X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_int.h;h=6e76e75987e963b2b6973f7d3ca0eb9c8d51293e;hb=1d7a28a723d59da67b58e42a61bc9f1905044fd5;hp=4f62a66ee238dc97abda8620ab5fc335b88c1e7e;hpb=db1d3564e69b422518701926bffdeae05379c400;p=picodrive.git

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 4f62a66..6e76e75 100644
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -230,8 +230,12 @@ typedef void (z80_write_f)(unsigned int a, unsigned char data);
 
 #include "cpu/sh2mame/sh2.h"
 
-SH2 msh2, ssh2;
-#define ash2_end_run(after) sh2_icount = after
+extern SH2 sh2s[2];
+#define msh2 sh2s[0]
+#define ssh2 sh2s[1]
+
+#define ash2_end_run(after) if (sh2_icount > (after)) sh2_icount = after
+#define ash2_cycles_done() (sh2->cycles_aim - sh2_icount)
 
 #define sh2_pc(c)     (c) ? ssh2.ppc : msh2.ppc
 #define sh2_reg(c, x) (c) ? ssh2.r[x] : msh2.r[x]
@@ -406,6 +410,7 @@ typedef struct
 #define P32XS2_ADEN (1<< 9)
 #define P32XS_FULL  (1<< 7) // DREQ FIFO full
 #define P32XS_68S   (1<< 2)
+#define P32XS_DMA   (1<< 1)
 #define P32XS_RV    (1<< 0)
 
 #define P32XV_nPAL  (1<<15) // VDP
@@ -434,6 +439,9 @@ typedef struct
 #define P32XI_CMD  (1 <<  8/2)
 #define P32XI_PWM  (1 <<  6/2)
 
+// peripheral reg access
+#define PREG8(regs,offs) ((unsigned char *)regs)[offs ^ 3]
+
 // real one is 4*2, but we use more because we don't lockstep
 #define DMAC_FIFO_LEN (4*4)
 #define PWM_BUFF_LEN 1024 // in one channel samples
@@ -442,9 +450,9 @@ struct Pico32x
 {
   unsigned short regs[0x20];
   unsigned short vdp_regs[0x10];
+  unsigned short sh2_regs[3];
   unsigned char pending_fb;
   unsigned char dirty_pal;
-  unsigned char pad[2];
   unsigned int emu_flags;
   unsigned char sh2irq_mask[2];
   unsigned char sh2irqi[2];      // individual
@@ -672,7 +680,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);
+void p32x_poll_event(int cpu_mask, int is_vdp);
 
 // 32x/draw.c
 void FinalizeLine32xRGB555(int sh, int line);
@@ -680,9 +688,9 @@ void FinalizeLine32xRGB555(int sh, int line);
 // 32x/pwm.c
 unsigned int p32x_pwm_read16(unsigned int a);
 void p32x_pwm_write16(unsigned int a, unsigned int d);
-void p32x_pwm_refresh(void);
-void p32x_pwm_irq_check(void);
 void p32x_pwm_update(int *buf32, int length, int stereo);
+void p32x_timers_do(int new_line);
+void p32x_timers_recalc(void);
 extern int pwm_frame_smp_cnt;
 
 /* avoid dependency on newer glibc */
@@ -716,6 +724,7 @@ static __inline int isspace_(int c)
 #define EL_CDREGS  0x00020000 /* MCD: register access */
 #define EL_CDREG3  0x00040000 /* MCD: register 3 only */
 #define EL_32X     0x00080000
+#define EL_PWM     0x00100000 /* 32X PWM stuff (LOTS of output) */
 
 #define EL_STATUS  0x40000000 /* status messages */
 #define EL_ANOMALY 0x80000000 /* some unexpected conditions (during emulation) */