From 18dcda09d08615feaad7e2329955a4d998da5692 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 19 Jul 2020 03:39:32 +0200 Subject: [PATCH] (IOHIDManager) Another buildfix --- input/drivers_hid/iohidmanager_hid.c | 57 ++++++++++++++-------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/input/drivers_hid/iohidmanager_hid.c b/input/drivers_hid/iohidmanager_hid.c index ee7a6256c2..9c1f7bef2a 100644 --- a/input/drivers_hid/iohidmanager_hid.c +++ b/input/drivers_hid/iohidmanager_hid.c @@ -188,6 +188,35 @@ static int16_t iohidmanager_hid_joypad_button(void *data, return 0; } +static int16_t iohidmanager_hid_joypad_axis(void *data, + unsigned port, uint32_t joyaxis) +{ + iohidmanager_hid_t *hid = (iohidmanager_hid_t*)data; + int16_t val = 0; + + if (AXIS_NEG_GET(joyaxis) < 11) + { + val += hid->axes[port][AXIS_NEG_GET(joyaxis)]; + val += pad_connection_get_axis(&hid->slots[port], + port, AXIS_NEG_GET(joyaxis)); + + if (val >= 0) + val = 0; + } + else if (AXIS_POS_GET(joyaxis) < 11) + { + val += hid->axes[port][AXIS_POS_GET(joyaxis)]; + val += pad_connection_get_axis(&hid->slots[port], + port, AXIS_POS_GET(joyaxis)); + + if (val <= 0) + val = 0; + } + + return val; +} + + static int16_t iohidmanager_hid_joypad_state( void *data, rarch_joypad_info_t *joypad_info, @@ -228,34 +257,6 @@ static bool iohidmanager_hid_joypad_rumble(void *data, unsigned pad, return pad_connection_rumble(&hid->slots[pad], pad, effect, strength); } -static int16_t iohidmanager_hid_joypad_axis(void *data, - unsigned port, uint32_t joyaxis) -{ - iohidmanager_hid_t *hid = (iohidmanager_hid_t*)data; - int16_t val = 0; - - if (AXIS_NEG_GET(joyaxis) < 11) - { - val += hid->axes[port][AXIS_NEG_GET(joyaxis)]; - val += pad_connection_get_axis(&hid->slots[port], - port, AXIS_NEG_GET(joyaxis)); - - if (val >= 0) - val = 0; - } - else if (AXIS_POS_GET(joyaxis) < 11) - { - val += hid->axes[port][AXIS_POS_GET(joyaxis)]; - val += pad_connection_get_axis(&hid->slots[port], - port, AXIS_POS_GET(joyaxis)); - - if (val <= 0) - val = 0; - } - - return val; -} - static void iohidmanager_hid_device_send_control(void *data, uint8_t* data_buf, size_t size) {