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 9ea6f28..6e76e75 100644 (file)
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -230,7 +230,10 @@ typedef void (z80_write_f)(unsigned int a, unsigned char data);
 \r
 #include "cpu/sh2mame/sh2.h"\r
 \r
-SH2 msh2, ssh2;\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
@@ -436,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
@@ -682,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(int new_line);\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