processing system

core/cart_hw/sram.c

@@ -41,6 +41,7 @@
 #include "../loadrom.h"
 #include "../macros.h"
 #include "../genesis.h"
+#include "../state.h"
 #include "sram.h"
 
 T_SRAM sram;

core/cd_hw/cdd.c

@@ -43,6 +43,7 @@
 #include "../system.h"
 #include "../genesis.h"
 #include "../m68k/m68k.h"
+#include "../state.h"
 
 #if defined(USE_LIBTREMOR) || defined(USE_LIBVORBIS)
 #include "../tremor/ogg.h"

core/cd_hw/pcm.c

@@ -40,6 +40,7 @@
 #include <string.h>
 #include "../system.h"
 #include "../genesis.h"
+#include "../state.h"
 
 #define PCM_SCYCLES_RATIO (384 * 4)
 

core/input_hw/gamepad.c

@@ -41,6 +41,7 @@
 #include "../m68k/m68k.h"
 #include "../z80/z80.h"
 #include "../input_hw/input.h"
+#include "../state.h"
 #include "gamepad.h"
 
 struct

core/input_hw/input.c

@@ -52,6 +52,7 @@
 #include "terebi_oekaki.h"
 #include "graphic_board.h"
 #include "input.h"
+#include "state.h"
 
 t_input input;
 int old_system[2] = {-1,-1};

core/loadrom.h

@@ -62,10 +62,6 @@ typedef struct
 } ROMINFO;
 
 
-/* Global variables */
-extern ROMINFO rominfo;
-extern uint8_t romtype;
-
 /* Function prototypes */
 extern int load_bios(int system);
 extern int load_rom(char *filename);

core/ntsc/md_ntsc.c

@@ -3,6 +3,7 @@
 /* Modified for use with Genesis Plus GX -- EkeEke */
 
 #include "../system.h"
+#include "../state.h"
 #include "md_ntsc.h"
 
 /* Copyright (C) 2006 Shay Green. This module is free software; you

core/ntsc/sms_ntsc.c

@@ -4,6 +4,7 @@
 
 #include "../system.h"
 #include "sms_ntsc.h"
+#include "../state.h"
 
 /* Copyright (C) 2006-2007 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser

core/sound/psg.c

@@ -44,6 +44,7 @@
 #include "../system.h"
 #include "blip_buf.h"
 #include "psg.h"
+#include "state.h"
 
 /* internal clock = input clock : 16 = (master clock : 15) : 16 */
 #define PSG_MCYCLES_RATIO (15*16)

core/sound/sound.c

@@ -42,6 +42,7 @@
 #include "../system.h"
 #include "../genesis.h"
 #include "../macros.h"
+#include "../state.h"
 #include "blip_buf.h"
 #include "psg.h"
 #include "ym2413.h"

core/state.c

@@ -24,4 +24,17 @@ uint8_t rom_region;
 
 // membnk.c
 
-t_zbank_memory_map zbank_memory_map[256];
+t_zbank_memory_map zbank_memory_map[256];
+
+// system.c
+
+t_bitmap bitmap;
+t_snd snd;
+uint32_t mcycles_vdp;
+uint8_t system_hw;
+uint8_t system_bios;
+uint32_t system_clock;
+int16_t SVP_cycles = 800; 
+uint8_t pause_b;
+EQSTATE eq[2];
+int16_t llp,rrp;

core/state.h

@@ -3,6 +3,8 @@
 #include "io_ctrl.h"
 #include "loadrom.h"
 #include "membnk.h"
+#include "system.h"
+#include "sound/eq.h"
 
 #pragma once
 
@@ -30,4 +32,17 @@ extern uint8_t rom_region;
 
 // membnk.h
 
-extern t_zbank_memory_map zbank_memory_map[256];
+extern t_zbank_memory_map zbank_memory_map[256];
+
+// system.h
+
+extern t_bitmap bitmap;
+extern t_snd snd;
+extern uint32_t mcycles_vdp;
+extern uint8_t system_hw;
+extern uint8_t system_bios;
+extern uint32_t system_clock;
+extern int16_t SVP_cycles; 
+extern uint8_t pause_b;
+extern EQSTATE eq[2];
+extern int16_t llp,rrp;

core/system.c

@@ -56,17 +56,6 @@
 #include "state.h"
 
 /* Global variables */
-t_bitmap bitmap;
-t_snd snd;
-uint32_t mcycles_vdp;
-uint8_t system_hw;
-uint8_t system_bios;
-uint32_t system_clock;
-int16_t SVP_cycles = 800; 
-
-static uint8_t pause_b;
-static EQSTATE eq[2];
-static int16_t llp,rrp;
 
 /******************************************************************************************/
 /* Audio subsystem                                                                        */

core/system.h

@@ -95,15 +95,6 @@ typedef struct
   blip_t* blips[3];     /* Blip Buffer resampling (stereo) */
 } t_snd;
 
-/* Global variables */
-extern t_bitmap bitmap;
-extern t_snd snd;
-extern uint32_t mcycles_vdp;
-extern int16_t SVP_cycles; 
-extern uint8_t system_hw;
-extern uint8_t system_bios;
-extern uint32_t system_clock;
-
 /* Function prototypes */
 extern int audio_init(int samplerate, double framerate);
 extern void audio_set_rate(int samplerate, double framerate);

core/vdp_render.c

@@ -49,6 +49,7 @@
 #include "macros.h"
 #include "vdp_ctrl.h"
 #include "vdp_render.h"
+#include "state.h"
 
 #ifndef HAVE_NO_SPRITE_LIMIT
 #define MAX_SPRITES_PER_LINE 20