eliminate texrels (wip)

[picodrive.git] / pico / pico.h

diff --git a/pico/pico.h b/pico/pico.h
index 43217dc..d899b1a 100644 (file)
--- a/pico/pico.h
+++ b/pico/pico.h
@@ -60,11 +60,11 @@ extern void *p32x_bios_g, *p32x_bios_m, *p32x_bios_s;
 #define POPT_EN_MCD_PCM     (1<<10)\r
 #define POPT_EN_MCD_CDDA    (1<<11)\r
 #define POPT_EN_MCD_GFX     (1<<12) // 00 x000\r
-#define POPT_EN_MCD_PSYNC   (1<<13)\r
+// unused                   (1<<13)\r
 #define POPT_EN_SOFTSCALE   (1<<14)\r
 #define POPT_EN_MCD_RAMCART (1<<15)\r
 #define POPT_DIS_VDP_FIFO   (1<<16) // 0x 0000\r
-#define POPT_EN_SVP_DRC     (1<<17)\r
+#define POPT_EN_DRC         (1<<17)\r
 #define POPT_DIS_SPRITE_LIM (1<<18)\r
 #define POPT_DIS_IDLE_DET   (1<<19)\r
 #define POPT_EN_32X         (1<<20)\r
@@ -81,9 +81,10 @@ extern int PicoAHW;            // Pico active hw
 #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 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 PicoRegionFPSOverride; // override the refresh rate of the region 0: Auto, 1: NTSC, 2: PAL\r
+extern int PicoAutoRgnOrder;      // packed priority list of regions, for example 0x148 means this detection order: EUR, USA, JAP\r
 extern int PicoSVPCycles;\r
 void PicoInit(void);\r
 void PicoExit(void);\r
@@ -99,10 +100,11 @@ typedef enum { PI_ROM, PI_ISPAL, PI_IS40_CELL, PI_IS240_LINES } pint_t;
 typedef union { int vint; void *vptr; } pint_ret_t;\r
 void PicoGetInternal(pint_t which, pint_ret_t *ret);\r
 \r
+struct PicoEState;\r
+\r
 // cd/mcd.c\r
 extern void (*PicoMCDopenTray)(void);\r
 extern void (*PicoMCDcloseTray)(void);\r
-extern int PicoCDBuffers;\r
 \r
 // pico.c\r
 #define XPCM_BUFFER_SIZE (320+160)\r
@@ -128,14 +130,9 @@ void *PicoTmpStateSave(void);
 void  PicoTmpStateRestore(void *data);\r
 extern void (*PicoStateProgressCB)(const char *str);\r
 \r
-// cd/buffering.c\r
-void PicoCDBufferInit(void);\r
-void PicoCDBufferFree(void);\r
-void PicoCDBufferFlush(void);\r
-\r
-// cd/cd_sys.c\r
-int Insert_CD(const char *cdimg_name, int type);\r
-void Stop_CD(void); // releases all resources taken when CD game was started.\r
+// cd/cdd.c\r
+int cdd_load(const char *filename, int type);\r
+int cdd_unload(void);\r
 \r
 // Cart.c\r
 typedef enum\r
@@ -181,7 +178,7 @@ extern unsigned char *HighCol;
 #ifdef _ASM_DRAW_C\r
 void vidConvCpyRGB565(void *to, void *from, int pixels);\r
 #endif\r
-void PicoDoHighPal555(int sh);\r
+void PicoDoHighPal555(int sh, int line, struct PicoEState *est);\r
 extern int PicoDrawMask;\r
 #define PDRAW_LAYERB_ON      (1<<2)\r
 #define PDRAW_LAYERA_ON      (1<<3)\r
@@ -198,7 +195,7 @@ extern int PicoDrawMask;
 #define PDRAW_PLANE_HI_PRIO (1<<6) // have layer with all hi prio tiles (mk3)\r
 #define PDRAW_SHHI_DONE     (1<<7) // layer sh/hi already processed\r
 #define PDRAW_32_COLS       (1<<8) // 32 column mode\r
-extern int rendstatus, rendstatus_old;\r
+extern int rendstatus_old;\r
 extern int rendlines;\r
 extern unsigned short HighPal[0x100];\r
 \r
@@ -244,6 +241,15 @@ enum media_type_e {
   PM_MARK3,\r
   PM_CD,\r
 };\r
+\r
+enum cd_img_type\r
+{\r
+  CIT_NOT_CD = 0,\r
+  CIT_ISO,\r
+  CIT_BIN,\r
+  CIT_CUE\r
+};\r
+\r
 enum media_type_e PicoLoadMedia(const char *filename,\r
   const char *carthw_cfg_fname,\r
   const char *(*get_bios_filename)(int *region, const char *cd_fname),\r