From 3fff1abb835df76d802bca9be27df063396fe3ae Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 16 Oct 2014 22:25:09 +0200
Subject: [PATCH] Refactor buttons variable in udev joypad driver

---
 input/udev_joypad.c | 19 ++++++++++++-------
 miscellaneous.h     | 28 +++++++++++++++++-----------
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/input/udev_joypad.c b/input/udev_joypad.c
index bfc50e6110..9e3c771d50 100644
--- a/input/udev_joypad.c
+++ b/input/udev_joypad.c
@@ -45,7 +45,7 @@ struct udev_joypad
    dev_t device;
 
    // Input state polled
-   bool buttons[NUM_BUTTONS];
+   int16_t buttons;
    int16_t axes[NUM_AXES];
    int8_t hats[NUM_HATS][2];
 
@@ -83,12 +83,12 @@ static inline int16_t compute_axis(const struct input_absinfo *info, int value)
 
 static void poll_pad(unsigned p)
 {
-   struct udev_joypad *pad = &g_pads[p];
-   if (pad->fd < 0)
-      return;
-
    int i, len;
    struct input_event events[32];
+   struct udev_joypad *pad = &g_pads[p];
+
+   if (pad->fd < 0)
+      return;
 
    while ((len = read(pad->fd, events, sizeof(events))) > 0)
    {
@@ -100,7 +100,12 @@ static void poll_pad(unsigned p)
          {
             case EV_KEY:
                if (code >= BTN_MISC || (code >= KEY_UP && code <= KEY_DOWN))
-                  pad->buttons[pad->button_bind[code]] = events[i].value;
+               {
+                  if (events[i].value)
+                     BIT16_SET(pad->buttons, pad->button_bind[code]);
+                  else
+                     BIT16_CLEAR(pad->buttons, pad->button_bind[code]);
+               }
                break;
 
             case EV_ABS:
@@ -552,7 +557,7 @@ static bool udev_joypad_button(unsigned port, uint16_t joykey)
 
    if (GET_HAT_DIR(joykey))
       return udev_joypad_hat(pad, joykey);
-   return joykey < NUM_BUTTONS && pad->buttons[joykey];
+   return joykey < NUM_BUTTONS && BIT16_GET(pad->buttons, joykey);
 }
 
 static int16_t udev_joypad_axis(unsigned port, uint32_t joyaxis)
diff --git a/miscellaneous.h b/miscellaneous.h
index 8d847b0d4a..eb9c2ab330 100644
--- a/miscellaneous.h
+++ b/miscellaneous.h
@@ -116,23 +116,29 @@ typedef struct
    uint32_t data[8];
 } rarch_bits_t;
 
-#define BIT128_SET(a, bit)   ((a).data[(bit) >> 5] |=  (1 << ((bit) & 31))
-#define BIT128_CLEAR(a, bit) ((a).data[(bit) >> 5] &= ~(1 << ((bit) & 31)))
-#define BIT128_GET(a, bit)   ((a).data[(bit) >> 5] &   (1 << ((bit) & 31)))
-#define BIT128_CLEAR_ALL(a)  memset(&(a), 0, sizeof(a));
+#define BIT_SET(a, bit)   ((a)[(bit) >> 3] |=  (1 << ((bit) & 7)))
+#define BIT_CLEAR(a, bit) ((a)[(bit) >> 3] &= ~(1 << ((bit) & 7)))
+#define BIT_GET(a, bit)   ((a)[(bit) >> 3] &   (1 << ((bit) & 7)))
 
-#define BIT64_SET(a, bit)    ((a) |=  (1ULL << ((bit) & 63)))
-#define BIT64_CLEAR(a, bit)  ((a) &= ~(1ULL << ((bit) & 63)))
-#define BIT64_GET(a, bit) (!!((a) &   (1ULL << ((bit) & 63))))
-#define BIT64_CLEAR_ALL(a)   ((a) = 0)
+#define BIT16_SET(a, bit)    ((a) |=  (1 << ((bit) & 15)))
+#define BIT16_CLEAR(a, bit)  ((a) &= ~(1 << ((bit) & 15)))
+#define BIT16_GET(a, bit) (!!((a) &   (1 << ((bit) & 15))))
+#define BIT16_CLEAR_ALL(a)   ((a) = 0)
 
 #define BIT32_SET(a, bit)    ((a) |=  (1 << ((bit) & 31)))
 #define BIT32_CLEAR(a, bit)  ((a) &= ~(1 << ((bit) & 31)))
 #define BIT32_GET(a, bit) (!!((a) &   (1 << ((bit) & 31))))
 #define BIT32_CLEAR_ALL(a)   ((a) = 0)
 
-#define BIT_SET(a, bit)   ((a)[(bit) >> 3] |=  (1 << ((bit) & 7)))
-#define BIT_CLEAR(a, bit) ((a)[(bit) >> 3] &= ~(1 << ((bit) & 7)))
-#define BIT_GET(a, bit)   ((a)[(bit) >> 3] &   (1 << ((bit) & 7)))
+#define BIT64_SET(a, bit)    ((a) |=  (1ULL << ((bit) & 63)))
+#define BIT64_CLEAR(a, bit)  ((a) &= ~(1ULL << ((bit) & 63)))
+#define BIT64_GET(a, bit) (!!((a) &   (1ULL << ((bit) & 63))))
+#define BIT64_CLEAR_ALL(a)   ((a) = 0)
+
+#define BIT128_SET(a, bit)   ((a).data[(bit) >> 5] |=  (1 << ((bit) & 31))
+#define BIT128_CLEAR(a, bit) ((a).data[(bit) >> 5] &= ~(1 << ((bit) & 31)))
+#define BIT128_GET(a, bit)   ((a).data[(bit) >> 5] &   (1 << ((bit) & 31)))
+#define BIT128_CLEAR_ALL(a)  memset(&(a), 0, sizeof(a));
+
 
 #endif