mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 12:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

(WiiU) Cleanups

Browse Source
This commit is contained in:
twinaphex 2020-06-10 06:30:23 +02:00
parent 1e2b649a21
commit c63a65ffa5
3 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
input/drivers_joypad/wiiu/hidpad_driver.c
View File

@ -16,15 +16,7 @@
#include "../../include/wiiu/input.h"
static bool hidpad_init(void *data);
static bool hidpad_query_pad(unsigned pad);
static void hidpad_destroy(void);
static bool hidpad_button(unsigned pad, uint16_t button);
static void hidpad_get_buttons(unsigned pad, input_bits_t *state);
static int16_t hidpad_axis(unsigned pad, uint32_t axis);
static void hidpad_poll(void);
static const char *hidpad_name(unsigned pad);
/* TODO/FIXME - static global variables */
static bool hidpad_ready = false;
static bool init_hid_driver(void)
@ -32,6 +24,12 @@ static bool init_hid_driver(void)
return hid_init(&hid_instance, &wiiu_hid, &hidpad_driver, MAX_USERS);
}
static void hidpad_poll(void)
{
if (hidpad_ready)
HID_POLL();
}
static bool hidpad_init(void *data)
{
(void)data;
@ -84,12 +82,6 @@ static int16_t hidpad_axis(unsigned pad, uint32_t axis)
return HID_AXIS(pad, axis);
}
static void hidpad_poll(void)
{
if (hidpad_ready)
HID_POLL();
}
static const char *hidpad_name(unsigned pad)
{
if (!hidpad_query_pad(pad))

4
input/drivers_joypad/wiiu/kpad_driver.c
View File

@ -41,8 +41,6 @@ struct _wiimote_state
uint8_t type;
};
static bool kpad_ready = false;
/* it would be nice to use designated initializers here,
* but those are only in C99 and newer. Oh well.
*/
@ -53,6 +51,8 @@ wiimote_state wiimotes[WIIU_WIIMOTE_CHANNELS] = {
{ 0, {{0,0},{0,0},{0,0}}, WIIMOTE_TYPE_NONE },
};
/* static global variables */
static bool kpad_ready = false;
static int channel_slot_map[] = { -1, -1, -1, -1 };
static int to_wiimote_channel(unsigned pad)

43
input/drivers_joypad/wiiu/wpad_driver.c
View File

@ -36,19 +36,21 @@ static drc_state gamepads[WIIU_GAMEPAD_CHANNELS] = { 0 };
#define WPAD_INVALID_CHANNEL -1
static int channel_slot_map[WIIU_GAMEPAD_CHANNELS] = { WPAD_INVALID_CHANNEL, WPAD_INVALID_CHANNEL };
static VPADChan to_gamepad_channel(unsigned pad) {
static VPADChan to_gamepad_channel(unsigned pad)
{
unsigned i;
for (i = 0; i < WIIU_GAMEPAD_CHANNELS; i++) {
if (channel_slot_map[i] == pad) {
for (i = 0; i < WIIU_GAMEPAD_CHANNELS; i++)
{
if (channel_slot_map[i] == pad)
return i;
}
}
return WPAD_INVALID_CHANNEL;
}
static void wpad_deregister(unsigned channel) {
static void wpad_deregister(unsigned channel)
{
unsigned slot;
if (channel >= WIIU_GAMEPAD_CHANNELS)
@ -59,7 +61,8 @@ static void wpad_deregister(unsigned channel) {
return;
/* Sanity check, about to use as unsigned */
if (channel_slot_map[channel] < 0) {
if (channel_slot_map[channel] < 0)
{
channel_slot_map[channel] = WPAD_INVALID_CHANNEL;
return;
}
@ -73,14 +76,16 @@ static void wpad_deregister(unsigned channel) {
channel_slot_map[channel] = WPAD_INVALID_CHANNEL;
}
static void wpad_register(unsigned channel) {
static void wpad_register(unsigned channel)
{
int slot;
if (channel >= WIIU_GAMEPAD_CHANNELS)
return;
/* Check if gamepad is already handled
Other checks not needed here - about to overwrite channel_slot_map entry*/
Other checks not needed here - about to overwrite
channel_slot_map entry*/
if (channel_slot_map[channel] != WPAD_INVALID_CHANNEL)
return;
@ -192,7 +197,8 @@ static void log_coords(int16_t x, int16_t y)
}
#endif
static void update_touch_state(int16_t state[3][2], uint64_t *buttons, VPADStatus *vpad, VPADChan channel)
static void update_touch_state(int16_t state[3][2],
uint64_t *buttons, VPADStatus *vpad, VPADChan channel)
{
VPADTouchData point = {0};
struct video_viewport viewport = {0};
@ -235,17 +241,18 @@ static void wpad_poll(void)
VPADReadError error;
VPADChan channel;
for (channel = VPAD_CHAN_0; channel < WIIU_GAMEPAD_CHANNELS; channel++) {
for (channel = VPAD_CHAN_0; channel < WIIU_GAMEPAD_CHANNELS; channel++)
{
VPADRead(channel, &vpad, 1, &error);
if (error == VPAD_READ_SUCCESS || error == VPAD_READ_NO_SAMPLES) {
/* Gamepad is connected! */
/* Gamepad is connected! */
if (error == VPAD_READ_SUCCESS || error == VPAD_READ_NO_SAMPLES)
wpad_register(channel);
} else if (error == VPAD_READ_INVALID_CONTROLLER) {
else if (error == VPAD_READ_INVALID_CONTROLLER)
wpad_deregister(channel);
}
if (error == VPAD_READ_SUCCESS) {
if (error == VPAD_READ_SUCCESS)
{
update_button_state(&gamepads[channel].button_state, vpad.hold);
update_analog_state(gamepads[channel].analog_state, &vpad);
update_touch_state(gamepads[channel].analog_state, &gamepads[channel].button_state, &vpad, channel);
@ -289,13 +296,15 @@ static void wpad_get_buttons(unsigned pad, input_bits_t *state)
{
VPADChan channel;
if (!wpad_query_pad(pad)) {
if (!wpad_query_pad(pad))
{
BIT256_CLEAR_ALL_PTR(state);
return;
}
channel = to_gamepad_channel(pad);
if (channel < 0) {
if (channel < 0)
{
BIT256_CLEAR_ALL_PTR(state);
return;
}