bugfix: Quickstart options and floppy drives

- The A4000(T) models had a 3.5" HD drive, not DD. - The second drive (DF1) was enabled automatically, incorrectly - Fixed startup default options
BlitterStudio · Dec 10, 2023 · 336af48 · 336af48
1 parent fcc9bac
commit 336af48
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 40 deletions.
diff --git a/src/osdep/amiberry.cpp b/src/osdep/amiberry.cpp
@@ -1884,18 +1884,18 @@ void target_default_options(struct uae_prefs* p, int type)
 	//TCHAR buf[MAX_DPATH];
 	if (type == 2 || type == 0 || type == 3) {
 		//p->logfile = 0;
-		p->active_nocapture_pause = 0;
-		p->active_nocapture_nosound = 0;
-		p->minimized_nosound = 1;
-		p->minimized_pause = 1;
+		p->active_nocapture_pause = false;
+		p->active_nocapture_nosound = false;
+		p->minimized_nosound = true;
+		p->minimized_pause = true;
 		p->minimized_input = 0;
-		p->inactive_nosound = 0;
-		p->inactive_pause = 0;
+		p->inactive_nosound = false;
+		p->inactive_pause = false;
 		p->inactive_input = 0;
 		//p->ctrl_F11_is_quit = 0;
 		p->soundcard = 0;
 		p->samplersoundcard = -1;
-		p->minimize_inactive = 0;
+		p->minimize_inactive = false;
 		p->capture_always = true;
 		p->start_minimized = false;
 		p->start_uncaptured = false;
@@ -1907,10 +1907,10 @@ void target_default_options(struct uae_prefs* p, int type)
 		p->main_alwaysontop = false;
 		p->gui_alwaysontop = false;
 		//p->guikey = -1;
-		p->automount_removable = 0;
+		p->automount_removable = false;
 		//p->automount_drives = 0;
 		//p->automount_removabledrives = 0;
-		p->automount_cddrives = 0;
+		p->automount_cddrives = false;
 		//p->automount_netdrives = 0;
 		//p->kbledmode = 1;
 		p->uaescsimode = UAESCSI_CDEMU;
@@ -1934,9 +1934,9 @@ void target_default_options(struct uae_prefs* p, int type)
 		p->gfx_api = 2;
 		if (p->gfx_api > 1)
 			p->color_mode = 5;
-		if (p->gf[GF_NORMAL].gfx_filter == 0 && p->gfx_api)
+		if (p->gf[GF_NORMAL].gfx_filter == 0)
 			p->gf[GF_NORMAL].gfx_filter = 1;
-		if (p->gf[GF_RTG].gfx_filter == 0 && p->gfx_api)
+		if (p->gf[GF_RTG].gfx_filter == 0)
 			p->gf[GF_RTG].gfx_filter = 1;
 		//WIN32GUI_LoadUIString(IDS_INPUT_CUSTOM, buf, sizeof buf / sizeof(TCHAR));
 		//for (int i = 0; i < GAMEPORT_INPUT_SETTINGS; i++)
@@ -1949,7 +1949,7 @@ void target_default_options(struct uae_prefs* p, int type)
 		//p->midioutdev = -2;
 		//p->midiindev = 0;
 		//p->midirouter = false;
-		p->automount_removable = 0;
+		p->automount_removable = false;
 		//p->automount_drives = 0;
 		//p->automount_removabledrives = 0;
 		p->automount_cddrives = true;
@@ -2083,15 +2083,6 @@ void target_default_options(struct uae_prefs* p, int type)
 	p->whdbootprefs.writecache = amiberry_options.default_whd_writecache;
 	p->whdbootprefs.quit_on_exit = amiberry_options.default_whd_quit_on_exit;
 
-	// Disable Cycle-Exact modes that are not yet implemented
-	if (p->cpu_cycle_exact || p->cpu_memory_cycle_exact)
-	{
-		if (p->cpu_model > 68010)
-		{
-			p->cpu_cycle_exact = p->cpu_memory_cycle_exact = false;
-		}
-	}
-
 	if (amiberry_options.default_soundcard > 0) p->soundcard = amiberry_options.default_soundcard;
 
 	// Virtual keyboard default options
@@ -2571,6 +2562,17 @@ static int target_parse_option_host(struct uae_prefs *p, const TCHAR *option, co
 		return 1;
 	}
 
+	if (cfgfile_string_escape(option, value, _T("parallel_port"), &p->prtname[0], 256)) {
+		if (!_tcscmp(p->prtname, _T("none")))
+			p->prtname[0] = 0;
+		if (!_tcscmp(p->prtname, _T("default"))) {
+			p->prtname[0] = 0;
+			//unsigned long size = 256;
+			//GetDefaultPrinter(p->prtname, &size);
+		}
+		return 1;
+	}
+
 	return 0;
 }
 

diff --git a/src/osdep/gui/PanelQuickstart.cpp b/src/osdep/gui/PanelQuickstart.cpp
@@ -109,9 +109,6 @@ static amigamodels amodels[] = {
 			"Basic non-expanded configuration",
 			"2 MB Chip RAM expanded configuration",
 			"4 MB Fast RAM expanded configuration",
-#ifdef ANDROID
-		 " ", " ", " ",
-#endif
 			"\0"
 		}
 	},
@@ -121,9 +118,6 @@ static amigamodels amodels[] = {
 			"2 MB Chip RAM expanded configuration",
 			"4 MB Fast RAM expanded configuration",
 			"8 MB Fast RAM expanded configuration"
-#ifdef ANDROID
-		 " ", " ", " ",
-#endif
 			"\0"
 		}
 	},
@@ -136,13 +130,10 @@ static amigamodels amodels[] = {
 		}
 	},
 	{
-		4, "Amiga 1200", {
+		5, "Amiga 1200", {
 			"Basic non-expanded configuration",
 			"4 MB Fast RAM expanded configuration",
 			"8 MB Fast RAM expanded configuration"
-#ifdef ANDROID
-		 " ", " ", " ", " ",
-#endif
 			"\0"
 		}
 	},
@@ -158,9 +149,6 @@ static amigamodels amodels[] = {
 		1, "Amiga 4000", {
 			"68030, 3.1 ROM, 2MB Chip + 8MB Fast",
 			"68040, 3.1 ROM, 2MB Chip + 8MB Fast",
-#ifdef ANDROID
-		 " ", " ", " ", " ",
-#endif
 			"\0"
 		}
 	},
@@ -172,19 +160,16 @@ static amigamodels amodels[] = {
 		}
 	},
 	{
-		3, "CD32", {
+		4, "CD32", {
 			"CD32",
 			"CD32 with Full Motion Video cartridge",
 			"Cubo CD32",
 			"CD32, 8MB Fast"
-#ifdef ANDROID
-		 " ", " ", " ", " ",
-#endif
 			"\0"
 		}
 	},
 	{
-		3, "CDTV", {
+		4, "CDTV", {
 			"CDTV",
 			"\0"
 		}
@@ -273,10 +258,19 @@ static void AdjustPrefs()
 	case 3: // A1000
 	case 4: // A1200
 	case 5: // A3000
+		// df0 always active
+		changed_prefs.floppyslots[0].dfxtype = DRV_35_DD;
+		changed_prefs.floppyslots[1].dfxtype = DRV_NONE;
+
+		// No CD available
+		changed_prefs.cdslots[0].inuse = false;
+		changed_prefs.cdslots[0].type = SCSI_UNIT_DISABLED;
+		break;
 	case 6: // A4000
 	case 7: // A4000T
 		// df0 always active
-		changed_prefs.floppyslots[0].dfxtype = DRV_35_DD;
+		changed_prefs.floppyslots[0].dfxtype = DRV_35_HD;
+		changed_prefs.floppyslots[1].dfxtype = DRV_NONE;
 
 		// No CD available
 		changed_prefs.cdslots[0].inuse = false;