--- previous/src/includes/configuration.h	2018/04/24 19:30:38	1.1.1.4
+++ previous/src/includes/configuration.h	2018/04/24 19:32:21	1.1.1.5
@@ -8,6 +8,9 @@
 #ifndef HATARI_CONFIGURATION_H
 #define HATARI_CONFIGURATION_H
 
+#include <stdio.h>
+
+#define ENABLE_TESTING 0
 
 /* Configuration Dialog */
 typedef struct
@@ -51,17 +54,6 @@ typedef struct
   bool bEnableSound;
 } CNF_SOUND;
 
-
-
-/* RS232 configuration */
-typedef struct
-{
-  bool bEnableRS232;
-  char szOutFileName[FILENAME_MAX];
-  char szInFileName[FILENAME_MAX];
-} CNF_RS232;
-
-
 /* Dialog Keyboard */
 typedef enum
 {
@@ -72,7 +64,6 @@ typedef enum
 
 typedef struct
 {
-  bool bDisableKeyRepeat;
   bool bSwapCmdAlt;
   KEYMAPTYPE nKeymapType;
   char szMappingFileName[FILENAME_MAX];
@@ -85,18 +76,12 @@ typedef enum {
   SHORTCUT_MOUSEGRAB,
   SHORTCUT_COLDRESET,
   SHORTCUT_WARMRESET,
-  SHORTCUT_SCREENSHOT,
-  SHORTCUT_BOSSKEY,
   SHORTCUT_CURSOREMU,
-  SHORTCUT_FASTFORWARD,
-  SHORTCUT_RECANIM,
-  SHORTCUT_RECSOUND,
   SHORTCUT_SOUND,
-  SHORTCUT_DEBUG,
+  SHORTCUT_DEBUG_M68K,
+  SHORTCUT_DEBUG_I860,
   SHORTCUT_PAUSE,
   SHORTCUT_QUIT,
-  SHORTCUT_LOADMEM,
-  SHORTCUT_SAVEMEM,
   SHORTCUT_DIMENSION,
   SHORTCUT_KEYS,  /* number of shortcuts */
   SHORTCUT_NONE
@@ -138,9 +123,6 @@ typedef struct
 {
   int nMemoryBankSize[4];
   MEMORY_SPEED nMemorySpeed;
-  bool bAutoSave;
-  char szMemoryCaptureFileName[FILENAME_MAX];
-  char szAutoSaveFileName[FILENAME_MAX];
 } CNF_MEMORY;
 
 
@@ -185,8 +167,16 @@ typedef struct {
     bool bWriteProtected;
 } SCSIDISK;
 
+typedef enum
+{
+    WRITEPROT_OFF,
+    WRITEPROT_ON,
+    WRITEPROT_AUTO
+} WRITEPROTECTION;
+
 typedef struct {
     SCSIDISK target[ESP_MAX_DEVS];
+    int nWriteProtection;
 } CNF_SCSI;
 
 
@@ -221,20 +211,9 @@ typedef struct {
 /* Ethernet configuration */
 typedef struct {
     bool bEthernetConnected;
+    bool bTwistedPair;
 } CNF_ENET;
 
-
-/* Falcon register $FFFF8006 bits 6 & 7 (mirrored in $FFFF82C0 bits 0 & 1):
- * 00 Monochrome
- * 01 RGB - Colormonitor
- * 10 VGA - Colormonitor
- * 11 TV
- */
-#define FALCON_MONITOR_MONO 0x00  /* SM124 */
-#define FALCON_MONITOR_RGB  0x40
-#define FALCON_MONITOR_VGA  0x80
-#define FALCON_MONITOR_TV   0xC0
-
 typedef enum
 {
   MONITOR_TYPE_DUAL,
@@ -246,22 +225,9 @@ typedef enum
 typedef struct
 {
   MONITORTYPE nMonitorType;
-  int nFrameSkips;
   bool bFullScreen;
-  bool bKeepResolution;
-  bool bAllowOverscan;
-  bool bAspectCorrect;
-  bool bUseExtVdiResolutions;
-  int nSpec512Threshold;
-  int nForceBpp;
-  int nVdiColors;
-  int nVdiWidth;
-  int nVdiHeight;
   bool bShowStatusbar;
   bool bShowDriveLed;
-  bool bCrop;
-  int nMaxWidth;
-  int nMaxHeight;
 } CNF_SCREEN;
 
 
@@ -281,16 +247,6 @@ typedef struct
   char szPrintToFileName[FILENAME_MAX];
 } CNF_PRINTER;
 
-
-/* Midi configuration */
-typedef struct
-{
-  bool bEnableMidi;
-  char sMidiInFileName[FILENAME_MAX];
-  char sMidiOutFileName[FILENAME_MAX];
-} CNF_MIDI;
-
-
 /* Dialog System */
 typedef enum
 {
@@ -337,14 +293,10 @@ typedef struct
   int nCpuFreq;
   bool bCompatibleCpu;            /* Prefetch mode */
   MACHINETYPE nMachineType;
-  bool bBlitter;                  /* TRUE if Blitter is enabled */
+  bool bRealtime;                 /* TRUE if realtime sources shoud be used */
   DSPTYPE nDSPType;               /* how to "emulate" DSP */
   bool bDSPMemoryExpansion;
   bool bRealTimeClock;
-  bool bPatchTimerD;
-  bool bFastForward;
-  bool bAddressSpace24;
-  bool bCycleExactCpu;
   FPUTYPE n_FPUType;
   bool bCompatibleFPU;            /* More compatible FPU */
   bool bMMU;                      /* TRUE if MMU is enabled */
@@ -353,59 +305,50 @@ typedef struct
 typedef struct
 {
     bool bEnabled;
-    int nMemoryBankSize[4];
+    bool bI860Thread;
+	bool bMainDisplay;
+    int  nMemoryBankSize[4];
     char szRomFileName[FILENAME_MAX];
 } CNF_ND;
 
-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_KEYBOARD Keyboard;
-  CNF_SHORTCUT Shortcut;
-  CNF_MOUSE Mouse;
-  CNF_SOUND Sound;
-  CNF_MEMORY Memory;
-  CNF_BOOT Boot;
-  CNF_SCSI SCSI;
-  CNF_MO MO;
-  CNF_FLOPPY Floppy;
-  CNF_ENET Ethernet;
-  CNF_ROM Rom;
-  CNF_RS232 RS232;
-  CNF_PRINTER Printer;
-  CNF_MIDI Midi;
-  CNF_SYSTEM System;
-  CNF_ND Dimension;
-  CNF_VIDEO Video;
+  CNF_LOG       Log;
+  CNF_DEBUGGER  Debugger;
+  CNF_SCREEN    Screen;
+  CNF_KEYBOARD  Keyboard;
+  CNF_SHORTCUT  Shortcut;
+  CNF_MOUSE     Mouse;
+  CNF_SOUND     Sound;
+  CNF_MEMORY    Memory;
+  CNF_BOOT      Boot;
+  CNF_SCSI      SCSI;
+  CNF_MO        MO;
+  CNF_FLOPPY    Floppy;
+  CNF_ENET      Ethernet;
+  CNF_ROM       Rom;
+  CNF_PRINTER   Printer;
+  CNF_SYSTEM    System;
+  CNF_ND        Dimension;
 } CNF_PARAMS;
 
 
 extern CNF_PARAMS ConfigureParams;
 extern char sConfigFileName[FILENAME_MAX];
 
-extern void Configuration_SetDefault(void);
-extern void Configuration_SetSystemDefaults(void);
-extern void Configuration_Apply(bool bReset);
-extern int Configuration_CheckMemory(int *banksize);
-extern int Configuration_CheckDimensionMemory(int *banksize);
-extern void Configuration_CheckDimensionSettings(void);
-extern void Configuration_Load(const char *psFileName);
-extern void Configuration_Save(void);
-extern void Configuration_MemorySnapShot_Capture(bool bSave);
+void Configuration_SetDefault(void);
+void Configuration_SetSystemDefaults(void);
+void Configuration_Apply(bool bReset);
+int Configuration_CheckMemory(int *banksize);
+int  Configuration_CheckDimensionMemory(int *banksize);
+void Configuration_CheckDimensionSettings(void);
+void Configuration_CheckEthernetSettings();
+void Configuration_Load(const char *psFileName);
+void Configuration_Save(void);
+void Configuration_MemorySnapShot_Capture(bool bSave);
 
 #endif