X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPico.h;h=f6305053c9b0aca8f7b930814b6c288f6ade34d2;hb=97a7f774d376d0ff9f65643c7b780772cb8449b7;hp=be3015aaac33c81fa8138fbbda9ad3e9bf77c4d7;hpb=d49b10c2f2c58e03a1be8b3b9e8bfc08703e0ce0;p=picodrive.git

diff --git a/Pico/Pico.h b/Pico/Pico.h
index be3015a..f630505 100644
--- a/Pico/Pico.h
+++ b/Pico/Pico.h
@@ -34,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,23 +47,30 @@ void mp3_update(int *buffer, int length, int stereo);
 #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);
@@ -71,13 +78,19 @@ 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;
+	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;
 
@@ -96,7 +109,7 @@ 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);
@@ -104,7 +117,6 @@ 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.
 
@@ -129,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);
 
@@ -146,15 +158,16 @@ extern int (*PicoScanEnd)(unsigned int num);
 void vidConvCpyRGB565(void *to, void *from, int pixels);
 #endif
 // 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
+#define PDRAW_HAVE_LO_SPR   (1<<8)
+#define PDRAW_HAVE_HI_SPR   (1<<9)
 extern int rendstatus;
 extern unsigned short HighPal[0x100];