--- hatari/src/includes/ikbd.h	2019/04/01 07:14:46	1.1.1.7
+++ hatari/src/includes/ikbd.h	2019/04/09 08:59:25	1.1.1.13
@@ -1,23 +1,13 @@
 /*
   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
 #define HATARI_IKBD_H
 
-#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 {
@@ -38,7 +28,7 @@ typedef struct {
 
 typedef struct {
   Uint8 JoyData[2];               /* Joystick details */
-  Uint8 PrevJoyData[2];           /* Previous joystick details, used to check for 'IKBD_SelAutoJoysticks' */
+  Uint8 PrevJoyData[2];           /* Previous joystick details, used to check for 'IKBD_SendAutoJoysticks' */
 } JOY;
 
 typedef struct {
@@ -47,24 +37,30 @@ 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 */
+#define KBD_MAX_SCANCODE          0x72
 #define SIZE_KEYBOARD_BUFFER      1024    /* Allow this many bytes to be stored in buffer (waiting to send to ACIA) */
 #define KEYBOARD_BUFFER_MASK      (SIZE_KEYBOARD_BUFFER-1)
 #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 KeyStates[KBD_MAX_SCANCODE + 1];	/* State of ST keys, TRUE is down */
+
+  Uint8 Buffer[SIZE_KEYBOARD_BUFFER];		/* Keyboard output buffer */
+  int BufferHead,BufferTail;			/* Pointers into above buffer */
+  int NbBytesInOutputBuffer;			/* Number of bytes in output buffer */
+  bool PauseOutput;				/* If true, don't send bytes anymore (see command 0x13) */
+
+  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;
   int LButtonDblClk,RButtonDblClk;
-  int LButtonHistory,RButtonHistory;
+  unsigned int LButtonHistory, RButtonHistory;
+
+  int AutoSendCycles;				/* Number of cpu cycles to call INTERRUPT_IKBD_AUTOSEND */
 } KEYBOARD;
 
 /* Button states, a bit mask so can mimick joystick/right mouse button duplication */
@@ -73,34 +69,32 @@ typedef struct {
 #define BUTTON_JOYSTICK  0x02
 
 /* Mouse/Joystick modes */
-#define AUTOMODE_OFF         0
-#define AUTOMODE_MOUSEREL    1
-#define AUTOMODE_MOUSEABS    2
-#define AUTOMODE_MOUSECURSOR 3
-#define AUTOMODE_JOYSTICK    4
+#define AUTOMODE_OFF			0
+#define AUTOMODE_MOUSEREL		1
+#define AUTOMODE_MOUSEABS		2
+#define AUTOMODE_MOUSECURSOR		3
+#define AUTOMODE_JOYSTICK		4
+#define AUTOMODE_JOYSTICK_MONITORING	5
 
 /* 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_ExeMode ( void );
+extern void IKBD_Init ( 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_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 */