mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-06 03:18:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Look at all available usages when determining whether to ignore a device

Browse Source
This commit is contained in:
Sam Lantinga
2024-02-07 16:02:12 -08:00
parent dd726cb097
commit c951bbe3de
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/hidapi/mac/hid.c
View File

@@ -594,6 +594,14 @@ static struct hid_device_info *create_device_info_with_usage(IOHIDDeviceRef dev,
dev_vid = get_vendor_id(dev); dev_vid = get_vendor_id(dev);
dev_pid = get_product_id(dev); dev_pid = get_product_id(dev);
#ifdef HIDAPI_IGNORE_DEVICE
/* See if there are any devices we should skip in enumeration */
if (HIDAPI_IGNORE_DEVICE(get_bus_type(dev), dev_vid, dev_pid, usage_page, usage)) {
free(cur_dev);
return NULL;
}
#endif
cur_dev->usage_page = usage_page; cur_dev->usage_page = usage_page;
cur_dev->usage = usage; cur_dev->usage = usage;
@@ -691,9 +699,6 @@ static struct hid_device_info *create_device_info(IOHIDDeviceRef device)
struct hid_device_info *root = create_device_info_with_usage(device, primary_usage_page, primary_usage); struct hid_device_info *root = create_device_info_with_usage(device, primary_usage_page, primary_usage);
struct hid_device_info *cur = root; struct hid_device_info *cur = root;
if (!root)
return NULL;
CFArrayRef usage_pairs = get_usage_pairs(device); CFArrayRef usage_pairs = get_usage_pairs(device);
if (usage_pairs != NULL) { if (usage_pairs != NULL) {
@@ -719,9 +724,13 @@ static struct hid_device_info *create_device_info(IOHIDDeviceRef device)
continue; /* Already added. */ continue; /* Already added. */
next = create_device_info_with_usage(device, usage_page, usage); next = create_device_info_with_usage(device, usage_page, usage);
cur->next = next; if (cur) {
if (next != NULL) { if (next != NULL) {
cur = next; cur->next = next;
cur = next;
}
} else {
root = cur = next;
} }
} }
} }
@@ -788,18 +797,6 @@ struct hid_device_info HID_API_EXPORT *hid_enumerate(unsigned short vendor_id,
continue; continue;
} }
#ifdef HIDAPI_IGNORE_DEVICE
/* See if there are any devices we should skip in enumeration */
hid_bus_type bus_type = get_bus_type(dev);
unsigned short dev_vid = get_vendor_id(dev);
unsigned short dev_pid = get_product_id(dev);
unsigned short usage_page = get_int_property(dev, CFSTR(kIOHIDPrimaryUsagePageKey));
unsigned short usage = get_int_property(dev, CFSTR(kIOHIDPrimaryUsageKey));
if (HIDAPI_IGNORE_DEVICE(bus_type, dev_vid, dev_pid, usage_page, usage)) {
continue;
}
#endif
struct hid_device_info *tmp = create_device_info(dev); struct hid_device_info *tmp = create_device_info(dev);
if (tmp == NULL) { if (tmp == NULL) {
continue; continue;