Procesing load_rom and membnk

core/cart_hw/eeprom_i2c.c

@@ -44,6 +44,7 @@
 #include "../m68k/m68k.h"
 #include "../mem68k.h"
 #include "../membnk.h"
+#include "../state.h"
 
 /* Some notes from 8BitWizard (http://gendev.spritesmind.net/forum/viewtopic.php?t=206):
  *

core/cart_hw/md_cart.c

@@ -59,6 +59,7 @@
 #include "sram.h"
 #include "ggenie.h"
 #include "areplay.h"
+#include "state.h"
 
 /* Cart database entry */
 typedef struct

core/cart_hw/megasd.c

@@ -41,6 +41,7 @@
 #include "../m68k/m68k.h"
 #include "../mem68k.h"
 #include "../membnk.h"
+#include "../state.h"
 #include "sram.h"
 
 typedef struct

core/cart_hw/svp/svp.c

@@ -14,6 +14,7 @@
 #include "../../genesis.h"
 #include "../../m68k/m68k.h"
 #include "../../membnk.h"
+#include "../../state.h"
 #include "svp.h"
 
 svp_t *svp;

core/cd_hw/cd_cart.c

@@ -42,6 +42,7 @@
 #include "../m68k/m68k.h"
 #include "../mem68k.h"
 #include "../membnk.h"
+#include "../state.h"
 
 /*--------------------------------------------------------------------------*/
 /* backup RAM cartridge (max. 512KB)                                        */

core/cd_hw/scd.c

@@ -42,6 +42,7 @@
 #include "../m68k/m68k.h"
 #include "../mem68k.h"
 #include "../membnk.h"
+#include "../state.h"
 
 /*--------------------------------------------------------------------------*/
 /* Unused area (return open bus data, i.e prefetched instruction word)      */

core/loadrom.c

@@ -99,11 +99,6 @@ typedef struct
 } PERIPHERALINFO;
 
 
-ROMINFO rominfo;
-uint8_t romtype;
-
-static uint8_t rom_region;
-
 /***************************************************************************
  * Genesis ROM Manufacturers
  *

core/membnk.c

@@ -46,8 +46,6 @@
 #include "io_ctrl.h"
 #include "state.h"
 
-t_zbank_memory_map zbank_memory_map[256];
-
 /*
   Handlers for access to unused addresses and those which make the
   machine lock up.

core/membnk.h

@@ -54,5 +54,4 @@ typedef struct
   void (*write)(unsigned int address, unsigned int data);
 } t_zbank_memory_map;
 
-extern t_zbank_memory_map zbank_memory_map[256];
 

core/state.c

@@ -16,3 +16,12 @@ uint8_t io_reg[0x10];
 uint8_t region_code = REGION_USA;
 struct port_t port[3];
 
+// load_rom.c
+
+ROMINFO rominfo;
+uint8_t romtype;
+uint8_t rom_region;
+
+// membnk.c
+
+t_zbank_memory_map zbank_memory_map[256];

core/state.h

@@ -1,6 +1,8 @@
 #include <stdint.h>
 #include "genesis.h"
 #include "io_ctrl.h"
+#include "loadrom.h"
+#include "membnk.h"
 
 #pragma once
 
@@ -18,4 +20,14 @@ extern uint8_t tmss[4];     // TMSS security register
 
 extern uint8_t io_reg[0x10];
 extern uint8_t region_code;
-extern struct port_t port[3];
+extern struct port_t port[3];
+
+// load_rom.h
+
+extern ROMINFO rominfo;
+extern uint8_t romtype;
+extern uint8_t rom_region;
+
+// membnk.h
+
+extern t_zbank_memory_map zbank_memory_map[256];