From 2d9922a46e6112ed901dc675d37a6bfc4f928c4d Mon Sep 17 00:00:00 2001 From: Pascal de Bruijn Date: Wed, 19 Jul 2017 18:02:13 +0200 Subject: [PATCH 1/3] nes: remove semiredundant KEY_ defines There are already JOY_ defines for most of these, and this should be expanded upon instead. --- include/nes.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/include/nes.h b/include/nes.h index 95e2fe93b..2687e2626 100644 --- a/include/nes.h +++ b/include/nes.h @@ -90,16 +90,6 @@ /* No support for dynamically loadable drivers */ #define DYN_DRV 0 -/* The joystick keys - all keys are supported */ -#define KEY_A 0x01 -#define KEY_B 0x02 -#define KEY_SELECT 0x04 -#define KEY_START 0x08 -#define KEY_UP 0x10 -#define KEY_DOWN 0x20 -#define KEY_LEFT 0x40 -#define KEY_RIGHT 0x80 - /* Define hardware */ /* Picture Processing Unit */ From d277055b5a06ee314fd3c93a562fd494cefbd767 Mon Sep 17 00:00:00 2001 From: Pascal de Bruijn Date: Wed, 19 Jul 2017 18:14:44 +0200 Subject: [PATCH 2/3] nes: add system specific joy_masks array indices and macros --- include/nes.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/nes.h b/include/nes.h index 2687e2626..3e139e00c 100644 --- a/include/nes.h +++ b/include/nes.h @@ -90,6 +90,17 @@ /* No support for dynamically loadable drivers */ #define DYN_DRV 0 +/* Expanding upon joystick.h */ +#define JOY_A 4 +#define JOY_B 5 +#define JOY_SELECT 6 +#define JOY_START 7 + +#define JOY_BTN_A(v) ((v) & joy_masks[JOY_A]) +#define JOY_BTN_B(v) ((v) & joy_masks[JOY_B]) +#define JOY_BTN_SELECT(v) ((v) & joy_masks[JOY_SELECT]) +#define JOY_BTN_START(v) ((v) & joy_masks[JOY_START]) + /* Define hardware */ /* Picture Processing Unit */ From 8ad72fc9ca78b8018ec1ef223eb1911bbd8965d5 Mon Sep 17 00:00:00 2001 From: Pascal de Bruijn Date: Wed, 19 Jul 2017 18:29:35 +0200 Subject: [PATCH 3/3] pce: add system specific joy_masks array indices and macros --- include/pce.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/pce.h b/include/pce.h index 856a2fa1d..ac6b2503f 100644 --- a/include/pce.h +++ b/include/pce.h @@ -76,6 +76,17 @@ /* No support for dynamically loadable drivers */ #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(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]) + /* The addresses of the static drivers */ extern void pce_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */