--- hatari/src/includes/configuration.h	2019/04/01 07:10:55	1.1.1.3
+++ hatari/src/includes/configuration.h	2019/04/01 07:11:51	1.1.1.5
@@ -9,14 +9,12 @@
 #define HATARI_CONFIGURATION_H
 
 
-/* TOS/GEM configuration */
+/* ROM (TOS + cartridge) configuration */
 typedef struct
 {
-  char szTOSImageFileName[MAX_FILENAME_LENGTH];
-  BOOL bUseExtGEMResolutions;
-  int nGEMResolution;
-  int nGEMColours;
-} CNF_TOSGEM;
+  char szTosImageFileName[FILENAME_MAX];
+  char szCartridgeImageFileName[FILENAME_MAX];
+} CNF_ROM;
 
 
 /* Sound configuration */
@@ -31,24 +29,17 @@ typedef struct
 {
   BOOL bEnableSound;
   SOUND_QUALITIY nPlaybackQuality;
-  char szYMCaptureFileName[MAX_FILENAME_LENGTH];
+  char szYMCaptureFileName[FILENAME_MAX];
 } CNF_SOUND;
 
 
 
-/* RS232 configuration - not yet used */
-/*
-enum {
-  COM_PORT_1,
-  COM_PORT_2,
-  COM_PORT_3,
-  COM_PORT_4
-};
-*/
+/* RS232 configuration */
 typedef struct
 {
   BOOL bEnableRS232;
-  int nCOMPort;
+  char szOutFileName[FILENAME_MAX];
+  char szInFileName[FILENAME_MAX];
 } CNF_RS232;
 
 
@@ -64,7 +55,7 @@ typedef struct
 {
   BOOL bDisableKeyRepeat;
   KEYMAPTYPE nKeymapType;
-  char szMappingFileName[MAX_FILENAME_LENGTH];
+  char szMappingFileName[FILENAME_MAX];
 } CNF_KEYBOARD;
 
 
@@ -80,7 +71,7 @@ typedef enum
 typedef struct
 {
   MEMORY_SIZE nMemorySize;
-  char szMemoryCaptureFileName[MAX_FILENAME_LENGTH];
+  char szMemoryCaptureFileName[FILENAME_MAX];
 } CNF_MEMORY;
 
 
@@ -101,7 +92,7 @@ typedef struct
 typedef struct
 {
   BOOL bAutoInsertDiscB;
-  char szDiscImageDirectory[MAX_FILENAME_LENGTH];
+  char szDiscImageDirectory[FILENAME_MAX];
 } CNF_DISCIMAGE;
 
 
@@ -133,8 +124,8 @@ typedef struct
   int nHardDiscDir;
   BOOL bUseHardDiscDirectories;
   BOOL bUseHardDiscImage;
-  char szHardDiscDirectories[MAX_HARDDRIVES][MAX_FILENAME_LENGTH];
-  char szHardDiscImage[MAX_FILENAME_LENGTH];
+  char szHardDiscDirectories[MAX_HARDDRIVES][FILENAME_MAX];
+  char szHardDiscImage[FILENAME_MAX];
 } CNF_HARDDISC;
 
 
@@ -142,15 +133,16 @@ typedef struct
 typedef struct
 {
   BOOL bFullScreen;
-  BOOL bDoubleSizeWindow;
-  BOOL bAllowOverscan;
-  BOOL bInterlacedScreen;
-  BOOL bSyncToRetrace;
   BOOL bFrameSkip;
+  BOOL bAllowOverscan;
+  BOOL bInterleavedScreen;
   int ChosenDisplayMode;
+  BOOL bUseHighRes;
+  BOOL bUseExtVdiResolutions;
+  int nVdiResolution;
+  int nVdiColors;
   BOOL bCaptureChange;
   int nFramesPerSecond;
-  BOOL bUseHighRes;
 } CNF_SCREEN;
 
 
@@ -159,10 +151,18 @@ typedef struct
 {
   BOOL bEnablePrinting;
   BOOL bPrintToFile;
-  char szPrintToFileName[MAX_FILENAME_LENGTH];
+  char szPrintToFileName[FILENAME_MAX];
 } CNF_PRINTER;
 
 
+/* Midi configuration */
+typedef struct
+{
+  BOOL bEnableMidi;
+  char szMidiOutFileName[FILENAME_MAX];
+} CNF_MIDI;
+
+
 /* Dialog System */
 typedef enum
 {
@@ -179,6 +179,8 @@ typedef struct
   BOOL bCompatibleCpu;
   BOOL bAddressSpace24;
   BOOL bBlitter;                  /* TRUE if blitter is enabled */
+  BOOL bPatchTimerD;
+  BOOL bSlowFDC;                  /* TRUE to slow down FDC emulation */
   MINMAXSPEED_TYPE nMinMaxSpeed;
 } CNF_SYSTEM;
 
@@ -195,17 +197,20 @@ typedef struct
   CNF_MEMORY Memory;
   CNF_DISCIMAGE DiscImage;
   CNF_HARDDISC HardDisc;
-  CNF_TOSGEM TOSGEM;
+  CNF_ROM Rom;
   CNF_RS232 RS232;
   CNF_PRINTER Printer;
+  CNF_MIDI Midi;
   CNF_SYSTEM System;
 } CNF_PARAMS;
 
 
 extern BOOL bFirstTimeInstall;
 extern CNF_PARAMS ConfigureParams;
+extern char sConfigFileName[FILENAME_MAX];
 
 extern void Configuration_SetDefault(void);
+extern void Configuration_WorkOnDetails(BOOL bReset);
 extern void Configuration_Load(void);
 extern void Configuration_Save(void);