633f9296f4
Iridium is a free, open, and libre browser modification of the Chromium code base, with privacy being enhanced in several key areas. Automatic transmission of partial queries, keywords, metrics to central services is inhibited and only occurs with consent. WWW: https://iridiumbrowser.de/
58 lines
1.8 KiB
C++
58 lines
1.8 KiB
C++
--- device/usb/usb_service_impl.cc.orig 2017-04-19 19:06:34 UTC
|
|
+++ device/usb/usb_service_impl.cc
|
|
@@ -25,7 +25,11 @@
|
|
#include "device/usb/usb_error.h"
|
|
#include "device/usb/webusb_descriptors.h"
|
|
#include "net/base/io_buffer.h"
|
|
-#include "third_party/libusb/src/libusb/libusb.h"
|
|
+#if defined(OS_FREEBSD)
|
|
+# include <libusb.h>
|
|
+#else
|
|
+# include "third_party/libusb/src/libusb/libusb.h"
|
|
+#endif
|
|
|
|
#if defined(OS_WIN)
|
|
#define INITGUID
|
|
@@ -231,8 +235,10 @@ UsbServiceImpl::UsbServiceImpl(
|
|
}
|
|
|
|
UsbServiceImpl::~UsbServiceImpl() {
|
|
+#if !defined(OS_FREEBSD)
|
|
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);
|
|
}
|
|
@@ -289,6 +295,7 @@ void UsbServiceImpl::OnUsbContext(scoped
|
|
|
|
context_ = std::move(context);
|
|
|
|
+#if !defined(OS_FREEBSD)
|
|
int rv = libusb_hotplug_register_callback(
|
|
context_->context(),
|
|
static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
|
|
@@ -301,6 +308,7 @@ void UsbServiceImpl::OnUsbContext(scoped
|
|
|
|
// This will call any enumeration callbacks queued while initializing.
|
|
RefreshDevices();
|
|
+#endif // !defined(OS_FREEBSD)
|
|
|
|
#if defined(OS_WIN)
|
|
DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces();
|
|
@@ -500,6 +508,7 @@ void UsbServiceImpl::RemoveDevice(scoped
|
|
device->OnDisconnect();
|
|
}
|
|
|
|
+#if !defined(OS_FREEBSD)
|
|
// static
|
|
int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context,
|
|
PlatformUsbDevice device,
|
|
@@ -530,6 +539,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugC
|
|
|
|
return 0;
|
|
}
|
|
+#endif // !defined(OS_FREEBSD)
|
|
|
|
void UsbServiceImpl::OnPlatformDeviceAdded(PlatformUsbDevice platform_device) {
|
|
DCHECK(CalledOnValidThread());
|