X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=picodrive.git;a=blobdiff_plain;f=pico%2Fpico_int.h;h=2249148f5fb15bdd2113df02c0c75d5e04f94d33;hp=da49e04ba46fb5702c023303f0f007a79b9892ba;hb=e0bcb7a90d06b295b1ca989b6ad70412912cca5b;hpb=ea38612fad50103e224a3d00492d40b7dcff9e94

diff --git a/pico/pico_int.h b/pico/pico_int.h
index da49e04..2249148 100644
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -281,6 +281,15 @@ extern SH2 sh2s[2];
 #define OSC_NTSC 53693100
 #define OSC_PAL  53203424
 
+#define PVD_KILL_A    (1 << 0)
+#define PVD_KILL_B    (1 << 1)
+#define PVD_KILL_S_LO (1 << 2)
+#define PVD_KILL_S_HI (1 << 3)
+#define PVD_KILL_32X  (1 << 4)
+#define PVD_FORCE_A   (1 << 5)
+#define PVD_FORCE_B   (1 << 6)
+#define PVD_FORCE_S   (1 << 7)
+
 struct PicoVideo
 {
   unsigned char reg[0x20];
@@ -292,7 +301,10 @@ struct PicoVideo
   unsigned char pending_ints; // pending interrupts: ??VH????
   signed char lwrite_cnt;     // VDP write count during active display line
   unsigned short v_counter;   // V-counter
-  unsigned char pad[0x10];
+  unsigned short debug;       // raw debug register
+  unsigned char debug_p;      // ... parsed: PVD_*
+  unsigned char addr_u;
+  unsigned char pad[0x0c];
 };
 
 struct PicoMisc
@@ -333,8 +345,14 @@ struct PicoEState
 {
   int DrawScanline;
   int rendstatus;
+  void *DrawLineDest;          // draw destination
+  unsigned char *HighCol;
+  int *HighPreSpr;
   void *Pico_video;
   void *Pico_vram;
+  int  *PicoOpt;
+  unsigned char *Draw2FB;
+  unsigned short HighPal[0x100];
 };
 
 // some assembly stuff depend on these, do not touch!
@@ -584,9 +602,10 @@ extern void (*PicoCartUnloadHook)(void);
 int CM_compareRun(int cyc, int is_sub);
 
 // draw.c
+void PicoDrawInit(void);
 PICO_INTERNAL void PicoFrameStart(void);
 void PicoDrawSync(int to, int blank_last_line);
-void BackFill(int reg7, int sh);
+void BackFill(int reg7, int sh, struct PicoEState *est);
 void FinalizeLine555(int sh, int line, struct PicoEState *est);
 extern int (*PicoScanBegin)(unsigned int num);
 extern int (*PicoScanEnd)(unsigned int num);
@@ -596,6 +615,7 @@ extern void *DrawLineDestBase;
 extern int DrawLineDestIncrement;
 
 // draw2.c
+void PicoDraw2Init(void);
 PICO_INTERNAL void PicoFrameFull();
 
 // mode4.c
@@ -774,7 +794,7 @@ extern int line_base_cycles;
 PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d);
 PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a);
 PICO_INTERNAL_ASM unsigned int PicoVideoRead8(unsigned int a);
-extern int (*PicoDmaHook)(unsigned int source, int len, unsigned short **srcp, unsigned short **limitp);
+extern int (*PicoDmaHook)(unsigned int source, int len, unsigned short **base, unsigned int *mask);
 
 // misc.c
 PICO_INTERNAL_ASM void memcpy16(unsigned short *dest, unsigned short *src, int count);