--- previous/src/includes/configuration.h	2018/04/24 19:25:10	1.1
+++ previous/src/includes/configuration.h	2018/04/24 19:28:11	1.1.1.3
@@ -8,6 +8,13 @@
 #ifndef HATARI_CONFIGURATION_H
 #define HATARI_CONFIGURATION_H
 
+
+/* Configuration Dialog */
+typedef struct
+{
+  bool bShowConfigDialogAtStartup;
+} CNF_CONFIGDLG;
+
 /* Logging and tracing */
 typedef struct
 {
@@ -19,7 +26,7 @@ typedef struct
 } CNF_LOG;
 
 
-/* debugger */
+/* Debugger */
 typedef struct
 {
   int nNumberBase;
@@ -28,21 +35,24 @@ typedef struct
 } CNF_DEBUGGER;
 
 
-/* ROM (TOS + cartridge) configuration */
+/* ROM configuration */
 typedef struct
 {
-  char szTosImageFileName[FILENAME_MAX];
-  char szCartridgeImageFileName[FILENAME_MAX];
+    char szRom030FileName[FILENAME_MAX];
+    char szRom040FileName[FILENAME_MAX];
+    char szRomTurboFileName[FILENAME_MAX];
 } CNF_ROM;
 
 
 /* Sound configuration */
 typedef struct
 {
+  bool bEnableMicrophone;
   bool bEnableSound;
   int nPlaybackFreq;
-  char szYMCaptureFileName[FILENAME_MAX];
   int SdlAudioBufferSize;
+  char szYMCaptureFileName[FILENAME_MAX];
+  int YmVolumeMixing;
 } CNF_SOUND;
 
 
@@ -101,39 +111,48 @@ typedef struct
   int withoutModifier[SHORTCUT_KEYS];
 } CNF_SHORTCUT;
 
+/* Memory configuration */
+
+typedef enum
+{
+  MEMORY_120NS,
+  MEMORY_100NS,
+  MEMORY_80NS,
+  MEMORY_60NS
+} MEMORY_SPEED;
 
 typedef struct
 {
-  int nMemorySize;
+  int nMemoryBankSize[4];
+  MEMORY_SPEED nMemorySpeed;
   bool bAutoSave;
   char szMemoryCaptureFileName[FILENAME_MAX];
   char szAutoSaveFileName[FILENAME_MAX];
 } CNF_MEMORY;
 
 
-/* Joystick configuration */
-typedef enum
-{
-  JOYSTICK_DISABLED,
-  JOYSTICK_REALSTICK,
-  JOYSTICK_KEYBOARD
-} JOYSTICKMODE;
+/* Dialog Boot options */
 
-typedef struct
+typedef enum
 {
-  JOYSTICKMODE nJoystickMode;
-  bool bEnableAutoFire;
-  bool bEnableJumpOnFire2;
-  int nJoyId;
-  int nKeyCodeUp, nKeyCodeDown, nKeyCodeLeft, nKeyCodeRight, nKeyCodeFire;
-} JOYSTICK;
-
-#define JOYSTICK_COUNT 6
+    BOOT_ROM,
+    BOOT_SCSI,
+    BOOT_ETHERNET,
+    BOOT_MO,
+    BOOT_FLOPPY
+} BOOT_DEVICE;
 
 typedef struct
 {
-  JOYSTICK Joy[JOYSTICK_COUNT];
-} CNF_JOYSTICKS;
+    BOOT_DEVICE nBootDevice;
+    bool bEnableDRAMTest;
+    bool bEnablePot;
+    bool bExtendedPot;
+    bool bEnableSoundTest;
+    bool bEnableSCSITest;
+    bool bLoopPot;
+    bool bVerbose;
+} CNF_BOOT;
 
 
 /* Disk image configuration */
@@ -169,20 +188,20 @@ typedef enum
   DRIVE_F
 } DRIVELETTER;
 
+typedef struct {
+  char szImageName[FILENAME_MAX];
+  bool bAttached;
+  bool bCDROM;
+} SCSIDISK;
+
+#define ESP_MAX_DEVS 7
 typedef struct
 {
-  int nHardDiskDir;
-  bool bUseHardDiskDirectories;
-  bool bUseHardDiskImage;
-  bool bUseIdeMasterHardDiskImage;
-  bool bUseIdeSlaveHardDiskImage;
+  SCSIDISK target[ESP_MAX_DEVS];    
+  
   WRITEPROTECTION nWriteProtection;
   bool bBootFromHardDisk;
-  char szHardDiskDirectories[MAX_HARDDRIVES][FILENAME_MAX];
-  char szHardDiskImage[FILENAME_MAX];
-  char szIdeMasterHardDiskImage[FILENAME_MAX];
-  char szIdeSlaveHardDiskImage[FILENAME_MAX];
-} CNF_HARDDISK;
+} CNF_SCSI;
 
 /* Falcon register $FFFF8006 bits 6 & 7 (mirrored in $FFFF82C0 bits 0 & 1):
  * 00 Monochrome
@@ -190,7 +209,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
@@ -210,6 +228,7 @@ typedef struct
   MONITORTYPE nMonitorType;
   int nFrameSkips;
   bool bFullScreen;
+  bool bKeepResolution;
   bool bAllowOverscan;
   bool bAspectCorrect;
   bool bUseExtVdiResolutions;
@@ -220,7 +239,7 @@ typedef struct
   int nVdiHeight;
   bool bShowStatusbar;
   bool bShowDriveLed;
-  bool bCaptureChange;
+  bool bCrop;
   int nMaxWidth;
   int nMaxHeight;
 } CNF_SCREEN;
@@ -247,54 +266,98 @@ typedef struct
 /* Dialog System */
 typedef enum
 {
-  MACHINE_ST,
-  MACHINE_STE,
-  MACHINE_TT,
-  MACHINE_FALCON
+  NEXT_CUBE030,
+  NEXT_CUBE040,
+  NEXT_STATION
 } MACHINETYPE;
 
 typedef enum
 {
+  NCR53C90,
+  NCR53C90A
+} SCSICHIP;
+
+typedef enum
+{
+  MC68HC68T1,
+  MCS1850
+} RTCCHIP;
+
+typedef enum
+{
   DSP_TYPE_NONE,
   DSP_TYPE_DUMMY,
   DSP_TYPE_EMU
 } DSPTYPE;
 
+#if ENABLE_WINUAE_CPU
+typedef enum
+{
+  FPU_NONE = 0,
+  FPU_68881 = 68881,
+  FPU_68882 = 68882,
+  FPU_CPU = 68040
+} FPUTYPE;
+#endif
+
 typedef struct
 {
+  bool bColor;
+  bool bTurbo;
+  bool bADB;
+  SCSICHIP nSCSI;
+  RTCCHIP nRTC;
   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. */
 typedef struct
 {
   /* Configure */
+  CNF_CONFIGDLG ConfigDialog;
   CNF_LOG Log;
   CNF_DEBUGGER Debugger;
   CNF_SCREEN Screen;
-  CNF_JOYSTICKS Joysticks;
   CNF_KEYBOARD Keyboard;
   CNF_SHORTCUT Shortcut;
   CNF_SOUND Sound;
   CNF_MEMORY Memory;
   CNF_DISKIMAGE DiskImage;
-  CNF_HARDDISK HardDisk;
+  CNF_BOOT Boot;
+  CNF_SCSI SCSI;
   CNF_ROM Rom;
   CNF_RS232 RS232;
   CNF_PRINTER Printer;
   CNF_MIDI Midi;
   CNF_SYSTEM System;
+  CNF_VIDEO Video;
 } CNF_PARAMS;
 
 
@@ -303,6 +366,7 @@ extern char sConfigFileName[FILENAME_MAX
 
 extern void Configuration_SetDefault(void);
 extern void Configuration_Apply(bool bReset);
+extern int Configuration_CheckMemory(int *banksize);
 extern void Configuration_Load(const char *psFileName);
 extern void Configuration_Save(void);
 extern void Configuration_MemorySnapShot_Capture(bool bSave);