X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fevent.h;h=ff976c966f83c81d96ba145706dc0373616b4e49;hb=5d76d651dfc3aa0a2e810e6b6db2ae8a2e34c53e;hp=9014dfb4e3f6f72df8e0395fea0841292c4d96ef;hpb=253f7b2713969c4982a3149c55e378db51d7791d;p=virtualjaguar

diff --git a/src/event.h b/src/event.h
index 9014dfb..ff976c9 100644
--- a/src/event.h
+++ b/src/event.h
@@ -1,28 +1,32 @@
 //
 // EVENT.H: System timing support functionality
 //
-// by James L. Hammons
+// by James Hammons
 //
 
 #ifndef __EVENT_H__
 #define __EVENT_H__
 
-#include "types.h"
+enum { EVENT_MAIN, EVENT_JERRY };
 
+//NTSC Timings...
 #define RISC_CYCLE_IN_USEC        0.03760684198
 #define M68K_CYCLE_IN_USEC        (RISC_CYCLE_IN_USEC * 2)
+//PAL Timings
+#define RISC_CYCLE_PAL_IN_USEC		0.03760260812
+#define M68K_CYCLE_PAL_IN_USEC		(RISC_CYCLE_PAL_IN_USEC * 2)
 
 #define HORIZ_PERIOD_IN_USEC_NTSC 63.555555555
 #define HORIZ_PERIOD_IN_USEC_PAL  64.0
 
-#define USEC_TO_RISC_CYCLES(u) (uint32)(((u) / RISC_CYCLE_IN_USEC) + 0.5)
-#define USEC_TO_M68K_CYCLES(u) (uint32)(((u) / M68K_CYCLE_IN_USEC) + 0.5)
+#define USEC_TO_RISC_CYCLES(u) (uint32_t)(((u) / RISC_CYCLE_IN_USEC) + 0.5)
+#define USEC_TO_M68K_CYCLES(u) (uint32_t)(((u) / M68K_CYCLE_IN_USEC) + 0.5)
 
 void InitializeEventList(void);
-void SetCallbackTime(void (* callback)(void), double time);
+void SetCallbackTime(void (* callback)(void), double time, int type = EVENT_MAIN);
 void RemoveCallback(void (* callback)(void));
 void AdjustCallbackTime(void (* callback)(void), double time);
-double GetTimeToNextEvent(void);
-void HandleNextEvent(void);
+double GetTimeToNextEvent(int type = EVENT_MAIN);
+void HandleNextEvent(int type = EVENT_MAIN);
 
 #endif	// __EVENT_H__