--- hatari/src/includes/ikbd.h	2019/04/01 07:14:46	1.1.1.7
+++ hatari/src/includes/ikbd.h	2019/04/09 08:50:25	1.1.1.10
@@ -11,13 +11,6 @@
 #include <SDL_keysym.h>           /* Needed for SDLK_LAST */
 
 
-/* Keyboard Command */
-typedef struct {
-  Uint8 Command;
-  Uint8 NumParameters;
-  void (*pCallFunction)(void);
-} IKBD_COMMAND_PARAMS;
-
 /* Keyboard processor details */
 
 typedef struct {
@@ -82,7 +75,7 @@ typedef struct {
 /* 0xfffc00 (read status from ACIA) */
 #define ACIA_STATUS_REGISTER__RX_BUFFER_FULL  0x01
 #define ACIA_STATUS_REGISTER__TX_BUFFER_EMPTY  0x02
-#define ACIA_STATUS_REGISTER__OVERRUN_ERROR    0x40
+#define ACIA_STATUS_REGISTER__OVERRUN_ERROR    0x20
 #define ACIA_STATUS_REGISTER__INTERRUPT_REQUEST  0x80
 
 extern KEYBOARD_PROCESSOR KeyboardProcessor;
@@ -92,10 +85,11 @@ extern void ACIA_Reset(void);
 extern void IKBD_Reset_ExeMode ( void );
 extern void IKBD_Reset(bool bCold);
 extern void IKBD_MemorySnapShot_Capture(bool bSave);
-extern void IKBD_SendAutoKeyboardCommands(void);
 extern void IKBD_InterruptHandler_ResetTimer(void);
-extern void IKBD_InterruptHandler_ACIA(void);
+extern void IKBD_InterruptHandler_ACIA_RX(void);
+extern void IKBD_InterruptHandler_ACIA_TX(void);
 extern void IKBD_InterruptHandler_MFP(void);
+extern void IKBD_InterruptHandler_AutoSend(void);
 
 extern void IKBD_PressSTKey(Uint8 ScanCode, bool bPress);
 extern void IKBD_KeyboardControl_ReadByte(void);