--- hatari/src/includes/configuration.h	2019/04/01 07:14:47	1.1.1.10
+++ hatari/src/includes/configuration.h	2019/04/09 08:48:41	1.1.1.13
@@ -8,7 +8,7 @@
 #ifndef HATARI_CONFIGURATION_H
 #define HATARI_CONFIGURATION_H
 
-/* Logging */
+/* Logging and tracing */
 typedef struct
 {
   char sLogFileName[FILENAME_MAX];
@@ -19,6 +19,15 @@ typedef struct
 } CNF_LOG;
 
 
+/* debugger */
+typedef struct
+{
+  int nNumberBase;
+  int nDisasmLines;
+  int nMemdumpLines;
+} CNF_DEBUGGER;
+
+
 /* ROM (TOS + cartridge) configuration */
 typedef struct
 {
@@ -28,18 +37,12 @@ typedef struct
 
 
 /* Sound configuration */
-typedef enum
-{
-  PLAYBACK_LOW,
-  PLAYBACK_MEDIUM,
-  PLAYBACK_HIGH
-} SOUND_QUALITY;
-
 typedef struct
 {
   bool bEnableSound;
-  SOUND_QUALITY nPlaybackQuality;
+  int nPlaybackFreq;
   char szYMCaptureFileName[FILENAME_MAX];
+  int SdlAudioBufferSize;
 } CNF_SOUND;
 
 
@@ -72,7 +75,7 @@ typedef struct
 typedef enum {
   SHORTCUT_OPTIONS,
   SHORTCUT_FULLSCREEN,
-  SHORTCUT_MOUSEMODE,
+  SHORTCUT_MOUSEGRAB,
   SHORTCUT_COLDRESET,
   SHORTCUT_WARMRESET,
   SHORTCUT_SCREENSHOT,
@@ -82,6 +85,7 @@ typedef enum {
   SHORTCUT_RECANIM,
   SHORTCUT_RECSOUND,
   SHORTCUT_SOUND,
+  SHORTCUT_DEBUG,
   SHORTCUT_PAUSE,
   SHORTCUT_QUIT,
   SHORTCUT_LOADMEM,
@@ -119,6 +123,7 @@ typedef struct
 {
   JOYSTICKMODE nJoystickMode;
   bool bEnableAutoFire;
+  bool bEnableJumpOnFire2;
   int nJoyId;
   int nKeyCodeUp, nKeyCodeDown, nKeyCodeLeft, nKeyCodeRight, nKeyCodeFire;
 } JOYSTICK;
@@ -145,6 +150,7 @@ typedef enum
 typedef struct
 {
   bool bAutoInsertDiskB;
+  bool bSlowFloppy;                  /* true to slow down FDC emulation */
   WRITEPROTECTION nWriteProtection;
   char szDiskZipPath[MAX_FLOPPYDRIVES][FILENAME_MAX];
   char szDiskFileName[MAX_FLOPPYDRIVES][FILENAME_MAX];
@@ -153,7 +159,7 @@ typedef struct
 
 
 /* Hard drives configuration */
-#define MAX_HARDDRIVES  1
+#define MAX_HARDDRIVES  23
 
 typedef enum
 {
@@ -165,14 +171,17 @@ typedef enum
 
 typedef struct
 {
-  bool bBootFromHardDisk;
   int nHardDiskDir;
   bool bUseHardDiskDirectories;
   bool bUseHardDiskImage;
+  bool bUseIdeMasterHardDiskImage;
+  bool bUseIdeSlaveHardDiskImage;
+  WRITEPROTECTION nWriteProtection;
+  bool bBootFromHardDisk;
   char szHardDiskDirectories[MAX_HARDDRIVES][FILENAME_MAX];
   char szHardDiskImage[FILENAME_MAX];
-  bool bUseIdeHardDiskImage;
-  char szIdeHardDiskImage[FILENAME_MAX];
+  char szIdeMasterHardDiskImage[FILENAME_MAX];
+  char szIdeSlaveHardDiskImage[FILENAME_MAX];
 } CNF_HARDDISK;
 
 /* Falcon register $FFFF8006 bits 6 & 7 (mirrored in $FFFF82C0 bits 0 & 1):
@@ -202,7 +211,7 @@ typedef struct
   int nFrameSkips;
   bool bFullScreen;
   bool bAllowOverscan;
-  bool bZoomLowRes;
+  bool bAspectCorrect;
   bool bUseExtVdiResolutions;
   int nSpec512Threshold;
   int nForceBpp;
@@ -212,14 +221,8 @@ typedef struct
   bool bShowStatusbar;
   bool bShowDriveLed;
   bool bCaptureChange;
-  int nWindowBorderPixelsTop;
-  int nWindowBorderPixelsLeft;
-  int nWindowBorderPixelsRight;
-  int nWindowBorderPixelsBottom;
-  int nFullScreenBorderPixelsTop;
-  int nFullScreenBorderPixelsLeft;
-  int nFullScreenBorderPixelsRight;
-  int nFullScreenBorderPixelsBottom;
+  int nMaxWidth;
+  int nMaxHeight;
 } CNF_SCREEN;
 
 
@@ -236,7 +239,8 @@ typedef struct
 typedef struct
 {
   bool bEnableMidi;
-  char szMidiOutFileName[FILENAME_MAX];
+  char sMidiInFileName[FILENAME_MAX];
+  char sMidiOutFileName[FILENAME_MAX];
 } CNF_MIDI;
 
 
@@ -267,7 +271,6 @@ typedef struct
   DSPTYPE nDSPType;               /* how to "emulate" DSP */
   bool bRealTimeClock;
   bool bPatchTimerD;
-  bool bSlowFDC;                  /* TRUE to slow down FDC emulation */
   bool bFastForward;
 } CNF_SYSTEM;
 
@@ -278,6 +281,7 @@ typedef struct
 {
   /* Configure */
   CNF_LOG Log;
+  CNF_DEBUGGER Debugger;
   CNF_SCREEN Screen;
   CNF_JOYSTICKS Joysticks;
   CNF_KEYBOARD Keyboard;