joy: refactor generic joy_masks array indices and macros

This commit is contained in:
Pascal de Bruijn
2017-07-22 15:49:34 +02:00
parent d90f032114
commit c802c9c946
6 changed files with 61 additions and 49 deletions

View File

@@ -77,23 +77,19 @@
#define DYN_DRV 0
/* Expanding upon joystick.h */
#define JOY_I 4
#define JOY_II 5
#define JOY_SELECT 6
#define JOY_RUN 7
#define JOY_BTN_I_IDX 4
#define JOY_BTN_II_IDX 5
#define JOY_SELECT_IDX 6
#define JOY_RUN_IDX 7
#define JOY_BTN_I(v) ((v) & joy_masks[JOY_I])
#define JOY_BTN_II(v) ((v) & joy_masks[JOY_II])
#define JOY_BTN_SELECT(v) ((v) & joy_masks[JOY_SELECT])
#define JOY_BTN_RUN(v) ((v) & joy_masks[JOY_RUN])
#define JOY_BTN_I(v) ((v) & joy_masks[JOY_BTN_I_IDX])
#define JOY_BTN_II(v) ((v) & joy_masks[JOY_BTN_II_IDX])
#define JOY_SELECT(v) ((v) & joy_masks[JOY_SELECT_IDX])
#define JOY_RUN(v) ((v) & joy_masks[JOY_RUN_IDX])
/* The addresses of the static drivers */
extern void pce_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */
#define JOY_FIRE_B 5
#define JOY_SELECT 6
#define JOY_RUN 7
void waitvsync (void);
/* Wait for start of the next frame */