--- hatari/src/includes/configuration.h	2019/04/09 08:47:16	1.1.1.12
+++ hatari/src/includes/configuration.h	2019/04/09 08:49:32	1.1.1.14
@@ -8,18 +8,26 @@
 #ifndef HATARI_CONFIGURATION_H
 #define HATARI_CONFIGURATION_H
 
-/* Logging and debugging */
+/* Logging and tracing */
 typedef struct
 {
   char sLogFileName[FILENAME_MAX];
   char sTraceFileName[FILENAME_MAX];
   int nTextLogLevel;
   int nAlertDlgLogLevel;
-  int nNumberBase;
   bool bConfirmQuit;
 } CNF_LOG;
 
 
+/* debugger */
+typedef struct
+{
+  int nNumberBase;
+  int nDisasmLines;
+  int nMemdumpLines;
+} CNF_DEBUGGER;
+
+
 /* ROM (TOS + cartridge) configuration */
 typedef struct
 {
@@ -31,9 +39,12 @@ typedef struct
 /* Sound configuration */
 typedef struct
 {
+  bool bEnableMicrophone;
   bool bEnableSound;
   int nPlaybackFreq;
+  int SdlAudioBufferSize;
   char szYMCaptureFileName[FILENAME_MAX];
+  int YmVolumeMixing;
 } CNF_SOUND;
 
 
@@ -66,7 +77,7 @@ typedef struct
 typedef enum {
   SHORTCUT_OPTIONS,
   SHORTCUT_FULLSCREEN,
-  SHORTCUT_MOUSEMODE,
+  SHORTCUT_MOUSEGRAB,
   SHORTCUT_COLDRESET,
   SHORTCUT_WARMRESET,
   SHORTCUT_SCREENSHOT,
@@ -162,14 +173,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):
@@ -178,7 +192,6 @@ typedef struct
  * 10 VGA - Colormonitor
  * 11 TV
  */
-#define FALCON_MONITOR_MASK 0x3F
 #define FALCON_MONITOR_MONO 0x00  /* SM124 */
 #define FALCON_MONITOR_RGB  0x40
 #define FALCON_MONITOR_VGA  0x80
@@ -198,8 +211,9 @@ typedef struct
   MONITORTYPE nMonitorType;
   int nFrameSkips;
   bool bFullScreen;
+  bool bKeepResolution;
   bool bAllowOverscan;
-  bool bZoomLowRes;
+  bool bAspectCorrect;
   bool bUseExtVdiResolutions;
   int nSpec512Threshold;
   int nForceBpp;
@@ -208,15 +222,9 @@ typedef struct
   int nVdiHeight;
   bool bShowStatusbar;
   bool bShowDriveLed;
-  bool bCaptureChange;
-  int nWindowBorderPixelsTop;
-  int nWindowBorderPixelsLeft;
-  int nWindowBorderPixelsRight;
-  int nWindowBorderPixelsBottom;
-  int nFullScreenBorderPixelsTop;
-  int nFullScreenBorderPixelsLeft;
-  int nFullScreenBorderPixelsRight;
-  int nFullScreenBorderPixelsBottom;
+  bool bCrop;
+  int nMaxWidth;
+  int nMaxHeight;
 } CNF_SCREEN;
 
 
@@ -244,7 +252,8 @@ typedef enum
   MACHINE_ST,
   MACHINE_STE,
   MACHINE_TT,
-  MACHINE_FALCON
+  MACHINE_FALCON,
+  MACHINE_MEGA_STE,
 } MACHINETYPE;
 
 typedef enum
@@ -254,20 +263,43 @@ typedef enum
   DSP_TYPE_EMU
 } DSPTYPE;
 
+#if ENABLE_WINUAE_CPU
+typedef enum
+{
+  FPU_NONE,
+  FPU_68881,
+  FPU_68882,
+  FPU_CPU
+} FPUTYPE;
+#endif
+
 typedef struct
 {
   int nCpuLevel;
   int nCpuFreq;
-  bool bCompatibleCpu;
-  /*bool bAddressSpace24;*/
+  bool bCompatibleCpu;            /* Prefetch mode */
   MACHINETYPE nMachineType;
   bool bBlitter;                  /* TRUE if Blitter is enabled */
   DSPTYPE nDSPType;               /* how to "emulate" DSP */
   bool bRealTimeClock;
   bool bPatchTimerD;
   bool bFastForward;
+  
+#if ENABLE_WINUAE_CPU
+  bool bAddressSpace24;
+  bool bCycleExactCpu;
+  FPUTYPE n_FPUType;
+  bool bCompatibleFPU;            /* More compatible FPU */
+  bool bMMU;                      /* TRUE if MMU is enabled */
+#endif
 } CNF_SYSTEM;
 
+typedef struct
+{
+  int AviRecordVcodec;
+  int AviRecordFps;
+  char AviRecordFile[FILENAME_MAX];
+} CNF_VIDEO;
 
 /* State of system is stored in this structure */
 /* On reset, variables are copied into system globals and used. */
@@ -275,6 +307,7 @@ typedef struct
 {
   /* Configure */
   CNF_LOG Log;
+  CNF_DEBUGGER Debugger;
   CNF_SCREEN Screen;
   CNF_JOYSTICKS Joysticks;
   CNF_KEYBOARD Keyboard;
@@ -288,6 +321,7 @@ typedef struct
   CNF_PRINTER Printer;
   CNF_MIDI Midi;
   CNF_SYSTEM System;
+  CNF_VIDEO Video;
 } CNF_PARAMS;