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

Fix pad leak in kpad (wiimote) driver

Browse Source 
== DETAILS

This is the wiimote version of the same bug I previously fixed in the HID
driver, where disconnected pads didn't actually invoke the unregister task.

This has an extra wrinkle, in that we *also* need to invoke the unregister
task when the wiimote device changes (e.g. user plugs in a nunchuk or
classic controller).

Now, there's still the problem of the "disconnect" detection being broken; so
a consequence of this commit is OSD spam. However, the actual wiimote input
is processed successfully and there's no noticeable issues in the pad
handling.

== TESTING

Using Mario 3, I played a level in which I started as bare wiimote, then
hot-plugged the nunchuk, and the input switched automatically. At  the
end of the level, I hot-unplugged the nunchuk and it automatically reverted
to horizontal layout; and the pad remained 100% responsive the entire time.
This commit is contained in:
gblues 2018-04-24 21:20:08 -07:00
parent f6b33b1d30
commit f33fa3d566
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
wiiu/input/kpad_driver.c
View File

@ -30,6 +30,7 @@ static void kpad_get_buttons(unsigned pad, input_bits_t *state);
static int16_t kpad_axis(unsigned pad, uint32_t axis); static int16_t kpad_axis(unsigned pad, uint32_t axis);
static void kpad_poll(void); static void kpad_poll(void);
static const char *kpad_name(unsigned pad); static const char *kpad_name(unsigned pad);
static void kpad_deregister(unsigned channel);
typedef struct _wiimote_state wiimote_state; typedef struct _wiimote_state wiimote_state;
@ -136,7 +137,11 @@ static void kpad_register(unsigned channel, uint8_t device_type)
{ {
if (wiimotes[channel].type != device_type) if (wiimotes[channel].type != device_type)
{ {
int slot = get_slot_for_channel(channel); int slot;
kpad_deregister(channel);
slot = get_slot_for_channel(channel);
if(slot < 0) if(slot < 0)
{ {
RARCH_ERR("Couldn't get a slot for this remote.\n"); RARCH_ERR("Couldn't get a slot for this remote.\n");
@ -188,6 +193,19 @@ static void kpad_poll_one_channel(unsigned channel, KPADData *kpad)
} }
} }
static void kpad_deregister(unsigned channel)
{
int slot = channel_slot_map[channel];
if(slot >= 0)
{
input_autoconfigure_disconnect(slot, kpad_driver.name(slot));
wiimotes[channel].type = WIIMOTE_TYPE_NONE;
hid_instance.pad_list[slot].connected = false;
channel_slot_map[channel] = -1;
}
}
static void kpad_poll(void) static void kpad_poll(void)
{ {
unsigned channel; unsigned channel;
@ -200,13 +218,7 @@ static void kpad_poll(void)
result = KPADRead(channel, &kpad, 1); result = KPADRead(channel, &kpad, 1);
if (result == 0) { if (result == 0) {
int slot = channel_slot_map[channel]; kpad_deregister(channel);
if(slot > 0)
{
hid_instance.pad_list[slot].connected = false;
channel_slot_map[channel] = -1;
}
continue; continue;
} }