final fixes for UIQ3

[picodrive.git] / Pico / Pico.h

diff --git a/Pico/Pico.h b/Pico/Pico.h
index 7e2ec69..fb067b8 100644 (file)
--- a/Pico/Pico.h
+++ b/Pico/Pico.h
@@ -22,10 +22,14 @@ extern "C" {
 #endif\r
 \r
 // external funcs for Sega/Mega CD\r
-int  mp3_get_bitrate(FILE *f, int size);\r
-void mp3_start_play(FILE *f, int pos);\r
-void mp3_update(int *buffer, int length, int stereo);\r
+extern int  mp3_get_bitrate(FILE *f, int size);\r
+extern void mp3_start_play(FILE *f, int pos);\r
+extern void mp3_update(int *buffer, int length, int stereo);\r
 \r
+// this function should write-back d-cache and invalidate i-cache\r
+// on a mem region [start_addr, end_addr)\r
+// used by SVP dynarec\r
+extern void cache_flush_d_inval_i(const void *start_addr, const void *end_addr);\r
 \r
 // Pico.c\r
 #define POPT_EN_FM          (1<< 0) // 00 000x\r
@@ -34,7 +38,7 @@ void mp3_update(int *buffer, int length, int stereo);
 #define POPT_EN_STEREO      (1<< 3)\r
 #define POPT_ALT_RENDERER   (1<< 4) // 00 00x0\r
 #define POPT_6BTN_PAD       (1<< 5)\r
-#define POPT_ACC_TIMING     (1<< 6)\r
+// unused                   (1<< 6)\r
 #define POPT_ACC_SPRITES    (1<< 7)\r
 #define POPT_DIS_32C_BORDER (1<< 8) // 00 0x00\r
 #define POPT_EXT_FM         (1<< 9)\r
@@ -59,11 +63,11 @@ extern int PicoSkipFrame;      // skip rendering frame, but still do sound (if e
 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 PicoSVPCycles;\r
-int  PicoInit(void);\r
+void PicoInit(void);\r
 void PicoExit(void);\r
 void PicoPower(void);\r
 int  PicoReset(void);\r
-int  PicoFrame(void);\r
+void PicoFrame(void);\r
 void PicoFrameDrawOnly(void);\r
 extern int PicoPad[2]; // Joypads, format is MXYZ SACB RLDU\r
 extern void (*PicoWriteSound)(int len); // called once per frame at the best time to send sound buffer (PsndOut) to hardware\r
@@ -109,7 +113,7 @@ extern areaclose *areaClose;
 extern void (*PicoStateProgressCB)(const char *str);\r
 \r
 // cd/Area.c\r
-int PicoCdLoadStateGfx(void *file);\r
+int  PicoCdLoadStateGfx(void *file);\r
 \r
 // cd/buffering.c\r
 void PicoCDBufferInit(void);\r
@@ -117,7 +121,6 @@ void PicoCDBufferFree(void);
 void PicoCDBufferFlush(void);\r
 \r
 // cd/cd_sys.c\r
-int Insert_CD(char *iso_name, int is_bin);\r
 int Insert_CD(char *cdimg_name, int type);\r
 void Stop_CD(void); // releases all resources taken when CD game was started.\r
 \r
@@ -142,7 +145,7 @@ int      pm_close(pm_file *fp);
 int PicoCartLoad(pm_file *f,unsigned char **prom,unsigned int *psize);\r
 int PicoCartInsert(unsigned char *rom,unsigned int romsize);\r
 void Byteswap(unsigned char *data,int len);\r
-int PicoCartUnload(void);\r
+void PicoCartUnload(void);\r
 extern void (*PicoCartLoadProgressCB)(int percent);\r
 extern void (*PicoCDLoadProgressCB)(int percent);\r
 \r
@@ -151,6 +154,8 @@ void PicoDrawSetColorFormat(int which); // 0=BGR444, 1=RGB555, 2=8bit(HighPal pa
 extern void *DrawLineDest;\r
 #if OVERRIDE_HIGHCOL\r
 extern unsigned char *HighCol;\r
+#else\r
+extern unsigned char  HighCol[8+320+8];\r
 #endif\r
 extern int (*PicoScanBegin)(unsigned int num);\r
 extern int (*PicoScanEnd)(unsigned int num);\r
@@ -158,16 +163,21 @@ extern int (*PicoScanEnd)(unsigned int num);
 #ifdef _ASM_DRAW_C\r
 void vidConvCpyRGB565(void *to, void *from, int pixels);\r
 #endif\r
+void PicoDoHighPal555(int sh);\r
+extern int PicoDrawMask;\r
+#define PDRAW_LAYERB_ON      (1<<2)\r
+#define PDRAW_LAYERA_ON      (1<<3)\r
+#define PDRAW_SPRITES_LOW_ON (1<<4)\r
+#define PDRAW_SPRITES_HI_ON  (1<<7)\r
 // internals\r
-#define PDRAW_SPRITES_MOVED (1<<0)\r
+#define PDRAW_SPRITES_MOVED (1<<0) // (asm)\r
 #define PDRAW_WND_DIFF_PRIO (1<<1) // not all window tiles use same priority\r
-#define PDRAW_ACC_SPRITES   (1<<2) // accurate sprites (copied from PicoOpt)\r
-#define PDRAW_INTERLACE     (1<<3) //\r
-#define PDRAW_DIRTY_SPRITES (1<<4)\r
+#define PDRAW_SPR_LO_ON_HI  (1<<2) // seen sprites without layer pri bit ontop spr. with that bit\r
+#define PDRAW_INTERLACE     (1<<3)\r
+#define PDRAW_DIRTY_SPRITES (1<<4) // (asm)\r
 #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_EARLY_BLANK   (1<<8) // blanking enabled at the start of prev line\r
 extern int rendstatus;\r
 extern unsigned short HighPal[0x100];\r
 \r