-#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];
-
-
-
-/* Result codes of the function. The actual code is a bitwise or
- * of one or more of the following values.
- */
-#if 0
-#if defined(__VIC20__)
-# define JOY_UP 0x02
-# define JOY_DOWN 0x04
-# define JOY_LEFT 0x08
-# define JOY_RIGHT 0x80
-# define JOY_FIRE 0x10
-#else
-# define JOY_UP 0x01
-# define JOY_DOWN 0x02
-# define JOY_LEFT 0x04
-# define JOY_RIGHT 0x08
-# define JOY_FIRE 0x10
-#endif
-#endif
+#define JOY_1 0
+#define JOY_2 1
+
+/* Macros that evaluate the return code of joy_read */
+#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[];