--- previous/src/gui-sdl/dlgSystem.c 2018/04/24 19:25:10 1.1 +++ previous/src/gui-sdl/dlgSystem.c 2018/04/24 19:28:24 1.1.1.3 @@ -3,6 +3,13 @@ This file is distributed under the GNU Public License, version 2 or at your option any later version. Read the file gpl.txt for details. + + This file contains 2 system panels : + - 1 for the old uae CPU + - 1 for the new WinUae cpu + + The selection is made during compilation with the ENABLE_WINUAE_CPU define + */ const char DlgSystem_fileid[] = "Hatari dlgSystem.c : " __DATE__ " " __TIME__; @@ -12,178 +19,266 @@ const char DlgSystem_fileid[] = "Hatari #include "sdlgui.h" -#define DLGSYS_68000 4 -#define DLGSYS_68010 5 -#define DLGSYS_68020 6 -#define DLGSYS_68030 7 -#define DLGSYS_68040 8 -#define DLGSYS_ST 11 -#define DLGSYS_STE 12 -#define DLGSYS_TT 13 -#define DLGSYS_FALCON 14 -#define DLGSYS_8MHZ 17 -#define DLGSYS_16MHZ 18 -#define DLGSYS_32MHZ 19 -#define DLGSYS_DSPOFF 21 -#define DLGSYS_DSPDUMMY 22 -#define DLGSYS_DSPON 23 -#define DLGSYS_PREFETCH 24 -#define DLGSYS_BLITTER 25 -#define DLGSYS_RTC 26 -#define DLGSYS_TIMERD 27 +#define DLGSYS_CUBE030 4 +#define DLGSYS_SLAB 5 +#define DLGSYS_COLOR 6 +#define DLGSYS_TURBO 7 + +#define DLGSYS_CUSTOMIZE 8 +#define DLGSYS_RESET 9 + +#define DLGSYS_EXIT 25 + +/* Variable strings */ +char cpu_type[16] = "68030"; +char cpu_clock[16] = "25 MHz"; +char fpu_type[16] = "68882"; +char memory_size[16] = "8 MB"; +char scsi_controller[16] = "NCR53C90"; +char rtc_chip[16] = "MC68HC68T1"; +char emulate_adb[16] = " "; + +/* Additional functions */ +void print_system_overview(void); +void get_default_values(void); + + -/* The "System" dialog: */ static SGOBJ systemdlg[] = { - { SGBOX, 0, 0, 0,0, 36,24, NULL }, - { SGTEXT, 0, 0, 11,1, 14,1, "System options" }, + { SGBOX, 0, 0, 0,0, 60,24, NULL }, + { SGTEXT, 0, 0, 23,1, 14,1, "System options" }, + + { SGBOX, 0, 0, 2,3, 26,14, NULL }, + { SGTEXT, 0, 0, 3,4, 14,1, "Machine type" }, + { SGRADIOBUT, 0, 0, 5,6, 15,1, "NeXT Computer" }, + { SGRADIOBUT, 0, 0, 5,8, 13,1, "NeXTstation" }, + { SGCHECKBOX, 0, 0, 7,9, 7,1, "Color" }, + { SGCHECKBOX, 0, 0, 7,10, 7,1, "Turbo" }, + + { SGBUTTON, SG_DEFAULT, 0, 5,13, 20,1, "Customize" }, + { SGBUTTON, SG_DEFAULT, 0, 5,15, 20,1, "System defaults" }, + + { SGTEXT, 0, 0, 30,4, 13,1, "System overview:" }, + { SGTEXT, 0, 0, 30,6, 13,1, "CPU type:" }, + { SGTEXT, 0, 0, 44,6, 13,1, cpu_type }, + { SGTEXT, 0, 0, 30,7, 13,1, "CPU clock:" }, + { SGTEXT, 0, 0, 44,7, 13,1, cpu_clock }, + { SGTEXT, 0, 0, 30,8, 13,1, "FPU type:" }, + { SGTEXT, 0, 0, 44,8, 13,1, fpu_type }, + { SGTEXT, 0, 0, 30,9, 13,1, "Memory size:" }, + { SGTEXT, 0, 0, 44,9, 13,1, memory_size }, + { SGTEXT, 0, 0, 30,10, 13,1, "SCSI chip:" }, + { SGTEXT, 0, 0, 44,10, 13,1, scsi_controller }, + { SGTEXT, 0, 0, 30,11, 13,1, "RTC chip:" }, + { SGTEXT, 0, 0, 44,11, 13,1, rtc_chip }, + { SGTEXT, 0, 0, 30,13, 13,1, emulate_adb }, + + { SGTEXT, 0, 0, 4,18, 13,1, "Changing machine type resets all advanced options." }, + + { SGBUTTON, SG_DEFAULT, 0, 21,21, 20,1, "Back to main menu" }, + { -1, 0, 0, 0,0, 0,0, NULL } + }; + + +/* Function to print system overview */ + +void print_system_overview(void) { + switch (ConfigureParams.System.nCpuLevel) { + case 0: + sprintf(cpu_type, "68000"); break; + case 1: + sprintf(cpu_type, "68010"); break; + case 2: + sprintf(cpu_type, "68020"); break; + case 3: + sprintf(cpu_type, "68030"); break; + case 4: + sprintf(cpu_type, "68040"); break; + case 5: + sprintf(cpu_type, "68060"); break; + default: break; + } + + sprintf(cpu_clock, "%i MHz", ConfigureParams.System.nCpuFreq); + + sprintf(memory_size, "%i MB", Configuration_CheckMemory(ConfigureParams.Memory.nMemoryBankSize)); + + switch (ConfigureParams.System.n_FPUType) { + case FPU_NONE: + sprintf(fpu_type, "none"); break; + case FPU_68881: + sprintf(fpu_type, "68881"); break; + case FPU_68882: + sprintf(fpu_type, "68882"); break; + case FPU_CPU: + sprintf(fpu_type, "68040 internal"); break; + default: break; + } + + switch (ConfigureParams.System.nSCSI) { + case NCR53C90: + sprintf(scsi_controller, "NCR53C90"); break; + case NCR53C90A: + sprintf(scsi_controller, "NCR53C90A"); break; + default: break; + } + + switch (ConfigureParams.System.nRTC) { + case MC68HC68T1: + sprintf(rtc_chip, "MC68HC68T1"); break; + case MCS1850: + sprintf(rtc_chip, "MCS1850"); break; + default: break; + } + + if (ConfigureParams.System.bADB) + sprintf(emulate_adb, "ADB emulated"); + else + sprintf(emulate_adb, " "); +} - { SGBOX, 0, 0, 2,3, 16,9, NULL }, - { SGTEXT, 0, 0, 3,4, 8,1, "CPU type:" }, - { SGRADIOBUT, 0, 0, 4,6, 7,1, "68000" }, - { SGRADIOBUT, 0, 0, 4,7, 7,1, "68010" }, - { SGRADIOBUT, 0, 0, 4,8, 7,1, "68020" }, - { SGRADIOBUT, 0, 0, 4,9, 13,1, "68EC030+FPU" }, - { SGRADIOBUT, 0, 0, 4,10, 7,1, "68040" }, - - { SGBOX, 0, 0, 19,3, 15,9, NULL }, - { SGTEXT, 0, 0, 20,4, 13,1, "Machine type:" }, - { SGRADIOBUT, 0, 0, 23,6, 8,1, "ST" }, - { SGRADIOBUT, 0, 0, 23,7, 8,1, "STE" }, - { SGRADIOBUT, 0, 0, 23,8, 8,1, "TT *" }, - { SGRADIOBUT, 0, 0, 23,9, 8,1, "Falcon *" }, - { SGTEXT, 0, 0, 21,11, 12,1, "* incomplete" }, - - { SGTEXT, 0, 0, 2,13, 15,1, "CPU clock (MHz):" }, - { SGRADIOBUT, 0, 0, 19,13, 3,1, "8" }, - { SGRADIOBUT, 0, 0, 24,13, 4,1, "16" }, - { SGRADIOBUT, 0, 0, 30,13, 4,1, "32" }, - - { SGTEXT, 0, 0, 2,15, 11,1, "Falcon DSP:" }, - { SGRADIOBUT, 0, 0, 14,15, 5,1, "off" }, - { SGRADIOBUT, 0, 0, 21,15, 7,1, "dummy" }, - { SGRADIOBUT, 0, 0, 30,15, 4,1, "on" }, - - { SGCHECKBOX, 0, 0, 2,17, 32,1, "Slower but more compatible CPU" }, - { SGCHECKBOX, 0, 0, 2,18, 20,1, "Blitter emulation" }, - { SGCHECKBOX, 0, 0, 2,19, 27,1, "Real time clock emulation" }, - { SGCHECKBOX, 0, 0, 2,20, 15,1, "Patch Timer-D" }, - - { SGBUTTON, SG_DEFAULT, 0, 8,22, 20,1, "Back to main menu" }, - { -1, 0, 0, 0,0, 0,0, NULL } -}; + +/* Function to get default values for each system */ +void get_default_values(void) { + switch (ConfigureParams.System.nMachineType) { + case NEXT_CUBE030: + ConfigureParams.System.nCpuLevel = 3; + ConfigureParams.System.nCpuFreq = 25; + ConfigureParams.System.n_FPUType = FPU_68882; + ConfigureParams.System.nSCSI = NCR53C90; + ConfigureParams.System.nRTC = MC68HC68T1; + ConfigureParams.System.bADB = false; + break; + + case NEXT_STATION: + ConfigureParams.System.nMachineType = NEXT_STATION; + ConfigureParams.System.nCpuLevel = 4; + if (ConfigureParams.System.bTurbo) + ConfigureParams.System.nCpuFreq = 33; + else + ConfigureParams.System.nCpuFreq = 25; + ConfigureParams.System.n_FPUType = FPU_CPU; + ConfigureParams.System.nSCSI = NCR53C90A; + ConfigureParams.System.nRTC = MCS1850; + ConfigureParams.System.bADB = false; + break; + default: + break; + } +} /*-----------------------------------------------------------------------*/ /** - * Show and process the "System" dialog. - */ + * Show and process the "System" dialog (specific to winUAE cpu). + */ void Dialog_SystemDlg(void) { - int i; - MACHINETYPE mti; - - SDLGui_CenterDlg(systemdlg); - - /* Set up dialog from actual values: */ - - for (i = DLGSYS_68000; i <= DLGSYS_68040; i++) - { - systemdlg[i].state &= ~SG_SELECTED; - } - systemdlg[DLGSYS_68000+ConfigureParams.System.nCpuLevel].state |= SG_SELECTED; + int i; + int but; + + SDLGui_CenterDlg(systemdlg); + + /* Set up dialog from actual values: */ + + /* System type: */ + for (i = DLGSYS_CUBE030; i <= DLGSYS_SLAB; i++) + { + systemdlg[i].state &= ~SG_SELECTED; + } + if (ConfigureParams.System.nMachineType == NEXT_CUBE030) + systemdlg[DLGSYS_CUBE030].state |= SG_SELECTED; + else if (ConfigureParams.System.nMachineType == NEXT_STATION) + systemdlg[DLGSYS_SLAB].state |= SG_SELECTED; + + + /* System overview */ + print_system_overview(); + + + /* Draw and process the dialog: */ - for (i = DLGSYS_ST; i <= DLGSYS_FALCON; i++) + do { - systemdlg[i].state &= ~SG_SELECTED; - } - systemdlg[DLGSYS_ST + ConfigureParams.System.nMachineType].state |= SG_SELECTED; - - /* CPU frequency: */ - for (i = DLGSYS_8MHZ; i <= DLGSYS_16MHZ; i++) - { - systemdlg[i].state &= ~SG_SELECTED; - } - if (ConfigureParams.System.nCpuFreq == 32) - systemdlg[DLGSYS_32MHZ].state |= SG_SELECTED; - else if (ConfigureParams.System.nCpuFreq == 16) - systemdlg[DLGSYS_16MHZ].state |= SG_SELECTED; - else - systemdlg[DLGSYS_8MHZ].state |= SG_SELECTED; - - /* DSP mode: */ - for (i = DLGSYS_DSPOFF; i <= DLGSYS_DSPON; i++) - { - systemdlg[i].state &= ~SG_SELECTED; - } - if (ConfigureParams.System.nDSPType == DSP_TYPE_NONE) - systemdlg[DLGSYS_DSPOFF].state |= SG_SELECTED; - else if (ConfigureParams.System.nDSPType == DSP_TYPE_DUMMY) - systemdlg[DLGSYS_DSPDUMMY].state |= SG_SELECTED; - else - systemdlg[DLGSYS_DSPON].state |= SG_SELECTED; - - - if (ConfigureParams.System.bCompatibleCpu) - systemdlg[DLGSYS_PREFETCH].state |= SG_SELECTED; - else - systemdlg[DLGSYS_PREFETCH].state &= ~SG_SELECTED; - - if (ConfigureParams.System.bBlitter) - systemdlg[DLGSYS_BLITTER].state |= SG_SELECTED; - else - systemdlg[DLGSYS_BLITTER].state &= ~SG_SELECTED; - - if (ConfigureParams.System.bRealTimeClock) - systemdlg[DLGSYS_RTC].state |= SG_SELECTED; - else - systemdlg[DLGSYS_RTC].state &= ~SG_SELECTED; - - if (ConfigureParams.System.bPatchTimerD) - systemdlg[DLGSYS_TIMERD].state |= SG_SELECTED; - else - systemdlg[DLGSYS_TIMERD].state &= ~SG_SELECTED; - - /* Show the dialog: */ - SDLGui_DoDialog(systemdlg, NULL); - - /* Read values from dialog: */ - - for (i = DLGSYS_68000; i <= DLGSYS_68040; i++) - { - if (systemdlg[i].state&SG_SELECTED) - { - ConfigureParams.System.nCpuLevel = i-DLGSYS_68000; - break; - } - } - - for (mti = MACHINE_ST; mti <= MACHINE_FALCON; mti++) - { - if (systemdlg[mti + DLGSYS_ST].state&SG_SELECTED) - { - ConfigureParams.System.nMachineType = mti; - break; - } - } - - if (systemdlg[DLGSYS_32MHZ].state & SG_SELECTED) - ConfigureParams.System.nCpuFreq = 32; - else if (systemdlg[DLGSYS_16MHZ].state & SG_SELECTED) - ConfigureParams.System.nCpuFreq = 16; - else - ConfigureParams.System.nCpuFreq = 8; - - if (systemdlg[DLGSYS_DSPOFF].state & SG_SELECTED) - ConfigureParams.System.nDSPType = DSP_TYPE_NONE; - else if (systemdlg[DLGSYS_DSPDUMMY].state & SG_SELECTED) - ConfigureParams.System.nDSPType = DSP_TYPE_DUMMY; - else - ConfigureParams.System.nDSPType = DSP_TYPE_EMU; - - ConfigureParams.System.bCompatibleCpu = (systemdlg[DLGSYS_PREFETCH].state & SG_SELECTED); - ConfigureParams.System.bBlitter = (systemdlg[DLGSYS_BLITTER].state & SG_SELECTED); - ConfigureParams.System.bRealTimeClock = (systemdlg[DLGSYS_RTC].state & SG_SELECTED); - ConfigureParams.System.bPatchTimerD = (systemdlg[DLGSYS_TIMERD].state & SG_SELECTED); + but = SDLGui_DoDialog(systemdlg, NULL); + switch (but) { + case DLGSYS_CUBE030: + ConfigureParams.System.nMachineType = NEXT_CUBE030; + systemdlg[DLGSYS_COLOR].state &= ~SG_SELECTED; + ConfigureParams.System.bColor = false; + systemdlg[DLGSYS_TURBO].state &= ~SG_SELECTED; + ConfigureParams.System.bTurbo = false; + get_default_values(); + print_system_overview(); + break; + + case DLGSYS_SLAB: + ConfigureParams.System.nMachineType = NEXT_STATION; + get_default_values(); + print_system_overview(); + break; + + case DLGSYS_COLOR: + ConfigureParams.System.nMachineType = NEXT_STATION; + if (systemdlg[DLGSYS_COLOR].state & SG_SELECTED) { + systemdlg[DLGSYS_CUBE030].state &= ~SG_SELECTED; + systemdlg[DLGSYS_SLAB].state |= SG_SELECTED; + ConfigureParams.System.bColor = true; + } else { + ConfigureParams.System.bColor = false; + } + get_default_values(); + print_system_overview(); + break; + + case DLGSYS_TURBO: + ConfigureParams.System.nMachineType = NEXT_STATION; + if (systemdlg[DLGSYS_TURBO].state & SG_SELECTED) { + systemdlg[DLGSYS_CUBE030].state &= ~SG_SELECTED; + systemdlg[DLGSYS_SLAB].state |= SG_SELECTED; + ConfigureParams.System.bTurbo = true; + } else { + ConfigureParams.System.bTurbo = false; + } + get_default_values(); + print_system_overview(); + break; + + case DLGSYS_CUSTOMIZE: + Dialog_AdvancedDlg(); + print_system_overview(); + break; + + case DLGSYS_RESET: + get_default_values(); + print_system_overview(); + break; + + default: + break; + } + } + while (but != DLGSYS_EXIT && but != SDLGUI_QUIT + && but != SDLGUI_ERROR && !bQuitProgram); + + + /* Read values from dialog: */ + +// if (systemdlg[DLGSYS_CUBE030].state&SG_SELECTED) +// ConfigureParams.System.nMachineType = NEXT_CUBE030; +// else if (systemdlg[DLGSYS_SLAB].state&SG_SELECTED) +// ConfigureParams.System.nMachineType = NEXT_STATION; + + /* Obsolete */ + ConfigureParams.System.bCompatibleCpu = 1; + ConfigureParams.System.bBlitter = 0; + ConfigureParams.System.bRealTimeClock = 0; + ConfigureParams.System.bPatchTimerD = 0; + ConfigureParams.System.bAddressSpace24 = 0; + ConfigureParams.System.bCycleExactCpu = 0; + ConfigureParams.System.bCompatibleFPU = 1; + ConfigureParams.System.bMMU = 1; } +