mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-26 11:37:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

add hotplugging to libusb hid driver

Browse Source
This commit is contained in:
Toad King 2015-04-13 19:19:10 -05:00
parent c25e397261
commit 7f229e57ab
1 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
input/drivers_hid/libusb_hid.c
View File

@ -26,10 +26,13 @@ typedef struct libusb_hid
{ {
libusb_hotplug_callback_handle hp; libusb_hotplug_callback_handle hp;
joypad_connection_t *slots; joypad_connection_t *slots;
sthread_t *poll_thread;
int quit;
} libusb_hid_t; } libusb_hid_t;
struct libusb_adapter struct libusb_adapter
{ {
libusb_hid_t *hid;
volatile bool quitting; volatile bool quitting;
struct libusb_device *device; struct libusb_device *device;
libusb_device_handle *handle; libusb_device_handle *handle;
@ -51,20 +54,13 @@ struct libusb_adapter
struct libusb_adapter *next; struct libusb_adapter *next;
}; };
struct thread_payload
{
struct libusb_adapter *adapter;
libusb_hid_t *hid;
};
static struct libusb_adapter adapters; static struct libusb_adapter adapters;
static void adapter_thread(void *data) static void adapter_thread(void *data)
{ {
struct thread_payload *payload = (struct thread_payload*)data; struct libusb_adapter *adapter = (struct libusb_adapter*)data;
struct libusb_adapter *adapter = payload->adapter; libusb_hid_t *hid = adapter->hid;
libusb_hid_t *hid = payload->hid;
free(data);
uint8_t send_command_buf[4096]; uint8_t send_command_buf[4096];
while (!adapter->quitting) while (!adapter->quitting)
@ -295,17 +291,8 @@ static int add_adapter(void *data, struct libusb_device *dev)
libusb_hid_device_add_autodetect(adapter->slot, libusb_hid_device_add_autodetect(adapter->slot,
device_name, libusb_hid.ident, desc.idVendor, desc.idProduct); device_name, libusb_hid.ident, desc.idVendor, desc.idProduct);
struct thread_payload *payload = malloc(sizeof(payload)); adapter->hid = hid;
adapter->thread = sthread_create(adapter_thread, adapter);
if (payload == NULL)
{
fprintf(stderr, "Error allocating payload\n");
goto error;
}
payload->adapter = adapter;
payload->hid = hid;
adapter->thread = sthread_create(adapter_thread, payload);
if (!adapter->thread) if (!adapter->thread)
{ {
@ -472,6 +459,12 @@ static void libusb_hid_free(void *data)
if (remove_adapter(hid, adapters.next->device) == -1) if (remove_adapter(hid, adapters.next->device) == -1)
RARCH_ERR("could not remove device %p\n", adapters.next->device); RARCH_ERR("could not remove device %p\n", adapters.next->device);
if (hid->poll_thread)
{
hid->quit = 1;
sthread_join(hid->poll_thread);
}
pad_connection_destroy(hid->slots); pad_connection_destroy(hid->slots);
libusb_hotplug_deregister_callback(NULL, hid->hp); libusb_hotplug_deregister_callback(NULL, hid->hp);
@ -481,6 +474,17 @@ static void libusb_hid_free(void *data)
free(hid); free(hid);
} }
static void poll_thread(void *data)
{
libusb_hid_t *hid = (libusb_hid_t*)data;
while (!hid->quit)
{
struct timeval timeout = {0};
libusb_handle_events_timeout_completed(NULL, &timeout, &hid->quit);
}
}
static void *libusb_hid_init(void) static void *libusb_hid_init(void)
{ {
unsigned i; unsigned i;
@ -531,12 +535,19 @@ static void *libusb_hid_init(void)
goto error; goto error;
} }
hid->poll_thread = sthread_create(poll_thread, hid);
if (!hid->poll_thread)
{
fprintf(stderr, "Error creating polling thread");
goto error;
}
return hid; return hid;
error: error:
libusb_hid_free(hid); libusb_hid_free(hid);
return hid; return NULL;
} }