bugfixes

[picodrive.git] / pico / pico.h

diff --git a/pico/pico.h b/pico/pico.h
index 92ba9cf..c274b80 100644 (file)
--- a/pico/pico.h
+++ b/pico/pico.h
@@ -34,6 +34,13 @@ extern void cache_flush_d_inval_i(const void *start_addr, const void *end_addr);
 // this one should handle display mode changes\r
 extern void emu_video_mode_change(int start_line, int line_count, int is_32cols);\r
 \r
+// this must switch to 16bpp mode\r
+extern void emu_32x_startup(void);\r
+\r
+// optional 32X BIOS, should be left NULL if not used\r
+// must be 256, 2048, 1024 bytes\r
+extern void *p32x_bios_g, *p32x_bios_m, *p32x_bios_s;\r
+\r
 // Pico.c\r
 #define POPT_EN_FM          (1<< 0) // 00 000x\r
 #define POPT_EN_PSG         (1<< 1)\r
@@ -55,14 +62,16 @@ extern void emu_video_mode_change(int start_line, int line_count, int is_32cols)
 #define POPT_EN_SVP_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
+#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
-extern int PicoVer;\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
@@ -71,6 +80,7 @@ void PicoInit(void);
 void PicoExit(void);\r
 void PicoPower(void);\r
 int  PicoReset(void);\r
+void PicoLoopPrepare(void);\r
 void PicoFrame(void);\r
 void PicoFrameDrawOnly(void);\r
 extern int PicoPad[2]; // Joypads, format is MXYZ SACB RLDU\r
@@ -139,8 +149,7 @@ size_t   pm_read(void *ptr, size_t bytes, pm_file *stream);
 int      pm_seek(pm_file *stream, long offset, int whence);\r
 int      pm_close(pm_file *fp);\r
 int PicoCartLoad(pm_file *f,unsigned char **prom,unsigned int *psize,int is_sms);\r
-int PicoCartInsert(unsigned char *rom,unsigned int romsize);\r
-void Byteswap(unsigned char *data,int len);\r
+int PicoCartInsert(unsigned char *rom, unsigned int romsize, const char *carthw_cfg);\r
 void PicoCartUnload(void);\r
 extern void (*PicoCartLoadProgressCB)(int percent);\r
 extern void (*PicoCDLoadProgressCB)(const char *fname, int percent);\r
@@ -165,6 +174,7 @@ extern int PicoDrawMask;
 #define PDRAW_LAYERA_ON      (1<<3)\r
 #define PDRAW_SPRITES_LOW_ON (1<<4)\r
 #define PDRAW_SPRITES_HI_ON  (1<<7)\r
+#define PDRAW_32X_ON         (1<<8)\r
 // internals\r
 #define PDRAW_SPRITES_MOVED (1<<0) // (asm)\r
 #define PDRAW_WND_DIFF_PRIO (1<<1) // not all window tiles use same priority\r
@@ -174,8 +184,9 @@ extern int PicoDrawMask;
 #define PDRAW_SONIC_MODE    (1<<5) // mid-frame palette changes for 8bit renderer\r
 #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_240LINES      (1<<8) // 240 line display (224 if not set)\r
+#define PDRAW_32_COLS       (1<<8) // 32 column mode\r
 extern int rendstatus, rendstatus_old;\r
+extern int rendlines;\r
 extern unsigned short HighPal[0x100];\r
 \r
 // Draw2.c\r