From f06b0ee952da972ca643d8ae63fcdb40361af78c Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Mon, 19 Apr 2021 18:30:31 -0500 Subject: [PATCH] Use NULL (shared) libusb context --- .../CorsairHydroControllerDetect.cpp | 7 +++---- Controllers/LianLiController/LianLiControllerDetect.cpp | 6 ++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Controllers/CorsairHydroController/CorsairHydroControllerDetect.cpp b/Controllers/CorsairHydroController/CorsairHydroControllerDetect.cpp index f1c5b357d..887315ebb 100644 --- a/Controllers/CorsairHydroController/CorsairHydroControllerDetect.cpp +++ b/Controllers/CorsairHydroController/CorsairHydroControllerDetect.cpp @@ -47,16 +47,15 @@ static const corsair_hydro_device device_list[] = void DetectCorsairHydroControllers(std::vector& rgb_controllers) { - libusb_context * ctx; - libusb_init(&ctx); + libusb_init(NULL); #ifdef _WIN32 - libusb_set_option(ctx, LIBUSB_OPTION_USE_USBDK); + libusb_set_option(NULL, LIBUSB_OPTION_USE_USBDK); #endif for(std::size_t device_idx = 0; device_idx < CORSAIR_NUM_DEVICES; device_idx++) { - libusb_device_handle * dev = libusb_open_device_with_vid_pid(ctx, device_list[device_idx].usb_vid, device_list[device_idx].usb_pid); + libusb_device_handle * dev = libusb_open_device_with_vid_pid(NULL, device_list[device_idx].usb_vid, device_list[device_idx].usb_pid); //Look for Corsair RGB Peripheral if(dev) diff --git a/Controllers/LianLiController/LianLiControllerDetect.cpp b/Controllers/LianLiController/LianLiControllerDetect.cpp index a84263737..62f25f5c0 100644 --- a/Controllers/LianLiController/LianLiControllerDetect.cpp +++ b/Controllers/LianLiController/LianLiControllerDetect.cpp @@ -28,19 +28,17 @@ void DetectLianLiUniHub(std::vector&) { - libusb_context * ctx; - libusb_device** devices = nullptr; int ret; - ret = libusb_init(&ctx); + ret = libusb_init(NULL); if(ret < 0) { return; } - ret = libusb_get_device_list(ctx, &devices); + ret = libusb_get_device_list(NULL, &devices); if(ret < 0) { return;