--- hatari/src/includes/main.h	2019/04/01 07:10:53	1.1.1.7
+++ hatari/src/includes/main.h	2019/04/01 07:12:13	1.1.1.10
@@ -10,29 +10,8 @@
 
 typedef int BOOL;
 
-#define PROG_NAME      "Hatari v0.40" /* Name, version for window title */
-#define PROG_VERSION        "v0.40"
-#define VERSION_STRING      "0.40 "   /* Always 6 bytes(inc' NULL) */
-#define VERSION_STRING_SIZE    6      /* Size of above(inc' NULL) */
-
-//#define TOTALLY_FINAL_VERSION       /* Web release version... */
-
-#define FINAL_VERSION                 /* Full-speed non-debug version for release */
-//#define DEBUG_TO_FILE               /* Use debug.txt files */
-#define FIND_PERFORMANCE
-
-#ifndef FINAL_VERSION
-  #define USE_DEBUGGER                /* Debugger version(non-release) */
-  #define DEBUG_TO_FILE               /* Use debug.txt files */
-#endif
-
-#ifdef TOTALLY_FINAL_VERSION
-  #undef DEBUG_TO_FILE                /* Don't use debug files for final release */
-  #undef FIND_PERFORMANCE
-#endif
-
-#define MAX_FILENAME_LENGTH  256
-#define MAX_STRING_LENGTH  512
+#define PROG_NAME      "Hatari v0.70" /* Name, version for window title */
+#define PROG_VERSION   "v0.70"
 
 
 #include <stdio.h>
@@ -40,7 +19,8 @@ typedef int BOOL;
 #include <string.h>
 #include <math.h>
 #include <time.h>
-#include <assert.h>
+
+#include <SDL_types.h>
 
 
 #ifndef FALSE
@@ -73,53 +53,33 @@ enum {
   REG_A4,
   REG_A5,
   REG_A6,
-  REG_A7,    /* ..A7(also SP) */
+  REG_A7,    /* ..A7 (also SP) */
 };
 
-/* PC Condition code's */
-#define PC_CARRY    0x0001  /* Bit 0 */
-#define PC_AUX      0x0010  /* Bit 4 */
-#define PC_ZERO     0x0040  /* Bit 6 */
-#define PC_NEG      0x0080  /* Bit 7 */
-#define PC_OVERFLOW 0x0800  /* Bit 11 */
-
 /* 68000 Condition code's */
-#define SR_AUX      0x0010
-#define SR_NEG      0x0008
-#define SR_ZERO      0x0004
-#define SR_OVERFLOW    0x0002
-#define SR_CARRY    0x0001
-
-#define SR_CLEAR_AUX    0xffef
-#define SR_CLEAR_NEG    0xfff7
-#define SR_CLEAR_ZERO    0xfffb
-#define SR_CLEAR_OVERFLOW  0xfffd
-#define SR_CLEAR_CARRY    0xfffe
-
-#define SR_CCODE_MASK    (SR_AUX|SR_NEG|SR_ZERO|SR_OVERFLOW|SR_CARRY)
-#define SR_MASK      0xFFE0
-
-#define SR_TRACEMODE    0x8000
-#define SR_SUPERMODE    0x2000
-#define SR_IPL      0x0700
+#define SR_AUX              0x0010
+#define SR_NEG              0x0008
+#define SR_ZERO             0x0004
+#define SR_OVERFLOW         0x0002
+#define SR_CARRY            0x0001
+
+#define SR_CLEAR_AUX        0xffef
+#define SR_CLEAR_NEG        0xfff7
+#define SR_CLEAR_ZERO       0xfffb
+#define SR_CLEAR_OVERFLOW   0xfffd
+#define SR_CLEAR_CARRY      0xfffe
+
+#define SR_CCODE_MASK       (SR_AUX|SR_NEG|SR_ZERO|SR_OVERFLOW|SR_CARRY)
+#define SR_MASK             0xFFE0
+
+#define SR_TRACEMODE        0x8000
+#define SR_SUPERMODE        0x2000
+#define SR_IPL              0x0700
 
-#define SR_CLEAR_IPL    0xf8ff
+#define SR_CLEAR_IPL        0xf8ff
 #define SR_CLEAR_TRACEMODE  0x7fff
 #define SR_CLEAR_SUPERMODE  0xdfff
 
-/* Emuation condition codes, ordered so can do 'xor al,al' to set XNZVC -0000 */
-#define  EMU_X    0x0100
-#define  EMU_N    0x0080
-#define  EMU_Z    0x0040
-#define  EMU_V    0x0020
-#define  EMU_C    0x0010
-
-#define  EMU_CLEAR_X  0xfeff
-#define  EMU_CLEAR_N  0xff7f
-#define  EMU_CLEAR_Z  0xffbf
-#define  EMU_CLEAR_V  0xffdf
-#define  EMU_CLEAR_C  0xffef
-
 /* Exception vectors */
 #define  EXCEPTION_BUSERROR   0x00000008
 #define  EXCEPTION_ADDRERROR  0x0000000c
@@ -192,13 +152,10 @@ enum {
 #define CYCLES_PER_SEC      (CYCLES_PER_FRAME*50) /* Cycles per second */
 #define CYCLES_ENDLINE      (64+320+88+40)        /* DE(Display Enable) */
 #define CYCLES_HBL          (CYCLES_PER_LINE+96)  /* Cycles for first HBL - very inaccurate on ST */
-#define CYCLES_DEBUGGER     3000        /* Check debugger every 'x' cycles */
 
 /* Illegal Opcode used to help emulation. eg. free entries are 8 to 15 inc' */
 #define  GEMDOS_OPCODE        8  /* Free op-code to intercept GemDOS trap */
-#define  RUNOLDGEMDOS_OPCODE  9  /* Free op-code to set PC to old GemDOS vector(if doesn't need to intercept) */
 #define  SYSINIT_OPCODE      10  /* Free op-code to initialize system (connected drives etc.) */
-#define  TIMERD_OPCODE       11  /* Free op-code to prevent Timer D starting in GemDOS */
 #define  VDI_OPCODE          12  /* Free op-code to call VDI handlers AFTER Trap#2 */
 
 
@@ -208,16 +165,14 @@ enum {
 extern BOOL bQuitProgram;
 extern BOOL bEnableDebug;
 extern BOOL bEmulationActive;
-extern char szName[];
-extern char szBootDiscImage[MAX_FILENAME_LENGTH];
-extern char szWorkingDir[MAX_FILENAME_LENGTH];
-extern char szCurrentDir[MAX_FILENAME_LENGTH];
+extern char szBootDiscImage[FILENAME_MAX];
+extern char szWorkingDir[FILENAME_MAX];
+
 
 extern void Main_MemorySnapShot_Capture(BOOL bSave);
-extern void Main_SysError(char *Error,char *Title);
-extern int Main_Message(char *lpText, char *lpCaption /*, unsigned int uType*/);
 extern void Main_PauseEmulation(void);
 extern void Main_UnPauseEmulation(void);
-extern void Main_EventHandler();
+extern void Main_WarpMouse(int x, int y);
+extern void Main_EventHandler(void);
 
 #endif /* ifndef HATARI_MAIN_H */