Commit 047b20e3b61aeb90489990d05ccc6f3fb21cb096
2020-12-23T16:11:16
Fixed compile warnings on platforms without hidapi support
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 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137
diff --git a/src/hidapi/SDL_hidapi.c b/src/hidapi/SDL_hidapi.c
index 0b07716..dc2bc49 100644
--- a/src/hidapi/SDL_hidapi.c
+++ b/src/hidapi/SDL_hidapi.c
@@ -434,6 +434,8 @@ struct _HIDDeviceWrapper
const struct hidapi_backend *backend;
};
+#if HAVE_PLATFORM_BACKEND || HAVE_DRIVER_BACKEND || SDL_LIBUSB_DYNAMIC
+
static HIDDeviceWrapper *
CreateHIDDeviceWrapper(hid_device *device, const struct hidapi_backend *backend)
{
@@ -449,6 +451,8 @@ WrapHIDDevice(HIDDeviceWrapper *wrapper)
return (hid_device *)wrapper;
}
+#endif /* HAVE_PLATFORM_BACKEND || HAVE_DRIVER_BACKEND || SDL_LIBUSB_DYNAMIC */
+
static HIDDeviceWrapper *
UnwrapHIDDevice(hid_device *device)
{
@@ -547,13 +551,14 @@ static SDL_bool SDL_hidapi_wasinit = SDL_FALSE;
int HID_API_EXPORT HID_API_CALL hid_init(void)
{
- int err;
+ int attempts = 0, success = 0;
if (SDL_hidapi_wasinit == SDL_TRUE) {
return 0;
}
#ifdef SDL_LIBUSB_DYNAMIC
+ ++attempts;
libusb_ctx.libhandle = SDL_LoadObject(SDL_LIBUSB_DYNAMIC);
if (libusb_ctx.libhandle != NULL) {
SDL_bool loaded = SDL_TRUE;
@@ -587,44 +592,40 @@ int HID_API_EXPORT HID_API_CALL hid_init(void)
LOAD_LIBUSB_SYMBOL(handle_events_completed)
#undef LOAD_LIBUSB_SYMBOL
- if (loaded == SDL_TRUE) {
- if ((err = LIBUSB_hid_init()) < 0) {
- SDL_UnloadObject(libusb_ctx.libhandle);
- libusb_ctx.libhandle = NULL;
- return err;
- }
- } else {
+ if (!loaded) {
+ SDL_UnloadObject(libusb_ctx.libhandle);
+ libusb_ctx.libhandle = NULL;
+ /* SDL_LogWarn(SDL_LOG_CATEGORY_INPUT, SDL_LIBUSB_DYNAMIC " found but could not load function"); */
+ } else if (LIBUSB_hid_init() < 0) {
SDL_UnloadObject(libusb_ctx.libhandle);
libusb_ctx.libhandle = NULL;
- /* SDL_LogWarn(SDL_LOG_CATEGORY_INPUT, SDL_LIBUSB_DYNAMIC " found but could not load function."); */
- /* ignore error: continue without libusb */
+ } else {
+ ++success;
}
}
#endif /* SDL_LIBUSB_DYNAMIC */
#if HAVE_PLATFORM_BACKEND
+ ++attempts;
#if __LINUX__
udev_ctx = SDL_UDEV_GetUdevSyms();
#endif /* __LINUX __ */
- if (udev_ctx && (err = PLATFORM_hid_init()) < 0) {
-#ifdef SDL_LIBUSB_DYNAMIC
- if (libusb_ctx.libhandle) {
- LIBUSB_hid_exit();
- SDL_UnloadObject(libusb_ctx.libhandle);
- libusb_ctx.libhandle = NULL;
- }
-#endif /* SDL_LIBUSB_DYNAMIC */
- return err;
+ if (udev_ctx && PLATFORM_hid_init() == 0) {
+ ++success;
}
#endif /* HAVE_PLATFORM_BACKEND */
+ if (attempts > 0 && success == 0) {
+ return -1;
+ }
+
SDL_hidapi_wasinit = SDL_TRUE;
return 0;
}
int HID_API_EXPORT HID_API_CALL hid_exit(void)
{
- int err = 0;
+ int result = 0;
if (SDL_hidapi_wasinit == SDL_FALSE) {
return 0;
@@ -633,21 +634,24 @@ int HID_API_EXPORT HID_API_CALL hid_exit(void)
#if HAVE_PLATFORM_BACKEND
if (udev_ctx) {
- err = PLATFORM_hid_exit();
+ result |= PLATFORM_hid_exit();
}
#endif /* HAVE_PLATFORM_BACKEND */
+
#ifdef SDL_LIBUSB_DYNAMIC
if (libusb_ctx.libhandle) {
- err |= LIBUSB_hid_exit(); /* Ehhhhh */
+ result |= LIBUSB_hid_exit();
SDL_UnloadObject(libusb_ctx.libhandle);
libusb_ctx.libhandle = NULL;
}
#endif /* SDL_LIBUSB_DYNAMIC */
- return err;
+
+ return result;
}
struct hid_device_info HID_API_EXPORT * HID_API_CALL hid_enumerate(unsigned short vendor_id, unsigned short product_id)
{
+#if HAVE_PLATFORM_BACKEND || HAVE_DRIVER_BACKEND || SDL_LIBUSB_DYNAMIC
#ifdef SDL_LIBUSB_DYNAMIC
struct LIBUSB_hid_device_info *usb_devs = NULL;
struct LIBUSB_hid_device_info *usb_dev;
@@ -779,6 +783,10 @@ struct hid_device_info HID_API_EXPORT * HID_API_CALL hid_enumerate(unsigned shor
}
#endif
return devs;
+
+#else
+ return NULL;
+#endif /* HAVE_PLATFORM_BACKEND || HAVE_DRIVER_BACKEND || SDL_LIBUSB_DYNAMIC */
}
void HID_API_EXPORT HID_API_CALL hid_free_enumeration(struct hid_device_info *devs)