--- hatari/src/includes/joy.h	2019/04/01 07:13:06	1.1.1.4
+++ hatari/src/includes/joy.h	2019/04/09 08:49:30	1.1.1.7
@@ -10,7 +10,8 @@
 
 typedef struct
 {
-	int XPos,YPos;                /* -32768...0...32767 */
+	int XPos,YPos;                /* the actually read axis values in range of -32768...0...32767 */
+	int XAxisID,YAxisID;          /* the IDs of the physical PC jyostick's axis to be used to gain ST joystick axis input */
 	int Buttons;                  /* JOY_BUTTON1 */
 } JOYREADING;
 
@@ -36,15 +37,21 @@ enum
 #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 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_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);