From ea82e42601bbc30a2d408fc14f96081102c18f16 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Sun, 13 May 2018 22:02:44 -0700 Subject: [PATCH 1/2] Bring list to parity with Redump known types This change adds all remaining consoles and disc-based devices that are currently listed in Redump as valid devices. This also does some minor renames and splits that bring this to parity as well. One minor TODO note was added possibly for future ease-of-use for dumping IBM PC software. --- MainWindow.xaml | 19 ++-- MainWindow.xaml.cs | 234 ++++++++++++++++++++++++++++++++------------- 2 files changed, 177 insertions(+), 76 deletions(-) diff --git a/MainWindow.xaml b/MainWindow.xaml index 01baa48a..291542e0 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -49,34 +49,39 @@ - + + + - + + - - + + - - + + + + + - diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index 31781db0..879c979a 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -65,10 +65,11 @@ namespace DICUI switch (Convert.ToString(CB_DiscType.Text)) { + #region Consoles + case "Bandai Playdia Quick Interactive System": VAR_Type = "cd"; VAR_Switches = "/c2"; - break; case "Bandai / Apple Pippin": VAR_Type = "cd"; @@ -82,10 +83,34 @@ namespace DICUI VAR_Type = "cd"; VAR_Switches = "/c2"; break; - case "NEC PC-FX / PC-Engine / TurboGrafx CD": + case "Microsoft XBOX": + // Placeholder for later use + break; + case "Microsoft XBOX 360": + // Placeholder for later use + break; + case "Microsoft XBOX One": + VAR_Type = "bd"; + VAR_Switches = ""; + VAR_IsXBOXorPS4 = true; + break; + case "NEC PC-Engine / TurboGrafx CD": VAR_Type = "cd"; VAR_Switches = "/c2"; break; + case "NEC PC-FX / PC-FXGA": + VAR_Type = "cd"; + VAR_Switches = "/c2"; + break; + case "Nintendo GameCube": + // Placeholder for later use + break; + case "Nintendo Wii": + // Placeholder for later use + break; + case "Nintendo Wii U": + // Placeholder for later use + break; case "Panasonic 3DO": VAR_Type = "cd"; VAR_Switches = "/c2"; @@ -94,7 +119,14 @@ namespace DICUI VAR_Type = "cd"; VAR_Switches = "/c2"; break; - case "Sega CD / Mega CD / Saturn": + case "Sega CD / Mega CD": + VAR_Type = "cd"; + VAR_Switches = "/c2"; + break; + case "Sega Dreamcast": + // Placeholder for later use + break; + case "Sega Saturn": VAR_Type = "cd"; VAR_Switches = "/c2"; break; @@ -102,87 +134,64 @@ namespace DICUI VAR_Type = "cd"; VAR_Switches = "/c2"; break; + case "Sony PlayStation": + VAR_Type = "cd"; + VAR_Switches = "/c2"; + VAR_IsPSX = true; + break; case "Sony PlayStation 2 (CD-Rom)": VAR_Type = "cd"; VAR_Switches = "/c2"; break; - case "VTech V.Flash - V.Smile Pro": - VAR_Type = "cd"; - VAR_Switches = "/c2"; - break; - case "Apple Macintosh (CD-Rom)": - VAR_Type = "cd"; - VAR_Switches = "/c2"; - break; - case "FM Towns series": - VAR_Type = "cd"; - VAR_Switches = "/c2"; - break; - case "NEC PC-88 / PC-98": - VAR_Type = "cd"; - VAR_Switches = "/c2"; - break; - case "Audio CD": - VAR_Type = "audio"; - VAR_Switches = "/c2"; - break; - case "PalmOS": - VAR_Type = "cd"; - VAR_Switches = "/c2"; - break; - case "Photo CD": - VAR_Type = "cd"; - VAR_Switches = "/c2"; - break; - case "PlayStation GameShark Updates": - VAR_Type = "cd"; - VAR_Switches = "/c2"; - break; - case "Sega Lindbergh": - VAR_Type = "cd"; - VAR_Switches = "/c2"; - break; - case "Tomy Kiss-Site": - VAR_Type = "cd"; - VAR_Switches = "/c2"; - break; - case "Video CD": - VAR_Type = "cd"; - VAR_Switches = "/c2"; - break; case "Sony PlayStation 2 (DVD-Rom)": VAR_Type = "dvd"; VAR_Switches = ""; break; - case "Apple Macintosh (DVD-Rom)": - VAR_Type = "dvd"; - VAR_Switches = ""; - break; - case "IBM PC Compatible (DVD-Rom)": - VAR_Type = "dvd"; - VAR_Switches = ""; - break; - case "IBM PC Compatible(CD - Rom) No Copy Protection": - VAR_Type = "dvd"; - VAR_Switches = "/c2"; - break; - case "BD-Video": - VAR_Switches = ""; - break; - case "Sony PlayStation": - VAR_Type = "cd"; - VAR_Switches = "/c2"; - VAR_IsPSX = true; + case "Sony PlayStation 3": + // Placeholder for later use break; case "Sony PlayStation 4": VAR_Type = "bd"; VAR_Switches = ""; VAR_IsXBOXorPS4 = true; break; - case "XBOX ONE": - VAR_Type = "bd"; + case "Sony PlayStation Portable": + // No-op - PSP can't be dumped with DIC + break; + case "VM Labs NUON": + // Placeholder for later use + break; + case "VTech V.Flash - V.Smile Pro": + VAR_Type = "cd"; + VAR_Switches = "/c2"; + break; + case "ZAPiT Games Game Wave Family Entertainment System": + // Placeholder for later use + break; + + #endregion + + #region Computers + + case "Acorn Archimedes": + // Placeholder for later use + break; + case "Apple Macintosh (CD-Rom)": + VAR_Type = "cd"; + VAR_Switches = "/c2"; + break; + case "Apple Macintosh (DVD-Rom)": + VAR_Type = "dvd"; VAR_Switches = ""; - VAR_IsXBOXorPS4 = true; + break; + case "Fujitsu FM Towns series": + VAR_Type = "cd"; + VAR_Switches = "/c2"; + break; + // TODO: Can protection be determined by a check automatically? + case "IBM PC Compatible (CD-Rom) No Copy Protection": + VAR_Type = "dvd"; + VAR_Switches = "/c2"; break; case "IBM PC Compatible (CD-Rom) SecuROM": VAR_Type = "cd"; @@ -196,7 +205,94 @@ namespace DICUI VAR_Type = "cd"; VAR_Switches = "/c2 /ss"; break; + case "IBM PC Compatible (DVD-Rom)": + VAR_Type = "dvd"; + VAR_Switches = ""; + break; + case "NEC PC-88": + VAR_Type = "cd"; + VAR_Switches = "/c2"; + break; + case "NEC PC-98": + VAR_Type = "cd"; + VAR_Switches = "/c2"; + break; + case "Sharp X68000": + // Placeholder for later use + break; + + #endregion + + #region Arcade + + case "Namco / Sega / Nintendo Triforce": + // Placeholder for later use + break; + case "Sega Chihiro": + // Placeholder for later use + break; + case "Sega Lindbergh": + VAR_Type = "cd"; + VAR_Switches = "/c2"; + break; + case "Sega Naomi": + // Placeholder for later use + break; + case "Sega Naomi 2": + // Placeholder for later use + break; + case "TAB-Austria Quizard": + // Placeholder for later use + break; + case "Tandy / Memorex Visual Information System": + // Placeholder for later use + break; + + #endregion + + #region Others + + case "Audio CD": + VAR_Type = "audio"; + VAR_Switches = "/c2"; + break; + case "BD-Video": + VAR_Switches = ""; + break; + case "DVD-Video": + VAR_Type = "dvd"; + break; + case "PalmOS": + VAR_Type = "cd"; + VAR_Switches = "/c2"; + break; + case "Philips CD-i Digital Video": + // Placeholder for later use + break; + case "Photo CD": + VAR_Type = "cd"; + VAR_Switches = "/c2"; + break; + case "PlayStation GameShark Updates": + VAR_Type = "cd"; + VAR_Switches = "/c2"; + break; + case "Tao iKTV": + // Placeholder for later use + break; + case "Tomy Kiss-Site": + VAR_Type = "cd"; + VAR_Switches = "/c2"; + break; + case "Video CD": + VAR_Type = "cd"; + VAR_Switches = "/c2"; + break; + + #endregion + case "Unknown": + default: VAR_Type = ""; VAR_Switches = ""; break; From e305ea1fdb192b3dc1bb4067e11754488ad8dba8 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Sun, 13 May 2018 22:09:37 -0700 Subject: [PATCH 2/2] Enable building on all machines --- DICUI.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DICUI.csproj b/DICUI.csproj index afed4e06..cd8a8283 100644 --- a/DICUI.csproj +++ b/DICUI.csproj @@ -62,8 +62,9 @@ true - true + false +