From 6ab91a422eef83ee014e14bc9511e92b4acba02e Mon Sep 17 00:00:00 2001
From: gblues <gblues@gmail.com>
Date: Sat, 14 Apr 2018 14:34:13 -0700
Subject: [PATCH] Small cleanup to adapt to upstream code changes

retro_bits_t turned into input_bits_t and there were parts of my
code that needed to update.

== TESTING
No idea if upstream changes broke anything, but it compiles cleanly
now.
---
 input/common/hid/device_ds3.c      | 2 +-
 input/common/hid/device_ds4.c      | 2 +-
 input/common/hid/device_null.c     | 4 ++--
 input/common/hid/device_wiiu_gca.c | 2 +-
 input/include/hid_driver.h         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/input/common/hid/device_ds3.c b/input/common/hid/device_ds3.c
index e06b0a6c6f..365d945b2e 100644
--- a/input/common/hid/device_ds3.c
+++ b/input/common/hid/device_ds3.c
@@ -236,7 +236,7 @@ static void ds3_pad_deinit(void *data)
    ds3_instance_t *pad = (ds3_instance_t *)data;
 }
 
-static void ds3_get_buttons(void *data, retro_bits_t *state)
+static void ds3_get_buttons(void *data, input_bits_t *state)
 {
    ds3_instance_t *pad = (ds3_instance_t *)data;
 
diff --git a/input/common/hid/device_ds4.c b/input/common/hid/device_ds4.c
index ce17221b35..b334a13233 100644
--- a/input/common/hid/device_ds4.c
+++ b/input/common/hid/device_ds4.c
@@ -103,7 +103,7 @@ static void ds4_pad_deinit(void *data)
 {
 }
 
-static void ds4_get_buttons(void *data, retro_bits_t *state)
+static void ds4_get_buttons(void *data, input_bits_t *state)
 {
    ds4_instance_t *instance = (ds4_instance_t *)data;
    if(!instance)
diff --git a/input/common/hid/device_null.c b/input/common/hid/device_null.c
index 18628859f5..96d99f5f74 100644
--- a/input/common/hid/device_null.c
+++ b/input/common/hid/device_null.c
@@ -140,10 +140,10 @@ static void null_pad_deinit(void *data)
 }
 
 /**
- * Translate the button data from the pad into the retro_bits_t format
+ * Translate the button data from the pad into the input_bits_t format
  * that RetroArch can use.
  */
-static void null_get_buttons(void *data, retro_bits_t *state)
+static void null_get_buttons(void *data, input_bits_t *state)
 {
    null_instance_t *instance = (null_instance_t *)data;
    if(!instance)
diff --git a/input/common/hid/device_wiiu_gca.c b/input/common/hid/device_wiiu_gca.c
index 1d50c513ee..5e3968f757 100644
--- a/input/common/hid/device_wiiu_gca.c
+++ b/input/common/hid/device_wiiu_gca.c
@@ -229,7 +229,7 @@ static void wiiu_gca_pad_deinit(void *data)
   }
 }
 
-static void wiiu_gca_get_buttons(void *data, retro_bits_t *state)
+static void wiiu_gca_get_buttons(void *data, input_bits_t *state)
 {
    gca_pad_t *pad = (gca_pad_t *)data;
    if(pad)
diff --git a/input/include/hid_driver.h b/input/include/hid_driver.h
index 5b75c785bb..02b6529f63 100644
--- a/input/include/hid_driver.h
+++ b/input/include/hid_driver.h
@@ -39,7 +39,7 @@ struct hid_driver
    bool (*query_pad)(void *handle, unsigned pad);
    void (*free)(const void *handle);
    bool (*button)(void *handle, unsigned pad, uint16_t button);
-   void (*get_buttons)(void *handle, unsigned pad, retro_bits_t *state);
+   void (*get_buttons)(void *handle, unsigned pad, input_bits_t *state);
    int16_t (*axis)(void *handle, unsigned pad, uint32_t axis);
    void (*poll)(void *handle);
    bool (*set_rumble)(void *handle, unsigned pad, enum retro_rumble_effect effect, uint16_t);