X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_int.h;h=794fcd1f0e0cfa5570546cab905e5ef70d72749f;hb=40d22a8e7610b2fdde5cfe6178605262ef0d61d7;hp=7447db94d2bc7f9d2c0a621e62e9fae15465aa6c;hpb=f47d0a28983cc999d2cc9d050b4badcd41652c27;p=picodrive.git

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 7447db9..794fcd1 100644
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -328,6 +328,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 +363,7 @@ struct Pico
   struct PicoMisc m;
   struct PicoVideo video;
   struct PicoMS ms;
+  struct PicoEState est;
 };
 
 // sram
@@ -574,19 +590,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
@@ -765,13 +782,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);
@@ -856,7 +873,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);