X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_int.h;h=743ecb48fbd08641e5180109a2f4b4674ac339c5;hb=e42a47e2086e6512519dd86af420363498302f49;hp=12769315fe9ae9e6164b0a14b78b8642df5c253b;hpb=5d638db094e6677240fb4766f2168c7b0791b677;p=picodrive.git

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 1276931..743ecb4 100644
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -185,6 +185,7 @@ extern struct DrZ80 drZ80;
 #define z80_nmi()          drZ80.Z80IF |= 8
 
 #define z80_cyclesLeft     drZ80.cycles
+#define z80_subCLeft(c)    drZ80.cycles -= c
 #define z80_pc()           (drZ80.Z80PC - drZ80.Z80PC_BASE)
 
 #elif defined(_USE_CZ80)
@@ -196,6 +197,7 @@ extern struct DrZ80 drZ80;
 #define z80_nmi()          Cz80_Set_IRQ(&CZ80, IRQ_LINE_NMI, 0)
 
 #define z80_cyclesLeft     (CZ80.ICount - CZ80.ExtraCycles)
+#define z80_subCLeft(c)    CZ80.ICount -= c
 #define z80_pc()           Cz80_Get_Reg(&CZ80, CZ80_PC)
 
 #else
@@ -281,6 +283,7 @@ extern SH2 sh2s[2];
 #define OSC_NTSC 53693100
 #define OSC_PAL  53203424
 
+// PicoVideo.debug_p
 #define PVD_KILL_A    (1 << 0)
 #define PVD_KILL_B    (1 << 1)
 #define PVD_KILL_S_LO (1 << 2)
@@ -290,6 +293,20 @@ extern SH2 sh2s[2];
 #define PVD_FORCE_B   (1 << 6)
 #define PVD_FORCE_S   (1 << 7)
 
+// PicoVideo.status, not part of real SR
+#define SR_PAL        (1 << 0)
+#define SR_DMA        (1 << 1)
+#define SR_HB         (1 << 2)
+#define SR_VB         (1 << 3)
+#define SR_ODD        (1 << 4)
+#define SR_C          (1 << 5)
+#define SR_SOVR       (1 << 6)
+#define SR_F          (1 << 7)
+#define SR_FULL       (1 << 8)
+#define SR_EMPT       (1 << 9)
+// not part of real SR
+#define PVS_ACTIVE    (1 << 16)
+
 struct PicoVideo
 {
   unsigned char reg[0x20];
@@ -297,14 +314,15 @@ struct PicoVideo
   unsigned char pending;      // 1 if waiting for second half of 32-bit command
   unsigned char type;         // Command type (v/c/vsram read/write)
   unsigned short addr;        // Read/Write address
-  int status;                 // Status bits
+  unsigned int status;        // Status bits (SR) and extra flags
   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 short debug;       // raw debug register
   unsigned char debug_p;      // ... parsed: PVD_*
-  unsigned char addr_u;
-  unsigned char pad[0x0c];
+  unsigned char addr_u;       // bit16 of .addr
+  unsigned char hint_cnt;
+  unsigned char pad[0x0b];
 };
 
 struct PicoMisc
@@ -682,7 +700,6 @@ extern struct Pico Pico;
 extern struct PicoSRAM SRam;
 extern int PicoPadInt[2];
 extern int emustatus;
-extern int scanlines_total;
 extern void (*PicoResetHook)(void);
 extern void (*PicoLineHook)(void);
 PICO_INTERNAL int  CheckDMA(void);
@@ -793,7 +810,12 @@ void ym2612_unpack_state(void);
 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);
+unsigned char PicoVideoRead8DataH(void);
+unsigned char PicoVideoRead8DataL(void);
+unsigned char PicoVideoRead8CtlH(void);
+unsigned char PicoVideoRead8CtlL(void);
+unsigned char PicoVideoRead8HV_H(void);
+unsigned char PicoVideoRead8HV_L(void);
 extern int (*PicoDmaHook)(unsigned int source, int len, unsigned short **base, unsigned int *mask);
 
 // misc.c