From 1cb07eb1a2e7781679a05641bcad768e7589a491 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Sun, 29 May 2022 13:29:18 -0500 Subject: [PATCH 1/2] MSM6295: add more rates --- src/engine/platform/msm6295.cpp | 27 +++++++++++++++++++++++++++ src/gui/sysConf.cpp | 27 +++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/src/engine/platform/msm6295.cpp b/src/engine/platform/msm6295.cpp index f1d4e997..deb027a2 100644 --- a/src/engine/platform/msm6295.cpp +++ b/src/engine/platform/msm6295.cpp @@ -352,6 +352,33 @@ void DivPlatformMSM6295::setFlags(unsigned int flags) { case 3: chipClock=4224000; break; + case 4: + chipClock=COLOR_NTSC; + break; + case 5: + chipClock=COLOR_NTSC/2.0; + break; + case 6: + chipClock=COLOR_NTSC*2.0/7.0; + break; + case 7: + chipClock=COLOR_NTSC/4.0; + break; + case 8: + chipClock=4000000/2; + break; + case 9: + chipClock=4224000/2; + break; + case 10: + chipClock=875000; + break; + case 11: + chipClock=937500; + break; + case 12: + chipClock=1500000; + break; } rate=chipClock/3; for (int i=0; i<4; i++) { diff --git a/src/gui/sysConf.cpp b/src/gui/sysConf.cpp index a49db16b..8b8c3c3a 100644 --- a/src/gui/sysConf.cpp +++ b/src/gui/sysConf.cpp @@ -427,6 +427,33 @@ void FurnaceGUI::drawSysConf(int chan, DivSystem type, unsigned int& flags, bool if (ImGui::RadioButton("4.224MHz",flags==3)) { copyOfFlags=3; } + if (ImGui::RadioButton("3.58MHz",flags==4)) { + copyOfFlags=4; + } + if (ImGui::RadioButton("1.79MHz",flags==5)) { + copyOfFlags=5; + } + if (ImGui::RadioButton("1.02MHz",flags==6)) { + copyOfFlags=6; + } + if (ImGui::RadioButton("0.89MHz",flags==7)) { + copyOfFlags=7; + } + if (ImGui::RadioButton("2MHz",flags==8)) { + copyOfFlags=8; + } + if (ImGui::RadioButton("2.112MHz",flags==9)) { + copyOfFlags=9; + } + if (ImGui::RadioButton("0.875MHz",flags==10)) { + copyOfFlags=10; + } + if (ImGui::RadioButton("0.9375MHz",flags==11)) { + copyOfFlags=11; + } + if (ImGui::RadioButton("1.5MHz",flags==12)) { + copyOfFlags=12; + } break; } case DIV_SYSTEM_GB: From 1ed5be887b8cab59385b0aa64990cf8a6258b890 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Sun, 29 May 2022 13:29:58 -0500 Subject: [PATCH 2/2] MSM6295: fallback rate --- src/engine/platform/msm6295.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/engine/platform/msm6295.cpp b/src/engine/platform/msm6295.cpp index deb027a2..541dded6 100644 --- a/src/engine/platform/msm6295.cpp +++ b/src/engine/platform/msm6295.cpp @@ -379,6 +379,9 @@ void DivPlatformMSM6295::setFlags(unsigned int flags) { case 12: chipClock=1500000; break; + default: + chipClock=4000000/4; + break; } rate=chipClock/3; for (int i=0; i<4; i++) {