X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico.h;h=f22ef60687788cfc745fe0e3aefd6320d65debe0;hb=6311a3baf533d4a034e51dfe38e8cb213a1bf442;hp=f1687f51492c58343fadcc0a0360c15501a4976d;hpb=df9251536deed37b18d10b8bc3502ee39006a320;p=picodrive.git

diff --git a/pico/pico.h b/pico/pico.h
index f1687f5..f22ef60 100644
--- a/pico/pico.h
+++ b/pico/pico.h
@@ -72,22 +72,44 @@ extern void *p32x_bios_g, *p32x_bios_m, *p32x_bios_s;
 #define POPT_DIS_IDLE_DET   (1<<19)
 #define POPT_EN_32X         (1<<20)
 #define POPT_EN_PWM         (1<<21)
-extern int PicoOpt; // bitfield
 
 #define PAHW_MCD  (1<<0)
 #define PAHW_32X  (1<<1)
 #define PAHW_SVP  (1<<2)
 #define PAHW_PICO (1<<3)
 #define PAHW_SMS  (1<<4)
-extern int PicoAHW;            // Pico active hw
 
 #define PQUIRK_FORCE_6BTN   (1<<0)
-extern int PicoQuirks;
 
-extern int PicoSkipFrame;      // skip rendering frame, but still do sound (if enabled) and emulation stuff
-extern int PicoRegionOverride; // override the region detection 0: auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe
-extern int PicoAutoRgnOrder;   // packed priority list of regions, for example 0x148 means this detection order: EUR, USA, JAP
-extern int PicoSVPCycles;
+// the emulator is configured and some status is reported
+// through this global state (not saved in savestates)
+typedef struct
+{
+	unsigned int opt; // POPT_* bitfield
+
+	unsigned short pad[2];     // Joypads, format is MXYZ SACB RLDU
+	unsigned short padInt[2];  // internal copy
+	unsigned short AHW;        // active addon hardware: PAHW_* bitfield
+
+	unsigned short skipFrame;      // skip rendering frame, but still do sound (if enabled) and emulation stuff
+	unsigned short regionOverride; // override the region detection 0: auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe
+	unsigned short autoRgnOrder;   // packed priority list of regions, for example 0x148 means this detection order: EUR, USA, JAP
+
+	unsigned short quirks;         // game-specific quirks: PQUIRK_*
+	unsigned short overclockM68k;  // overclock the emulated 68k, in %
+
+	int sndRate;                   // rate in Hz
+	short *sndOut;                 // PCM output buffer
+	void (*writeSound)(int len);   // write .sndOut callback, called once per frame
+
+	void (*osdMessage)(const char *msg); // output OSD message from emu, optional
+
+	void (*mcdTrayOpen)(void);
+	void (*mcdTrayClose)(void);
+} PicoInterface;
+
+extern PicoInterface PicoIn;
+
 void PicoInit(void);
 void PicoExit(void);
 void PicoPower(void);
@@ -95,19 +117,12 @@ int  PicoReset(void);
 void PicoLoopPrepare(void);
 void PicoFrame(void);
 void PicoFrameDrawOnly(void);
-extern int PicoPad[2]; // Joypads, format is MXYZ SACB RLDU
-extern void (*PicoWriteSound)(int bytes); // called once per frame at the best time to send sound buffer (PsndOut) to hardware
-extern void (*PicoMessage)(const char *msg); // callback to output text message from emu
 typedef enum { PI_ROM, PI_ISPAL, PI_IS40_CELL, PI_IS240_LINES } pint_t;
 typedef union { int vint; void *vptr; } pint_ret_t;
 void PicoGetInternal(pint_t which, pint_ret_t *ret);
 
 struct PicoEState;
 
-// cd/mcd.c
-extern void (*PicoMCDopenTray)(void);
-extern void (*PicoMCDcloseTray)(void);
-
 // pico.c
 #define XPCM_BUFFER_SIZE (320+160)
 typedef struct
@@ -218,8 +233,6 @@ void Pico32xSetClocks(int msh2_hz, int ssh2_hz);
 #define PICO_SSH2_HZ ((int)(7670442.0 * 2.4))
 
 // sound.c
-extern int PsndRate,PsndLen;
-extern short *PsndOut;
 extern void (*PsndMix_32_to_16l)(short *dest, int *src, int count);
 void PsndRerate(int preserve_state);