--- hatari/src/includes/joy.h	2019/04/01 07:13:06	1.1.1.4
+++ hatari/src/includes/joy.h	2019/04/09 08:55:40	1.1.1.10
@@ -1,19 +1,13 @@
 /*
   Hatari - joy.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_JOY_H
 #define HATARI_JOY_H
 
-typedef struct
-{
-	int XPos,YPos;                /* -32768...0...32767 */
-	int Buttons;                  /* JOY_BUTTON1 */
-} JOYREADING;
-
 enum
 {
 	JOYSTICK_SPACE_NULL,          /* Not up/down */
@@ -21,30 +15,30 @@ enum
 	JOYSTICK_SPACE_UP
 };
 
-enum
-{
-	JOYID_JOYSTICK0,
-	JOYID_JOYSTICK1,
-	JOYID_STEPADA,
-	JOYID_STEPADB,
-	JOYID_PARPORT1,
-	JOYID_PARPORT2,
-};
-
 #define JOYRANGE_UP_VALUE     -16384     /* Joystick ranges in XY */
 #define JOYRANGE_DOWN_VALUE    16383
 #define JOYRANGE_LEFT_VALUE   -16384
 #define JOYRANGE_RIGHT_VALUE   16383
 
+#define ATARIJOY_BITMASK_UP    0x01
+#define ATARIJOY_BITMASK_DOWN  0x02
+#define ATARIJOY_BITMASK_LEFT  0x04
+#define ATARIJOY_BITMASK_RIGHT 0x08
+#define ATARIJOY_BITMASK_FIRE  0x80
+
 extern int JoystickSpaceBar;
 
 extern void Joy_Init(void);
 extern void Joy_UnInit(void);
+extern const char *Joy_GetName(int id);
+extern int Joy_GetMaxId(void);
+extern bool Joy_ValidateJoyId(int i);
 extern Uint8 Joy_GetStickData(int nStJoyId);
-extern BOOL Joy_SetCursorEmulation(int port);
+extern bool Joy_SetCursorEmulation(int port);
 extern void Joy_ToggleCursorEmulation(void);
-extern BOOL Joy_KeyDown(int symkey, int modkey);
-extern BOOL Joy_KeyUp(int symkey, int modkey);
+extern bool Joy_SwitchMode(int port);
+extern bool Joy_KeyDown(int symkey, int modkey);
+extern bool Joy_KeyUp(int symkey, int modkey);
 extern void Joy_StePadButtons_ReadWord(void);
 extern void Joy_StePadMulti_ReadWord(void);
 extern void Joy_StePadMulti_WriteWord(void);