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

(libusb) Cleanups

This commit is contained in:
twinaphex 2015-07-09 01:51:44 +02:00
parent 701b5609d4
commit 12ca517cf7
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
input/drivers_hid/libusb_hid.c
View File

@ -64,17 +64,16 @@ static struct libusb_adapter adapters;
static void adapter_thread(void *data) static void adapter_thread(void *data)
{ {
uint8_t send_command_buf[4096];
struct libusb_adapter *adapter = (struct libusb_adapter*)data; struct libusb_adapter *adapter = (struct libusb_adapter*)data;
libusb_hid_t *hid = adapter->hid; libusb_hid_t *hid = adapter->hid;
uint8_t send_command_buf[4096];
while (!adapter->quitting) while (!adapter->quitting)
{ {
int size = 0;
size_t send_command_size; size_t send_command_size;
int tmp; int tmp;
int report_number; int report_number;
int size = 0;
slock_lock(adapter->send_control_lock); slock_lock(adapter->send_control_lock);
if (fifo_read_avail(adapter->send_control_buffer) >= sizeof(send_command_size)) if (fifo_read_avail(adapter->send_control_buffer) >= sizeof(send_command_size))
@ -104,6 +103,7 @@ static void libusb_hid_device_send_control(void *data,
if (adapter) if (adapter)
{ {
slock_lock(adapter->send_control_lock); slock_lock(adapter->send_control_lock);
if (fifo_write_avail(adapter->send_control_buffer) >= size + sizeof(size)) if (fifo_write_avail(adapter->send_control_buffer) >= size + sizeof(size))
{ {
fifo_write(adapter->send_control_buffer, &size, sizeof(size)); fifo_write(adapter->send_control_buffer, &size, sizeof(size));
@ -192,7 +192,8 @@ static int add_adapter(void *data, struct libusb_device *dev)
struct libusb_adapter *old_head = NULL; struct libusb_adapter *old_head = NULL;
struct libusb_hid *hid = (struct libusb_hid*)data; struct libusb_hid *hid = (struct libusb_hid*)data;
const char *device_name = NULL; const char *device_name = NULL;
struct libusb_adapter *adapter = (struct libusb_adapter*)calloc(1, sizeof(struct libusb_adapter)); struct libusb_adapter *adapter = (struct libusb_adapter*)
calloc(1, sizeof(struct libusb_adapter));
if (!adapter || !hid) if (!adapter || !hid)
{ {
@ -326,7 +327,7 @@ error:
static int remove_adapter(void *data, struct libusb_device *dev) static int remove_adapter(void *data, struct libusb_device *dev)
{ {
struct libusb_adapter *adapter = (struct libusb_adapter*)&adapters; struct libusb_adapter *adapter = (struct libusb_adapter*)&adapters;
struct libusb_hid *hid = (struct libusb_hid*)data; struct libusb_hid *hid = (struct libusb_hid*)data;
while (adapter->next != NULL) while (adapter->next != NULL)