--- hatari/src/includes/cart.h	2019/04/01 07:09:42	1.1.1.2
+++ hatari/src/includes/cart.h	2019/04/09 08:59:22	1.1.1.8
@@ -1,19 +1,15 @@
 /*
-  Hatari
+  Hatari - cart.h
+
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 
-/* Workspace in our 'cart.s' internal program */
-#define CART_HARDDRV          (0xfa1000)
-#define CART_OLDGEMDOS        (0xfa1004)
-#define CART_VDI_OPCODE_ADDR  (0xfa1008)
-#define CART_GEMDOS           (0xfa100A)
-#define CART_PEXEC_ADDR       (0xfa1018)
-#define CART_HDV_ADDR_1       (0xFA1454+2)
-#define CART_HDV_ADDR_2       (0xFA1486+2)
-#define CART_RETURN           (0xFA1014)
+/* Workspace in our 'cart_asm.s' internal program */
+#define CART_OLDGEMDOS        (0xfa0024)
+#define CART_VDI_OPCODE_ADDR  (0xfa0028)
+#define CART_GEMDOS           (0xfa002a)
+
+extern void Cart_ResetImage(void);
+extern void Cart_PatchCpuTables(void);
 
-/* This is set to 4, but should be 6 for TOS 1.2 on */
-#define CART_PEXEC_TOS        (0xFA104D)
-extern void Cart_LoadHeader(void);
-extern void Cart_LoadImage(void);
-extern void Cart_WriteHdvAddress(unsigned short int HdvAddress);