--- hatari/src/includes/configuration.h	2019/04/01 07:11:51	1.1.1.5
+++ hatari/src/includes/configuration.h	2019/04/01 07:12:15	1.1.1.6
@@ -9,6 +9,15 @@
 #define HATARI_CONFIGURATION_H
 
 
+/* Logging */
+typedef struct
+{
+  char sLogFileName[FILENAME_MAX];
+  int nTextLogLevel;
+  int nAlertDlgLogLevel;
+} CNF_LOG;
+
+
 /* ROM (TOS + cartridge) configuration */
 typedef struct
 {
@@ -89,9 +98,18 @@ typedef struct
 
 
 /* Discimage configuration */
+
+typedef enum
+{
+  WRITEPROT_OFF,
+  WRITEPROT_ON,
+  WRITEPROT_AUTO
+} WRITEPROTECTION;
+
 typedef struct
 {
   BOOL bAutoInsertDiscB;
+  WRITEPROTECTION nWriteProtection;
   char szDiscImageDirectory[FILENAME_MAX];
 } CNF_DISCIMAGE;
 
@@ -173,12 +191,21 @@ typedef enum
   MINMAXSPEED_MAX
 } MINMAXSPEED_TYPE;
 
+typedef enum
+{
+  MACHINE_ST,
+  MACHINE_STE
+} MACHINETYPE;
+
 typedef struct
 {
   int nCpuLevel;
+  int nCpuFreq;
   BOOL bCompatibleCpu;
-  BOOL bAddressSpace24;
+  /*BOOL bAddressSpace24;*/
+  MACHINETYPE nMachineType;
   BOOL bBlitter;                  /* TRUE if blitter is enabled */
+  BOOL bRealTimeClock;
   BOOL bPatchTimerD;
   BOOL bSlowFDC;                  /* TRUE to slow down FDC emulation */
   MINMAXSPEED_TYPE nMinMaxSpeed;
@@ -190,6 +217,7 @@ typedef struct
 typedef struct
 {
   /* Configure */
+  CNF_LOG Log;
   CNF_SCREEN Screen;
   CNF_JOYSTICKS Joysticks;
   CNF_KEYBOARD Keyboard;
@@ -211,7 +239,7 @@ extern char sConfigFileName[FILENAME_MAX
 
 extern void Configuration_SetDefault(void);
 extern void Configuration_WorkOnDetails(BOOL bReset);
-extern void Configuration_Load(void);
+extern void Configuration_Load(const char *psFileName);
 extern void Configuration_Save(void);
 
 #endif