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=76c4812eabeb75f0f5ee288c5ea2c4040534aeb5;hb=e0bcb7a90d06b295b1ca989b6ad70412912cca5b;hpb=274fcc35aa20e9777a8e09630a94088757384329

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 76c4812..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
@@ -328,6 +340,21 @@ struct PicoMS
   unsigned char pad[0x4e];
 };
 
+// emu state and data for the asm code
+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!
 struct Pico
 {
@@ -348,6 +375,7 @@ struct Pico
   struct PicoMisc m;
   struct PicoVideo video;
   struct PicoMS ms;
+  struct PicoEState est;
 };
 
 // sram
@@ -396,20 +424,21 @@ struct mcd_pcm
 
 struct mcd_misc
 {
-	unsigned short hint_vector;
-	unsigned char  busreq;		// not s68k_regs[1]
-	unsigned char  s68k_pend_ints;
-	unsigned int   state_flags;	// 04
-	unsigned int   stopwatch_base_c;
-	unsigned short m68k_poll_a;
-	unsigned short m68k_poll_cnt;
-	unsigned short s68k_poll_a;
-	unsigned short s68k_poll_cnt;
-	unsigned int   s68k_poll_clk;
-	unsigned char  bcram_reg;	// 18: battery-backed RAM cart register
-	unsigned char  dmna_ret_2m;
-	unsigned short pad3;
-	int pad4[9];
+  unsigned short hint_vector;
+  unsigned char  busreq;          // not s68k_regs[1]
+  unsigned char  s68k_pend_ints;
+  unsigned int   state_flags;     // 04
+  unsigned int   stopwatch_base_c;
+  unsigned short m68k_poll_a;
+  unsigned short m68k_poll_cnt;
+  unsigned short s68k_poll_a;
+  unsigned short s68k_poll_cnt;
+  unsigned int   s68k_poll_clk;
+  unsigned char  bcram_reg;       // 18: battery-backed RAM cart register
+  unsigned char  dmna_ret_2m;
+  unsigned char  need_sync;
+  unsigned char  pad3;
+  int pad4[9];
 };
 
 typedef struct
@@ -433,15 +462,7 @@ typedef struct
     unsigned char pcm_ram[0x10000];
     unsigned char pcm_ram_b[0x10][0x1000];
   };
-  union {
-    unsigned char s68k_regs[0x200];		// 110000: GA, not CPU regs
-    union {
-      struct {
-        unsigned char h;
-        unsigned char l;
-      } byte;
-    } regs[0x200/2];
-  };
+  unsigned char s68k_regs[0x200];		// 110000: GA, not CPU regs
   unsigned char bram[0x2000];			// 110200: 8K
   struct mcd_misc m;				// 112200: misc
   struct mcd_pcm pcm;				// 112240:
@@ -581,19 +602,20 @@ 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 FinalizeLine555(int sh, int line);
+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);
-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
+void PicoDraw2Init(void);
 PICO_INTERNAL void PicoFrameFull();
 
 // mode4.c
@@ -772,13 +794,13 @@ 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);
 PICO_INTERNAL_ASM void memcpy16bswap(unsigned short *dest, void *src, int count);
-PICO_INTERNAL_ASM void memcpy32(int *dest, int *src, int count); // 32bit word count
-PICO_INTERNAL_ASM void memset32(int *dest, int c, int count);
+PICO_INTERNAL_ASM void memcpy32(void *dest, const void *src, int count); // 32bit word count
+PICO_INTERNAL_ASM void memset32(void *dest, int c, int count);
 
 // eeprom.c
 void EEPROM_write8(unsigned int a, unsigned int d);
@@ -863,7 +885,7 @@ void p32x_sh2_poll_event(SH2 *sh2, unsigned int flags, unsigned int m68k_cycles)
 
 // 32x/draw.c
 void PicoDrawSetOutFormat32x(pdso_t which, int use_32x_line_mode);
-void FinalizeLine32xRGB555(int sh, int line);
+void FinalizeLine32xRGB555(int sh, int line, struct PicoEState *est);
 void PicoDraw32xLayer(int offs, int lines, int mdbg);
 void PicoDraw32xLayerMdOnly(int offs, int lines);
 extern int (*PicoScan32xBegin)(unsigned int num);