summaryrefslogtreecommitdiff
path: root/Source/Core/UICommon/USBUtils.cpp
diff options
context:
space:
mode:
authorLéo Lam <leo@innovatetechnologi.es>2017-03-26 14:51:12 +0200
committerLéo Lam <leo@innovatetechnologi.es>2017-03-26 15:58:30 +0200
commit32a1b5068ad61bb025ef28f8bc3bdf81af9bf581 (patch)
tree2c78b2386160e9f0bb316e530058abce3192a615 /Source/Core/UICommon/USBUtils.cpp
parent6c62cfb1aa248d9106f5a70ecf690dd320028365 (diff)
Revert "Use a single libusb context"
This reverts commit c8a6dc6c23a5efe99b4bf937003ba3f2f7f8f200. libusb on Windows isn't really safe to use from different threads with a single context.
Diffstat (limited to 'Source/Core/UICommon/USBUtils.cpp')
-rw-r--r--Source/Core/UICommon/USBUtils.cpp16
1 files changed, 4 insertions, 12 deletions
diff --git a/Source/Core/UICommon/USBUtils.cpp b/Source/Core/UICommon/USBUtils.cpp
index 4fbabda856..001e1dbbb1 100644
--- a/Source/Core/UICommon/USBUtils.cpp
+++ b/Source/Core/UICommon/USBUtils.cpp
@@ -2,23 +2,14 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
-#include <memory>
-#include <mutex>
-
#ifdef __LIBUSB__
#include <libusb.h>
-#include "Common/LibusbContext.h"
#endif
#include "Common/CommonTypes.h"
#include "Common/StringUtil.h"
#include "UICommon/USBUtils.h"
-#ifdef __LIBUSB__
-static std::once_flag s_tried_libusb_init;
-static std::shared_ptr<libusb_context> s_libusb_context;
-#endif
-
// Because opening and getting the device name from devices is slow, especially on Windows
// with usbdk, we cannot do that for every single device. We should however still show
// device names for known Wii peripherals.
@@ -43,12 +34,12 @@ std::map<std::pair<u16, u16>, std::string> GetInsertedDevices()
std::map<std::pair<u16, u16>, std::string> devices;
#ifdef __LIBUSB__
- std::call_once(s_tried_libusb_init, []() { s_libusb_context = LibusbContext::Get(); });
- if (!s_libusb_context)
+ libusb_context* context = nullptr;
+ if (libusb_init(&context) < 0)
return devices;
libusb_device** list;
- const ssize_t cnt = libusb_get_device_list(s_libusb_context.get(), &list);
+ const ssize_t cnt = libusb_get_device_list(context, &list);
for (ssize_t i = 0; i < cnt; ++i)
{
libusb_device_descriptor descr;
@@ -57,6 +48,7 @@ std::map<std::pair<u16, u16>, std::string> GetInsertedDevices()
devices[vid_pid] = GetDeviceName(vid_pid);
}
libusb_free_device_list(list, 1);
+ libusb_exit(context);
#endif
return devices;