--- hatari/src/includes/main.h	2019/04/01 07:10:35	1.1.1.6
+++ hatari/src/includes/main.h	2019/04/01 07:10:53	1.1.1.7
@@ -10,9 +10,9 @@
 
 typedef int BOOL;
 
-#define PROG_NAME      "Hatari v0.30" /* Name, version for window title */
-#define PROG_VERSION        "v0.30"
-#define VERSION_STRING      "0.30 "   /* Always 6 bytes(inc' NULL) */
+#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... */
@@ -50,18 +50,6 @@ typedef int BOOL;
 
 #define CALL_VAR(func)  { ((void(*)(void))func)(); }
 
-/* Binary conversion macro's */
-#define BIN2(a,b) ((a<<1)+(b))
-#define BIN3(a,b,c) ((a<<2)+(b<<1)+(c))
-#define BIN4(a,b,c,d) ((a<<3)+(b<<2)+(c<<1)+(d))
-#define BIN5(a,b,c,d,e) ((a<<4)+(b<<3)+(c<<2)+(d<<1)+(e))
-#define BIN6(a,b,c,d,e,f) ((a<<5)+(b<<4)+(c<<3)+(d<<2)+(e<<1)+(f))
-#define BIN7(a,b,c,d,e,f,g) ((a<<6)+(b<<5)+(c<<4)+(d<<3)+(e<<2)+(f<<1)+(g))
-#define BIN8(a,b,c,d,e,f,g,h) ((a<<7)+(b<<6)+(c<<5)+(d<<4)+(e<<3)+(f<<2)+(g<<1)+(h))
-#define BIN10(a,b,c,d,e,f,g,h,i,j) ((a<<9)+(b<<8)+(c<<7)+(d<<6)+(e<<5)+(f<<4)+(g<<3)+(h<<2)+(i<<1)+(j))
-#define BIN12(a,b,c,d,e,f,g,h,i,j,k,l) ((a<<11)+(b<<10)+(c<<9)+(d<<8)+(e<<7)+(f<<6)+(g<<5)+(h<<4)+(i<<3)+(j<<2)+(k<<1)+(l))
-#define BIN14(a,b,c,d,e,f,g,h,i,j,k,l,m,n) ((a<<13)+(b<<12)+(c<<11)+(d<<10)+(e<<9)+(f<<8)+(g<<7)+(h<<6)+(i<<5)+(j<<4)+(k<<3)+(l<<2)+(m<<1)+(n))
-#define BIN16(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) ((a<<15)+(b<<14)+(c<<13)+(d<<12)+(e<<11)+(f<<10)+(g<<9)+(h<<8)+(i<<7)+(j<<6)+(k<<5)+(l<<4)+(m<<3)+(n<<2)+(o<<1)+(p))
 
 /* 68000 operand sizes */
 #define SIZE_BYTE  1
@@ -162,14 +150,14 @@ enum {
 
   Clock cycles per line (50Hz)      : 512
   NOPs per scan line (50Hz)         : 128
-  Scan lines per VBL (50Hz)         : 313(64 at top,200 screen,49 bottom)
+  Scan lines per VBL (50Hz)         : 313 (64 at top,200 screen,49 bottom)
 
   Clock cycles per line (60Hz)      : 508
   NOPs per scan line (60Hz)         : 127
-  Scan lines per VBL (60Hz)         : 315
+  Scan lines per VBL (60Hz)         : 263
 
-  Clock cycles per VBL              : 160256
-  NOPs per VBL                      : 40064
+  Clock cycles per VBL (50Hz)       : 160256
+  NOPs per VBL (50Hz)               : 40064
 
   Pixels per clock cycle (low res)  : 1
   Pixels per clock cycle (med res)  : 2
@@ -199,8 +187,8 @@ enum {
 #define SCREEN_START_CYCLE  96          /* Cycle first normal pixel appears on */
 #define SCANLINES_PER_FRAME 313         /* Number of scan lines per frame */
 #define CYCLES_PER_LINE     512         /* Cycles per horiztonal line scan */
+#define CYCLES_VBL_IN       (SCREEN_START_HBL*CYCLES_PER_LINE)     /* ((28+64)*CYCLES_PER_LINE) */
 #define CYCLES_PER_FRAME    (SCANLINES_PER_FRAME*CYCLES_PER_LINE)  /* Cycles per VBL @ 50fps = 160256 */
-#define CYCLES_VBL_IN       (SCREEN_START_HBL*CYCLES_PER_LINE)  /*((28+64)*CYCLES_PER_LINE) */
 #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 */
@@ -209,10 +197,9 @@ enum {
 /* 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  CONDRV_OPCODE       10  /* Free op-code to intercept set up connected drives */
+#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 */
-#define  LINEA_OPCODE        13  /* Free op-code to call handlers AFTER Line-A */
 
 
 #define PRG_HEADER_SIZE    0x1c  /* Size of header at start of ST .prg files */