X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_int.h;h=5b7f2f435c7e22fe44bc9b1628da91bf6e407212;hb=b78efee2b2213cf62a1b8a3b7a5adf05e39b4e4e;hp=d73041ef90ecaea7d52485460ab8a03b88c91c0a;hpb=266c6afa84bde8d77a54d61ced8f227480247e24;p=picodrive.git

diff --git a/pico/pico_int.h b/pico/pico_int.h
index d73041e..5b7f2f4 100644
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -231,14 +231,13 @@ typedef void (z80_write_f)(unsigned int a, unsigned char data);
 #include "cpu/sh2mame/sh2.h"
 
 SH2 msh2, ssh2;
-#define ash2_pc() msh2.ppc
 #define ash2_end_run(after) sh2_icount = after
 
-#define msh2_pc() msh2.ppc
-#define ssh2_pc() ssh2.ppc
-
-#define msh2_reg(x) msh2.r[x]
-#define ssh2_reg(x) ssh2.r[x]
+#define sh2_pc(c)     (c) ? ssh2.ppc : msh2.ppc
+#define sh2_reg(c, x) (c) ? ssh2.r[x] : msh2.r[x]
+#define sh2_gbr(c)    (c) ? ssh2.gbr : msh2.gbr
+#define sh2_vbr(c)    (c) ? ssh2.vbr : msh2.vbr
+#define sh2_sr(c)     (c) ? ssh2.sr : msh2.sr
 
 // ---------------------------------------------------------
 
@@ -405,10 +404,13 @@ typedef struct
 // 32X
 #define P32XS_FM    (1<<15)
 #define P32XS2_ADEN (1<< 9)
+#define P32XS_FULL  (1<< 7)
+#define P32XS_68S   (1<< 2)
+#define P32XS_RV    (1<< 0)
 
 #define P32XV_nPAL  (1<<15)
 #define P32XV_PRI   (1<< 7)
-#define P32XV_Mx    (3<< 0)
+#define P32XV_Mx    (3<< 0) // display mode mask
 
 #define P32XV_VBLK  (1<<15)
 #define P32XV_HBLK  (1<<14)
@@ -416,9 +418,21 @@ typedef struct
 #define P32XV_nFEN  (1<< 1)
 #define P32XV_FS    (1<< 0)
 
-#define P32XF_68KPOLL  (1 << 0)
-#define P32XF_MSH2POLL (1 << 1)
-#define P32XF_SSH2POLL (1 << 2)
+#define P32XF_68KPOLL   (1 << 0)
+#define P32XF_MSH2POLL  (1 << 1)
+#define P32XF_SSH2POLL  (1 << 2)
+#define P32XF_68KVPOLL  (1 << 3)
+#define P32XF_MSH2VPOLL (1 << 4)
+#define P32XF_SSH2VPOLL (1 << 5)
+
+#define P32XI_VRES (1 << 14/2) // IRL/2
+#define P32XI_VINT (1 << 12/2)
+#define P32XI_HINT (1 << 10/2)
+#define P32XI_CMD  (1 <<  8/2)
+#define P32XI_PWM  (1 <<  6/2)
+
+// real one is 4*2, but we use more because we don't lockstep
+#define DMAC_FIFO_LEN (4*4)
 
 struct Pico32x
 {
@@ -428,17 +442,24 @@ struct Pico32x
   unsigned char dirty_pal;
   unsigned char pad[2];
   unsigned int emu_flags;
+  unsigned char sh2irq_mask[2];
+  unsigned char sh2irqi[2];      // individual
+  unsigned int sh2irqs;          // common irqs
+  unsigned short dmac_fifo[DMAC_FIFO_LEN];
+  unsigned int dmac_ptr;
 };
 
 struct Pico32xMem
 {
   unsigned char  sdram[0x40000];
-  unsigned short dram[2][0x20000/2]; // AKA fb
-  unsigned char  m68k_rom[0x10000]; // 0x100; using M68K_BANK_SIZE
+  unsigned short dram[2][0x20000/2];    // AKA fb
+  unsigned char  m68k_rom[0x10000];     // 0x100; using M68K_BANK_SIZE
+  unsigned char  data_array[2][0x1000]; // cache in SH2s (can be used as RAM)
   unsigned char  sh2_rom_m[0x800];
   unsigned char  sh2_rom_s[0x400];
   unsigned short pal[0x100];
   unsigned short pal_native[0x100]; // converted to native (for renderer)
+  unsigned int   sh2_peri_regs[2][0x200/4]; // periphereal regs of SH2s
 };
 
 // area.c
@@ -634,6 +655,7 @@ void PicoReset32x(void);
 void Pico32xStartup(void);
 void PicoUnload32x(void);
 void PicoFrame32x(void);
+void p32x_update_irls(void);
 
 // 32x/memory.c
 struct Pico32xMem *Pico32xMem;
@@ -643,6 +665,7 @@ void PicoWrite8_32x(unsigned int a, unsigned int d);
 void PicoWrite16_32x(unsigned int a, unsigned int d);
 void PicoMemSetup32x(void);
 void Pico32xSwapDRAM(int b);
+void p32x_poll_event(int is_vdp);
 
 // 32x/draw.c
 void FinalizeLine32xRGB555(int sh, int line);