32x: watchdog for Star Wars, SCI IRQs for X-men (also needs idle loop hacks)

[picodrive.git] / pico / pico_int.h

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 6c4e45d..6e76e75 100644 (file)
--- 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);
 \r
 #include "cpu/sh2mame/sh2.h"\r
 \r
-SH2 msh2, ssh2;\r
-#define ash2_end_run(after) sh2_icount = after\r
+extern SH2 sh2s[2];\r
+#define msh2 sh2s[0]\r
+#define ssh2 sh2s[1]\r
+\r
+#define ash2_end_run(after) if (sh2_icount > (after)) sh2_icount = after\r
+#define ash2_cycles_done() (sh2->cycles_aim - sh2_icount)\r
 \r
 #define sh2_pc(c)     (c) ? ssh2.ppc : msh2.ppc\r
 #define sh2_reg(c, x) (c) ? ssh2.r[x] : msh2.r[x]\r
@@ -435,6 +439,9 @@ typedef struct
 #define P32XI_CMD  (1 <<  8/2)\r
 #define P32XI_PWM  (1 <<  6/2)\r
 \r
+// peripheral reg access\r
+#define PREG8(regs,offs) ((unsigned char *)regs)[offs ^ 3]\r
+\r
 // real one is 4*2, but we use more because we don't lockstep\r
 #define DMAC_FIFO_LEN (4*4)\r
 #define PWM_BUFF_LEN 1024 // in one channel samples\r
@@ -681,9 +688,9 @@ void FinalizeLine32xRGB555(int sh, int line);
 // 32x/pwm.c\r
 unsigned int p32x_pwm_read16(unsigned int a);\r
 void p32x_pwm_write16(unsigned int a, unsigned int d);\r
-void p32x_pwm_refresh(void);\r
-void p32x_pwm_irq_check(void);\r
 void p32x_pwm_update(int *buf32, int length, int stereo);\r
+void p32x_timers_do(int new_line);\r
+void p32x_timers_recalc(void);\r
 extern int pwm_frame_smp_cnt;\r
 \r
 /* avoid dependency on newer glibc */\r
@@ -717,6 +724,7 @@ static __inline int isspace_(int c)
 #define EL_CDREGS  0x00020000 /* MCD: register access */\r
 #define EL_CDREG3  0x00040000 /* MCD: register 3 only */\r
 #define EL_32X     0x00080000\r
+#define EL_PWM     0x00100000 /* 32X PWM stuff (LOTS of output) */\r
 \r
 #define EL_STATUS  0x40000000 /* status messages */\r
 #define EL_ANOMALY 0x80000000 /* some unexpected conditions (during emulation) */\r