--- hatari/src/includes/configuration.h	2019/04/09 08:49:32	1.1.1.14
+++ hatari/src/includes/configuration.h	2019/04/09 08:53:12	1.1.1.17
@@ -1,8 +1,8 @@
 /*
   Hatari - configuration.h
 
-  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 is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 
 #ifndef HATARI_CONFIGURATION_H
@@ -16,6 +16,8 @@ typedef struct
   int nTextLogLevel;
   int nAlertDlgLogLevel;
   bool bConfirmQuit;
+  bool bNatFeats;
+  bool bConsoleWindow;	/* for now, used just for Windows */
 } CNF_LOG;
 
 
@@ -25,6 +27,8 @@ typedef struct
   int nNumberBase;
   int nDisasmLines;
   int nMemdumpLines;
+  int nDisasmOptions;
+  bool bDisasmUAE;
 } CNF_DEBUGGER;
 
 
@@ -32,6 +36,7 @@ typedef struct
 typedef struct
 {
   char szTosImageFileName[FILENAME_MAX];
+  bool bPatchTos;
   char szCartridgeImageFileName[FILENAME_MAX];
 } CNF_ROM;
 
@@ -41,6 +46,7 @@ typedef struct
 {
   bool bEnableMicrophone;
   bool bEnableSound;
+  bool bEnableSoundSync;
   int nPlaybackFreq;
   int SdlAudioBufferSize;
   char szYMCaptureFileName[FILENAME_MAX];
@@ -152,7 +158,7 @@ typedef enum
 typedef struct
 {
   bool bAutoInsertDiskB;
-  bool bSlowFloppy;                  /* true to slow down FDC emulation */
+  bool FastFloppy;			/* true to speed up FDC emulation */
   WRITEPROTECTION nWriteProtection;
   char szDiskZipPath[MAX_FLOPPYDRIVES][FILENAME_MAX];
   char szDiskFileName[MAX_FLOPPYDRIVES][FILENAME_MAX];
@@ -160,16 +166,16 @@ typedef struct
 } CNF_DISKIMAGE;
 
 
-/* Hard drives configuration */
-#define MAX_HARDDRIVES  23
+/* Hard drives configuration: C: - Z: */
+#define MAX_HARDDRIVES  24
+#define DRIVE_C 0
 
 typedef enum
 {
-  DRIVE_C,
-  DRIVE_D,
-  DRIVE_E,
-  DRIVE_F
-} DRIVELETTER;
+  GEMDOS_NOP,
+  GEMDOS_UPPER,
+  GEMDOS_LOWER
+} GEMDOS_CHR_CONV;
 
 typedef struct
 {
@@ -179,6 +185,7 @@ typedef struct
   bool bUseIdeMasterHardDiskImage;
   bool bUseIdeSlaveHardDiskImage;
   WRITEPROTECTION nWriteProtection;
+  GEMDOS_CHR_CONV nGemdosCase;
   bool bBootFromHardDisk;
   char szHardDiskDirectories[MAX_HARDDRIVES][FILENAME_MAX];
   char szHardDiskImage[FILENAME_MAX];
@@ -212,6 +219,7 @@ typedef struct
   int nFrameSkips;
   bool bFullScreen;
   bool bKeepResolution;
+  bool bKeepResolutionST;
   bool bAllowOverscan;
   bool bAspectCorrect;
   bool bUseExtVdiResolutions;
@@ -223,6 +231,7 @@ typedef struct
   bool bShowStatusbar;
   bool bShowDriveLed;
   bool bCrop;
+  bool bForceMax;
   int nMaxWidth;
   int nMaxHeight;
 } CNF_SCREEN;
@@ -232,7 +241,6 @@ typedef struct
 typedef struct
 {
   bool bEnablePrinting;
-  bool bPrintToFile;
   char szPrintToFileName[FILENAME_MAX];
 } CNF_PRINTER;
 
@@ -253,7 +261,7 @@ typedef enum
   MACHINE_STE,
   MACHINE_TT,
   MACHINE_FALCON,
-  MACHINE_MEGA_STE,
+  MACHINE_MEGA_STE
 } MACHINETYPE;
 
 typedef enum
@@ -266,10 +274,10 @@ typedef enum
 #if ENABLE_WINUAE_CPU
 typedef enum
 {
-  FPU_NONE,
-  FPU_68881,
-  FPU_68882,
-  FPU_CPU
+  FPU_NONE = 0,
+  FPU_68881 = 68881,
+  FPU_68882 = 68882,
+  FPU_CPU = 68040
 } FPUTYPE;
 #endif
 
@@ -283,8 +291,9 @@ typedef struct
   DSPTYPE nDSPType;               /* how to "emulate" DSP */
   bool bRealTimeClock;
   bool bPatchTimerD;
+  bool bFastBoot;                 /* Enable to patch TOS for fast boot */
   bool bFastForward;
-  
+
 #if ENABLE_WINUAE_CPU
   bool bAddressSpace24;
   bool bCycleExactCpu;