--- hatari/src/includes/ikbd.h	2019/04/09 08:50:25	1.1.1.10
+++ 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
@@ -40,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 */
@@ -49,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;
@@ -81,20 +83,16 @@ typedef struct {
 extern KEYBOARD_PROCESSOR KeyboardProcessor;
 extern KEYBOARD Keyboard;
 
-extern void ACIA_Reset(void);
-extern void IKBD_Reset_ExeMode ( 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_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_UpdateClockOnVBL ( void );
+
+
 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);
 
 #endif  /* HATARI_IKBD_H */