X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico.h;h=be02ef3a499100548b77d48c66d8ca603f1c4113;hb=93f9619ed819dee07948416c98ca2f1c70a22666;hp=0422dfd9a5da034100cd3c1c765b02eacb6fd1b4;hpb=9c9cda8c39bd2a6b99b8420a3034c454bc713954;p=picodrive.git

diff --git a/pico/pico.h b/pico/pico.h
index 0422dfd..be02ef3 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
@@ -52,7 +55,7 @@ extern void *p32x_bios_g, *p32x_bios_m, *p32x_bios_s;
 #define POPT_EN_Z80         (1<< 2)
 #define POPT_EN_STEREO      (1<< 3)
 #define POPT_ALT_RENDERER   (1<< 4) // 00 00x0
-#define POPT_6BTN_PAD       (1<< 5)
+// unused                   (1<< 5)
 // unused                   (1<< 6)
 #define POPT_ACC_SPRITES    (1<< 7)
 #define POPT_DIS_32C_BORDER (1<< 8) // 00 0x00
@@ -60,27 +63,43 @@ extern void *p32x_bios_g, *p32x_bios_m, *p32x_bios_s;
 #define POPT_EN_MCD_PCM     (1<<10)
 #define POPT_EN_MCD_CDDA    (1<<11)
 #define POPT_EN_MCD_GFX     (1<<12) // 00 x000
-#define POPT_EN_MCD_PSYNC   (1<<13)
+// unused                   (1<<13)
 #define POPT_EN_SOFTSCALE   (1<<14)
 #define POPT_EN_MCD_RAMCART (1<<15)
 #define POPT_DIS_VDP_FIFO   (1<<16) // 0x 0000
-#define POPT_EN_SVP_DRC     (1<<17)
+#define POPT_EN_DRC         (1<<17)
 #define POPT_DIS_SPRITE_LIM (1<<18)
 #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
-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;
+
+#define PQUIRK_FORCE_6BTN   (1<<0)
+
+// 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_*
+} PicoInterface;
+
+extern PicoInterface PicoIn;
+
 void PicoInit(void);
 void PicoExit(void);
 void PicoPower(void);
@@ -88,17 +107,17 @@ 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);
 
-// cd/Pico.c
+struct PicoEState;
+
+// cd/mcd.c
 extern void (*PicoMCDopenTray)(void);
 extern void (*PicoMCDcloseTray)(void);
-extern int PicoCDBuffers;
 
 // pico.c
 #define XPCM_BUFFER_SIZE (320+160)
@@ -124,14 +143,9 @@ void *PicoTmpStateSave(void);
 void  PicoTmpStateRestore(void *data);
 extern void (*PicoStateProgressCB)(const char *str);
 
-// cd/buffering.c
-void PicoCDBufferInit(void);
-void PicoCDBufferFree(void);
-void PicoCDBufferFlush(void);
-
-// cd/cd_sys.c
-int Insert_CD(const char *cdimg_name, int type);
-void Stop_CD(void); // releases all resources taken when CD game was started.
+// cd/cdd.c
+int cdd_load(const char *filename, int type);
+int cdd_unload(void);
 
 // Cart.c
 typedef enum
@@ -171,19 +185,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);
-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)
+void PicoDoHighPal555(int sh, int line, struct PicoEState *est);
 // internals
 #define PDRAW_SPRITES_MOVED (1<<0) // (asm)
 #define PDRAW_WND_DIFF_PRIO (1<<1) // not all window tiles use same priority
@@ -194,9 +200,8 @@ extern int PicoDrawMask;
 #define PDRAW_PLANE_HI_PRIO (1<<6) // have layer with all hi prio tiles (mk3)
 #define PDRAW_SHHI_DONE     (1<<7) // layer sh/hi already processed
 #define PDRAW_32_COLS       (1<<8) // 32 column mode
-extern int rendstatus, rendstatus_old;
+extern int rendstatus_old;
 extern int rendlines;
-extern unsigned short HighPal[0x100];
 
 // draw.c
 void PicoDrawUpdateHighPal(void);
@@ -204,7 +209,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
 
@@ -240,6 +244,15 @@ enum media_type_e {
   PM_MARK3,
   PM_CD,
 };
+
+enum cd_img_type
+{
+  CIT_NOT_CD = 0,
+  CIT_ISO,
+  CIT_BIN,
+  CIT_CUE
+};
+
 enum media_type_e PicoLoadMedia(const char *filename,
   const char *carthw_cfg_fname,
   const char *(*get_bios_filename)(int *region, const char *cd_fname),
@@ -248,6 +261,14 @@ int PicoCdCheck(const char *fname_in, int *pregion);
 
 extern unsigned char media_id_header[0x100];
 
+// memory.c
+enum input_device {
+  PICO_INPUT_NOTHING,
+  PICO_INPUT_PAD_3BTN,
+  PICO_INPUT_PAD_6BTN,
+};
+void PicoSetInputDevice(int port, enum input_device device);
+
 #ifdef __cplusplus
 } // End of extern "C"
 #endif