--- previous/src/options.c 2018/04/24 19:25:32 1.1.1.2 +++ 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", @@ -777,12 +775,12 @@ static bool Opt_HandleArgument(const cha /* GEMDOS HDD directory (as argument, or for the Atari program)? */ if (File_DirExists(path)) { - if (Opt_StrCpy(OPT_HARDDRIVE, false, ConfigureParams.HardDisk.szHardDiskDirectories[0], - path, sizeof(ConfigureParams.HardDisk.szHardDiskDirectories[0]), - &ConfigureParams.HardDisk.bUseHardDiskDirectories) - && ConfigureParams.HardDisk.bUseHardDiskDirectories) +// if (Opt_StrCpy(OPT_HARDDRIVE, false, ConfigureParams.HardDisk.szHardDiskDirectories[0], +// path, sizeof(ConfigureParams.HardDisk.szHardDiskDirectories[0]), +// &ConfigureParams.HardDisk.bUseHardDiskDirectories) +// && ConfigureParams.HardDisk.bUseHardDiskDirectories) { - ConfigureParams.HardDisk.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 { @@ -1098,19 +1096,19 @@ bool Opt_ParseParameters(int argc, const case OPT_JOYSTICK4: case OPT_JOYSTICK5: port = argv[i][strlen(argv[i])-1] - '0'; - assert(port >= 0 && port < JOYSTICK_COUNT); +// assert(port >= 0 && port < JOYSTICK_COUNT); i += 1; if (strcasecmp(argv[i], "none") == 0) { - ConfigureParams.Joysticks.Joy[port].nJoystickMode = JOYSTICK_DISABLED; +// ConfigureParams.Joysticks.Joy[port].nJoystickMode = JOYSTICK_DISABLED; } else if (strcasecmp(argv[i], "keys") == 0) { - ConfigureParams.Joysticks.Joy[port].nJoystickMode = JOYSTICK_KEYBOARD; +// ConfigureParams.Joysticks.Joy[port].nJoystickMode = JOYSTICK_KEYBOARD; } else if (strcasecmp(argv[i], "real") == 0) { - ConfigureParams.Joysticks.Joy[port].nJoystickMode = JOYSTICK_REALSTICK; +// ConfigureParams.Joysticks.Joy[port].nJoystickMode = JOYSTICK_REALSTICK; } 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,50 +1173,50 @@ 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.HardDisk.nWriteProtection = WRITEPROT_OFF; - else if (strcasecmp(argv[i], "on") == 0) - ConfigureParams.HardDisk.nWriteProtection = WRITEPROT_ON; - else if (strcasecmp(argv[i], "auto") == 0) - ConfigureParams.HardDisk.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; case OPT_HARDDRIVE: i += 1; - ok = Opt_StrCpy(OPT_HARDDRIVE, false, ConfigureParams.HardDisk.szHardDiskDirectories[0], - argv[i], sizeof(ConfigureParams.HardDisk.szHardDiskDirectories[0]), - &ConfigureParams.HardDisk.bUseHardDiskDirectories); - if (ok && ConfigureParams.HardDisk.bUseHardDiskDirectories) +// ok = Opt_StrCpy(OPT_HARDDRIVE, false, ConfigureParams.HardDisk.szHardDiskDirectories[0], +// argv[i], sizeof(ConfigureParams.HardDisk.szHardDiskDirectories[0]), +// &ConfigureParams.HardDisk.bUseHardDiskDirectories); +// if (ok && ConfigureParams.HardDisk.bUseHardDiskDirectories) { - ConfigureParams.HardDisk.bBootFromHardDisk = true; +// ConfigureParams.SCSI.bBootFromHardDisk = true; } bLoadAutoSave = false; break; case OPT_ACSIHDIMAGE: i += 1; - ok = Opt_StrCpy(OPT_ACSIHDIMAGE, true, ConfigureParams.HardDisk.szHardDiskImage, - argv[i], sizeof(ConfigureParams.HardDisk.szHardDiskImage), - &ConfigureParams.HardDisk.bUseHardDiskImage); +// ok = Opt_StrCpy(OPT_ACSIHDIMAGE, true, ConfigureParams.HardDisk.szHardDiskImage, +// argv[i], sizeof(ConfigureParams.HardDisk.szHardDiskImage), +// &ConfigureParams.HardDisk.bUseHardDiskImage); if (ok) { bLoadAutoSave = false; @@ -1227,9 +1225,9 @@ bool Opt_ParseParameters(int argc, const case OPT_IDEMASTERHDIMAGE: i += 1; - ok = Opt_StrCpy(OPT_IDEMASTERHDIMAGE, true, ConfigureParams.HardDisk.szIdeMasterHardDiskImage, - argv[i], sizeof(ConfigureParams.HardDisk.szIdeMasterHardDiskImage), - &ConfigureParams.HardDisk.bUseIdeMasterHardDiskImage); +// ok = Opt_StrCpy(OPT_IDEMASTERHDIMAGE, true, ConfigureParams.HardDisk.szIdeMasterHardDiskImage, +// argv[i], sizeof(ConfigureParams.HardDisk.szIdeMasterHardDiskImage), +// &ConfigureParams.HardDisk.bUseIdeMasterHardDiskImage); if (ok) { bLoadAutoSave = false; @@ -1238,9 +1236,9 @@ bool Opt_ParseParameters(int argc, const case OPT_IDESLAVEHDIMAGE: i += 1; - ok = Opt_StrCpy(OPT_IDESLAVEHDIMAGE, true, ConfigureParams.HardDisk.szIdeSlaveHardDiskImage, - argv[i], sizeof(ConfigureParams.HardDisk.szIdeSlaveHardDiskImage), - &ConfigureParams.HardDisk.bUseIdeSlaveHardDiskImage); +// ok = Opt_StrCpy(OPT_IDESLAVEHDIMAGE, true, ConfigureParams.HardDisk.szIdeSlaveHardDiskImage, +// argv[i], sizeof(ConfigureParams.HardDisk.szIdeSlaveHardDiskImage), +// &ConfigureParams.HardDisk.bUseIdeSlaveHardDiskImage); if (ok) { bLoadAutoSave = false; @@ -1254,15 +1252,15 @@ bool Opt_ParseParameters(int argc, const { return Opt_ShowError(OPT_MEMSIZE, argv[i], "Invalid memory size"); } - ConfigureParams.Memory.nMemorySize = memsize; +// ConfigureParams.Memory.nMemorySize = memsize; bLoadAutoSave = false; break; case OPT_TOS: i += 1; - ok = Opt_StrCpy(OPT_TOS, true, ConfigureParams.Rom.szTosImageFileName, - argv[i], sizeof(ConfigureParams.Rom.szTosImageFileName), - NULL); +// ok = Opt_StrCpy(OPT_TOS, true, ConfigureParams.Rom.szTosImageFileName, +// argv[i], sizeof(ConfigureParams.Rom.szTosImageFileName), +// NULL); if (ok) { bLoadAutoSave = false; @@ -1271,9 +1269,9 @@ bool Opt_ParseParameters(int argc, const case OPT_CARTRIDGE: i += 1; - ok = Opt_StrCpy(OPT_CARTRIDGE, true, ConfigureParams.Rom.szCartridgeImageFileName, - argv[i], sizeof(ConfigureParams.Rom.szCartridgeImageFileName), - NULL); +// ok = Opt_StrCpy(OPT_CARTRIDGE, true, ConfigureParams.Rom.szCartridgeImageFileName, +// argv[i], sizeof(ConfigureParams.Rom.szCartridgeImageFileName), +// NULL); if (ok) { bLoadAutoSave = false; @@ -1327,19 +1325,19 @@ bool Opt_ParseParameters(int argc, const i += 1; if (strcasecmp(argv[i], "st") == 0) { - ConfigureParams.System.nMachineType = MACHINE_ST; +// ConfigureParams.System.nMachineType = MACHINE_ST; ConfigureParams.System.nCpuLevel = 0; ConfigureParams.System.nCpuFreq = 8; } else if (strcasecmp(argv[i], "ste") == 0) { - ConfigureParams.System.nMachineType = MACHINE_STE; +// ConfigureParams.System.nMachineType = MACHINE_STE; ConfigureParams.System.nCpuLevel = 0; ConfigureParams.System.nCpuFreq = 8; } else if (strcasecmp(argv[i], "tt") == 0) { - ConfigureParams.System.nMachineType = MACHINE_TT; +// ConfigureParams.System.nMachineType = MACHINE_TT; ConfigureParams.System.nCpuLevel = 3; ConfigureParams.System.nCpuFreq = 32; } @@ -1348,7 +1346,7 @@ bool Opt_ParseParameters(int argc, const #if ENABLE_DSP_EMU ConfigureParams.System.nDSPType = DSP_TYPE_EMU; #endif - ConfigureParams.System.nMachineType = MACHINE_FALCON; +// ConfigureParams.System.nMachineType = MACHINE_FALCON; ConfigureParams.System.nCpuLevel = 3; ConfigureParams.System.nCpuFreq = 16; } @@ -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: