X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPico.h;h=7bdcc6f6f338b23334a9d638dfd366a7ff852516;hb=1413b9a1185543e6fff7a3f67c5b8cdfec4b7eee;hp=4439480ba69ea6c1eb1b9c454c103cf8e8cf771a;hpb=602133e1c66666f9152b1edb3014e137a9768cad;p=picodrive.git

diff --git a/Pico/Pico.h b/Pico/Pico.h
index 4439480..7bdcc6f 100644
--- a/Pico/Pico.h
+++ b/Pico/Pico.h
@@ -24,7 +24,6 @@ extern "C" {
 // external funcs for Sega/Mega CD
 int  mp3_get_bitrate(FILE *f, int size);
 void mp3_start_play(FILE *f, int pos);
-int  mp3_get_offset(void); // 0-1023
 void mp3_update(int *buffer, int length, int stereo);
 
 
@@ -35,7 +34,7 @@ void mp3_update(int *buffer, int length, int stereo);
 #define POPT_EN_STEREO      (1<< 3)
 #define POPT_ALT_RENDERER   (1<< 4) // 00 00x0
 #define POPT_6BTN_PAD       (1<< 5)
-#define POPT_ACC_TIMING     (1<< 6)
+// unused                   (1<< 6)
 #define POPT_ACC_SPRITES    (1<< 7)
 #define POPT_DIS_32C_BORDER (1<< 8) // 00 0x00
 #define POPT_EXT_FM         (1<< 9)
@@ -47,29 +46,54 @@ void mp3_update(int *buffer, int length, int stereo);
 #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_DIS_SPRITE_LIM (1<<18)
+#define POPT_DIS_IDLE_DET   (1<<19)
 extern int PicoOpt; // bitfield
+#define PAHW_MCD  (1<<0)
+#define PAHW_32X  (1<<1)
+#define PAHW_SVP  (1<<2)
+#define PAHW_PICO (1<<3)
+extern int PicoAHW;            // Pico active hw
 extern int PicoVer;
-extern int PicoSkipFrame; // skip rendering frame, but still do sound (if enabled) and emulation stuff
+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 PicoAutoRgnOrder;   // packed priority list of regions, for example 0x148 means this detection order: EUR, USA, JAP
 extern int PicoSVPCycles;
-int  PicoInit(void);
+void PicoInit(void);
 void PicoExit(void);
 void PicoPower(void);
 int  PicoReset(void);
-int  PicoFrame(void);
+void PicoFrame(void);
 void PicoFrameDrawOnly(void);
 extern int PicoPad[2]; // Joypads, format is MXYZ SACB RLDU
 extern void (*PicoWriteSound)(int len); // 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 { PS_PAL, PS_40_CELL, PS_240_LINES } pstat_t;
-int  PicoGetStat(pstat_t which);
+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
 extern void (*PicoMCDopenTray)(void);
 extern int  (*PicoMCDcloseTray)(void);
 extern int PicoCDBuffers;
 
+// Pico/Pico.c
+#define XPCM_BUFFER_SIZE (320+160)
+typedef struct
+{
+	int pen_pos[2];
+	int page;
+	// internal
+	int fifo_bytes;      // bytes in FIFO
+	int fifo_bytes_prev;
+	int fifo_line_bytes; // float part, << 16
+	int line_counter;
+	unsigned short r1, r12;
+	unsigned char xpcm_buffer[XPCM_BUFFER_SIZE+4];
+	unsigned char *xpcm_ptr;
+} picohw_state;
+extern picohw_state PicoPicohw;
+
 // Area.c
 typedef size_t (arearw)(void *p, size_t _size, size_t _n, void *file);
 typedef size_t (areaeof)(void *file);
@@ -85,14 +109,15 @@ extern areaclose *areaClose;
 extern void (*PicoStateProgressCB)(const char *str);
 
 // cd/Area.c
-int PicoCdLoadStateGfx(void *file);
+int  PicoCdLoadStateGfx(void *file);
 
 // cd/buffering.c
 void PicoCDBufferInit(void);
 void PicoCDBufferFree(void);
+void PicoCDBufferFlush(void);
 
 // cd/cd_sys.c
-int Insert_CD(char *iso_name, int is_bin);
+int Insert_CD(char *cdimg_name, int type);
 void Stop_CD(void); // releases all resources taken when CD game was started.
 
 // Cart.c
@@ -116,7 +141,7 @@ int      pm_close(pm_file *fp);
 int PicoCartLoad(pm_file *f,unsigned char **prom,unsigned int *psize);
 int PicoCartInsert(unsigned char *rom,unsigned int romsize);
 void Byteswap(unsigned char *data,int len);
-int PicoCartUnload(void);
+void PicoCartUnload(void);
 extern void (*PicoCartLoadProgressCB)(int percent);
 extern void (*PicoCDLoadProgressCB)(int percent);
 
@@ -132,16 +157,20 @@ extern int (*PicoScanEnd)(unsigned int num);
 #ifdef _ASM_DRAW_C
 void vidConvCpyRGB565(void *to, void *from, int pixels);
 #endif
+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)
 // internals
-#define PDRAW_SPRITES_MOVED (1<<0)
+#define PDRAW_SPRITES_MOVED (1<<0) // (asm)
 #define PDRAW_WND_DIFF_PRIO (1<<1) // not all window tiles use same priority
 #define PDRAW_ACC_SPRITES   (1<<2) // accurate sprites (copied from PicoOpt)
-#define PDRAW_INTERLACE     (1<<3) // 
-#define PDRAW_DIRTY_SPRITES (1<<4)
+#define PDRAW_INTERLACE     (1<<3)
+#define PDRAW_DIRTY_SPRITES (1<<4) // (asm)
 #define PDRAW_SONIC_MODE    (1<<5) // mid-frame palette changes for 8bit renderer
 #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_EARLY_BLANK   (1<<8) // blanking enabled at the start of prev line
 extern int rendstatus;
 extern unsigned short HighPal[0x100];