use libusb auto-detach feature

Merge pull request #76 from mogenson/connection-error-params
Swap arguments to ConnectionError in RFCOMM Multiplexer
2022-11-25 17:52:13 -08:00 · 2022-11-18 10:48:02 -05:00 · 2022-11-18 10:02:40 -05:00
2 changed files with 6 additions and 7 deletions
--- a/bumble/rfcomm.py
+++ b/bumble/rfcomm.py
@@ -636,8 +636,8 @@ class Multiplexer(EventEmitter):
            if self.open_result:
                self.open_result.set_exception(ConnectionError(
                    ConnectionError.CONNECTION_REFUSED,
-                    self.l2cap_channel.connection.peer_address,
                    BT_BR_EDR_TRANSPORT,
+                    self.l2cap_channel.connection.peer_address,
                    'rfcomm'
                ))
        else:
--- a/bumble/transport/usb.py
+++ b/bumble/transport/usb.py
@@ -414,14 +414,13 @@ async def open_usb_transport(spec):

        device = found.open()

-        # Detach the kernel driver if supported and needed
+        # Auto-detach the kernel driver if supported
        if usb1.hasCapability(usb1.CAP_SUPPORTS_DETACH_KERNEL_DRIVER):
            try:
-                if device.kernelDriverActive(interface):
-                    logger.debug("detaching kernel driver")
-                    device.detachKernelDriver(interface)
-            except usb1.USBError:
-                pass
+                logger.debug('auto-detaching kernel driver')
+                device.setAutoDetachKernelDriver(True)
+            except usb1.USBError as error:
+                logger.warning(f'unable to auto-detach kernel driver: {error}')

        # Set the configuration if needed
        try:
Author	SHA1	Message	Date
Gilles Boccon-Gibod	9e5a85bd10	use libusb auto-detach feature	2022-11-25 17:52:13 -08:00
Michael Mogenson	4988a31487	Merge pull request #76 from mogenson/connection-error-params Swap arguments to ConnectionError in RFCOMM Multiplexer	2022-11-18 10:48:02 -05:00
Michael Mogenson	e6c062117f	Swap arguments to ConnectionError in RFCOMM Multiplexer Minor fixup. Change the order of arguments to ConnectionError to set the transport and address correctly in rfcomm.py on_dm_frame().	2022-11-18 10:02:40 -05:00