asm code updated, Bass Masters fix

[picodrive.git] / Pico / Pico.h

diff --git a/Pico/Pico.h b/Pico/Pico.h
index 8e5d642..23e9e0b 100644 (file)
--- a/Pico/Pico.h
+++ b/Pico/Pico.h
@@ -12,6 +12,8 @@
 #ifndef PICO_H\r
 #define PICO_H\r
 \r
+#include <stdio.h>\r
+\r
 // port-specific compile-time settings\r
 #include <port_config.h>\r
 \r
@@ -32,24 +34,25 @@ void mp3_update(int *buffer, int length, int stereo);
 // alt_renderer, 6button_gamepad, accurate_timing, accurate_sprites,\r
 // draw_no_32col_border, external_ym2612, enable_cd_pcm, enable_cd_cdda\r
 // enable_cd_gfx, cd_perfect_sync, soft_32col_scaling, enable_cd_ramcart\r
+// disable_vdp_fifo\r
 extern int PicoOpt;\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
-int PicoInit(void);\r
+extern int PicoSVPCycles;\r
+int  PicoInit(void);\r
 void PicoExit(void);\r
-int PicoReset(int hard);\r
-int PicoFrame(void);\r
+int  PicoReset(int hard);\r
+int  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
 extern void (*PicoMessage)(const char *msg); // callback to output text message from emu\r
 \r
 // cd/Pico.c\r
-int PicoFrameMCD(void);\r
 extern void (*PicoMCDopenTray)(void);\r
 extern int  (*PicoMCDcloseTray)(void);\r
-\r
 extern int PicoCDBuffers;\r
 \r
 // Area.c\r
@@ -66,15 +69,23 @@ extern areaseek *areaSeek;
 extern areaclose *areaClose;\r
 extern void (*PicoStateProgressCB)(const char *str);\r
 \r
+// cd/Area.c\r
+int PicoCdLoadStateGfx(void *file);\r
+\r
 // cd/buffering.c\r
 void PicoCDBufferInit(void);\r
 void PicoCDBufferFree(void);\r
 \r
+// cd/cd_sys.c\r
+int Insert_CD(char *iso_name, int is_bin);\r
+void Stop_CD(void); // releases all resources taken when CD game was started.\r
+\r
 // Cart.c\r
 typedef enum\r
 {\r
        PMT_UNCOMPRESSED = 0,\r
-       PMT_ZIP\r
+       PMT_ZIP,\r
+       PMT_CSO\r
 } pm_type;\r
 typedef struct\r
 {\r
@@ -90,12 +101,16 @@ 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
-// anotherguest\r
 int PicoUnloadCart(unsigned char* romdata);\r
+extern void (*PicoCartLoadProgressCB)(int percent);\r
+extern void (*PicoCDLoadProgressCB)(int percent);\r
 \r
 // Draw.c\r
 void PicoDrawSetColorFormat(int which); // 0=BGR444, 1=RGB555, 2=8bit(HighPal pal)\r
 extern void *DrawLineDest;\r
+#if OVERRIDE_HIGHCOL\r
+extern unsigned char *HighCol;\r
+#endif\r
 extern int (*PicoScan)(unsigned int num, void *data);\r
 // internals\r
 extern unsigned short HighPal[0x100];\r
@@ -103,23 +118,22 @@ extern int rendstatus;
 // utility\r
 #ifdef _ASM_DRAW_C\r
 void *blockcpy(void *dst, const void *src, size_t n);\r
+void vidConvCpyRGB565(void *to, void *from, int pixels);\r
 #else\r
 #define blockcpy memcpy\r
 #endif\r
 \r
 // Draw2.c\r
 // stuff below is optional\r
+extern unsigned char  *PicoDraw2FB;  // buffer for fasr renderer in format (8+320)x(8+224+8) (eights for borders)\r
 extern unsigned short *PicoCramHigh; // pointer to CRAM buff (0x40 shorts), converted to native device color (works only with 16bit for now)\r
 extern void (*PicoPrepareCram)();    // prepares PicoCramHigh for renderer to use\r
 \r
 // sound.c\r
 extern int PsndRate,PsndLen;\r
 extern short *PsndOut;\r
-void sound_reset();\r
-void sound_rerate(int preserve_state);\r
-void z80_pack(unsigned char *data);\r
-void z80_unpack(unsigned char *data);\r
-void z80_reset();\r
+extern void (*PsndMix_32_to_16l)(short *dest, int *src, int count);\r
+void PsndRerate(int preserve_state);\r
 \r
 // Utils.c\r
 extern int PicuAnd;\r