From 537b9c22f920e8864a5bec7991fd3ade2b27ef7b Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sat, 21 Apr 2018 13:11:15 +0300 Subject: [PATCH] Removed CDTV SCSI from Advanced chipset. --- cfgfile.cpp | 10 +++++++--- include/options.h | 1 - od-win32/resources/resource.h | 1 - od-win32/resources/winuae.rc | 5 ++--- od-win32/win32gui.cpp | 4 ---- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/cfgfile.cpp b/cfgfile.cpp index d7b8749d..34800dbd 100644 --- a/cfgfile.cpp +++ b/cfgfile.cpp @@ -5098,7 +5098,6 @@ static int cfgfile_parse_hardware (struct uae_prefs *p, const TCHAR *option, TCH || cfgfile_yesno(option, value, _T("cdtv-cr"), &p->cs_cdtvcr) || cfgfile_yesno(option, value, _T("cdtvram"), &p->cs_cdtvram) || cfgfile_yesno(option, value, _T("a1000ram"), &p->cs_a1000ram) - || cfgfile_yesno(option, value, _T("scsi_cdtv"), &p->cs_cdtvscsi) || cfgfile_yesno(option, value, _T("cia_overlay"), &p->cs_ciaoverlay) || cfgfile_yesno(option, value, _T("bogomem_fast"), &p->cs_slowmemisfast) || cfgfile_yesno(option, value, _T("ksmirror_e0"), &p->cs_ksmirror_e0) @@ -5256,6 +5255,12 @@ static int cfgfile_parse_hardware (struct uae_prefs *p, const TCHAR *option, TCH return 1; } + if (cfgfile_yesno(option, value, _T("scsi_cdtv"), &tmpval)) { + if (tmpval) + addbcromtype(p, ROMTYPE_CDTVSCSI, true, NULL, 0); + return 1; + } + if (cfgfile_yesno(option, value, _T("pcmcia"), &p->cs_pcmcia)) { if (p->cs_pcmcia) addbcromtype(p, ROMTYPE_MB_PCMCIA, true, NULL, 0); @@ -5736,7 +5741,6 @@ void cfgfile_compatibility_romtype(struct uae_prefs *p) } addbcromtype(p, ROMTYPE_CDTVDMAC, p->cs_cdtvcd && !p->cs_cdtvcr, NULL, 0); - addbcromtype(p, ROMTYPE_CDTVSCSI, p->cs_cdtvscsi, NULL, 0); addbcromtype(p, ROMTYPE_CDTVCR, p->cs_cdtvcr, NULL, 0); @@ -8438,7 +8442,7 @@ int built_in_chipset_prefs (struct uae_prefs *p) p->cs_a1000ram = 0; p->cs_cd32c2p = p->cs_cd32cd = p->cs_cd32nvram = 0; - p->cs_cdtvcd = p->cs_cdtvram = p->cs_cdtvscsi = p->cs_cdtvcr = 0; + p->cs_cdtvcd = p->cs_cdtvram = p->cs_cdtvcr = 0; p->cs_cdtvcard = 0; p->cs_fatgaryrev = -1; p->cs_ide = 0; diff --git a/include/options.h b/include/options.h index 4534a3bf..fc646db4 100644 --- a/include/options.h +++ b/include/options.h @@ -614,7 +614,6 @@ struct uae_prefs { int cs_agnusrev; int cs_deniserev; int cs_mbdmac; - bool cs_cdtvscsi; bool cs_cdtvcr; bool cs_df0idhw; bool cs_slowmemisfast; diff --git a/od-win32/resources/resource.h b/od-win32/resources/resource.h index 88d63cf7..cb11fd34 100644 --- a/od-win32/resources/resource.h +++ b/od-win32/resources/resource.h @@ -1149,7 +1149,6 @@ #define IDC_DBG_CUSTOM 1766 #define IDC_DBG_MISCCPU 1767 #define IDC_CS_DMAC2 1769 -#define IDC_CS_CDTVSCSI 1771 #define IDC_CS_CD32FMV 1771 #define IDC_DF0ENABLE 1773 #define IDC_DF1ENABLE 1774 diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index 2817a39c..fad27c7a 100644 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -810,9 +810,8 @@ BEGIN CONTROL "A1000 Agnus (8361/8367)",IDC_CS_DIPAGNUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,171,125,11 CONTROL "Composite color burst",IDC_CS_COMPOSITECOLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,184,125,12 GROUPBOX "Internal SCSI Hardware",IDC_STATIC,0,232,395,30 - CONTROL "A3000 WD33C93 SCSI",IDC_CS_DMAC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,247,108,11 - CONTROL "A4000T NCR53C710 SCSI",IDC_CS_DMAC2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,130,247,125,11 - CONTROL "CDTV WD33C93 SCSI",IDC_CS_CDTVSCSI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,263,247,121,11 + CONTROL "A3000 WD33C93 SCSI",IDC_CS_DMAC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,247,108,11 + CONTROL "A4000T NCR53C710 SCSI",IDC_CS_DMAC2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,200,247,125,11 GROUPBOX "Chipset Revision",IDC_STATIC,1,264,393,52 CONTROL "Ramsey revision:",IDC_CS_RAMSEY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,34,285,97,11 CONTROL "Fat Gary revision:",IDC_CS_FATGARY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,34,299,97,11 diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp index 5b3e6da3..0018d56f 100644 --- a/od-win32/win32gui.cpp +++ b/od-win32/win32gui.cpp @@ -8186,7 +8186,6 @@ static void values_to_chipsetdlg2 (HWND hDlg) CheckDlgButton(hDlg, IDC_CS_DENISE, workprefs.cs_deniserev >= 0); CheckDlgButton(hDlg, IDC_CS_DMAC, workprefs.cs_mbdmac & 1); CheckDlgButton(hDlg, IDC_CS_DMAC2, workprefs.cs_mbdmac & 2); - CheckDlgButton(hDlg, IDC_CS_CDTVSCSI, workprefs.cs_cdtvscsi); CheckDlgButton(hDlg, IDC_CS_PCMCIA, workprefs.cs_pcmcia); CheckDlgButton(hDlg, IDC_CS_SLOWISFAST, workprefs.cs_slowmemisfast); CheckDlgButton(hDlg, IDC_CS_CIATODBUG, workprefs.cs_ciatodbug); @@ -8278,7 +8277,6 @@ static void values_from_chipsetdlg2 (HWND hDlg, UINT msg, WPARAM wParam, LPARAM workprefs.cs_fatgaryrev = ischecked (hDlg, IDC_CS_FATGARY) ? 0x00 : -1; workprefs.cs_mbdmac = ischecked (hDlg, IDC_CS_DMAC) ? 1 : 0; workprefs.cs_mbdmac |= ischecked (hDlg, IDC_CS_DMAC2) ? 2 : 0; - workprefs.cs_cdtvscsi = ischecked (hDlg, IDC_CS_CDTVSCSI) ? 1 : 0; workprefs.cs_pcmcia = ischecked (hDlg, IDC_CS_PCMCIA) ? 1 : 0; workprefs.cs_slowmemisfast = ischecked (hDlg, IDC_CS_SLOWISFAST) ? 1 : 0; workprefs.cs_z3autoconfig = ischecked (hDlg, IDC_CS_Z3AUTOCONFIG) ? 1 : 0; @@ -8351,7 +8349,6 @@ static void enable_for_chipsetdlg2 (HWND hDlg) ew(hDlg, IDC_CS_IDE2, e); ew(hDlg, IDC_CS_DMAC, e); ew(hDlg, IDC_CS_DMAC2, e); - ew(hDlg, IDC_CS_CDTVSCSI, e); ew(hDlg, IDC_CS_PCMCIA, e); ew(hDlg, IDC_CS_SLOWISFAST, e); ew(hDlg, IDC_CS_CD32CD, e); @@ -13362,7 +13359,6 @@ static INT_PTR CALLBACK CDDriveSettingsProc (HWND hDlg, UINT msg, WPARAM wParam, if (current_cddlg.ci.controller_type == HD_CONTROLLER_TYPE_UAE) current_cddlg.ci.controller_type = (is_board_enabled(&workprefs, ROMTYPE_A2091, 0) || is_board_enabled(&workprefs, ROMTYPE_GVPS2, 0) || is_board_enabled(&workprefs, ROMTYPE_A4091, 0) || - workprefs.cs_cdtvscsi || (workprefs.cs_mbdmac & 3)) ? HD_CONTROLLER_TYPE_SCSI_AUTO : HD_CONTROLLER_TYPE_IDE_AUTO; inithdcontroller(hDlg, current_cddlg.ci.controller_type, current_cddlg.ci.controller_type_unit, UAEDEV_CD, current_cddlg.ci.rootdir[0] != 0); SendDlgItemMessage(hDlg, IDC_HDF_CONTROLLER_UNIT, CB_SETCURSEL, current_cddlg.ci.controller_type != HD_CONTROLLER_TYPE_PCMCIA ? current_cddlg.ci.controller_unit : current_cddlg.ci.controller_type_unit, 0); -- 2.47.3