--- previous/src/cycInt.c	2018/04/24 19:25:37	1.1.1.2
+++ previous/src/cycInt.c	2018/04/24 19:29:58	1.1.1.4
@@ -55,6 +55,15 @@ const char CycInt_fileid[] = "Hatari cyc
 #include "memorySnapShot.h"
 #include "screen.h"
 #include "video.h"
+#include "sysReg.h"
+#include "esp.h"
+#include "mo.h"
+#include "ethernet.h"
+#include "dma.h"
+#include "floppy.h"
+#include "snd.h"
+#include "printer.h"
+#include "kms.h"
 
 
 void (*PendingInterruptFunction)(void);
@@ -68,22 +77,19 @@ static void (* const pIntHandlerFunction
 {
 	NULL,
 	Video_InterruptHandler_VBL,
-//	Video_InterruptHandler_HBL,
-//	Video_InterruptHandler_EndLine,
-//	MFP_InterruptHandler_TimerA,
-//	MFP_InterruptHandler_TimerB,
-//	MFP_InterruptHandler_TimerC,
-//	MFP_InterruptHandler_TimerD,
-//	IKBD_InterruptHandler_ResetTimer,
-//	IKBD_InterruptHandler_ACIA,
-//	IKBD_InterruptHandler_MFP,
-//	IKBD_InterruptHandler_AutoSend,
-//	DmaSnd_InterruptHandler_Microwire,
-//	Crossbar_InterruptHandler_25Mhz,
-//	Crossbar_InterruptHandler_32Mhz,
-//	FDC_InterruptHandler_Update,
-//	Blitter_InterruptHandler,
-//	Midi_InterruptHandler_Update
+	Hardclock_InterruptHandler,
+    Mouse_Handler,
+    ESP_InterruptHandler,
+    ESP_IO_Handler,
+    M2RDMA_InterruptHandler,
+    R2MDMA_InterruptHandler,
+    MO_InterruptHandler,
+    MO_IO_Handler,
+    ECC_IO_Handler,
+    ENET_IO_Handler,
+    FLP_IO_Handler,
+    SND_IO_Handler,
+    Printer_IO_Handler
 };
 
 /* Event timer structure - keeps next timer to occur in structure so don't need
@@ -330,29 +336,6 @@ void CycInt_AddRelativeInterrupt(int Cyc
 }
 
 
-/*-----------------------------------------------------------------------*/
-/**
- * Add interrupt to occur from now without offset
- */
-//#if 0
-//void CycInt_AddRelativeInterruptNoOffset(int CycleTime, int CycleType, interrupt_id Handler)
-//{
-	/* Update list cycle counts before adding a new one, */
-	/* since CycInt_SetNewInterrupt can change the active int / PendingInterruptCount */
-//	if ( ( ActiveInterrupt > 0 ) && ( PendingInterruptCount > 0 ) )
-//		CycInt_UpdateInterrupt();
-
-//  nCyclesOver = 0;
-//	InterruptHandlers[Handler].bUsed = true;
-//	InterruptHandlers[Handler].Cycles = INT_CONVERT_TO_INTERNAL((Sint64)CycleTime , CycleType) + PendingInterruptCount;
-
-	/* Set new */
-//	CycInt_SetNewInterrupt();
-
-//	LOG_TRACE(TRACE_INT, "int add rel no_off video_cyc=%d handler=%d handler_cyc=%lld pending_count=%d\n",
-//	               Cycles_GetCounter(CYCLES_COUNTER_VIDEO), Handler, InterruptHandlers[Handler].Cycles, PendingInterruptCount );
-//}
-//#endif
 
 
 /*-----------------------------------------------------------------------*/