--- previous/src/options.c 2018/04/24 19:27:34 1.1.1.3 +++ previous/src/options.c 2018/04/24 19:29:52 1.1.1.4 @@ -104,13 +104,13 @@ enum { OPT_CPULEVEL, /* CPU options */ OPT_CPUCLOCK, OPT_COMPATIBLE, -#if ENABLE_WINUAE_CPU + OPT_CPU_CYCLE_EXACT, /* WinUAE CPU/FPU/bus options */ OPT_CPU_ADDR24, OPT_FPU_TYPE, OPT_FPU_COMPATIBLE, OPT_MMU, -#endif + OPT_MACHINE, /* system options */ OPT_BLITTER, OPT_DSP, @@ -290,7 +290,6 @@ static const opt_t HatariOptions[] = { { OPT_COMPATIBLE, NULL, "--compatible", "", "Use a more compatible (but slower) 68000 CPU mode" }, -#if ENABLE_WINUAE_CPU { OPT_HEADER, NULL, NULL, NULL, "WinUAE CPU/FPU/bus" }, { OPT_CPU_CYCLE_EXACT, NULL, "--cpu-exact", "", "Use cycle exact CPU emulation" }, @@ -302,7 +301,6 @@ static const opt_t HatariOptions[] = { "", "Use more compatible, but slower FPU emulation" }, { OPT_MMU, NULL, "--mmu", "", "Use MMU emulation" }, -#endif { OPT_HEADER, NULL, NULL, NULL, "Misc system" }, { OPT_MACHINE, NULL, "--machine", @@ -782,7 +780,7 @@ static bool Opt_HandleArgument(const cha // &ConfigureParams.HardDisk.bUseHardDiskDirectories) // && ConfigureParams.HardDisk.bUseHardDiskDirectories) { - ConfigureParams.SCSI.bBootFromHardDisk = true; +// ConfigureParams.SCSI.bBootFromHardDisk = true; } bLoadAutoSave = false; if (dir) { @@ -867,7 +865,7 @@ bool Opt_ParseParameters(int argc, const /* common display options */ case OPT_MONO: - ConfigureParams.Screen.nMonitorType = MONITOR_TYPE_MONO; +// ConfigureParams.Screen.nMonitorType = MONITOR_TYPE_MONO; bLoadAutoSave = false; break; @@ -875,19 +873,19 @@ bool Opt_ParseParameters(int argc, const i += 1; if (strcasecmp(argv[i], "mono") == 0) { - ConfigureParams.Screen.nMonitorType = MONITOR_TYPE_MONO; +// ConfigureParams.Screen.nMonitorType = MONITOR_TYPE_MONO; } else if (strcasecmp(argv[i], "rgb") == 0) { - ConfigureParams.Screen.nMonitorType = MONITOR_TYPE_RGB; +// ConfigureParams.Screen.nMonitorType = MONITOR_TYPE_RGB; } else if (strcasecmp(argv[i], "vga") == 0) { - ConfigureParams.Screen.nMonitorType = MONITOR_TYPE_VGA; +// ConfigureParams.Screen.nMonitorType = MONITOR_TYPE_VGA; } else if (strcasecmp(argv[i], "tv") == 0) { - ConfigureParams.Screen.nMonitorType = MONITOR_TYPE_TV; +// ConfigureParams.Screen.nMonitorType = MONITOR_TYPE_TV; } else { @@ -1123,7 +1121,7 @@ bool Opt_ParseParameters(int argc, const /* "none" can be used to disable printer */ ok = Opt_StrCpy(OPT_PRINTER, false, ConfigureParams.Printer.szPrintToFileName, argv[i], sizeof(ConfigureParams.Printer.szPrintToFileName), - &ConfigureParams.Printer.bEnablePrinting); + &ConfigureParams.Printer.bPrinterConnected); break; case OPT_MIDI_IN: @@ -1175,30 +1173,30 @@ bool Opt_ParseParameters(int argc, const // break; case OPT_SLOWFLOPPY: - ok = Opt_Bool(argv[++i], OPT_SLOWFLOPPY, &ConfigureParams.DiskImage.bSlowFloppy); +// ok = Opt_Bool(argv[++i], OPT_SLOWFLOPPY, &ConfigureParams.DiskImage.bSlowFloppy); break; case OPT_WRITEPROT_FLOPPY: i += 1; if (strcasecmp(argv[i], "off") == 0) - ConfigureParams.DiskImage.nWriteProtection = WRITEPROT_OFF; - else if (strcasecmp(argv[i], "on") == 0) - ConfigureParams.DiskImage.nWriteProtection = WRITEPROT_ON; - else if (strcasecmp(argv[i], "auto") == 0) - ConfigureParams.DiskImage.nWriteProtection = WRITEPROT_AUTO; - else +// ConfigureParams.DiskImage.nWriteProtection = WRITEPROT_OFF; +// else if (strcasecmp(argv[i], "on") == 0) +// ConfigureParams.DiskImage.nWriteProtection = WRITEPROT_ON; +// else if (strcasecmp(argv[i], "auto") == 0) +// ConfigureParams.DiskImage.nWriteProtection = WRITEPROT_AUTO; +// else return Opt_ShowError(OPT_WRITEPROT_FLOPPY, argv[i], "Unknown option value"); break; case OPT_WRITEPROT_HD: i += 1; - if (strcasecmp(argv[i], "off") == 0) - ConfigureParams.SCSI.nWriteProtection = WRITEPROT_OFF; - else if (strcasecmp(argv[i], "on") == 0) - ConfigureParams.SCSI.nWriteProtection = WRITEPROT_ON; - else if (strcasecmp(argv[i], "auto") == 0) - ConfigureParams.SCSI.nWriteProtection = WRITEPROT_AUTO; - else +// if (strcasecmp(argv[i], "off") == 0) +// ConfigureParams.SCSI.nWriteProtection = WRITEPROT_OFF; +// else if (strcasecmp(argv[i], "on") == 0) +// ConfigureParams.SCSI.nWriteProtection = WRITEPROT_ON; +// else if (strcasecmp(argv[i], "auto") == 0) +// ConfigureParams.SCSI.nWriteProtection = WRITEPROT_AUTO; +// else return Opt_ShowError(OPT_WRITEPROT_HD, argv[i], "Unknown option value"); break; @@ -1209,7 +1207,7 @@ bool Opt_ParseParameters(int argc, const // &ConfigureParams.HardDisk.bUseHardDiskDirectories); // if (ok && ConfigureParams.HardDisk.bUseHardDiskDirectories) { - ConfigureParams.SCSI.bBootFromHardDisk = true; +// ConfigureParams.SCSI.bBootFromHardDisk = true; } bLoadAutoSave = false; break; @@ -1400,7 +1398,6 @@ bool Opt_ParseParameters(int argc, const bLoadAutoSave = false; break; -#if ENABLE_WINUAE_CPU case OPT_CPU_ADDR24: ok = Opt_Bool(argv[++i], OPT_CPU_ADDR24, &ConfigureParams.System.bAddressSpace24); bLoadAutoSave = false; @@ -1444,8 +1441,8 @@ bool Opt_ParseParameters(int argc, const ok = Opt_Bool(argv[++i], OPT_MMU, &ConfigureParams.System.bMMU); bLoadAutoSave = false; break; -#endif - case OPT_YM_MIXING: + + case OPT_YM_MIXING: i += 1; if (strcasecmp(argv[i], "linear") == 0) { @@ -1474,7 +1471,7 @@ bool Opt_ParseParameters(int argc, const { return Opt_ShowError(OPT_SOUND, argv[i], "Unsupported sound frequency"); } - ConfigureParams.Sound.nPlaybackFreq = freq; +// ConfigureParams.Sound.nPlaybackFreq = freq; ConfigureParams.Sound.bEnableSound = true; } break; @@ -1488,7 +1485,7 @@ bool Opt_ParseParameters(int argc, const { return Opt_ShowError(OPT_SOUNDBUFFERSIZE, argv[i], "Unsupported sound buffer size"); } - ConfigureParams.Sound.SdlAudioBufferSize = temp; +// ConfigureParams.Sound.SdlAudioBufferSize = temp; break; case OPT_MICROPHONE: