X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=pico%2Fpico.h;h=b61d7b14b24f84fcddb8376033965dcc4c88d146;hb=f3a57b2d6c6a32dc09a6efd4fbef31eb876263b2;hp=033ed6f581da26cc22094871e8ff52d51196d052;hpb=b081408f66662068a3d274f696bdabba5186b68e;p=picodrive.git

diff --git a/pico/pico.h b/pico/pico.h
index 033ed6f..b61d7b1 100644
--- a/pico/pico.h
+++ b/pico/pico.h
@@ -34,6 +34,7 @@ extern void cache_flush_d_inval_i(const void *start_addr, const void *end_addr);
 // attempt to alloc mem at specified address.
 // alloc anywhere else if that fails (callers should handle that)
 extern void *plat_mmap(unsigned long addr, size_t size);
+extern void *plat_mremap(void *ptr, size_t oldsize, size_t newsize);
 extern void  plat_munmap(void *ptr, size_t size);
 
 // this one should handle display mode changes
@@ -100,7 +101,7 @@ extern void (*PicoMCDopenTray)(void);
 extern void (*PicoMCDcloseTray)(void);
 extern int PicoCDBuffers;
 
-// Pico/Pico.c
+// pico.c
 #define XPCM_BUFFER_SIZE (320+160)
 typedef struct
 {
@@ -119,12 +120,11 @@ extern picohw_state PicoPicohw;
 
 // area.c
 int PicoState(const char *fname, int is_save);
-int PicoStateLoadVDP(const char *fname);
+int PicoStateLoadGfx(const char *fname);
+void *PicoTmpStateSave(void);
+void  PicoTmpStateRestore(void *data);
 extern void (*PicoStateProgressCB)(const char *str);
 
-// cd/area.c
-int  PicoCdLoadStateGfx(void *file);
-
 // cd/buffering.c
 void PicoCDBufferInit(void);
 void PicoCDBufferFree(void);
@@ -160,13 +160,18 @@ extern void (*PicoCartLoadProgressCB)(int percent);
 extern void (*PicoCDLoadProgressCB)(const char *fname, int percent);
 
 // Draw.c
-void PicoDrawSetColorFormat(int which); // 0=BGR444, 1=RGB555, 2=8bit(HighPal pal)
+// for line-based renderer, set conversion
+// from internal 8 bit representation in 'HighCol' to:
+typedef enum
+{
+	PDF_NONE = 0,    // no conversion
+	PDF_RGB555,      // RGB/BGR output, depends on compile options
+	PDF_8BIT,        // 8-bit out (handles shadow/hilight mode, sonic water)
+} pdso_t;
+void PicoDrawSetOutFormat(pdso_t which, int allow_32x);
+void PicoDrawSetOutBuf(void *dest, int increment);
 extern void *DrawLineDest;
-#if OVERRIDE_HIGHCOL
 extern unsigned char *HighCol;
-#else
-extern unsigned char  HighCol[8+320+8];
-#endif
 extern int (*PicoScanBegin)(unsigned int num);
 extern int (*PicoScanEnd)(unsigned int num);
 // utility
@@ -194,12 +199,29 @@ extern int rendstatus, rendstatus_old;
 extern int rendlines;
 extern unsigned short HighPal[0x100];
 
-// Draw2.c
+// draw.c
+void PicoDrawUpdateHighPal(void);
+void PicoDrawSetInternalBuf(void *dest, int line_increment);
+
+// draw2.c
 // stuff below is optional
 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
 
+// pico.c (32x)
+// multipliers against 68k clock
+extern int p32x_msh2_multiplier;
+extern int p32x_ssh2_multiplier;
+#define SH2_MULTI_SHIFT 10
+#define MSH2_MULTI_DEFAULT ((1 << SH2_MULTI_SHIFT) * 3 / 2)
+#define SSH2_MULTI_DEFAULT ((1 << SH2_MULTI_SHIFT) * 3 / 2)
+
+// 32x/draw.c
+void PicoDraw32xSetFrameMode(int is_on, int only_32x);
+extern int (*PicoScan32xBegin)(unsigned int num);
+extern int (*PicoScan32xEnd)(unsigned int num);
+
 // sound.c
 extern int PsndRate,PsndLen;
 extern short *PsndOut;