ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanups

This commit is contained in:
twinaphex 2020-08-28 20:42:55 +02:00
parent 1c0f79442b
commit 93f9d69742
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
input/connect/joypad_connection.c
View File

@ -24,7 +24,13 @@
#include "joypad_connection.h" #include "joypad_connection.h"
static bool joypad_is_end_of_list(joypad_connection_t *pad); static bool joypad_is_end_of_list(joypad_connection_t *pad)
{
return pad
&& !pad->connected
&& !pad->iface
&& (pad->data == (void *)0xdeadbeef);
}
int pad_connection_find_vacant_pad(joypad_connection_t *joyconn) int pad_connection_find_vacant_pad(joypad_connection_t *joyconn)
{ {
@ -45,14 +51,11 @@ int pad_connection_find_vacant_pad(joypad_connection_t *joyconn)
static void set_end_of_list(joypad_connection_t *list, unsigned end) static void set_end_of_list(joypad_connection_t *list, unsigned end)
{ {
joypad_connection_t *entry = (joypad_connection_t *)&list[end]; joypad_connection_t *entry = (joypad_connection_t *)&list[end];
entry->connected = false; entry->connected = false;
entry->iface = NULL; entry->iface = NULL;
entry->data = (void *)0xdeadbeef; entry->data = (void*)0xdeadbeef;
} }
static bool joypad_is_end_of_list(joypad_connection_t *pad) {
return pad && !pad->connected && !pad->iface && pad->data == (void *)0xdeadbeef;
}
/** /**
* Since the pad_connection_destroy() call needs to iterate through this * Since the pad_connection_destroy() call needs to iterate through this
@ -195,8 +198,8 @@ int32_t pad_connection_pad_init(joypad_connection_t *joyconn,
* set up one without an interface */ * set up one without an interface */
if (!s->connected) if (!s->connected)
{ {
s->iface = NULL; s->iface = NULL;
s->data = data; s->data = data;
s->connected = true; s->connected = true;
} }
} }