/*****************************************************************************/
/* */
-/* joystick.h */
+/* joystick.h */
/* */
-/* Read the joystick on systems that support it */
+/* Read the joystick on systems that support it */
/* */
/* */
/* */
-/* (C) 1998-2002 Ullrich von Bassewitz */
-/* Wacholderweg 14 */
-/* D-70597 Stuttgart */
-/* EMail: uz@musoftware.de */
+/* (C) 1998-2011, Ullrich von Bassewitz */
+/* Roemerstrasse 52 */
+/* D-70794 Filderstadt */
+/* EMail: uz@cc65.org */
/* */
/* */
/* This software is provided 'as-is', without any expressed or implied */
+#include <target.h>
+
+
+
/*****************************************************************************/
/* Definitions */
/*****************************************************************************/
#define JOY_ERR_NO_DEVICE 4 /* Device (hardware) not found */
/* Argument for the joy_read function */
-#define JOY_1 0
-#define JOY_2 1
-
-/* The following codes are *indices* into the joy_masks array */
-#define JOY_UP 0
-#define JOY_DOWN 1
-#define JOY_LEFT 2
-#define JOY_RIGHT 3
-#define JOY_FIRE 4
-
-/* Array of masks used to check the return value of joy_read for a state */
-extern const unsigned char joy_masks[8];
+#define JOY_1 0
+#define JOY_2 1
/* Macros that evaluate the return code of joy_read */
-#define JOY_BTN_UP(v) ((v) & joy_masks[JOY_UP])
-#define JOY_BTN_DOWN(v) ((v) & joy_masks[JOY_DOWN])
-#define JOY_BTN_LEFT(v) ((v) & joy_masks[JOY_LEFT])
-#define JOY_BTN_RIGHT(v) ((v) & joy_masks[JOY_RIGHT])
-#define JOY_BTN_FIRE(v) ((v) & joy_masks[JOY_FIRE])
+#define JOY_UP(v) ((v) & JOY_UP_MASK)
+#define JOY_DOWN(v) ((v) & JOY_DOWN_MASK)
+#define JOY_LEFT(v) ((v) & JOY_LEFT_MASK)
+#define JOY_RIGHT(v) ((v) & JOY_RIGHT_MASK)
+#define JOY_BTN_1(v) ((v) & JOY_BTN_1_MASK) /* Universally available */
+#define JOY_BTN_2(v) ((v) & JOY_BTN_2_MASK) /* Second button if available */
+#define JOY_BTN_3(v) ((v) & JOY_BTN_3_MASK) /* Third button if available */
+#define JOY_BTN_4(v) ((v) & JOY_BTN_4_MASK) /* Fourth button if available */
/* The name of the standard joystick driver for a platform */
extern const char joy_stddrv[];
+/* The address of the static standard joystick driver for a platform */
+extern const void joy_static_stddrv[];
+
/*****************************************************************************/
-/* Functions */
+/* Functions */
/*****************************************************************************/
unsigned char __fastcall__ joy_load_driver (const char* driver);
-/* Load a joystick driver and return an error code */
+/* Load and install a joystick driver. Return an error code. */
-unsigned char __fastcall__ joy_unload (void);
-/* Unload the currently loaded driver. */
+unsigned char joy_unload (void);
+/* Uninstall, then unload the currently loaded driver. */
-unsigned char __fastcall__ joy_count (void);
+unsigned char __fastcall__ joy_install (void* driver);
+/* Install an already loaded driver. Return an error code. */
+
+unsigned char joy_uninstall (void);
+/* Uninstall the currently loaded driver and return an error code.
+** Note: This call does not free allocated memory.
+*/
+
+unsigned char joy_count (void);
/* Return the number of joysticks supported by the driver */
unsigned char __fastcall__ joy_read (unsigned char joystick);
/* End of joystick.h */
#endif
-
-
-