diff options
Diffstat (limited to 'www/chromium/files/patch-device_usb_usb__service__impl.cc')
| -rw-r--r-- | www/chromium/files/patch-device_usb_usb__service__impl.cc | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/www/chromium/files/patch-device_usb_usb__service__impl.cc b/www/chromium/files/patch-device_usb_usb__service__impl.cc index bf899301ad01..9b37f5c8bd92 100644 --- a/www/chromium/files/patch-device_usb_usb__service__impl.cc +++ b/www/chromium/files/patch-device_usb_usb__service__impl.cc @@ -1,18 +1,6 @@ ---- device/usb/usb_service_impl.cc.orig 2018-03-20 23:05:25.000000000 +0100 -+++ device/usb/usb_service_impl.cc 2018-03-24 17:34:53.453193000 +0100 -@@ -27,7 +27,11 @@ - #include "device/usb/usb_device_handle.h" - #include "device/usb/usb_error.h" - #include "device/usb/webusb_descriptors.h" -+#if defined(OS_FREEBSD) -+#include "libusb.h" -+#else - #include "third_party/libusb/src/libusb/libusb.h" -+#endif - - #if defined(OS_WIN) - #define INITGUID -@@ -227,8 +231,10 @@ +--- device/usb/usb_service_impl.cc.orig 2018-06-13 00:10:18.000000000 +0200 ++++ device/usb/usb_service_impl.cc 2018-07-20 12:49:59.699912000 +0200 +@@ -239,8 +239,10 @@ } UsbServiceImpl::~UsbServiceImpl() { @@ -20,10 +8,10 @@ if (hotplug_enabled_) libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_); +#endif // !defined(OS_FREEBSD) - for (auto* platform_device : ignored_devices_) - libusb_unref_device(platform_device); } -@@ -285,6 +291,7 @@ + + void UsbServiceImpl::GetDevices(const GetDevicesCallback& callback) { +@@ -295,6 +297,7 @@ context_ = std::move(context); @@ -31,7 +19,7 @@ int rv = libusb_hotplug_register_callback( context_->context(), static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | -@@ -297,6 +304,7 @@ +@@ -307,6 +310,7 @@ // This will call any enumeration callbacks queued while initializing. RefreshDevices(); @@ -39,19 +27,19 @@ #if defined(OS_WIN) DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces(); -@@ -496,6 +504,7 @@ +@@ -503,6 +507,7 @@ device->OnDisconnect(); } +#if !defined(OS_FREEBSD) // static int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context, - PlatformUsbDevice device, -@@ -526,6 +535,7 @@ + libusb_device* device_raw, +@@ -537,6 +542,7 @@ return 0; } +#endif // !defined(OS_FREEBSD) - void UsbServiceImpl::OnPlatformDeviceAdded(PlatformUsbDevice platform_device) { - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + void UsbServiceImpl::OnPlatformDeviceAdded( + ScopedLibusbDeviceRef platform_device) { |