X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_int.h;h=48d8e294f2d05e5555ece8eb97239f6ea0f101c4;hb=e51e5983fe5cac8486df76bf349bde8aa23d1e5d;hp=68a77c0b11c8a48aa3be542df05fc055bd5a0ebd;hpb=b8a1c09ad1ef0b807c2eb1632d34e6bfae14b633;p=picodrive.git

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 68a77c0..48d8e29 100644
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -437,6 +437,8 @@ typedef struct
 #define P32XV_PRI   (1<< 7)
 #define P32XV_Mx    (3<< 0) // display mode mask
 
+#define P32XV_SFT   (1<< 0)
+
 #define P32XV_VBLK  (1<<15)
 #define P32XV_HBLK  (1<<14)
 #define P32XV_PEN   (1<<13)
@@ -469,11 +471,13 @@ typedef struct
 #define SH2_DRCBLK_RAM_SHIFT 1
 #define SH2_DRCBLK_DA_SHIFT  1
 
+#define SH2_WRITE_SHIFT 25
+
 struct Pico32x
 {
   unsigned short regs[0x20];
-  unsigned short vdp_regs[0x10];
-  unsigned short sh2_regs[3];
+  unsigned short vdp_regs[0x10]; // 0x40
+  unsigned short sh2_regs[3];    // 0x60
   unsigned char pending_fb;
   unsigned char dirty_pal;
   unsigned int emu_flags;
@@ -545,10 +549,12 @@ int CM_compareRun(int cyc, int is_sub);
 PICO_INTERNAL void PicoFrameStart(void);
 void PicoDrawSync(int to, int blank_last_line);
 void BackFill(int reg7, int sh);
-void FinalizeLineRGB555(int sh, int line);
+void FinalizeLine555(int sh, int line);
 extern int DrawScanline;
 #define MAX_LINE_SPRITES 29
 extern unsigned char HighLnSpr[240][3 + MAX_LINE_SPRITES];
+extern void *DrawLineDestBase;
+extern int DrawLineDestIncrement;
 
 // draw2.c
 PICO_INTERNAL void PicoFrameFull();
@@ -557,7 +563,7 @@ PICO_INTERNAL void PicoFrameFull();
 void PicoFrameStartMode4(void);
 void PicoLineMode4(int line);
 void PicoDoHighPal555M4(void);
-void PicoDrawSetColorFormatMode4(int which);
+void PicoDrawSetOutputMode4(pdso_t which);
 
 // memory.c
 PICO_INTERNAL void PicoMemSetup(void);
@@ -715,6 +721,8 @@ void p32x_poll_event(int cpu_mask, int is_vdp);
 
 // 32x/draw.c
 void FinalizeLine32xRGB555(int sh, int line);
+void PicoDraw32xLayer(int offs, int lines, int mdbg);
+extern int Pico32xDrawMode;
 
 // 32x/pwm.c
 unsigned int p32x_pwm_read16(unsigned int a);
@@ -777,6 +785,18 @@ extern void lprintf(const char *fmt, ...);
 #define elprintf(w,f,...)
 #endif
 
+// profiling
+#ifdef PPROF
+#include <platform/linux/pprof.h>
+#else
+#define pprof_init()
+#define pprof_finish()
+#define pprof_start(x)
+#define pprof_end(...)
+#define pprof_end_sub(...)
+#endif
+
+// misc
 #ifdef _MSC_VER
 #define cdprintf
 #else