mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-22 16:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
twinaphex 2016-02-05 14:35:16 +01:00
parent 6b55a5f20b
commit 341e8f8f15
2 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
input/drivers_hid/btstack_hid.c
View File

@ -128,7 +128,8 @@ BTDIMPORT char* (*bd_addr_to_str_ptr)(bd_addr_t addr);
BTDIMPORT btstack_packet_handler_t (*bt_register_packet_handler_ptr) BTDIMPORT btstack_packet_handler_t (*bt_register_packet_handler_ptr)
(btstack_packet_handler_t handler); (btstack_packet_handler_t handler);
BTDIMPORT int (*bt_send_cmd_ptr)(const hci_cmd_t *cmd, ...); BTDIMPORT int (*bt_send_cmd_ptr)(const hci_cmd_t *cmd, ...);
BTDIMPORT void (*bt_send_l2cap_ptr)(uint16_t local_cid, uint8_t *data, uint16_t len); BTDIMPORT void (*bt_send_l2cap_ptr)(uint16_t local_cid,
uint8_t *data, uint16_t len);
BTDIMPORT void (*run_loop_init_ptr)(RUN_LOOP_TYPE type); BTDIMPORT void (*run_loop_init_ptr)(RUN_LOOP_TYPE type);
BTDIMPORT void (*run_loop_execute_ptr)(void); BTDIMPORT void (*run_loop_execute_ptr)(void);

46
input/drivers_hid/libusb_hid.c
View File

@ -87,18 +87,27 @@ static void adapter_thread(void *data)
int size = 0; 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))
{ {
fifo_read(adapter->send_control_buffer, &send_command_size, sizeof(send_command_size)); fifo_read(adapter->send_control_buffer,
if (fifo_read_avail(adapter->send_control_buffer) >= sizeof(send_command_size)) &send_command_size, sizeof(send_command_size));
if (fifo_read_avail(adapter->send_control_buffer)
>= sizeof(send_command_size))
{ {
fifo_read(adapter->send_control_buffer, send_command_buf, send_command_size); fifo_read(adapter->send_control_buffer,
libusb_interrupt_transfer(adapter->handle, adapter->endpoint_out, send_command_buf, send_command_size, &tmp, 1000); send_command_buf, send_command_size);
libusb_interrupt_transfer(adapter->handle,
adapter->endpoint_out, send_command_buf,
send_command_size, &tmp, 1000);
} }
} }
slock_unlock(adapter->send_control_lock); slock_unlock(adapter->send_control_lock);
libusb_interrupt_transfer(adapter->handle, adapter->endpoint_in, &adapter->data[1], adapter->endpoint_in_max_size, &size, 1000); libusb_interrupt_transfer(adapter->handle,
adapter->endpoint_in, &adapter->data[1],
adapter->endpoint_in_max_size, &size, 1000);
if (adapter && hid && hid->slots && size) if (adapter && hid && hid->slots && size)
pad_connection_packet(&hid->slots[adapter->slot], adapter->slot, pad_connection_packet(&hid->slots[adapter->slot], adapter->slot,
@ -159,7 +168,8 @@ static void libusb_get_description(struct libusb_device *device,
for(j = 0; j < inter->num_altsetting; j++) for(j = 0; j < inter->num_altsetting; j++)
{ {
const struct libusb_interface_descriptor *interdesc = &inter->altsetting[j]; const struct libusb_interface_descriptor *interdesc =
&inter->altsetting[j];
#if 0 #if 0
if (interdesc->bInterfaceClass == LIBUSB_CLASS_HID) if (interdesc->bInterfaceClass == LIBUSB_CLASS_HID)
@ -169,10 +179,15 @@ static void libusb_get_description(struct libusb_device *device,
for(k = 0; k < (int)interdesc->bNumEndpoints; k++) for(k = 0; k < (int)interdesc->bNumEndpoints; k++)
{ {
const struct libusb_endpoint_descriptor *epdesc = &interdesc->endpoint[k]; const struct libusb_endpoint_descriptor *epdesc =
bool is_int = (epdesc->bmAttributes & LIBUSB_TRANSFER_TYPE_MASK) == LIBUSB_TRANSFER_TYPE_INTERRUPT; &interdesc->endpoint[k];
bool is_out = (epdesc->bEndpointAddress & LIBUSB_ENDPOINT_DIR_MASK) == LIBUSB_ENDPOINT_OUT; bool is_int = (epdesc->bmAttributes & LIBUSB_TRANSFER_TYPE_MASK)
bool is_in = (epdesc->bEndpointAddress & LIBUSB_ENDPOINT_DIR_MASK) == LIBUSB_ENDPOINT_IN; == LIBUSB_TRANSFER_TYPE_INTERRUPT;
bool is_out = (epdesc->bEndpointAddress & LIBUSB_ENDPOINT_DIR_MASK)
== LIBUSB_ENDPOINT_OUT;
bool is_in = (epdesc->bEndpointAddress & LIBUSB_ENDPOINT_DIR_MASK)
== LIBUSB_ENDPOINT_IN;
if (is_int) if (is_int)
{ {
if (is_in) if (is_in)
@ -249,7 +264,8 @@ static int add_adapter(void *data, struct libusb_device *dev)
desc.iManufacturer, adapter->manufacturer_name, desc.iManufacturer, adapter->manufacturer_name,
sizeof(adapter->manufacturer_name)); sizeof(adapter->manufacturer_name));
#if 0 #if 0
RARCH_ERR(" Adapter Manufacturer name: %s\n", adapter->manufacturer_name); RARCH_ERR(" Adapter Manufacturer name: %s\n",
adapter->manufacturer_name);
#endif #endif
} }
@ -363,7 +379,8 @@ static int remove_adapter(void *data, struct libusb_device *dev)
slock_free(adapter->send_control_lock); slock_free(adapter->send_control_lock);
fifo_free(adapter->send_control_buffer); fifo_free(adapter->send_control_buffer);
libusb_release_interface(adapter->next->handle, adapter->next->interface_number); libusb_release_interface(adapter->next->handle,
adapter->next->interface_number);
libusb_close(adapter->next->handle); libusb_close(adapter->next->handle);
new_next = adapter->next->next; new_next = adapter->next->next;
@ -422,7 +439,8 @@ static uint64_t libusb_hid_joypad_get_buttons(void *data, unsigned port)
return 0; return 0;
} }
static bool libusb_hid_joypad_button(void *data, unsigned port, uint16_t joykey) static bool libusb_hid_joypad_button(void *data,
unsigned port, uint16_t joykey)
{ {
uint64_t buttons = libusb_hid_joypad_get_buttons(data, port); uint64_t buttons = libusb_hid_joypad_get_buttons(data, port);