--- hatari/src/includes/ikbd.h	2019/04/01 07:13:06	1.1.1.5
+++ 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 {
@@ -47,7 +40,7 @@ typedef struct {
   JOY      Joy;
   int MouseMode;                  /* AUTOMODE_xxxx */
   int JoystickMode;               /* AUTOMODE_xxxx */
-  BOOL bReset;                    /* Set to TRUE is keyboard 'RESET' and now active */
+  bool bReset;                    /* Set to TRUE is keyboard 'RESET' and now active */
 } KEYBOARD_PROCESSOR;
 
 /* Keyboard state */
@@ -82,52 +75,23 @@ 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;
 extern KEYBOARD Keyboard;
 
-extern void IKBD_Reset(BOOL bCold);
-extern void IKBD_MemorySnapShot_Capture(BOOL bSave);
-extern void IKBD_SendAutoKeyboardCommands(void);
+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_InterruptHandler_ResetTimer(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_Cmd_NullFunction(void);
-extern void IKBD_Cmd_Reset(void);
-extern void IKBD_Cmd_MouseAction(void);
-extern void IKBD_Cmd_RelMouseMode(void);
-extern void IKBD_Cmd_AbsMouseMode(void);
-extern void IKBD_Cmd_MouseCursorKeycodes(void);
-extern void IKBD_Cmd_SetMouseThreshold(void);
-extern void IKBD_Cmd_SetMouseScale(void);
-extern void IKBD_Cmd_ReadAbsMousePos(void);
-extern void IKBD_Cmd_SetInternalMousePos(void);
-extern void IKBD_Cmd_SetYAxisDown(void);
-extern void IKBD_Cmd_SetYAxisUp(void);
-extern void IKBD_Cmd_StartKeyboardTransfer(void);
-extern void IKBD_Cmd_TurnMouseOff(void);
-extern void IKBD_Cmd_StopKeyboardTransfer(void);
-extern void IKBD_Cmd_ReturnJoystickAuto(void);
-extern void IKBD_Cmd_StopJoystick(void);
-extern void IKBD_Cmd_ReturnJoystick(void);
-extern void IKBD_Cmd_SetJoystickDuration(void);
-extern void IKBD_Cmd_SetJoystickFireDuration(void);
-extern void IKBD_Cmd_SetCursorForJoystick(void);
-extern void IKBD_Cmd_DisableJoysticks(void);
-extern void IKBD_Cmd_SetClock(void);
-extern void IKBD_Cmd_ReadClock(void);
-extern void IKBD_Cmd_LoadMemory(void);
-extern void IKBD_Cmd_ReadMemory(void);
-extern void IKBD_Cmd_Execute(void);
-
-extern void IKBD_SendByteToKeyboardProcessor(Uint16 bl);
-extern Uint16 IKBD_GetByteFromACIA(void);
-extern void IKBD_InterruptHandler_ACIA(void);
-extern void IKBD_SendByteToACIA(void);
-extern void IKBD_AddKeyToKeyboardBuffer(Uint8 Data);
-extern void IKBD_PressSTKey(Uint8 ScanCode, BOOL bPress);
-
+extern void IKBD_PressSTKey(Uint8 ScanCode, bool bPress);
 extern void IKBD_KeyboardControl_ReadByte(void);
 extern void IKBD_KeyboardData_ReadByte(void);
 extern void IKBD_KeyboardControl_WriteByte(void);