--- hatari/src/includes/ikbd.h	2019/04/01 07:13:40	1.1.1.6
+++ hatari/src/includes/ikbd.h	2019/04/09 08:53:11	1.1.1.11
@@ -1,8 +1,8 @@
 /*
   Hatari - ikbd.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 
 #ifndef HATARI_IKBD_H
@@ -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,6 @@ typedef struct {
   JOY      Joy;
   int MouseMode;                  /* AUTOMODE_xxxx */
   int JoystickMode;               /* AUTOMODE_xxxx */
-  BOOL bReset;                    /* Set to TRUE is keyboard 'RESET' and now active */
 } KEYBOARD_PROCESSOR;
 
 /* Keyboard state */
@@ -56,10 +48,13 @@ typedef struct {
 #define SIZE_KEYBOARDINPUT_BUFFER 8
 typedef struct {
   Uint8 KeyStates[SDLK_LAST];           /* State of PC's keys, TRUE is down */
-  Uint8 Buffer[SIZE_KEYBOARD_BUFFER];   /* Keyboard buffer */
-  int BufferHead,BufferTail;                    /* Pointers into above buffer */
-  Uint8 InputBuffer[SIZE_KEYBOARDINPUT_BUFFER];  /* Buffer for data send from CPU to keyboard processor (commands) */
-  int nBytesInInputBuffer;                      /* Number of command bytes in above buffer */
+
+  Uint8 Buffer[SIZE_KEYBOARD_BUFFER];		/* Keyboard output buffer */
+  int BufferHead,BufferTail;			/* Pointers into above buffer */
+  int NbBytesInOutputBuffer;			/* Number of bytes in output buffer */
+
+  Uint8 InputBuffer[SIZE_KEYBOARDINPUT_BUFFER];	/* Buffer for data send from CPU to keyboard processor (commands) */
+  int nBytesInInputBuffer;			/* Number of command bytes in above buffer */
 
   int bLButtonDown,bRButtonDown;                /* Mouse states in emulation system, BUTTON_xxxx */
   int bOldLButtonDown,bOldRButtonDown;
@@ -82,56 +77,22 @@ 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 ACIA_Reset(void);
-extern void IKBD_Reset(BOOL bCold);
-extern void IKBD_MemorySnapShot_Capture(BOOL bSave);
-extern void IKBD_SendAutoKeyboardCommands(void);
+extern void IKBD_Init ( void );
+extern void IKBD_Reset(bool bCold);
+extern void IKBD_MemorySnapShot_Capture(bool bSave);
+
 extern void IKBD_InterruptHandler_ResetTimer(void);
+extern void IKBD_InterruptHandler_AutoSend(void);
+
+extern void IKBD_UpdateClockOnVBL ( 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_KeyboardControl_ReadByte(void);
-extern void IKBD_KeyboardData_ReadByte(void);
-extern void IKBD_KeyboardControl_WriteByte(void);
-extern void IKBD_KeyboardData_WriteByte(void);
+extern void IKBD_PressSTKey(Uint8 ScanCode, bool bPress);
 
 #endif  /* HATARI_IKBD_H */