X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_int.h;h=8fb4a49ec9a25aa28415a12519115a81be54dc1d;hb=00faec9cdbc073199fa984a0450e1a961994b058;hp=8d1a3379ec2bb701a2d69e129f89d408d6faa3d7;hpb=a8fd6e376175c06e2423d0914359c761829d6e93;p=picodrive.git

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 8d1a337..8fb4a49 100644
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -237,23 +237,23 @@ extern SH2 sh2s[2];
 #define ssh2 sh2s[1]
 
 #ifndef DRC_SH2
-# define ash2_end_run(after) do { \
-  if (sh2->icount > (after)) { \
-    sh2->cycles_timeslice -= sh2->icount; \
-    sh2->icount = after; \
+# define ash2_end_run(sh2, after) do { \
+  if ((sh2)->icount > (after)) { \
+    (sh2)->cycles_timeslice -= (sh2)->icount; \
+    (sh2)->icount = after; \
   } \
 } while (0)
-# define ash2_cycles_done() (sh2->cycles_timeslice - sh2->icount)
+# define ash2_cycles_done(sh2) ((sh2)->cycles_timeslice - (sh2)->icount)
 #else
-# define ash2_end_run(after) do { \
-  int left = sh2->sr >> 12; \
+# define ash2_end_run(sh2, after) do { \
+  int left = (sh2)->sr >> 12; \
   if (left > (after)) { \
-    sh2->cycles_timeslice -= left; \
-    sh2->sr &= 0xfff; \
-    sh2->sr |= (after) << 12; \
+    (sh2)->cycles_timeslice -= left; \
+    (sh2)->sr &= 0xfff; \
+    (sh2)->sr |= (after) << 12; \
   } \
 } while (0)
-# define ash2_cycles_done() (sh2->cycles_timeslice - (sh2->sr >> 12))
+# define ash2_cycles_done(sh2) ((sh2)->cycles_timeslice - ((sh2)->sr >> 12))
 #endif
 
 //#define sh2_pc(c)     (c) ? ssh2.ppc : msh2.ppc
@@ -722,6 +722,13 @@ void PicoFrameDrawOnlyMS(void);
 // 32x/32x.c
 #ifndef NO_32X
 extern struct Pico32x Pico32x;
+enum p32x_event {
+  P32X_EVENT_PWM,
+  P32X_EVENT_FILLEND,
+  P32X_EVENT_COUNT,
+};
+extern unsigned int event_times[P32X_EVENT_COUNT];
+
 void Pico32xInit(void);
 void PicoPower32x(void);
 void PicoReset32x(void);
@@ -731,12 +738,6 @@ void PicoFrame32x(void);
 void p32x_sync_sh2s(unsigned int m68k_target);
 void p32x_update_irls(int nested_call);
 void p32x_reset_sh2s(void);
-
-enum p32x_event {
-  P32X_EVENT_PWM,
-  P32X_EVENT_FILLEND,
-  P32X_EVENT_COUNT,
-};
 void p32x_event_schedule(enum p32x_event event, unsigned int now, int after);
 
 // 32x/memory.c