X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico.h;h=2d63d184bd907d401400d3a64c26b8197c0379e5;hb=35f2b65ef708e7afc922ceda8d00b716de289610;hp=c033c2daed63cc97c4fa5bc75fa29b35cae23e3f;hpb=ea38612fad50103e224a3d00492d40b7dcff9e94;p=picodrive.git

diff --git a/pico/pico.h b/pico/pico.h
index c033c2d..2d63d18 100644
--- a/pico/pico.h
+++ b/pico/pico.h
@@ -34,6 +34,9 @@ extern void cache_flush_d_inval_i(void *start_addr, void *end_addr);
 extern void *plat_mmap(unsigned long addr, size_t size, int need_exec, int is_fixed);
 extern void *plat_mremap(void *ptr, size_t oldsize, size_t newsize);
 extern void  plat_munmap(void *ptr, size_t size);
+
+// memory for the dynarec; plat_mem_get_for_drc() can just return NULL
+extern void *plat_mem_get_for_drc(size_t size);
 extern int   plat_mem_set_exec(void *ptr, size_t size);
 
 // this one should handle display mode changes
@@ -69,22 +72,35 @@ 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 %
+} PicoInterface;
+
+extern PicoInterface PicoIn;
+
 void PicoInit(void);
 void PicoExit(void);
 void PicoPower(void);
@@ -92,7 +108,6 @@ 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;
@@ -171,19 +186,11 @@ typedef enum
 void PicoDrawSetOutFormat(pdso_t which, int use_32x_line_mode);
 void PicoDrawSetOutBuf(void *dest, int increment);
 void PicoDrawSetCallbacks(int (*begin)(unsigned int num), int (*end)(unsigned int num));
-extern void *DrawLineDest;
-extern unsigned char *HighCol;
 // utility
 #ifdef _ASM_DRAW_C
 void vidConvCpyRGB565(void *to, void *from, int pixels);
 #endif
 void PicoDoHighPal555(int sh, int line, struct PicoEState *est);
-extern int PicoDrawMask;
-#define PDRAW_LAYERB_ON      (1<<2)
-#define PDRAW_LAYERA_ON      (1<<3)
-#define PDRAW_SPRITES_LOW_ON (1<<4)
-#define PDRAW_SPRITES_HI_ON  (1<<7)
-#define PDRAW_32X_ON         (1<<8)
 // internals
 #define PDRAW_SPRITES_MOVED (1<<0) // (asm)
 #define PDRAW_WND_DIFF_PRIO (1<<1) // not all window tiles use same priority
@@ -196,7 +203,6 @@ extern int PicoDrawMask;
 #define PDRAW_32_COLS       (1<<8) // 32 column mode
 extern int rendstatus_old;
 extern int rendlines;
-extern unsigned short HighPal[0x100];
 
 // draw.c
 void PicoDrawUpdateHighPal(void);
@@ -204,7 +210,6 @@ void PicoDrawSetInternalBuf(void *dest, int line_increment);
 
 // draw2.c
 // stuff below is optional
-extern unsigned char  *PicoDraw2FB;  // buffer for fast renderer in format (8+320)x(8+224+8) (eights for borders)
 extern unsigned short *PicoCramHigh; // pointer to CRAM buff (0x40 shorts), converted to native device color (works only with 16bit for now)
 extern void (*PicoPrepareCram)();    // prepares PicoCramHigh for renderer to use