--- hatari/src/includes/configuration.h	2019/04/09 08:55:42	1.1.1.19
+++ hatari/src/includes/configuration.h	2019/04/09 08:56:55	1.1.1.20
@@ -252,7 +252,9 @@ typedef struct
   int nFrameSkips;
   bool bFullScreen;
   bool bKeepResolution;
+#if !WITH_SDL2
   bool bKeepResolutionST;
+#endif
   bool bAllowOverscan;
   bool bAspectCorrect;
   bool bUseExtVdiResolutions;
@@ -296,10 +298,11 @@ typedef struct
 typedef enum
 {
   MACHINE_ST,
+  MACHINE_MEGA_ST,
   MACHINE_STE,
+  MACHINE_MEGA_STE,
   MACHINE_TT,
-  MACHINE_FALCON,
-  MACHINE_MEGA_STE
+  MACHINE_FALCON
 } MACHINETYPE;
 
 typedef enum
@@ -319,6 +322,15 @@ typedef enum
 } FPUTYPE;
 #endif
 
+typedef enum
+{
+  VIDEO_TIMING_MODE_RANDOM = 0,
+  VIDEO_TIMING_MODE_WS1,
+  VIDEO_TIMING_MODE_WS2,
+  VIDEO_TIMING_MODE_WS3,
+  VIDEO_TIMING_MODE_WS4,
+} VIDEOTIMINGMODE;
+
 typedef struct
 {
   int nCpuLevel;
@@ -327,11 +339,11 @@ typedef struct
   MACHINETYPE nMachineType;
   bool bBlitter;                  /* TRUE if Blitter is enabled */
   DSPTYPE nDSPType;               /* how to "emulate" DSP */
-  bool bRealTimeClock;
   bool bPatchTimerD;
   bool bFastBoot;                 /* Enable to patch TOS for fast boot */
   bool bFastForward;
   bool bAddressSpace24;           /* Always set to true with old UAE cpu */
+  VIDEOTIMINGMODE VideoTimingMode;
 
 #if ENABLE_WINUAE_CPU
   bool bCycleExactCpu;
@@ -377,6 +389,28 @@ typedef struct
 extern CNF_PARAMS ConfigureParams;
 extern char sConfigFileName[FILENAME_MAX];
 
+static inline bool Config_IsMachineST(void)
+{
+	return ConfigureParams.System.nMachineType == MACHINE_ST ||
+	       ConfigureParams.System.nMachineType == MACHINE_MEGA_ST;
+}
+
+static inline bool Config_IsMachineSTE(void)
+{
+	return ConfigureParams.System.nMachineType == MACHINE_STE ||
+	       ConfigureParams.System.nMachineType == MACHINE_MEGA_STE;
+}
+
+static inline bool Config_IsMachineTT(void)
+{
+	return ConfigureParams.System.nMachineType == MACHINE_TT;
+}
+
+static inline bool Config_IsMachineFalcon(void)
+{
+	return ConfigureParams.System.nMachineType == MACHINE_FALCON;
+}
+
 extern void Configuration_SetDefault(void);
 extern void Configuration_Apply(bool bReset);
 extern void Configuration_Load(const char *psFileName);