X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico.h;h=2398ad1ac5761563e94bcf0be714becdfd3201e9;hb=5e49c3a88d1c3ece302a40d8c3a32285d3199ab6;hp=4940796da712b4f3f7d9d4759dbd39b43f871a37;hpb=d687ef50419fe4f286df866333a5425204e5b98e;p=picodrive.git

diff --git a/pico/pico.h b/pico/pico.h
index 4940796d..2398ad1a 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-2008 notaz, All rights reserved.
+// (c) Copyright 2006-2009 notaz, All rights reserved.
 // Free for non-commercial use.
 
 // For commercial use, separate licencing terms must be obtained.
@@ -31,6 +31,12 @@ extern void mp3_update(int *buffer, int length, int stereo);
 // used by SVP dynarec
 extern void cache_flush_d_inval_i(const void *start_addr, const void *end_addr);
 
+// this one should handle display mode changes
+extern void emu_video_mode_change(int start_line, int line_count, int is_32cols);
+
+// this must switch to 32bpp mode
+extern void emu_32x_startup(void);
+
 // Pico.c
 #define POPT_EN_FM          (1<< 0) // 00 000x
 #define POPT_EN_PSG         (1<< 1)
@@ -52,11 +58,14 @@ extern void cache_flush_d_inval_i(const void *start_addr, const void *end_addr);
 #define POPT_EN_SVP_DRC     (1<<17)
 #define POPT_DIS_SPRITE_LIM (1<<18)
 #define POPT_DIS_IDLE_DET   (1<<19)
+#define POPT_DIS_32X        (1<<20)
 extern int PicoOpt; // bitfield
+
 #define PAHW_MCD  (1<<0)
 #define PAHW_32X  (1<<1)
 #define PAHW_SVP  (1<<2)
 #define PAHW_PICO (1<<3)
+#define PAHW_SMS  (1<<4)
 extern int PicoAHW;            // Pico active hw
 extern int PicoVer;
 extern int PicoSkipFrame;      // skip rendering frame, but still do sound (if enabled) and emulation stuff
@@ -98,21 +107,12 @@ typedef struct
 } 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);
-typedef int    (areaseek)(void *file, long offset, int whence);
-typedef int    (areaclose)(void *file);
-// Save or load the state from PmovFile:
-int PmovState(int PmovAction, void *PmovFile); // &1=for reading &2=for writing &4=volatile &8=non-volatile
-extern arearw  *areaRead;  // external read and write function pointers for
-extern arearw  *areaWrite; // gzip save state ability
-extern areaeof *areaEof;
-extern areaseek *areaSeek;
-extern areaclose *areaClose;
+// area.c
+int PicoState(const char *fname, int is_save);
+int PicoStateLoadVDP(const char *fname);
 extern void (*PicoStateProgressCB)(const char *str);
 
-// cd/Area.c
+// cd/area.c
 int  PicoCdLoadStateGfx(void *file);
 
 // cd/buffering.c
@@ -137,17 +137,17 @@ typedef struct
 	void *param;		/* additional file related field */
 	unsigned int size;	/* size */
 	pm_type type;
+	char ext[4];
 } pm_file;
 pm_file *pm_open(const char *path);
 size_t   pm_read(void *ptr, size_t bytes, pm_file *stream);
 int      pm_seek(pm_file *stream, long offset, int whence);
 int      pm_close(pm_file *fp);
-int PicoCartLoad(pm_file *f,unsigned char **prom,unsigned int *psize);
+int PicoCartLoad(pm_file *f,unsigned char **prom,unsigned int *psize,int is_sms);
 int PicoCartInsert(unsigned char *rom,unsigned int romsize);
-void Byteswap(unsigned char *data,int len);
 void PicoCartUnload(void);
 extern void (*PicoCartLoadProgressCB)(int percent);
-extern void (*PicoCDLoadProgressCB)(int percent);
+extern void (*PicoCDLoadProgressCB)(const char *fname, int percent);
 
 // Draw.c
 void PicoDrawSetColorFormat(int which); // 0=BGR444, 1=RGB555, 2=8bit(HighPal pal)
@@ -169,6 +169,7 @@ extern int PicoDrawMask;
 #define PDRAW_LAYERA_ON      (1<<3)
 #define PDRAW_SPRITES_LOW_ON (1<<4)
 #define PDRAW_SPRITES_HI_ON  (1<<7)
+#define PDRAW_32X_ON         (1<<8)
 // internals
 #define PDRAW_SPRITES_MOVED (1<<0) // (asm)
 #define PDRAW_WND_DIFF_PRIO (1<<1) // not all window tiles use same priority
@@ -178,7 +179,8 @@ extern int PicoDrawMask;
 #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
-extern int rendstatus;
+#define PDRAW_240LINES      (1<<8) // 240 line display (224 if not set)
+extern int rendstatus, rendstatus_old;
 extern unsigned short HighPal[0x100];
 
 // Draw2.c