X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPico.h;h=cfcd7e4717855efe9b2bdfd0c520a73eb26c5a3a;hb=b923ecbe75225bc7a1b6fbf419fd962a59066d59;hp=6adb7f557a4902df78202f232a0b49048bc1e01f;hpb=e5f426aa2e86d56357b8af2795e73cc0c9b17e8f;p=picodrive.git

diff --git a/Pico/Pico.h b/Pico/Pico.h
index 6adb7f5..cfcd7e4 100644
--- a/Pico/Pico.h
+++ b/Pico/Pico.h
@@ -4,7 +4,7 @@
 // Pico Library - Header File
 
 // (c) Copyright 2004 Dave, All rights reserved.
-// (c) Copyright 2006-2007 notaz, All rights reserved.
+// (c) Copyright 2006-2008 notaz, All rights reserved.
 // Free for non-commercial use.
 
 // For commercial use, separate licencing terms must be obtained.
@@ -29,24 +29,42 @@ void mp3_update(int *buffer, int length, int stereo);
 
 
 // Pico.c
-// PicoOpt bits LSb->MSb:
-// enable_ym2612&dac, enable_sn76496, enable_z80, stereo_sound,
-// alt_renderer, 6button_gamepad, accurate_timing, accurate_sprites,
-// draw_no_32col_border, external_ym2612, enable_cd_pcm, enable_cd_cdda
-// enable_cd_gfx, cd_perfect_sync, soft_32col_scaling, enable_cd_ramcart
-extern int PicoOpt;
+#define POPT_EN_FM          (1<< 0) // 00 000x
+#define POPT_EN_PSG         (1<< 1)
+#define POPT_EN_Z80         (1<< 2)
+#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)
+#define POPT_ACC_SPRITES    (1<< 7)
+#define POPT_DIS_32C_BORDER (1<< 8) // 00 0x00
+#define POPT_EXT_FM         (1<< 9)
+#define POPT_EN_MCD_PCM     (1<<10)
+#define POPT_EN_MCD_CDDA    (1<<11)
+#define POPT_EN_MCD_GFX     (1<<12) // 00 x000
+#define POPT_EN_MCD_PSYNC   (1<<13)
+#define POPT_EN_SOFTSCALE   (1<<14)
+#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)
+extern int PicoOpt; // bitfield
 extern int PicoVer;
 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
-int PicoInit(void);
+extern int PicoSVPCycles;
+int  PicoInit(void);
 void PicoExit(void);
-int PicoReset(int hard);
-int PicoFrame(void);
+void PicoPower(void);
+int  PicoReset(void);
+int  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);
 
 // cd/Pico.c
 extern void (*PicoMCDopenTray)(void);
@@ -76,13 +94,15 @@ void PicoCDBufferFree(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
 typedef enum
 {
 	PMT_UNCOMPRESSED = 0,
-	PMT_ZIP
+	PMT_ZIP,
+	PMT_CSO
 } pm_type;
 typedef struct
 {
@@ -98,34 +118,46 @@ 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);
-// anotherguest
-int PicoUnloadCart(unsigned char* romdata);
+int PicoCartUnload(void);
 extern void (*PicoCartLoadProgressCB)(int percent);
+extern void (*PicoCDLoadProgressCB)(int percent);
 
 // Draw.c
 void PicoDrawSetColorFormat(int which); // 0=BGR444, 1=RGB555, 2=8bit(HighPal pal)
 extern void *DrawLineDest;
-extern int (*PicoScan)(unsigned int num, void *data);
-// internals
-extern unsigned short HighPal[0x100];
-extern int rendstatus;
+#if OVERRIDE_HIGHCOL
+extern unsigned char *HighCol;
+#endif
+extern int (*PicoScanBegin)(unsigned int num);
+extern int (*PicoScanEnd)(unsigned int num);
 // utility
 #ifdef _ASM_DRAW_C
-void *blockcpy(void *dst, const void *src, size_t n);
-#else
-#define blockcpy memcpy
+void vidConvCpyRGB565(void *to, void *from, int pixels);
 #endif
+// internals
+#define PDRAW_SPRITES_MOVED (1<<0)
+#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_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];
 
 // Draw2.c
 // stuff below is optional
-extern unsigned char  *PicoDraw2FB;  // buffer for fasr renderer in format (8+320)x(8+224+8) (eights for borders)
+extern unsigned char  *PicoDraw2FB;  // buffer for fast renderer in format (8+320)x(8+224+8) (eights for borders)
 extern unsigned short *PicoCramHigh; // pointer to CRAM buff (0x40 shorts), converted to native device color (works only with 16bit for now)
 extern void (*PicoPrepareCram)();    // prepares PicoCramHigh for renderer to use
 
 // sound.c
 extern int PsndRate,PsndLen;
 extern short *PsndOut;
-void sound_rerate(int preserve_state);
+extern void (*PsndMix_32_to_16l)(short *dest, int *src, int count);
+void PsndRerate(int preserve_state);
 
 // Utils.c
 extern int PicuAnd;