From 41135f4a954646f7dfa3e18ac39b0f6443f11bb0 Mon Sep 17 00:00:00 2001
From: cam900 <dbtlrchl@naver.com>
Date: Tue, 21 Jun 2022 06:35:11 +0900
Subject: [PATCH 1/3] Add extended channel 3 preset for here

---
 src/gui/presets.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/gui/presets.cpp b/src/gui/presets.cpp
index 463352272..5fa4d75e1 100644
--- a/src/gui/presets.cpp
+++ b/src/gui/presets.cpp
@@ -1910,6 +1910,13 @@ void FurnaceGUI::initSystemPresets() {
       0
     }
   ));
+  cat.systems.push_back(FurnaceGUISysDef(
+    "Seta 1 + FM addon (extended channel 3)", {
+      DIV_SYSTEM_X1_010, 64, 0, 0,
+      DIV_SYSTEM_YM2612_EXT, 64, 0, 2, // Discrete YM3438
+      0
+    }
+  ));
   cat.systems.push_back(FurnaceGUISysDef(
     "Seta 2", {
       DIV_SYSTEM_X1_010, 64, 0, 1,

From df21621ce7b5b74054e6c4a8bb349e257f7990f5 Mon Sep 17 00:00:00 2001
From: cam900 <dbtlrchl@naver.com>
Date: Tue, 21 Jun 2022 06:36:41 +0900
Subject: [PATCH 2/3] Add drums mode in here, too

---
 src/gui/presets.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/gui/presets.cpp b/src/gui/presets.cpp
index 5fa4d75e1..d85865f7c 100644
--- a/src/gui/presets.cpp
+++ b/src/gui/presets.cpp
@@ -1972,6 +1972,14 @@ void FurnaceGUI::initSystemPresets() {
       0
     }
   ));
+  cat.systems.push_back(FurnaceGUISysDef(
+    "Dynax/Nakanihon 3rd generation hardware (drums mode)", {
+      DIV_SYSTEM_AY8910, 64, 0, 0, // AY or YM, optional - 1.79MHz or 3.58MHz; various per game
+      DIV_SYSTEM_OPLL_DRUMS, 64, 0, 0,
+      DIV_SYSTEM_MSM6295, 64, 0, 6, // 1.023MHz mostly
+      0
+    }
+  ));
   cat.systems.push_back(FurnaceGUISysDef(
     "Dynax/Nakanihon Real Break", {
       DIV_SYSTEM_OPLL, 64, 0, 0,
@@ -1979,6 +1987,13 @@ void FurnaceGUI::initSystemPresets() {
       0
     }
   ));
+  cat.systems.push_back(FurnaceGUISysDef(
+    "Dynax/Nakanihon Real Break (drums mode)", {
+      DIV_SYSTEM_OPLL_DRUMS, 64, 0, 0,
+      DIV_SYSTEM_YMZ280B, 64, 0, 0,
+      0
+    }
+  ));
   sysCategories.push_back(cat);
 
   cat=FurnaceGUISysCategory("DefleMask-compatible","these configurations are compatible with DefleMask.\nselect this if you need to save as .dmf or work with that program.");

From b3201853bc5256605d6f1e932df4f36cddd96dcf Mon Sep 17 00:00:00 2001
From: cam900 <dbtlrchl@naver.com>
Date: Tue, 21 Jun 2022 06:54:18 +0900
Subject: [PATCH 3/3] Fix YM2151 clock in CPS-1

---
 src/gui/presets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/presets.cpp b/src/gui/presets.cpp
index d85865f7c..67acca82a 100644
--- a/src/gui/presets.cpp
+++ b/src/gui/presets.cpp
@@ -1405,7 +1405,7 @@ void FurnaceGUI::initSystemPresets() {
   ));
   cat.systems.push_back(FurnaceGUISysDef(
     "Capcom CPS-1", { 
-      DIV_SYSTEM_YM2151, 64, 0, 2,
+      DIV_SYSTEM_YM2151, 64, 0, 0, // 3.58MHz
       DIV_SYSTEM_MSM6295, 64, 0, 0,
       0
     }