rearrange globals

[picodrive.git] / pico / pico.h

diff --git a/pico/pico.h b/pico/pico.h
index f1687f5..be02ef3 100644 (file)
--- a/pico/pico.h
+++ b/pico/pico.h
@@ -72,22 +72,34 @@ extern void *p32x_bios_g, *p32x_bios_m, *p32x_bios_s;
 #define POPT_DIS_IDLE_DET   (1<<19)\r
 #define POPT_EN_32X         (1<<20)\r
 #define POPT_EN_PWM         (1<<21)\r
-extern int PicoOpt; // bitfield\r
 \r
 #define PAHW_MCD  (1<<0)\r
 #define PAHW_32X  (1<<1)\r
 #define PAHW_SVP  (1<<2)\r
 #define PAHW_PICO (1<<3)\r
 #define PAHW_SMS  (1<<4)\r
-extern int PicoAHW;            // Pico active hw\r
 \r
 #define PQUIRK_FORCE_6BTN   (1<<0)\r
-extern int PicoQuirks;\r
 \r
-extern int PicoSkipFrame;      // skip rendering frame, but still do sound (if enabled) and emulation stuff\r
-extern int PicoRegionOverride; // override the region detection 0: auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe\r
-extern int PicoAutoRgnOrder;   // packed priority list of regions, for example 0x148 means this detection order: EUR, USA, JAP\r
-extern int PicoSVPCycles;\r
+// the emulator is configured and some status is reported\r
+// through this global state (not saved in savestates)\r
+typedef struct\r
+{\r
+       unsigned int opt; // POPT_* bitfield\r
+\r
+       unsigned short pad[2];     // Joypads, format is MXYZ SACB RLDU\r
+       unsigned short padInt[2];  // internal copy\r
+       unsigned short AHW;        // active addon hardware: PAHW_* bitfield\r
+\r
+       unsigned short skipFrame;      // skip rendering frame, but still do sound (if enabled) and emulation stuff\r
+       unsigned short regionOverride; // override the region detection 0: auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe\r
+       unsigned short autoRgnOrder;   // packed priority list of regions, for example 0x148 means this detection order: EUR, USA, JAP\r
+\r
+       unsigned short quirks;         // game-specific quirks: PQUIRK_*\r
+} PicoInterface;\r
+\r
+extern PicoInterface PicoIn;\r
+\r
 void PicoInit(void);\r
 void PicoExit(void);\r
 void PicoPower(void);\r
@@ -95,7 +107,6 @@ int  PicoReset(void);
 void PicoLoopPrepare(void);\r
 void PicoFrame(void);\r
 void PicoFrameDrawOnly(void);\r
-extern int PicoPad[2]; // Joypads, format is MXYZ SACB RLDU\r
 extern void (*PicoWriteSound)(int bytes); // called once per frame at the best time to send sound buffer (PsndOut) to hardware\r
 extern void (*PicoMessage)(const char *msg); // callback to output text message from emu\r
 typedef enum { PI_ROM, PI_ISPAL, PI_IS40_CELL, PI_IS240_LINES } pint_t;\r