--- uae/src/include/events.h	2018/04/24 16:40:27	1.1.1.3
+++ uae/src/include/events.h	2018/04/24 16:53:30	1.1.1.8
@@ -2,13 +2,18 @@
   * UAE - The Un*x Amiga Emulator
   *
   * Events
+  * These are best for low-frequency events. Having too many of them,
+  * or using them for events that occur too frequently, can cause massive
+  * slowdown.
   *
-  * Note that this file must be included after sound.h and sounddep/sound.h,
-  * since DONT_WANT_SOUND can get overridden in those.
-  *
-  * Copyright 1995, 1996, 1997 Bernd Schmidt
+  * Copyright 1995-1998 Bernd Schmidt
   */
 
+#include "machdep/rpt.h"
+extern frame_time_t vsynctime, vsyncmintime;
+extern void reset_frame_rate_hack (void);
+extern int rpt_available;
+
 extern unsigned long int cycles, nextevent, is_lastline;
 extern unsigned long int sample_evtime;
 typedef void (*evfunc)(void);
@@ -21,18 +26,13 @@ struct ev
 };
 
 enum {
-    ev_hsync, ev_copper, ev_cia,
-    ev_blitter, ev_diskblk, ev_diskindex,
-#ifndef DONT_WANT_SOUND
-    ev_aud0, ev_aud1, ev_aud2, ev_aud3,
-    ev_sample,
-#endif
+    ev_hsync, ev_copper, ev_cia, ev_blitter, ev_disk,
     ev_max
 };
 
 extern struct ev eventtab[ev_max];
 
-static __inline__ void events_schedule(void)
+STATIC_INLINE void events_schedule (void)
 {
     int i;
 
@@ -47,21 +47,18 @@ static __inline__ void events_schedule(v
     nextevent = cycles + mintime;
 }
 
-static __inline__ void do_cycles_slow(void)
+STATIC_INLINE void do_cycles_slow (unsigned long cycles_to_add)
 {
-    unsigned long cycles_to_add = currprefs.m68k_speed;
-
-#ifdef FRAME_RATE_HACK
     if (is_lastline && eventtab[ev_hsync].evtime-cycles <= cycles_to_add
 	&& (long int)(read_processor_time () - vsyncmintime) < 0)
 	return;
-#endif
+
     if ((nextevent - cycles) <= cycles_to_add) {
 	for (; cycles_to_add != 0; cycles_to_add--) {
 	    if (++cycles == nextevent) {
 		int i;
 
-		for(i = 0; i < ev_max; i++) {
+		for (i = 0; i < ev_max; i++) {
 		    if (eventtab[i].active && eventtab[i].evtime == cycles) {
 			(*eventtab[i].handler)();
 		    }
@@ -73,20 +70,19 @@ static __inline__ void do_cycles_slow(vo
     cycles += cycles_to_add;
 }
 
-static __inline__ void do_cycles_fast(void)
+STATIC_INLINE void do_cycles_fast (void)
 {
-#ifdef FRAME_RATE_HACK
     if (is_lastline && eventtab[ev_hsync].evtime-cycles <= 1
 	&& (long int)(read_processor_time () - vsyncmintime) < 0)
 	return;
-#endif
+
     cycles++;
     if (nextevent == cycles) {
 	int i;
 
-	for(i = 0; i < ev_max; i++) {
+	for (i = 0; i < ev_max; i++) {
 	    if (eventtab[i].active && eventtab[i].evtime == cycles) {
-		(*eventtab[i].handler)();
+		(*eventtab[i].handler) ();
 	    }
 	}
 	events_schedule();