Commit 327ea974361ab35b406083f3e7d30496f601b837
2021-01-19T15:50:02
hidapi/libusb/hid.c: whitespace tidy-up.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85
diff --git a/src/hidapi/libusb/hid.c b/src/hidapi/libusb/hid.c
index 67833d9..8fa98b0 100644
--- a/src/hidapi/libusb/hid.c
+++ b/src/hidapi/libusb/hid.c
@@ -196,7 +196,6 @@ static void free_hid_device(hid_device *dev)
/*TODO: Implement this function on hidapi/libusb.. */
static void register_error(hid_device *dev, const char *op)
{
-
}
#endif
@@ -320,7 +319,6 @@ static inline int libusb_get_string_descriptor(libusb_device_handle *dev,
(LIBUSB_DT_STRING << 8) | descriptor_index,
lang_id, data, (uint16_t) length, 1000);
}
-
#endif
@@ -524,17 +522,17 @@ static int is_xbox360(unsigned short vendor_id, const struct libusb_interface_de
static int is_xboxone(unsigned short vendor_id, const struct libusb_interface_descriptor *intf_desc)
{
- static const int XB1_IFACE_SUBCLASS = 71;
- static const int XB1_IFACE_PROTOCOL = 208;
- static const int SUPPORTED_VENDORS[] = {
- 0x045e, /* Microsoft */
- 0x0738, /* Mad Catz */
- 0x0e6f, /* PDP */
- 0x0f0d, /* Hori */
- 0x1532, /* Razer Wildcat */
- 0x24c6, /* PowerA */
- 0x2e24, /* Hyperkin */
- };
+ static const int XB1_IFACE_SUBCLASS = 71;
+ static const int XB1_IFACE_PROTOCOL = 208;
+ static const int SUPPORTED_VENDORS[] = {
+ 0x045e, /* Microsoft */
+ 0x0738, /* Mad Catz */
+ 0x0e6f, /* PDP */
+ 0x0f0d, /* Hori */
+ 0x1532, /* Razer Wildcat */
+ 0x24c6, /* PowerA */
+ 0x2e24, /* Hyperkin */
+ };
if (intf_desc->bInterfaceNumber == 0 &&
intf_desc->bInterfaceClass == LIBUSB_CLASS_VENDOR_SPEC &&
@@ -922,8 +920,8 @@ static int read_thread(void *param)
static void init_xboxone(libusb_device_handle *device_handle, struct libusb_config_descriptor *conf_desc)
{
- static const int XB1_IFACE_SUBCLASS = 71;
- static const int XB1_IFACE_PROTOCOL = 208;
+ static const int XB1_IFACE_SUBCLASS = 71;
+ static const int XB1_IFACE_PROTOCOL = 208;
int j, k, res;
for (j = 0; j < conf_desc->bNumInterfaces; j++) {
@@ -1173,21 +1171,21 @@ static void cleanup_mutex(void *param)
}
#endif
-
int HID_API_EXPORT hid_read_timeout(hid_device *dev, unsigned char *data, size_t length, int milliseconds)
{
- int bytes_read = -1;
-
#if 0
int transferred;
int res = libusb_interrupt_transfer(dev->device_handle, dev->input_endpoint, data, length, &transferred, 5000);
LOG("transferred: %d\n", transferred);
return transferred;
#endif
+ int bytes_read;
SDL_LockMutex(dev->mutex);
/* TODO: pthread_cleanup SDL? */
+ bytes_read = -1;
+
/* There's an input report queued up. Return it. */
if (dev->input_reports) {
/* Return the first one */