--- hatari/src/gui-sdl/dlgSystem.c	2019/04/01 07:13:16	1.1.1.3
+++ hatari/src/gui-sdl/dlgSystem.c	2019/04/01 07:15:40	1.1.1.6
@@ -4,7 +4,7 @@
   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.
 */
-const char DlgSystem_rcsid[] = "Hatari $Id: dlgSystem.c,v 1.1.1.3 2019/04/01 07:13:16 root Exp $";
+const char DlgSystem_rcsid[] = "Hatari $Id: dlgSystem.c,v 1.1.1.6 2019/04/01 07:15:40 root Exp $";
 
 #include "main.h"
 #include "configuration.h"
@@ -19,14 +19,16 @@ const char DlgSystem_rcsid[] = "Hatari $
 #define DLGSYS_68040    8
 #define DLGSYS_ST       11
 #define DLGSYS_STE      12
-#define DLGSYS_8MHZ     14
-#define DLGSYS_16MHZ    15
-#define DLGSYS_32MHZ    16
-#define DLGSYS_PREFETCH 17
-#define DLGSYS_BLITTER  18
-#define DLGSYS_RTC      19
-#define DLGSYS_TIMERD   20
-#define DLGSYS_SLOWFDC  21
+#define DLGSYS_TT       13
+#define DLGSYS_FALCON   14
+#define DLGSYS_8MHZ     17
+#define DLGSYS_16MHZ    18
+#define DLGSYS_32MHZ    19
+#define DLGSYS_PREFETCH 20
+#define DLGSYS_BLITTER  21
+#define DLGSYS_RTC      22
+#define DLGSYS_TIMERD   23
+#define DLGSYS_SLOWFDC  24
 
 
 /* The "System" dialog: */
@@ -45,8 +47,11 @@ static SGOBJ systemdlg[] =
 
 	{ SGBOX, 0, 0, 19,3, 15,9, NULL },
 	{ SGTEXT, 0, 0, 20,4, 13,1, "Machine type:" },
-	{ SGRADIOBUT, 0, 0, 23,6, 7,1, "ST" },
-	{ SGRADIOBUT, 0, 0, 23,7, 7,1, "STE" },
+	{ 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" },
@@ -59,10 +64,7 @@ static SGOBJ systemdlg[] =
 	{ SGCHECKBOX, 0, 0, 2,18, 15,1, "Patch Timer-D" },
 	{ SGCHECKBOX, 0, 0, 2,19, 25,1, "Slow down FDC emulation" },
 
-	{ SGTEXT, 0, 0, 20, 9, 13,1, "(STE mode is" },
-	{ SGTEXT, 0, 0, 20,10, 13,1, " incomplete!)" },
-
-	{ SGBUTTON, 0, 0, 8,21, 20,1, "Back to main menu" },
+	{ SGBUTTON, SG_DEFAULT, 0, 8,21, 20,1, "Back to main menu" },
 	{ -1, 0, 0, 0,0, 0,0, NULL }
 };
 
@@ -83,46 +85,46 @@ void Dialog_SystemDlg(void)
 	{
 		systemdlg[i].state &= ~SG_SELECTED;
 	}
-	systemdlg[DLGSYS_68000+DialogParams.System.nCpuLevel].state |= SG_SELECTED;
+	systemdlg[DLGSYS_68000+ConfigureParams.System.nCpuLevel].state |= SG_SELECTED;
 
-	for (i = DLGSYS_ST; i <= DLGSYS_STE; i++)
+	for (i = DLGSYS_ST; i <= DLGSYS_FALCON; i++)
 	{
 		systemdlg[i].state &= ~SG_SELECTED;
 	}
-	systemdlg[DLGSYS_ST + DialogParams.System.nMachineType].state |= SG_SELECTED;
+	systemdlg[DLGSYS_ST + ConfigureParams.System.nMachineType].state |= SG_SELECTED;
 
 	for (i = DLGSYS_8MHZ; i <= DLGSYS_16MHZ; i++)
 	{
 		systemdlg[i].state &= ~SG_SELECTED;
 	}
-	if (DialogParams.System.nCpuFreq == 32)
+	if (ConfigureParams.System.nCpuFreq == 32)
 	  systemdlg[DLGSYS_32MHZ].state |= SG_SELECTED;
-	else if (DialogParams.System.nCpuFreq == 16)
+	else if (ConfigureParams.System.nCpuFreq == 16)
 	  systemdlg[DLGSYS_16MHZ].state |= SG_SELECTED;
 	else
 	  systemdlg[DLGSYS_8MHZ].state |= SG_SELECTED;
 
-	if (DialogParams.System.bCompatibleCpu)
+	if (ConfigureParams.System.bCompatibleCpu)
 		systemdlg[DLGSYS_PREFETCH].state |= SG_SELECTED;
 	else
 		systemdlg[DLGSYS_PREFETCH].state &= ~SG_SELECTED;
 
-	if (DialogParams.System.bBlitter)
+	if (ConfigureParams.System.bBlitter)
 		systemdlg[DLGSYS_BLITTER].state |= SG_SELECTED;
 	else
 		systemdlg[DLGSYS_BLITTER].state &= ~SG_SELECTED;
 
-	if (DialogParams.System.bRealTimeClock)
+	if (ConfigureParams.System.bRealTimeClock)
 		systemdlg[DLGSYS_RTC].state |= SG_SELECTED;
 	else
 		systemdlg[DLGSYS_RTC].state &= ~SG_SELECTED;
 
-	if (DialogParams.System.bPatchTimerD)
+	if (ConfigureParams.System.bPatchTimerD)
 		systemdlg[DLGSYS_TIMERD].state |= SG_SELECTED;
 	else
 		systemdlg[DLGSYS_TIMERD].state &= ~SG_SELECTED;
 
-	if (DialogParams.System.bSlowFDC)
+	if (ConfigureParams.System.bSlowFDC)
 		systemdlg[DLGSYS_SLOWFDC].state |= SG_SELECTED;
 	else
 		systemdlg[DLGSYS_SLOWFDC].state &= ~SG_SELECTED;
@@ -136,30 +138,30 @@ void Dialog_SystemDlg(void)
 	{
 		if (systemdlg[i].state&SG_SELECTED)
 		{
-			DialogParams.System.nCpuLevel = i-DLGSYS_68000;
+			ConfigureParams.System.nCpuLevel = i-DLGSYS_68000;
 			break;
 		}
 	}
 
-	for (i = DLGSYS_ST; i <= DLGSYS_STE; i++)
+	for (i = DLGSYS_ST; i <= DLGSYS_FALCON; i++)
 	{
 		if (systemdlg[i].state&SG_SELECTED)
 		{
-			DialogParams.System.nMachineType = i-DLGSYS_ST;
+			ConfigureParams.System.nMachineType = i-DLGSYS_ST;
 			break;
 		}
 	}
 
 	if (systemdlg[DLGSYS_32MHZ].state & SG_SELECTED)
-		DialogParams.System.nCpuFreq = 32;
+		ConfigureParams.System.nCpuFreq = 32;
 	else if (systemdlg[DLGSYS_16MHZ].state & SG_SELECTED)
-		DialogParams.System.nCpuFreq = 16;
+		ConfigureParams.System.nCpuFreq = 16;
 	else
-		DialogParams.System.nCpuFreq = 8;
+		ConfigureParams.System.nCpuFreq = 8;
 
-	DialogParams.System.bCompatibleCpu = (systemdlg[DLGSYS_PREFETCH].state & SG_SELECTED);
-	DialogParams.System.bBlitter = (systemdlg[DLGSYS_BLITTER].state & SG_SELECTED);
-	DialogParams.System.bRealTimeClock = (systemdlg[DLGSYS_RTC].state & SG_SELECTED);
-	DialogParams.System.bPatchTimerD = (systemdlg[DLGSYS_TIMERD].state & SG_SELECTED);
-	DialogParams.System.bSlowFDC = (systemdlg[DLGSYS_SLOWFDC].state & SG_SELECTED);
+	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);
+	ConfigureParams.System.bSlowFDC = (systemdlg[DLGSYS_SLOWFDC].state & SG_SELECTED);
 }