--- hatari/src/includes/configuration.h	2019/04/09 08:53:12	1.1.1.17
+++ hatari/src/includes/configuration.h	2019/04/09 08:56:55	1.1.1.20
@@ -8,11 +8,15 @@
 #ifndef HATARI_CONFIGURATION_H
 #define HATARI_CONFIGURATION_H
 
+/* if header's struct contents depend on configuration options, header must include config.h */
+#include "config.h"
+
 /* Logging and tracing */
 typedef struct
 {
   char sLogFileName[FILENAME_MAX];
   char sTraceFileName[FILENAME_MAX];
+  int nExceptionDebugMask;
   int nTextLogLevel;
   int nAlertDlgLogLevel;
   bool bConfirmQuit;
@@ -99,6 +103,10 @@ typedef enum {
   SHORTCUT_LOADMEM,
   SHORTCUT_SAVEMEM,
   SHORTCUT_INSERTDISKA,
+  SHORTCUT_JOY_0,
+  SHORTCUT_JOY_1,
+  SHORTCUT_PAD_A,
+  SHORTCUT_PAD_B,
   SHORTCUT_KEYS,  /* number of shortcuts */
   SHORTCUT_NONE
 } SHORTCUTKEYIDX;
@@ -113,6 +121,7 @@ typedef struct
 typedef struct
 {
   int nMemorySize;
+  int nTTRamSize;
   bool bAutoSave;
   char szMemoryCaptureFileName[FILENAME_MAX];
   char szAutoSaveFileName[FILENAME_MAX];
@@ -126,6 +135,7 @@ typedef enum
   JOYSTICK_REALSTICK,
   JOYSTICK_KEYBOARD
 } JOYSTICKMODE;
+#define JOYSTICK_MODES 3
 
 typedef struct
 {
@@ -136,7 +146,16 @@ typedef struct
   int nKeyCodeUp, nKeyCodeDown, nKeyCodeLeft, nKeyCodeRight, nKeyCodeFire;
 } JOYSTICK;
 
-#define JOYSTICK_COUNT 6
+enum
+{
+	JOYID_JOYSTICK0,
+	JOYID_JOYSTICK1,
+	JOYID_STEPADA,
+	JOYID_STEPADB,
+	JOYID_PARPORT1,
+	JOYID_PARPORT2,
+	JOYSTICK_COUNT
+};
 
 typedef struct
 {
@@ -159,6 +178,10 @@ typedef struct
 {
   bool bAutoInsertDiskB;
   bool FastFloppy;			/* true to speed up FDC emulation */
+  bool EnableDriveA;
+  bool EnableDriveB;
+  int  DriveA_NumberOfHeads;
+  int  DriveB_NumberOfHeads;
   WRITEPROTECTION nWriteProtection;
   char szDiskZipPath[MAX_FLOPPYDRIVES][FILENAME_MAX];
   char szDiskFileName[MAX_FLOPPYDRIVES][FILENAME_MAX];
@@ -169,6 +192,7 @@ typedef struct
 /* Hard drives configuration: C: - Z: */
 #define MAX_HARDDRIVES  24
 #define DRIVE_C 0
+#define DRIVE_SKIP -1
 
 typedef enum
 {
@@ -179,20 +203,29 @@ typedef enum
 
 typedef struct
 {
-  int nHardDiskDir;
+  int nGemdosDrive;
   bool bUseHardDiskDirectories;
-  bool bUseHardDiskImage;
   bool bUseIdeMasterHardDiskImage;
   bool bUseIdeSlaveHardDiskImage;
   WRITEPROTECTION nWriteProtection;
   GEMDOS_CHR_CONV nGemdosCase;
+  bool bFilenameConversion;
   bool bBootFromHardDisk;
   char szHardDiskDirectories[MAX_HARDDRIVES][FILENAME_MAX];
-  char szHardDiskImage[FILENAME_MAX];
   char szIdeMasterHardDiskImage[FILENAME_MAX];
   char szIdeSlaveHardDiskImage[FILENAME_MAX];
 } CNF_HARDDISK;
 
+/* SCSI/ACSI configuration */
+#define MAX_ACSI_DEVS 8
+#define MAX_SCSI_DEVS 8
+
+typedef struct
+{
+  bool bUseDevice;
+  char sDeviceFile[FILENAME_MAX];
+} CNF_SCSIDEV;
+
 /* Falcon register $FFFF8006 bits 6 & 7 (mirrored in $FFFF82C0 bits 0 & 1):
  * 00 Monochrome
  * 01 RGB - Colormonitor
@@ -219,7 +252,9 @@ typedef struct
   int nFrameSkips;
   bool bFullScreen;
   bool bKeepResolution;
+#if !WITH_SDL2
   bool bKeepResolutionST;
+#endif
   bool bAllowOverscan;
   bool bAspectCorrect;
   bool bUseExtVdiResolutions;
@@ -228,12 +263,17 @@ typedef struct
   int nVdiColors;
   int nVdiWidth;
   int nVdiHeight;
+  bool bMouseWarp;
   bool bShowStatusbar;
   bool bShowDriveLed;
   bool bCrop;
   bool bForceMax;
   int nMaxWidth;
   int nMaxHeight;
+#if WITH_SDL2
+  int nRenderScaleQuality;
+  bool bUseVsync;
+#endif
 } CNF_SCREEN;
 
 
@@ -258,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
@@ -281,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;
@@ -289,13 +339,13 @@ 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 bAddressSpace24;
   bool bCycleExactCpu;
   FPUTYPE n_FPUType;
   bool bCompatibleFPU;            /* More compatible FPU */
@@ -325,6 +375,8 @@ typedef struct
   CNF_MEMORY Memory;
   CNF_DISKIMAGE DiskImage;
   CNF_HARDDISK HardDisk;
+  CNF_SCSIDEV Acsi[MAX_ACSI_DEVS];
+  CNF_SCSIDEV Scsi[MAX_SCSI_DEVS];
   CNF_ROM Rom;
   CNF_RS232 RS232;
   CNF_PRINTER Printer;
@@ -337,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);