bumble 0.0.219__py3-none-any.whl → 0.0.220__py3-none-any.whl

bumble/controller.py

@@ -23,45 +23,11 @@ import itertools
 import logging
 import random
 import struct
-from typing import TYPE_CHECKING, Any, Optional, Union
+from typing import TYPE_CHECKING, Any, Optional, Union, cast
 
-from bumble import hci
+from bumble import hci, lmp
 from bumble.colors import color
 from bumble.core import PhysicalTransport
-from bumble.hci import (
-    HCI_ACL_DATA_PACKET,
-    HCI_COMMAND_DISALLOWED_ERROR,
-    HCI_COMMAND_PACKET,
-    HCI_COMMAND_STATUS_PENDING,
-    HCI_CONTROLLER_BUSY_ERROR,
-    HCI_EVENT_PACKET,
-    HCI_INVALID_HCI_COMMAND_PARAMETERS_ERROR,
-    HCI_LE_1M_PHY,
-    HCI_REMOTE_USER_TERMINATED_CONNECTION_ERROR,
-    HCI_SUCCESS,
-    HCI_UNKNOWN_CONNECTION_IDENTIFIER_ERROR,
-    HCI_UNKNOWN_HCI_COMMAND_ERROR,
-    HCI_VERSION_BLUETOOTH_CORE_5_0,
-    Address,
-    HCI_AclDataPacket,
-    HCI_AclDataPacketAssembler,
-    HCI_Command_Complete_Event,
-    HCI_Command_Status_Event,
-    HCI_Connection_Complete_Event,
-    HCI_Connection_Request_Event,
-    HCI_Disconnection_Complete_Event,
-    HCI_Encryption_Change_Event,
-    HCI_LE_Advertising_Report_Event,
-    HCI_LE_CIS_Established_Event,
-    HCI_LE_CIS_Request_Event,
-    HCI_LE_Connection_Complete_Event,
-    HCI_LE_Read_Remote_Features_Complete_Event,
-    HCI_Number_Of_Completed_Packets_Event,
-    HCI_Packet,
-    HCI_Role_Change_Event,
-    HCI_Synchronous_Connection_Complete_Event,
-    Role,
-)
 
 if TYPE_CHECKING:
     from bumble.link import LocalLink
@@ -90,24 +56,33 @@ class CisLink:
     data_paths: set[int] = dataclasses.field(default_factory=set)
 
 
+# -----------------------------------------------------------------------------
+@dataclasses.dataclass
+class ScoLink:
+    handle: int
+    link_type: int
+    peer_address: hci.Address
+
+
 # -----------------------------------------------------------------------------
 @dataclasses.dataclass
 class Connection:
     controller: Controller
     handle: int
-    role: Role
-    peer_address: Address
+    role: hci.Role
+    peer_address: hci.Address
     link: Any
     transport: int
     link_type: int
+    classic_allow_role_switch: bool = False
 
     def __post_init__(self) -> None:
-        self.assembler = HCI_AclDataPacketAssembler(self.on_acl_pdu)
+        self.assembler = hci.HCI_AclDataPacketAssembler(self.on_acl_pdu)
 
     def on_hci_acl_data_packet(self, packet: hci.HCI_AclDataPacket) -> None:
         self.assembler.feed_packet(packet)
         self.controller.send_hci_packet(
-            HCI_Number_Of_Completed_Packets_Event(
+            hci.HCI_Number_Of_Completed_Packets_Event(
                 connection_handles=[self.handle], num_completed_packets=[1]
             )
         )
@@ -124,18 +99,20 @@ class Controller:
     hci_sink: Optional[TransportSink] = None
 
     central_connections: dict[
-        Address, Connection
+        hci.Address, Connection
     ]  # Connections where this controller is the central
     peripheral_connections: dict[
-        Address, Connection
+        hci.Address, Connection
     ]  # Connections where this controller is the peripheral
-    classic_connections: dict[Address, Connection]  # Connections in BR/EDR
+    classic_connections: dict[hci.Address, Connection]  # Connections in BR/EDR
+    classic_pending_commands: dict[hci.Address, dict[lmp.Opcode, asyncio.Future[int]]]
+    sco_links: dict[hci.Address, ScoLink]  # SCO links by address
     central_cis_links: dict[int, CisLink]  # CIS links by handle
     peripheral_cis_links: dict[int, CisLink]  # CIS links by handle
 
-    hci_version: int = HCI_VERSION_BLUETOOTH_CORE_5_0
+    hci_version: int = hci.HCI_VERSION_BLUETOOTH_CORE_5_0
     hci_revision: int = 0
-    lmp_version: int = HCI_VERSION_BLUETOOTH_CORE_5_0
+    lmp_version: int = hci.HCI_VERSION_BLUETOOTH_CORE_5_0
     lmp_subversion: int = 0
     lmp_features: bytes = bytes.fromhex(
         '0000000060000000'
@@ -174,7 +151,7 @@ class Controller:
     le_scan_interval: int = 0x10
     le_scan_window: int = 0x10
     le_scan_enable: int = 0
-    le_scan_own_address_type: int = Address.RANDOM_DEVICE_ADDRESS
+    le_scan_own_address_type: int = hci.Address.RANDOM_DEVICE_ADDRESS
     le_scanning_filter_policy: int = 0
     le_scan_response_data: Optional[bytes] = None
     le_address_resolution: bool = False
@@ -184,8 +161,10 @@ class Controller:
     advertising_interval: int = 2000
     advertising_data: Optional[bytes] = None
     advertising_timer_handle: Optional[asyncio.Handle] = None
+    classic_scan_enable: int = 0
+    classic_allow_role_switch: bool = True
 
-    _random_address: 'Address' = Address('00:00:00:00:00:00')
+    _random_address: hci.Address = hci.Address('00:00:00:00:00:00')
 
     def __init__(
         self,
@@ -193,13 +172,15 @@ class Controller:
         host_source=None,
         host_sink: Optional[TransportSink] = None,
         link: Optional[LocalLink] = None,
-        public_address: Optional[Union[bytes, str, Address]] = None,
+        public_address: Optional[Union[bytes, str, hci.Address]] = None,
     ) -> None:
         self.name = name
         self.link = link
         self.central_connections = {}
         self.peripheral_connections = {}
         self.classic_connections = {}
+        self.sco_links = {}
+        self.classic_pending_commands = {}
         self.central_cis_links = {}
         self.peripheral_cis_links = {}
         self.default_phy = {
@@ -208,14 +189,14 @@ class Controller:
             'rx_phys': 0,
         }
 
-        if isinstance(public_address, Address):
+        if isinstance(public_address, hci.Address):
             self._public_address = public_address
         elif public_address is not None:
-            self._public_address = Address(
-                public_address, Address.PUBLIC_DEVICE_ADDRESS
+            self._public_address = hci.Address(
+                public_address, hci.Address.PUBLIC_DEVICE_ADDRESS
             )
         else:
-            self._public_address = Address('00:00:00:00:00:00')
+            self._public_address = hci.Address('00:00:00:00:00:00')
 
         # Set the source and sink interfaces
         if host_source:
@@ -249,23 +230,23 @@ class Controller:
         self.hci_sink = sink
 
     @property
-    def public_address(self) -> Address:
+    def public_address(self) -> hci.Address:
         return self._public_address
 
     @public_address.setter
-    def public_address(self, address: Union[Address, str]) -> None:
+    def public_address(self, address: Union[hci.Address, str]) -> None:
         if isinstance(address, str):
-            address = Address(address)
+            address = hci.Address(address)
         self._public_address = address
 
     @property
-    def random_address(self) -> Address:
+    def random_address(self) -> hci.Address:
         return self._random_address
 
     @random_address.setter
-    def random_address(self, address: Union[Address, str]) -> None:
+    def random_address(self, address: Union[hci.Address, str]) -> None:
         if isinstance(address, str):
-            address = Address(address)
+            address = hci.Address(address)
         self._random_address = address
         logger.debug(f'new random address: {address}')
 
@@ -274,9 +255,9 @@ class Controller:
 
     # Packet Sink protocol (packets coming from the host via HCI)
     def on_packet(self, packet: bytes) -> None:
-        self.on_hci_packet(HCI_Packet.from_bytes(packet))
+        self.on_hci_packet(hci.HCI_Packet.from_bytes(packet))
 
-    def on_hci_packet(self, packet: HCI_Packet) -> None:
+    def on_hci_packet(self, packet: hci.HCI_Packet) -> None:
         logger.debug(
             f'{color("<<<", "blue")} [{self.name}] '
             f'{color("HOST -> CONTROLLER", "blue")}: {packet}'
@@ -298,14 +279,14 @@ class Controller:
         result: Optional[bytes] = handler(command)
         if isinstance(result, bytes):
             self.send_hci_packet(
-                HCI_Command_Complete_Event(
+                hci.HCI_Command_Complete_Event(
                     num_hci_command_packets=1,
                     command_opcode=command.op_code,
                     return_parameters=result,
                 )
             )
 
-    def on_hci_event_packet(self, _event: HCI_Packet) -> None:
+    def on_hci_event_packet(self, _event: hci.HCI_Packet) -> None:
         logger.warning('!!! unexpected event packet')
 
     def on_hci_acl_data_packet(self, packet: hci.HCI_AclDataPacket) -> None:
@@ -320,13 +301,13 @@ class Controller:
         # Pass the packet to the connection
         connection.on_hci_acl_data_packet(packet)
 
-    def send_hci_packet(self, packet: HCI_Packet) -> None:
+    def send_hci_packet(self, packet: hci.HCI_Packet) -> None:
         logger.debug(
             f'{color(">>>", "green")} [{self.name}] '
             f'{color("CONTROLLER -> HOST", "green")}: {packet}'
         )
         if self.host:
-            self.host.on_packet(bytes(packet))
+            asyncio.get_running_loop().call_soon(self.host.on_packet, bytes(packet))
 
     # This method allows the controller to emulate the same API as a transport source
     async def wait_for_termination(self) -> None:
@@ -336,33 +317,30 @@ class Controller:
     # Link connections
     ############################################################
     def allocate_connection_handle(self) -> int:
-        handle = 0
-        max_handle = 0
-        for connection in itertools.chain(
-            self.central_connections.values(),
-            self.peripheral_connections.values(),
-            self.classic_connections.values(),
-        ):
-            max_handle = max(max_handle, connection.handle)
-            if connection.handle == handle:
-                # Already used, continue searching after the current max
-                handle = max_handle + 1
-        for cis_handle in itertools.chain(
-            self.central_cis_links.keys(), self.peripheral_cis_links.keys()
-        ):
-            max_handle = max(max_handle, cis_handle)
-            if cis_handle == handle:
-                # Already used, continue searching after the current max
-                handle = max_handle + 1
-        return handle
+        current_handles = set(
+            cast(Connection | CisLink | ScoLink, link).handle
+            for link in itertools.chain(
+                self.central_connections.values(),
+                self.peripheral_connections.values(),
+                self.classic_connections.values(),
+                self.sco_links.values(),
+                self.central_cis_links.values(),
+                self.peripheral_cis_links.values(),
+            )
+        )
+        return next(
+            handle for handle in range(0xEFF + 1) if handle not in current_handles
+        )
 
-    def find_le_connection_by_address(self, address: Address) -> Optional[Connection]:
+    def find_le_connection_by_address(
+        self, address: hci.Address
+    ) -> Optional[Connection]:
         return self.central_connections.get(address) or self.peripheral_connections.get(
             address
         )
 
     def find_classic_connection_by_address(
-        self, address: Address
+        self, address: hci.Address
     ) -> Optional[Connection]:
         return self.classic_connections.get(address)
 
@@ -394,12 +372,18 @@ class Controller:
                 return connection
         return None
 
+    def find_classic_sco_link_by_handle(self, handle: int) -> Optional[ScoLink]:
+        for connection in self.sco_links.values():
+            if connection.handle == handle:
+                return connection
+        return None
+
     def find_iso_link_by_handle(self, handle: int) -> Optional[CisLink]:
         return self.central_cis_links.get(handle) or self.peripheral_cis_links.get(
             handle
         )
 
-    def on_link_central_connected(self, central_address: Address) -> None:
+    def on_link_central_connected(self, central_address: hci.Address) -> None:
         '''
         Called when an incoming connection occurs from a central on the link
         '''
@@ -413,19 +397,19 @@ class Controller:
             connection = Connection(
                 controller=self,
                 handle=connection_handle,
-                role=Role.PERIPHERAL,
+                role=hci.Role.PERIPHERAL,
                 peer_address=peer_address,
                 link=self.link,
                 transport=PhysicalTransport.LE,
-                link_type=HCI_Connection_Complete_Event.LinkType.ACL,
+                link_type=hci.HCI_Connection_Complete_Event.LinkType.ACL,
             )
             self.peripheral_connections[peer_address] = connection
             logger.debug(f'New PERIPHERAL connection handle: 0x{connection_handle:04X}')
 
         # Then say that the connection has completed
         self.send_hci_packet(
-            HCI_LE_Connection_Complete_Event(
-                status=HCI_SUCCESS,
+            hci.HCI_LE_Connection_Complete_Event(
+                status=hci.HCI_SUCCESS,
                 connection_handle=connection.handle,
                 role=connection.role,
                 peer_address_type=peer_address_type,
@@ -437,7 +421,7 @@ class Controller:
             )
         )
 
-    def on_link_disconnected(self, peer_address: Address, reason: int) -> None:
+    def on_link_disconnected(self, peer_address: hci.Address, reason: int) -> None:
         '''
         Called when an active disconnection occurs from a peer
         '''
@@ -445,8 +429,8 @@ class Controller:
         # Send a disconnection complete event
         if connection := self.peripheral_connections.get(peer_address):
             self.send_hci_packet(
-                HCI_Disconnection_Complete_Event(
-                    status=HCI_SUCCESS,
+                hci.HCI_Disconnection_Complete_Event(
+                    status=hci.HCI_SUCCESS,
                     connection_handle=connection.handle,
                     reason=reason,
                 )
@@ -456,8 +440,8 @@ class Controller:
             del self.peripheral_connections[peer_address]
         elif connection := self.central_connections.get(peer_address):
             self.send_hci_packet(
-                HCI_Disconnection_Complete_Event(
-                    status=HCI_SUCCESS,
+                hci.HCI_Disconnection_Complete_Event(
+                    status=hci.HCI_SUCCESS,
                     connection_handle=connection.handle,
                     reason=reason,
                 )
@@ -477,7 +461,7 @@ class Controller:
         Called by the link when a connection has been made or has failed to be made
         '''
 
-        if status == HCI_SUCCESS:
+        if status == hci.HCI_SUCCESS:
             # Allocate (or reuse) a connection handle
             peer_address = le_create_connection_command.peer_address
             connection = self.central_connections.get(peer_address)
@@ -486,11 +470,11 @@ class Controller:
                 connection = Connection(
                     controller=self,
                     handle=connection_handle,
-                    role=Role.CENTRAL,
+                    role=hci.Role.CENTRAL,
                     peer_address=peer_address,
                     link=self.link,
                     transport=PhysicalTransport.LE,
-                    link_type=HCI_Connection_Complete_Event.LinkType.ACL,
+                    link_type=hci.HCI_Connection_Complete_Event.LinkType.ACL,
                 )
                 self.central_connections[peer_address] = connection
                 logger.debug(
@@ -502,10 +486,10 @@ class Controller:
         # Say that the connection has completed
         self.send_hci_packet(
             # pylint: disable=line-too-long
-            HCI_LE_Connection_Complete_Event(
+            hci.HCI_LE_Connection_Complete_Event(
                 status=status,
                 connection_handle=connection.handle if connection else 0,
-                role=Role.CENTRAL,
+                role=hci.Role.CENTRAL,
                 peer_address_type=le_create_connection_command.peer_address_type,
                 peer_address=le_create_connection_command.peer_address,
                 connection_interval=le_create_connection_command.connection_interval_min,
@@ -524,7 +508,7 @@ class Controller:
 
         # Send a disconnection complete event
         self.send_hci_packet(
-            HCI_Disconnection_Complete_Event(
+            hci.HCI_Disconnection_Complete_Event(
                 status=status,
                 connection_handle=disconnection_command.connection_handle,
                 reason=disconnection_command.reason,
@@ -544,18 +528,18 @@ class Controller:
             del self.peripheral_connections[connection.peer_address]
 
     def on_link_encrypted(
-        self, peer_address: Address, _rand: int, _ediv: int, _ltk: bytes
+        self, peer_address: hci.Address, _rand: bytes, _ediv: int, _ltk: bytes
     ) -> None:
         # For now, just setup the encryption without asking the host
         if connection := self.find_le_connection_by_address(peer_address):
             self.send_hci_packet(
-                HCI_Encryption_Change_Event(
+                hci.HCI_Encryption_Change_Event(
                     status=0, connection_handle=connection.handle, encryption_enabled=1
                 )
             )
 
     def on_link_acl_data(
-        self, sender_address: Address, transport: PhysicalTransport, data: bytes
+        self, sender_address: hci.Address, transport: PhysicalTransport, data: bytes
     ) -> None:
         # Look for the connection to which this data belongs
         if transport == PhysicalTransport.LE:
@@ -568,36 +552,38 @@ class Controller:
 
         # Send the data to the host
         # TODO: should fragment
-        acl_packet = HCI_AclDataPacket(connection.handle, 2, 0, len(data), data)
+        acl_packet = hci.HCI_AclDataPacket(connection.handle, 2, 0, len(data), data)
         self.send_hci_packet(acl_packet)
 
-    def on_link_advertising_data(self, sender_address: Address, data: bytes) -> None:
+    def on_link_advertising_data(
+        self, sender_address: hci.Address, data: bytes
+    ) -> None:
         # Ignore if we're not scanning
         if self.le_scan_enable == 0:
             return
 
         # Send a scan report
-        report = HCI_LE_Advertising_Report_Event.Report(
-            event_type=HCI_LE_Advertising_Report_Event.EventType.ADV_IND,
+        report = hci.HCI_LE_Advertising_Report_Event.Report(
+            event_type=hci.HCI_LE_Advertising_Report_Event.EventType.ADV_IND,
             address_type=sender_address.address_type,
             address=sender_address,
             data=data,
             rssi=-50,
         )
-        self.send_hci_packet(HCI_LE_Advertising_Report_Event([report]))
+        self.send_hci_packet(hci.HCI_LE_Advertising_Report_Event([report]))
 
         # Simulate a scan response
-        report = HCI_LE_Advertising_Report_Event.Report(
-            event_type=HCI_LE_Advertising_Report_Event.EventType.SCAN_RSP,
+        report = hci.HCI_LE_Advertising_Report_Event.Report(
+            event_type=hci.HCI_LE_Advertising_Report_Event.EventType.SCAN_RSP,
             address_type=sender_address.address_type,
             address=sender_address,
             data=data,
             rssi=-50,
         )
-        self.send_hci_packet(HCI_LE_Advertising_Report_Event([report]))
+        self.send_hci_packet(hci.HCI_LE_Advertising_Report_Event([report]))
 
     def on_link_cis_request(
-        self, central_address: Address, cig_id: int, cis_id: int
+        self, central_address: hci.Address, cig_id: int, cis_id: int
     ) -> None:
         '''
         Called when an incoming CIS request occurs from a central on the link
@@ -615,7 +601,7 @@ class Controller:
         self.peripheral_cis_links[pending_cis_link.handle] = pending_cis_link
 
         self.send_hci_packet(
-            HCI_LE_CIS_Request_Event(
+            hci.HCI_LE_CIS_Request_Event(
                 acl_connection_handle=connection.handle,
                 cis_connection_handle=pending_cis_link.handle,
                 cig_id=cig_id,
@@ -637,8 +623,8 @@ class Controller:
         )
 
         self.send_hci_packet(
-            HCI_LE_CIS_Established_Event(
-                status=HCI_SUCCESS,
+            hci.HCI_LE_CIS_Established_Event(
+                status=hci.HCI_SUCCESS,
                 connection_handle=cis_link.handle,
                 # CIS parameters are ignored.
                 cig_sync_delay=0,
@@ -681,16 +667,16 @@ class Controller:
             ),
             None,
         ):
-            # Keep central CIS on disconnection. They should be removed by HCI_LE_Remove_CIG_Command.
+            # Keep central CIS on disconnection. They should be removed by hci.HCI_LE_Remove_CIG_Command.
             cis_link.acl_connection = None
         else:
             return
 
         self.send_hci_packet(
-            HCI_Disconnection_Complete_Event(
-                status=HCI_SUCCESS,
+            hci.HCI_Disconnection_Complete_Event(
+                status=hci.HCI_SUCCESS,
                 connection_handle=cis_link.handle,
-                reason=HCI_REMOTE_USER_TERMINATED_CONNECTION_ERROR,
+                reason=hci.HCI_REMOTE_USER_TERMINATED_CONNECTION_ERROR,
             )
         )
 
@@ -698,11 +684,86 @@ class Controller:
     # Classic link connections
     ############################################################
 
+    def send_lmp_packet(
+        self, receiver_address: hci.Address, packet: lmp.Packet
+    ) -> asyncio.Future[int]:
+        loop = asyncio.get_running_loop()
+        assert self.link
+        self.link.send_lmp_packet(self, receiver_address, packet)
+        future = self.classic_pending_commands.setdefault(receiver_address, {})[
+            packet.opcode
+        ] = loop.create_future()
+        return future
+
+    def on_lmp_packet(self, sender_address: hci.Address, packet: lmp.Packet):
+        if isinstance(packet, (lmp.LmpAccepted, lmp.LmpAcceptedExt)):
+            if future := self.classic_pending_commands.setdefault(
+                sender_address, {}
+            ).get(packet.response_opcode):
+                future.set_result(hci.HCI_SUCCESS)
+            else:
+                logger.error("!!! Unhandled packet: %s", packet)
+        elif isinstance(packet, (lmp.LmpNotAccepted, lmp.LmpNotAcceptedExt)):
+            if future := self.classic_pending_commands.setdefault(
+                sender_address, {}
+            ).get(packet.response_opcode):
+                future.set_result(packet.error_code)
+            else:
+                logger.error("!!! Unhandled packet: %s", packet)
+        elif isinstance(packet, (lmp.LmpHostConnectionReq)):
+            self.on_classic_connection_request(
+                sender_address, hci.HCI_Connection_Complete_Event.LinkType.ACL
+            )
+        elif isinstance(packet, (lmp.LmpScoLinkReq)):
+            self.on_classic_connection_request(
+                sender_address, hci.HCI_Connection_Complete_Event.LinkType.SCO
+            )
+        elif isinstance(packet, (lmp.LmpEscoLinkReq)):
+            self.on_classic_connection_request(
+                sender_address, hci.HCI_Connection_Complete_Event.LinkType.ESCO
+            )
+        elif isinstance(packet, (lmp.LmpDetach)):
+            self.on_classic_disconnected(
+                sender_address, hci.HCI_REMOTE_USER_TERMINATED_CONNECTION_ERROR
+            )
+        elif isinstance(packet, (lmp.LmpSwitchReq)):
+            self.on_classic_role_change_request(sender_address)
+        elif isinstance(packet, (lmp.LmpRemoveScoLinkReq, lmp.LmpRemoveEscoLinkReq)):
+            self.on_classic_sco_disconnected(sender_address, packet.error_code)
+        elif isinstance(packet, lmp.LmpNameReq):
+            self.on_classic_remote_name_request(sender_address, packet.name_offset)
+        elif isinstance(packet, lmp.LmpNameRes):
+            self.on_classic_remote_name_response(
+                sender_address,
+                packet.name_offset,
+                packet.name_length,
+                packet.name_fregment,
+            )
+        else:
+            logger.error("!!! Unhandled packet: %s", packet)
+
     def on_classic_connection_request(
-        self, peer_address: Address, link_type: int
+        self, peer_address: hci.Address, link_type: int
     ) -> None:
+        if link_type == hci.HCI_Connection_Complete_Event.LinkType.ACL:
+            self.classic_connections[peer_address] = Connection(
+                controller=self,
+                handle=0,
+                role=hci.Role.PERIPHERAL,
+                peer_address=peer_address,
+                link=self.link,
+                transport=PhysicalTransport.BR_EDR,
+                link_type=link_type,
+                classic_allow_role_switch=self.classic_allow_role_switch,
+            )
+        else:
+            self.sco_links[peer_address] = ScoLink(
+                handle=0,
+                link_type=link_type,
+                peer_address=peer_address,
+            )
         self.send_hci_packet(
-            HCI_Connection_Request_Event(
+            hci.HCI_Connection_Request_Event(
                 bd_addr=peer_address,
                 class_of_device=0,
                 link_type=link_type,
@@ -710,99 +771,126 @@ class Controller:
         )
 
     def on_classic_connection_complete(
-        self, peer_address: Address, status: int
+        self, peer_address: hci.Address, status: int
     ) -> None:
-        if status == HCI_SUCCESS:
+        if status == hci.HCI_SUCCESS:
             # Allocate (or reuse) a connection handle
             peer_address = peer_address
-            connection = self.classic_connections.get(peer_address)
-            if connection is None:
-                connection_handle = self.allocate_connection_handle()
+            connection_handle = self.allocate_connection_handle()
+            if connection := self.classic_connections.get(peer_address):
+                connection.handle = connection_handle
+            else:
                 connection = Connection(
                     controller=self,
                     handle=connection_handle,
-                    # Role doesn't matter in Classic because they are managed by HCI_Role_Change and HCI_Role_Discovery
-                    role=Role.CENTRAL,
+                    role=hci.Role.CENTRAL,
                     peer_address=peer_address,
                     link=self.link,
                     transport=PhysicalTransport.BR_EDR,
-                    link_type=HCI_Connection_Complete_Event.LinkType.ACL,
+                    link_type=hci.HCI_Connection_Complete_Event.LinkType.ACL,
                 )
                 self.classic_connections[peer_address] = connection
                 logger.debug(
                     f'New CLASSIC connection handle: 0x{connection_handle:04X}'
                 )
-            else:
-                connection_handle = connection.handle
             self.send_hci_packet(
-                HCI_Connection_Complete_Event(
+                hci.HCI_Connection_Complete_Event(
                     status=status,
                     connection_handle=connection_handle,
                     bd_addr=peer_address,
                     encryption_enabled=False,
-                    link_type=HCI_Connection_Complete_Event.LinkType.ACL,
+                    link_type=hci.HCI_Connection_Complete_Event.LinkType.ACL,
                 )
             )
         else:
             connection = None
             self.send_hci_packet(
-                HCI_Connection_Complete_Event(
+                hci.HCI_Connection_Complete_Event(
                     status=status,
                     connection_handle=0,
                     bd_addr=peer_address,
                     encryption_enabled=False,
-                    link_type=HCI_Connection_Complete_Event.LinkType.ACL,
+                    link_type=hci.HCI_Connection_Complete_Event.LinkType.ACL,
                 )
             )
 
-    def on_classic_disconnected(self, peer_address: Address, reason: int) -> None:
+    def on_classic_disconnected(self, peer_address: hci.Address, reason: int) -> None:
         # Send a disconnection complete event
-        if connection := self.classic_connections.get(peer_address):
+        if connection := self.classic_connections.pop(peer_address, None):
             self.send_hci_packet(
-                HCI_Disconnection_Complete_Event(
-                    status=HCI_SUCCESS,
+                hci.HCI_Disconnection_Complete_Event(
+                    status=hci.HCI_SUCCESS,
                     connection_handle=connection.handle,
                     reason=reason,
                 )
             )
+        else:
+            logger.warning(f'!!! No classic connection found for {peer_address}')
 
-            # Remove the connection
-            del self.classic_connections[peer_address]
+    def on_classic_sco_disconnected(
+        self, peer_address: hci.Address, reason: int
+    ) -> None:
+        # Send a disconnection complete event
+        if sco_link := self.sco_links.pop(peer_address, None):
+            self.send_hci_packet(
+                hci.HCI_Disconnection_Complete_Event(
+                    status=hci.HCI_SUCCESS,
+                    connection_handle=sco_link.handle,
+                    reason=reason,
+                )
+            )
         else:
             logger.warning(f'!!! No classic connection found for {peer_address}')
 
-    def on_classic_role_change(self, peer_address: Address, new_role: int) -> None:
+    def on_classic_role_change_request(self, peer_address: hci.Address) -> None:
+        assert (connection := self.classic_connections.get(peer_address))
+        if not connection.classic_allow_role_switch:
+            self.send_lmp_packet(
+                peer_address,
+                lmp.LmpNotAccepted(
+                    lmp.Opcode.LMP_SWITCH_REQ, hci.HCI_ROLE_CHANGE_NOT_ALLOWED_ERROR
+                ),
+            )
+        else:
+            self.send_lmp_packet(
+                peer_address,
+                lmp.LmpAccepted(lmp.Opcode.LMP_SWITCH_REQ),
+            )
+            self.classic_role_change(connection)
+
+    def classic_role_change(self, connection: Connection) -> None:
+        new_role = (
+            hci.Role.CENTRAL
+            if connection.role == hci.Role.PERIPHERAL
+            else hci.Role.PERIPHERAL
+        )
+        connection.role = new_role
         self.send_hci_packet(
-            HCI_Role_Change_Event(
-                status=HCI_SUCCESS,
-                bd_addr=peer_address,
+            hci.HCI_Role_Change_Event(
+                status=hci.HCI_SUCCESS,
+                bd_addr=connection.peer_address,
                 new_role=new_role,
             )
         )
 
     def on_classic_sco_connection_complete(
-        self, peer_address: Address, status: int, link_type: int
+        self, peer_address: hci.Address, status: int, link_type: int
     ) -> None:
-        if status == HCI_SUCCESS:
+        if status == hci.HCI_SUCCESS:
             # Allocate (or reuse) a connection handle
             connection_handle = self.allocate_connection_handle()
-            connection = Connection(
-                controller=self,
+            sco_link = ScoLink(
                 handle=connection_handle,
-                # Role doesn't matter in SCO.
-                role=Role.CENTRAL,
-                peer_address=peer_address,
-                link=self.link,
-                transport=PhysicalTransport.BR_EDR,
                 link_type=link_type,
+                peer_address=peer_address,
             )
-            self.classic_connections[peer_address] = connection
+            self.sco_links[peer_address] = sco_link
             logger.debug(f'New SCO connection handle: 0x{connection_handle:04X}')
         else:
             connection_handle = 0
 
         self.send_hci_packet(
-            HCI_Synchronous_Connection_Complete_Event(
+            hci.HCI_Synchronous_Connection_Complete_Event(
                 status=status,
                 connection_handle=connection_handle,
                 bd_addr=peer_address,
@@ -816,6 +904,33 @@ class Controller:
             )
         )
 
+    def on_classic_remote_name_request(
+        self, peer_address: hci.Address, name_offset: int
+    ):
+        self.send_lmp_packet(
+            peer_address,
+            lmp.LmpNameRes(
+                name_offset=name_offset,
+                name_length=len(self.local_name),
+                name_fregment=self.local_name.encode('utf-8'),
+            ),
+        )
+
+    def on_classic_remote_name_response(
+        self,
+        peer_address: hci.Address,
+        name_offset: int,
+        name_length: int,
+        name_fregment: bytes,
+    ):
+        self.send_hci_packet(
+            hci.HCI_Remote_Name_Request_Complete_Event(
+                status=hci.HCI_SUCCESS,
+                bd_addr=peer_address,
+                remote_name=name_fregment,
+            )
+        )
+
     ############################################################
     # Advertising support
     ############################################################
@@ -852,7 +967,7 @@ class Controller:
     ############################################################
     def on_hci_command(self, command: hci.HCI_Command) -> Optional[bytes]:
         logger.warning(color(f'--- Unsupported command {command}', 'red'))
-        return bytes([HCI_UNKNOWN_HCI_COMMAND_ERROR])
+        return bytes([hci.HCI_UNKNOWN_HCI_COMMAND_ERROR])
 
     def on_hci_create_connection_command(
         self, command: hci.HCI_Create_Connection_Command
@@ -868,24 +983,39 @@ class Controller:
         # Check that we don't already have a pending connection
         if self.link.get_pending_connection():
             self.send_hci_packet(
-                HCI_Command_Status_Event(
-                    status=HCI_CONTROLLER_BUSY_ERROR,
+                hci.HCI_Command_Status_Event(
+                    status=hci.HCI_CONTROLLER_BUSY_ERROR,
                     num_hci_command_packets=1,
                     command_opcode=command.op_code,
                 )
             )
             return None
 
-        self.link.classic_connect(self, command.bd_addr)
+        self.classic_connections[command.bd_addr] = Connection(
+            controller=self,
+            handle=0,
+            role=hci.Role.CENTRAL,
+            peer_address=command.bd_addr,
+            link=self.link,
+            transport=PhysicalTransport.BR_EDR,
+            link_type=hci.HCI_Connection_Complete_Event.LinkType.ACL,
+            classic_allow_role_switch=bool(command.allow_role_switch),
+        )
 
         # Say that the connection is pending
         self.send_hci_packet(
-            HCI_Command_Status_Event(
-                status=HCI_COMMAND_STATUS_PENDING,
+            hci.HCI_Command_Status_Event(
+                status=hci.HCI_COMMAND_STATUS_PENDING,
                 num_hci_command_packets=1,
                 command_opcode=command.op_code,
             )
         )
+        future = self.send_lmp_packet(command.bd_addr, lmp.LmpHostConnectionReq())
+
+        def on_response(future: asyncio.Future[int]):
+            self.on_classic_connection_complete(command.bd_addr, future.result())
+
+        future.add_done_callback(on_response)
         return None
 
     def on_hci_disconnect_command(
@@ -896,8 +1026,8 @@ class Controller:
         '''
         # First, say that the disconnection is pending
         self.send_hci_packet(
-            HCI_Command_Status_Event(
-                status=HCI_COMMAND_STATUS_PENDING,
+            hci.HCI_Command_Status_Event(
+                status=hci.HCI_COMMAND_STATUS_PENDING,
                 num_hci_command_packets=1,
                 command_opcode=command.op_code,
             )
@@ -923,14 +1053,37 @@ class Controller:
                 del self.peripheral_connections[connection.peer_address]
         elif connection := self.find_classic_connection_by_handle(handle):
             if self.link:
-                self.link.classic_disconnect(
-                    self,
+                self.send_lmp_packet(
                     connection.peer_address,
-                    HCI_REMOTE_USER_TERMINATED_CONNECTION_ERROR,
+                    lmp.LmpDetach(command.reason),
                 )
+                self.on_classic_disconnected(connection.peer_address, command.reason)
             else:
                 # Remove the connection
                 del self.classic_connections[connection.peer_address]
+        elif sco_link := self.find_classic_sco_link_by_handle(handle):
+            if self.link:
+                if (
+                    sco_link.link_type
+                    == hci.HCI_Connection_Complete_Event.LinkType.ESCO
+                ):
+                    self.send_lmp_packet(
+                        sco_link.peer_address,
+                        lmp.LmpRemoveScoLinkReq(
+                            sco_handle=0, error_code=command.reason
+                        ),
+                    )
+                else:
+                    self.send_lmp_packet(
+                        sco_link.peer_address,
+                        lmp.LmpRemoveEscoLinkReq(
+                            esco_handle=0, error_code=command.reason
+                        ),
+                    )
+                self.on_classic_sco_disconnected(sco_link.peer_address, command.reason)
+            else:
+                # Remove the connection
+                del self.sco_links[sco_link.peer_address]
         elif cis_link := (
             self.central_cis_links.get(handle) or self.peripheral_cis_links.get(handle)
         ):
@@ -954,14 +1107,71 @@ class Controller:
 
         if self.link is None:
             return None
+
+        if not (connection := self.classic_connections.get(command.bd_addr)):
+            self.send_hci_packet(
+                hci.HCI_Command_Status_Event(
+                    status=hci.HCI_UNKNOWN_CONNECTION_IDENTIFIER_ERROR,
+                    num_hci_command_packets=1,
+                    command_opcode=command.op_code,
+                )
+            )
+            return None
         self.send_hci_packet(
-            HCI_Command_Status_Event(
-                status=HCI_SUCCESS,
+            hci.HCI_Command_Status_Event(
+                status=hci.HCI_SUCCESS,
                 num_hci_command_packets=1,
                 command_opcode=command.op_code,
             )
         )
-        self.link.classic_accept_connection(self, command.bd_addr, command.role)
+
+        if command.role == hci.Role.CENTRAL:
+            # Perform role switching before accept.
+            future = self.send_lmp_packet(command.bd_addr, lmp.LmpSwitchReq())
+
+            def on_response(future: asyncio.Future[int]):
+                if (status := future.result()) == hci.HCI_SUCCESS:
+                    self.classic_role_change(connection)
+                    # Continue connection setup.
+                    self.send_lmp_packet(
+                        command.bd_addr,
+                        lmp.LmpAccepted(lmp.Opcode.LMP_HOST_CONNECTION_REQ),
+                    )
+                else:
+                    # Abort connection setup.
+                    self.send_lmp_packet(
+                        command.bd_addr,
+                        lmp.LmpNotAccepted(lmp.Opcode.LMP_HOST_CONNECTION_REQ, status),
+                    )
+                self.on_classic_connection_complete(command.bd_addr, status)
+
+            future.add_done_callback(on_response)
+
+        else:
+            # Simply accept connection.
+            self.send_lmp_packet(
+                command.bd_addr,
+                lmp.LmpAccepted(lmp.Opcode.LMP_HOST_CONNECTION_REQ),
+            )
+            self.on_classic_connection_complete(command.bd_addr, hci.HCI_SUCCESS)
+        return None
+
+    def on_hci_remote_name_request_command(
+        self, command: hci.HCI_Remote_Name_Request_Command
+    ) -> Optional[bytes]:
+        '''
+        See Bluetooth spec Vol 4, Part E - 7.1.19 Remote Name Request command
+        '''
+        self.send_hci_packet(
+            hci.HCI_Command_Status_Event(
+                status=hci.HCI_SUCCESS,
+                num_hci_command_packets=1,
+                command_opcode=command.op_code,
+            )
+        )
+
+        self.send_lmp_packet(command.bd_addr, lmp.LmpNameReq(0))
+
         return None
 
     def on_hci_enhanced_setup_synchronous_connection_command(
@@ -980,8 +1190,8 @@ class Controller:
             )
         ):
             self.send_hci_packet(
-                HCI_Command_Status_Event(
-                    status=HCI_UNKNOWN_CONNECTION_IDENTIFIER_ERROR,
+                hci.HCI_Command_Status_Event(
+                    status=hci.HCI_UNKNOWN_CONNECTION_IDENTIFIER_ERROR,
                     num_hci_command_packets=1,
                     command_opcode=command.op_code,
                 )
@@ -989,15 +1199,38 @@ class Controller:
             return None
 
         self.send_hci_packet(
-            HCI_Command_Status_Event(
-                status=HCI_SUCCESS,
+            hci.HCI_Command_Status_Event(
+                status=hci.HCI_SUCCESS,
                 num_hci_command_packets=1,
                 command_opcode=command.op_code,
             )
         )
-        self.link.classic_sco_connect(
-            self, connection.peer_address, HCI_Connection_Complete_Event.LinkType.ESCO
+        future = self.send_lmp_packet(
+            connection.peer_address,
+            lmp.LmpEscoLinkReq(
+                esco_handle=0,
+                esco_lt_addr=0,
+                timing_control_flags=0,
+                d_esco=0,
+                t_esco=0,
+                w_esco=0,
+                esco_packet_type_c_to_p=0,
+                esco_packet_type_p_to_c=0,
+                packet_length_c_to_p=0,
+                packet_length_p_to_c=0,
+                air_mode=0,
+                negotiation_state=0,
+            ),
         )
+
+        def on_response(future: asyncio.Future[int]):
+            self.on_classic_sco_connection_complete(
+                connection.peer_address,
+                future.result(),
+                hci.HCI_Connection_Complete_Event.LinkType.ESCO,
+            )
+
+        future.add_done_callback(on_response)
         return None
 
     def on_hci_enhanced_accept_synchronous_connection_request_command(
@@ -1012,8 +1245,8 @@ class Controller:
 
         if not (connection := self.find_classic_connection_by_address(command.bd_addr)):
             self.send_hci_packet(
-                HCI_Command_Status_Event(
-                    status=HCI_UNKNOWN_CONNECTION_IDENTIFIER_ERROR,
+                hci.HCI_Command_Status_Event(
+                    status=hci.HCI_UNKNOWN_CONNECTION_IDENTIFIER_ERROR,
                     num_hci_command_packets=1,
                     command_opcode=command.op_code,
                 )
@@ -1021,14 +1254,20 @@ class Controller:
             return None
 
         self.send_hci_packet(
-            HCI_Command_Status_Event(
-                status=HCI_SUCCESS,
+            hci.HCI_Command_Status_Event(
+                status=hci.HCI_SUCCESS,
                 num_hci_command_packets=1,
                 command_opcode=command.op_code,
             )
         )
-        self.link.classic_accept_sco_connection(
-            self, connection.peer_address, HCI_Connection_Complete_Event.LinkType.ESCO
+        self.send_lmp_packet(
+            connection.peer_address,
+            lmp.LmpAcceptedExt(lmp.Opcode.LMP_ESCO_LINK_REQ),
+        )
+        self.on_classic_sco_connection_complete(
+            connection.peer_address,
+            hci.HCI_SUCCESS,
+            hci.HCI_Connection_Complete_Event.LinkType.ESCO,
         )
         return None
 
@@ -1050,14 +1289,14 @@ class Controller:
 
         self.send_hci_packet(
             hci.HCI_Command_Status_Event(
-                status=HCI_SUCCESS,
+                status=hci.HCI_SUCCESS,
                 num_hci_command_packets=1,
                 command_opcode=command.op_code,
             )
         )
         self.send_hci_packet(
             hci.HCI_Mode_Change_Event(
-                status=HCI_SUCCESS,
+                status=hci.HCI_SUCCESS,
                 connection_handle=command.connection_handle,
                 current_mode=hci.HCI_Mode_Change_Event.Mode.SNIFF,
                 interval=2,
@@ -1084,14 +1323,14 @@ class Controller:
 
         self.send_hci_packet(
             hci.HCI_Command_Status_Event(
-                status=HCI_SUCCESS,
+                status=hci.HCI_SUCCESS,
                 num_hci_command_packets=1,
                 command_opcode=command.op_code,
             )
         )
         self.send_hci_packet(
             hci.HCI_Mode_Change_Event(
-                status=HCI_SUCCESS,
+                status=hci.HCI_SUCCESS,
                 connection_handle=command.connection_handle,
                 current_mode=hci.HCI_Mode_Change_Event.Mode.ACTIVE,
                 interval=2,
@@ -1103,19 +1342,57 @@ class Controller:
         self, command: hci.HCI_Switch_Role_Command
     ) -> Optional[bytes]:
         '''
-        See Bluetooth spec Vol 4, Part E - 7.2.8 Switch Role command
+        See Bluetooth spec Vol 4, Part E - 7.2.8 Switch hci.Role command
         '''
 
         if self.link is None:
             return None
-        self.send_hci_packet(
-            HCI_Command_Status_Event(
-                status=HCI_SUCCESS,
-                num_hci_command_packets=1,
-                command_opcode=command.op_code,
+
+        if connection := self.classic_connections.get(command.bd_addr):
+            current_role = connection.role
+            self.send_hci_packet(
+                hci.HCI_Command_Status_Event(
+                    status=hci.HCI_SUCCESS,
+                    num_hci_command_packets=1,
+                    command_opcode=command.op_code,
+                )
             )
-        )
-        self.link.classic_switch_role(self, command.bd_addr, command.role)
+        else:
+            # Connection doesn't exist, reject.
+            self.send_hci_packet(
+                hci.HCI_Command_Status_Event(
+                    status=hci.HCI_COMMAND_DISALLOWED_ERROR,
+                    num_hci_command_packets=1,
+                    command_opcode=command.op_code,
+                )
+            )
+            return None
+
+        # If role doesn't change, only send event to local host.
+        if current_role == command.role:
+            self.send_hci_packet(
+                hci.HCI_Role_Change_Event(
+                    status=hci.HCI_SUCCESS,
+                    bd_addr=command.bd_addr,
+                    new_role=current_role,
+                )
+            )
+        else:
+            future = self.send_lmp_packet(command.bd_addr, lmp.LmpSwitchReq())
+
+            def on_response(future: asyncio.Future[int]):
+                if (status := future.result()) == hci.HCI_SUCCESS:
+                    connection.role = hci.Role(command.role)
+                self.send_hci_packet(
+                    hci.HCI_Role_Change_Event(
+                        status=status,
+                        bd_addr=command.bd_addr,
+                        new_role=connection.role,
+                    )
+                )
+
+            future.add_done_callback(on_response)
+
         return None
 
     def on_hci_set_event_mask_command(
@@ -1127,14 +1404,14 @@ class Controller:
         self.event_mask = int.from_bytes(
             command.event_mask, byteorder='little', signed=False
         )
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_reset_command(self, _command: hci.HCI_Reset_Command) -> Optional[bytes]:
         '''
         See Bluetooth spec Vol 4, Part E - 7.3.2 Reset Command
         '''
         # TODO: cleanup what needs to be reset
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_write_local_name_command(
         self, command: hci.HCI_Write_Local_Name_Command
@@ -1151,7 +1428,7 @@ class Controller:
                 self.local_name = str(local_name, 'utf-8')
             except UnicodeDecodeError:
                 pass
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_read_local_name_command(
         self, _command: hci.HCI_Read_Local_Name_Command
@@ -1163,7 +1440,7 @@ class Controller:
         if len(local_name) < 248:
             local_name = local_name + bytes(248 - len(local_name))
 
-        return bytes([HCI_SUCCESS]) + local_name
+        return bytes([hci.HCI_SUCCESS]) + local_name
 
     def on_hci_read_class_of_device_command(
         self, _command: hci.HCI_Read_Class_Of_Device_Command
@@ -1171,7 +1448,7 @@ class Controller:
         '''
         See Bluetooth spec Vol 4, Part E - 7.3.25 Read Class of Device Command
         '''
-        return bytes([HCI_SUCCESS, 0, 0, 0])
+        return bytes([hci.HCI_SUCCESS, 0, 0, 0])
 
     def on_hci_write_class_of_device_command(
         self, _command: hci.HCI_Write_Class_Of_Device_Command
@@ -1179,7 +1456,7 @@ class Controller:
         '''
         See Bluetooth spec Vol 4, Part E - 7.3.26 Write Class of Device Command
         '''
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_read_synchronous_flow_control_enable_command(
         self, _command: hci.HCI_Read_Synchronous_Flow_Control_Enable_Command
@@ -1192,7 +1469,7 @@ class Controller:
             ret = 1
         else:
             ret = 0
-        return bytes([HCI_SUCCESS, ret])
+        return bytes([hci.HCI_SUCCESS, ret])
 
     def on_hci_write_synchronous_flow_control_enable_command(
         self, command: hci.HCI_Write_Synchronous_Flow_Control_Enable_Command
@@ -1201,13 +1478,13 @@ class Controller:
         See Bluetooth spec Vol 4, Part E - 7.3.37 Write Synchronous Flow Control Enable
         Command
         '''
-        ret = HCI_SUCCESS
+        ret = hci.HCI_SUCCESS
         if command.synchronous_flow_control_enable == 1:
             self.sync_flow_control = True
         elif command.synchronous_flow_control_enable == 0:
             self.sync_flow_control = False
         else:
-            ret = HCI_INVALID_HCI_COMMAND_PARAMETERS_ERROR
+            ret = hci.HCI_INVALID_HCI_COMMAND_PARAMETERS_ERROR
         return bytes([ret])
 
     def on_hci_set_controller_to_host_flow_control_command(
@@ -1219,7 +1496,7 @@ class Controller:
         '''
         # For now we just accept the command but ignore the values.
         # TODO: respect the passed in values.
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_host_buffer_size_command(
         self, _command: hci.HCI_Host_Buffer_Size_Command
@@ -1229,7 +1506,7 @@ class Controller:
         '''
         # For now we just accept the command but ignore the values.
         # TODO: respect the passed in values.
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_write_extended_inquiry_response_command(
         self, _command: hci.HCI_Write_Extended_Inquiry_Response_Command
@@ -1238,7 +1515,7 @@ class Controller:
         See Bluetooth spec Vol 4, Part E - 7.3.56 Write Extended Inquiry Response
         Command
         '''
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_write_simple_pairing_mode_command(
         self, _command: hci.HCI_Write_Simple_Pairing_Mode_Command
@@ -1246,7 +1523,7 @@ class Controller:
         '''
         See Bluetooth spec Vol 4, Part E - 7.3.59 Write Simple Pairing Mode Command
         '''
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_set_event_mask_page_2_command(
         self, command: hci.HCI_Set_Event_Mask_Page_2_Command
@@ -1257,7 +1534,7 @@ class Controller:
         self.event_mask_page_2 = int.from_bytes(
             command.event_mask_page_2, byteorder='little', signed=False
         )
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_read_le_host_support_command(
         self, _command: hci.HCI_Read_LE_Host_Support_Command
@@ -1265,7 +1542,7 @@ class Controller:
         '''
         See Bluetooth spec Vol 4, Part E - 7.3.78 Write LE Host Support Command
         '''
-        return bytes([HCI_SUCCESS, 1, 0])
+        return bytes([hci.HCI_SUCCESS, 1, 0])
 
     def on_hci_write_le_host_support_command(
         self, _command: hci.HCI_Write_LE_Host_Support_Command
@@ -1274,7 +1551,7 @@ class Controller:
         See Bluetooth spec Vol 4, Part E - 7.3.79 Write LE Host Support Command
         '''
         # TODO / Just ignore for now
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_write_authenticated_payload_timeout_command(
         self, command: hci.HCI_Write_Authenticated_Payload_Timeout_Command
@@ -1284,7 +1561,7 @@ class Controller:
         Command
         '''
         # TODO
-        return struct.pack('<BH', HCI_SUCCESS, command.connection_handle)
+        return struct.pack('<BH', hci.HCI_SUCCESS, command.connection_handle)
 
     def on_hci_read_local_version_information_command(
         self, _command: hci.HCI_Read_Local_Version_Information_Command
@@ -1294,7 +1571,7 @@ class Controller:
         '''
         return struct.pack(
             '<BBHBHH',
-            HCI_SUCCESS,
+            hci.HCI_SUCCESS,
             self.hci_version,
             self.hci_revision,
             self.lmp_version,
@@ -1308,7 +1585,7 @@ class Controller:
         '''
         See Bluetooth spec Vol 4, Part E - 7.4.2 Read Local Supported Commands Command
         '''
-        return bytes([HCI_SUCCESS]) + self.supported_commands
+        return bytes([hci.HCI_SUCCESS]) + self.supported_commands
 
     def on_hci_read_local_supported_features_command(
         self, _command: hci.HCI_Read_Local_Supported_Features_Command
@@ -1316,7 +1593,7 @@ class Controller:
         '''
         See Bluetooth spec Vol 4, Part E - 7.4.3 Read Local Supported Features Command
         '''
-        return bytes([HCI_SUCCESS]) + self.lmp_features[:8]
+        return bytes([hci.HCI_SUCCESS]) + self.lmp_features[:8]
 
     def on_hci_read_local_extended_features_command(
         self, command: hci.HCI_Read_Local_Extended_Features_Command
@@ -1325,12 +1602,12 @@ class Controller:
         See Bluetooth spec Vol 4, Part E - 7.4.4 Read Local Extended Features Command
         '''
         if command.page_number * 8 > len(self.lmp_features):
-            return bytes([HCI_INVALID_HCI_COMMAND_PARAMETERS_ERROR])
+            return bytes([hci.HCI_INVALID_HCI_COMMAND_PARAMETERS_ERROR])
         return (
             bytes(
                 [
                     # Status
-                    HCI_SUCCESS,
+                    hci.HCI_SUCCESS,
                     # Page number
                     command.page_number,
                     # Max page number
@@ -1349,7 +1626,7 @@ class Controller:
         '''
         return struct.pack(
             '<BHBHH',
-            HCI_SUCCESS,
+            hci.HCI_SUCCESS,
             self.acl_data_packet_length,
             0,
             self.total_num_acl_data_packets,
@@ -1367,7 +1644,7 @@ class Controller:
             if self._public_address is not None
             else bytes(6)
         )
-        return bytes([HCI_SUCCESS]) + bd_addr
+        return bytes([hci.HCI_SUCCESS]) + bd_addr
 
     def on_hci_le_set_default_subrate_command(
         self, command: hci.HCI_LE_Set_Default_Subrate_Command
@@ -1381,9 +1658,9 @@ class Controller:
             or command.subrate_max < command.subrate_min
             or command.continuation_number >= command.subrate_max
         ):
-            return bytes([HCI_INVALID_HCI_COMMAND_PARAMETERS_ERROR])
+            return bytes([hci.HCI_INVALID_HCI_COMMAND_PARAMETERS_ERROR])
 
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_subrate_request_command(
         self, command: hci.HCI_LE_Subrate_Request_Command
@@ -1397,7 +1674,7 @@ class Controller:
             or command.subrate_max < command.subrate_min
             or command.continuation_number >= command.subrate_max
         ):
-            return bytes([HCI_INVALID_HCI_COMMAND_PARAMETERS_ERROR])
+            return bytes([hci.HCI_INVALID_HCI_COMMAND_PARAMETERS_ERROR])
 
         self.send_hci_packet(
             hci.HCI_Command_Status_Event(
@@ -1428,7 +1705,7 @@ class Controller:
         self.le_event_mask = int.from_bytes(
             command.le_event_mask, byteorder='little', signed=False
         )
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_read_buffer_size_command(
         self, _command: hci.HCI_LE_Read_Buffer_Size_Command
@@ -1438,7 +1715,7 @@ class Controller:
         '''
         return struct.pack(
             '<BHB',
-            HCI_SUCCESS,
+            hci.HCI_SUCCESS,
             self.le_acl_data_packet_length,
             self.total_num_le_acl_data_packets,
         )
@@ -1451,7 +1728,7 @@ class Controller:
         '''
         return struct.pack(
             '<BHBHB',
-            HCI_SUCCESS,
+            hci.HCI_SUCCESS,
             self.le_acl_data_packet_length,
             self.total_num_le_acl_data_packets,
             self.iso_data_packet_length,
@@ -1465,16 +1742,16 @@ class Controller:
         See Bluetooth spec Vol 4, Part E - 7.8.3 LE Read Local Supported Features
         Command
         '''
-        return bytes([HCI_SUCCESS]) + self.le_features
+        return bytes([hci.HCI_SUCCESS]) + self.le_features
 
     def on_hci_le_set_random_address_command(
         self, command: hci.HCI_LE_Set_Random_Address_Command
     ) -> Optional[bytes]:
         '''
-        See Bluetooth spec Vol 4, Part E - 7.8.4 LE Set Random Address Command
+        See Bluetooth spec Vol 4, Part E - 7.8.4 LE Set Random hci.Address Command
         '''
         self.random_address = command.random_address
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_set_advertising_parameters_command(
         self, command: hci.HCI_LE_Set_Advertising_Parameters_Command
@@ -1483,7 +1760,7 @@ class Controller:
         See Bluetooth spec Vol 4, Part E - 7.8.5 LE Set Advertising Parameters Command
         '''
         self.advertising_parameters = command
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_read_advertising_physical_channel_tx_power_command(
         self, _command: hci.HCI_LE_Read_Advertising_Physical_Channel_Tx_Power_Command
@@ -1492,7 +1769,7 @@ class Controller:
         See Bluetooth spec Vol 4, Part E - 7.8.6 LE Read Advertising Physical Channel
         Tx Power Command
         '''
-        return bytes([HCI_SUCCESS, self.advertising_channel_tx_power])
+        return bytes([hci.HCI_SUCCESS, self.advertising_channel_tx_power])
 
     def on_hci_le_set_advertising_data_command(
         self, command: hci.HCI_LE_Set_Advertising_Data_Command
@@ -1501,7 +1778,7 @@ class Controller:
         See Bluetooth spec Vol 4, Part E - 7.8.7 LE Set Advertising Data Command
         '''
         self.advertising_data = command.advertising_data
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_set_scan_response_data_command(
         self, command: hci.HCI_LE_Set_Scan_Response_Data_Command
@@ -1510,7 +1787,7 @@ class Controller:
         See Bluetooth spec Vol 4, Part E - 7.8.8 LE Set Scan Response Data Command
         '''
         self.le_scan_response_data = command.scan_response_data
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_set_advertising_enable_command(
         self, command: hci.HCI_LE_Set_Advertising_Enable_Command
@@ -1523,7 +1800,7 @@ class Controller:
         else:
             self.stop_advertising()
 
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_set_scan_parameters_command(
         self, command: hci.HCI_LE_Set_Scan_Parameters_Command
@@ -1532,14 +1809,14 @@ class Controller:
         See Bluetooth spec Vol 4, Part E - 7.8.10 LE Set Scan Parameters Command
         '''
         if self.le_scan_enable:
-            return bytes([HCI_COMMAND_DISALLOWED_ERROR])
+            return bytes([hci.HCI_COMMAND_DISALLOWED_ERROR])
 
         self.le_scan_type = command.le_scan_type
         self.le_scan_interval = command.le_scan_interval
         self.le_scan_window = command.le_scan_window
         self.le_scan_own_address_type = hci.AddressType(command.own_address_type)
         self.le_scanning_filter_policy = command.scanning_filter_policy
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_set_scan_enable_command(
         self, command: hci.HCI_LE_Set_Scan_Enable_Command
@@ -1549,7 +1826,7 @@ class Controller:
         '''
         self.le_scan_enable = bool(command.le_scan_enable)
         self.filter_duplicates = bool(command.filter_duplicates)
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_create_connection_command(
         self, command: hci.HCI_LE_Create_Connection_Command
@@ -1566,8 +1843,8 @@ class Controller:
         # Check that we don't already have a pending connection
         if self.link.get_pending_connection():
             self.send_hci_packet(
-                HCI_Command_Status_Event(
-                    status=HCI_COMMAND_DISALLOWED_ERROR,
+                hci.HCI_Command_Status_Event(
+                    status=hci.HCI_COMMAND_DISALLOWED_ERROR,
                     num_hci_command_packets=1,
                     command_opcode=command.op_code,
                 )
@@ -1579,8 +1856,8 @@ class Controller:
 
         # Say that the connection is pending
         self.send_hci_packet(
-            HCI_Command_Status_Event(
-                status=HCI_COMMAND_STATUS_PENDING,
+            hci.HCI_Command_Status_Event(
+                status=hci.HCI_COMMAND_STATUS_PENDING,
                 num_hci_command_packets=1,
                 command_opcode=command.op_code,
             )
@@ -1593,7 +1870,7 @@ class Controller:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.13 LE Create Connection Cancel Command
         '''
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_read_filter_accept_list_size_command(
         self, _command: hci.HCI_LE_Read_Filter_Accept_List_Size_Command
@@ -1602,7 +1879,7 @@ class Controller:
         See Bluetooth spec Vol 4, Part E - 7.8.14 LE Read Filter Accept List Size
         Command
         '''
-        return bytes([HCI_SUCCESS, self.filter_accept_list_size])
+        return bytes([hci.HCI_SUCCESS, self.filter_accept_list_size])
 
     def on_hci_le_clear_filter_accept_list_command(
         self, _command: hci.HCI_LE_Clear_Filter_Accept_List_Command
@@ -1610,7 +1887,7 @@ class Controller:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.15 LE Clear Filter Accept List Command
         '''
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_add_device_to_filter_accept_list_command(
         self, _command: hci.HCI_LE_Add_Device_To_Filter_Accept_List_Command
@@ -1619,7 +1896,7 @@ class Controller:
         See Bluetooth spec Vol 4, Part E - 7.8.16 LE Add Device To Filter Accept List
         Command
         '''
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_remove_device_from_filter_accept_list_command(
         self, _command: hci.HCI_LE_Remove_Device_From_Filter_Accept_List_Command
@@ -1628,7 +1905,16 @@ class Controller:
         See Bluetooth spec Vol 4, Part E - 7.8.17 LE Remove Device From Filter Accept
         List Command
         '''
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
+
+    def on_hci_write_scan_enable_command(
+        self, command: hci.HCI_Write_Scan_Enable_Command
+    ) -> Optional[bytes]:
+        '''
+        See Bluetooth spec Vol 4, Part E - 7.3.18 Write Scan Enable Command
+        '''
+        self.classic_scan_enable = command.scan_enable
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_read_remote_features_command(
         self, command: hci.HCI_LE_Read_Remote_Features_Command
@@ -1641,8 +1927,8 @@ class Controller:
 
         if not self.find_connection_by_handle(handle):
             self.send_hci_packet(
-                HCI_Command_Status_Event(
-                    status=HCI_INVALID_HCI_COMMAND_PARAMETERS_ERROR,
+                hci.HCI_Command_Status_Event(
+                    status=hci.HCI_INVALID_HCI_COMMAND_PARAMETERS_ERROR,
                     num_hci_command_packets=1,
                     command_opcode=command.op_code,
                 )
@@ -1651,8 +1937,8 @@ class Controller:
 
         # First, say that the command is pending
         self.send_hci_packet(
-            HCI_Command_Status_Event(
-                status=HCI_COMMAND_STATUS_PENDING,
+            hci.HCI_Command_Status_Event(
+                status=hci.HCI_COMMAND_STATUS_PENDING,
                 num_hci_command_packets=1,
                 command_opcode=command.op_code,
             )
@@ -1660,8 +1946,8 @@ class Controller:
 
         # Then send the remote features
         self.send_hci_packet(
-            HCI_LE_Read_Remote_Features_Complete_Event(
-                status=HCI_SUCCESS,
+            hci.HCI_LE_Read_Remote_Features_Complete_Event(
+                status=hci.HCI_SUCCESS,
                 connection_handle=handle,
                 le_features=bytes.fromhex('dd40000000000000'),
             )
@@ -1674,7 +1960,7 @@ class Controller:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.23 LE Rand Command
         '''
-        return bytes([HCI_SUCCESS]) + struct.pack('Q', random.randint(0, 1 << 64))
+        return bytes([hci.HCI_SUCCESS]) + struct.pack('Q', random.randint(0, 1 << 64))
 
     def on_hci_le_enable_encryption_command(
         self, command: hci.HCI_LE_Enable_Encryption_Command
@@ -1692,7 +1978,7 @@ class Controller:
             )
         ):
             logger.warning('connection not found')
-            return bytes([HCI_INVALID_HCI_COMMAND_PARAMETERS_ERROR])
+            return bytes([hci.HCI_INVALID_HCI_COMMAND_PARAMETERS_ERROR])
 
         # Notify that the connection is now encrypted
         self.link.on_connection_encrypted(
@@ -1704,8 +1990,8 @@ class Controller:
         )
 
         self.send_hci_packet(
-            HCI_Command_Status_Event(
-                status=HCI_COMMAND_STATUS_PENDING,
+            hci.HCI_Command_Status_Event(
+                status=hci.HCI_COMMAND_STATUS_PENDING,
                 num_hci_command_packets=1,
                 command_opcode=command.op_code,
             )
@@ -1719,7 +2005,7 @@ class Controller:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.27 LE Read Supported States Command
         '''
-        return bytes([HCI_SUCCESS]) + self.le_states
+        return bytes([hci.HCI_SUCCESS]) + self.le_states
 
     def on_hci_le_read_suggested_default_data_length_command(
         self, _command: hci.HCI_LE_Read_Suggested_Default_Data_Length_Command
@@ -1730,7 +2016,7 @@ class Controller:
         '''
         return struct.pack(
             '<BHH',
-            HCI_SUCCESS,
+            hci.HCI_SUCCESS,
             self.suggested_max_tx_octets,
             self.suggested_max_tx_time,
         )
@@ -1745,7 +2031,7 @@ class Controller:
         self.suggested_max_tx_octets, self.suggested_max_tx_time = struct.unpack(
             '<HH', command.parameters[:4]
         )
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_read_local_p_256_public_key_command(
         self, _command: hci.HCI_LE_Read_Local_P_256_Public_Key_Command
@@ -1753,8 +2039,8 @@ class Controller:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.36 LE Read P-256 Public Key Command
         '''
-        # TODO create key and send HCI_LE_Read_Local_P-256_Public_Key_Complete event
-        return bytes([HCI_SUCCESS])
+        # TODO create key and send hci.HCI_LE_Read_Local_P-256_Public_Key_Complete event
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_add_device_to_resolving_list_command(
         self, _command: hci.HCI_LE_Add_Device_To_Resolving_List_Command
@@ -1763,7 +2049,7 @@ class Controller:
         See Bluetooth spec Vol 4, Part E - 7.8.38 LE Add Device To Resolving List
         Command
         '''
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_clear_resolving_list_command(
         self, _command: hci.HCI_LE_Clear_Resolving_List_Command
@@ -1771,7 +2057,7 @@ class Controller:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.40 LE Clear Resolving List Command
         '''
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_read_resolving_list_size_command(
         self, _command: hci.HCI_LE_Read_Resolving_List_Size_Command
@@ -1779,33 +2065,33 @@ class Controller:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.41 LE Read Resolving List Size Command
         '''
-        return bytes([HCI_SUCCESS, self.resolving_list_size])
+        return bytes([hci.HCI_SUCCESS, self.resolving_list_size])
 
     def on_hci_le_set_address_resolution_enable_command(
         self, command: hci.HCI_LE_Set_Address_Resolution_Enable_Command
     ) -> Optional[bytes]:
         '''
-        See Bluetooth spec Vol 4, Part E - 7.8.44 LE Set Address Resolution Enable
+        See Bluetooth spec Vol 4, Part E - 7.8.44 LE Set hci.Address Resolution Enable
         Command
         '''
-        ret = HCI_SUCCESS
+        ret = hci.HCI_SUCCESS
         if command.address_resolution_enable == 1:
             self.le_address_resolution = True
         elif command.address_resolution_enable == 0:
             self.le_address_resolution = False
         else:
-            ret = HCI_INVALID_HCI_COMMAND_PARAMETERS_ERROR
+            ret = hci.HCI_INVALID_HCI_COMMAND_PARAMETERS_ERROR
         return bytes([ret])
 
     def on_hci_le_set_resolvable_private_address_timeout_command(
         self, command: hci.HCI_LE_Set_Resolvable_Private_Address_Timeout_Command
     ) -> Optional[bytes]:
         '''
-        See Bluetooth spec Vol 4, Part E - 7.8.45 LE Set Resolvable Private Address
+        See Bluetooth spec Vol 4, Part E - 7.8.45 LE Set Resolvable Private hci.Address
         Timeout Command
         '''
         self.le_rpa_timeout = command.rpa_timeout
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_read_maximum_data_length_command(
         self, _command: hci.HCI_LE_Read_Maximum_Data_Length_Command
@@ -1815,7 +2101,7 @@ class Controller:
         '''
         return struct.pack(
             '<BHHHH',
-            HCI_SUCCESS,
+            hci.HCI_SUCCESS,
             self.supported_max_tx_octets,
             self.supported_max_tx_time,
             self.supported_max_rx_octets,
@@ -1830,10 +2116,10 @@ class Controller:
         '''
         return struct.pack(
             '<BHBB',
-            HCI_SUCCESS,
+            hci.HCI_SUCCESS,
             command.connection_handle,
-            HCI_LE_1M_PHY,
-            HCI_LE_1M_PHY,
+            hci.HCI_LE_1M_PHY,
+            hci.HCI_LE_1M_PHY,
         )
 
     def on_hci_le_set_default_phy_command(
@@ -1845,16 +2131,16 @@ class Controller:
         self.default_phy['all_phys'] = command.all_phys
         self.default_phy['tx_phys'] = command.tx_phys
         self.default_phy['rx_phys'] = command.rx_phys
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_set_advertising_set_random_address_command(
         self, _command: hci.HCI_LE_Set_Advertising_Set_Random_Address_Command
     ) -> Optional[bytes]:
         '''
-        See Bluetooth spec Vol 4, Part E - 7.8.52 LE Set Advertising Set Random Address
+        See Bluetooth spec Vol 4, Part E - 7.8.52 LE Set Advertising Set Random hci.Address
         Command
         '''
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_set_extended_advertising_parameters_command(
         self, _command: hci.HCI_LE_Set_Extended_Advertising_Parameters_Command
@@ -1863,7 +2149,7 @@ class Controller:
         See Bluetooth spec Vol 4, Part E - 7.8.53 LE Set Extended Advertising Parameters
         Command
         '''
-        return bytes([HCI_SUCCESS, 0])
+        return bytes([hci.HCI_SUCCESS, 0])
 
     def on_hci_le_set_extended_advertising_data_command(
         self, _command: hci.HCI_LE_Set_Extended_Advertising_Data_Command
@@ -1872,7 +2158,7 @@ class Controller:
         See Bluetooth spec Vol 4, Part E - 7.8.54 LE Set Extended Advertising Data
         Command
         '''
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_set_extended_scan_response_data_command(
         self, _command: hci.HCI_LE_Set_Extended_Scan_Response_Data_Command
@@ -1881,7 +2167,7 @@ class Controller:
         See Bluetooth spec Vol 4, Part E - 7.8.55 LE Set Extended Scan Response Data
         Command
         '''
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_set_extended_advertising_enable_command(
         self, _command: hci.HCI_LE_Set_Extended_Advertising_Enable_Command
@@ -1890,7 +2176,7 @@ class Controller:
         See Bluetooth spec Vol 4, Part E - 7.8.56 LE Set Extended Advertising Enable
         Command
         '''
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_read_maximum_advertising_data_length_command(
         self, _command: hci.HCI_LE_Read_Maximum_Advertising_Data_Length_Command
@@ -1899,7 +2185,7 @@ class Controller:
         See Bluetooth spec Vol 4, Part E - 7.8.57 LE Read Maximum Advertising Data
         Length Command
         '''
-        return struct.pack('<BH', HCI_SUCCESS, 0x0672)
+        return struct.pack('<BH', hci.HCI_SUCCESS, 0x0672)
 
     def on_hci_le_read_number_of_supported_advertising_sets_command(
         self, _command: hci.HCI_LE_Read_Number_Of_Supported_Advertising_Sets_Command
@@ -1908,7 +2194,7 @@ class Controller:
         See Bluetooth spec Vol 4, Part E - 7.8.58 LE Read Number of Supported
         Advertising Set Command
         '''
-        return struct.pack('<BB', HCI_SUCCESS, 0xF0)
+        return struct.pack('<BB', hci.HCI_SUCCESS, 0xF0)
 
     def on_hci_le_set_periodic_advertising_parameters_command(
         self, _command: hci.HCI_LE_Set_Periodic_Advertising_Parameters_Command
@@ -1917,7 +2203,7 @@ class Controller:
         See Bluetooth spec Vol 4, Part E - 7.8.61 LE Set Periodic Advertising Parameters
         Command
         '''
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_set_periodic_advertising_data_command(
         self, _command: hci.HCI_LE_Set_Periodic_Advertising_Data_Command
@@ -1926,7 +2212,7 @@ class Controller:
         See Bluetooth spec Vol 4, Part E - 7.8.62 LE Set Periodic Advertising Data
         Command
         '''
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_set_periodic_advertising_enable_command(
         self, _command: hci.HCI_LE_Set_Periodic_Advertising_Enable_Command
@@ -1935,7 +2221,7 @@ class Controller:
         See Bluetooth spec Vol 4, Part E - 7.8.63 LE Set Periodic Advertising Enable
         Command
         '''
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_read_transmit_power_command(
         self, _command: hci.HCI_LE_Read_Transmit_Power_Command
@@ -1943,7 +2229,7 @@ class Controller:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.74 LE Read Transmit Power Command
         '''
-        return struct.pack('<BBB', HCI_SUCCESS, 0, 0)
+        return struct.pack('<BBB', hci.HCI_SUCCESS, 0, 0)
 
     def on_hci_le_set_cig_parameters_command(
         self, command: hci.HCI_LE_Set_CIG_Parameters_Command
@@ -1968,7 +2254,7 @@ class Controller:
                 handle=handle,
             )
         return struct.pack(
-            '<BBB', HCI_SUCCESS, command.cig_id, len(handles)
+            '<BBB', hci.HCI_SUCCESS, command.cig_id, len(handles)
         ) + b''.join([struct.pack('<H', handle) for handle in handles])
 
     def on_hci_le_create_cis_command(
@@ -1985,11 +2271,11 @@ class Controller:
         ):
             if not (connection := self.find_connection_by_handle(acl_handle)):
                 logger.error(f'Cannot find connection with handle={acl_handle}')
-                return bytes([HCI_INVALID_HCI_COMMAND_PARAMETERS_ERROR])
+                return bytes([hci.HCI_INVALID_HCI_COMMAND_PARAMETERS_ERROR])
 
             if not (cis_link := self.central_cis_links.get(cis_handle)):
                 logger.error(f'Cannot find CIS with handle={cis_handle}')
-                return bytes([HCI_INVALID_HCI_COMMAND_PARAMETERS_ERROR])
+                return bytes([hci.HCI_INVALID_HCI_COMMAND_PARAMETERS_ERROR])
 
             cis_link.acl_connection = connection
 
@@ -2001,8 +2287,8 @@ class Controller:
             )
 
         self.send_hci_packet(
-            HCI_Command_Status_Event(
-                status=HCI_COMMAND_STATUS_PENDING,
+            hci.HCI_Command_Status_Event(
+                status=hci.HCI_COMMAND_STATUS_PENDING,
                 num_hci_command_packets=1,
                 command_opcode=command.op_code,
             )
@@ -2016,13 +2302,13 @@ class Controller:
         See Bluetooth spec Vol 4, Part E - 7.8.100 LE Remove CIG Command
         '''
 
-        status = HCI_UNKNOWN_CONNECTION_IDENTIFIER_ERROR
+        status = hci.HCI_UNKNOWN_CONNECTION_IDENTIFIER_ERROR
 
         cis_links = list(self.central_cis_links.items())
         for cis_handle, cis_link in cis_links:
             if cis_link.cig_id == command.cig_id:
                 self.central_cis_links.pop(cis_handle)
-                status = HCI_SUCCESS
+                status = hci.HCI_SUCCESS
 
         return struct.pack('<BH', status, command.cig_id)
 
@@ -2039,7 +2325,7 @@ class Controller:
             pending_cis_link := self.peripheral_cis_links.get(command.connection_handle)
         ):
             logger.error(f'Cannot find CIS with handle={command.connection_handle}')
-            return bytes([HCI_INVALID_HCI_COMMAND_PARAMETERS_ERROR])
+            return bytes([hci.HCI_INVALID_HCI_COMMAND_PARAMETERS_ERROR])
 
         assert pending_cis_link.acl_connection
         self.link.accept_cis(
@@ -2050,8 +2336,8 @@ class Controller:
         )
 
         self.send_hci_packet(
-            HCI_Command_Status_Event(
-                status=HCI_COMMAND_STATUS_PENDING,
+            hci.HCI_Command_Status_Event(
+                status=hci.HCI_COMMAND_STATUS_PENDING,
                 num_hci_command_packets=1,
                 command_opcode=command.op_code,
             )
@@ -2067,17 +2353,17 @@ class Controller:
         if not (iso_link := self.find_iso_link_by_handle(command.connection_handle)):
             return struct.pack(
                 '<BH',
-                HCI_UNKNOWN_CONNECTION_IDENTIFIER_ERROR,
+                hci.HCI_UNKNOWN_CONNECTION_IDENTIFIER_ERROR,
                 command.connection_handle,
             )
         if command.data_path_direction in iso_link.data_paths:
             return struct.pack(
                 '<BH',
-                HCI_COMMAND_DISALLOWED_ERROR,
+                hci.HCI_COMMAND_DISALLOWED_ERROR,
                 command.connection_handle,
             )
         iso_link.data_paths.add(command.data_path_direction)
-        return struct.pack('<BH', HCI_SUCCESS, command.connection_handle)
+        return struct.pack('<BH', hci.HCI_SUCCESS, command.connection_handle)
 
     def on_hci_le_remove_iso_data_path_command(
         self, command: hci.HCI_LE_Remove_ISO_Data_Path_Command
@@ -2088,7 +2374,7 @@ class Controller:
         if not (iso_link := self.find_iso_link_by_handle(command.connection_handle)):
             return struct.pack(
                 '<BH',
-                HCI_UNKNOWN_CONNECTION_IDENTIFIER_ERROR,
+                hci.HCI_UNKNOWN_CONNECTION_IDENTIFIER_ERROR,
                 command.connection_handle,
             )
         data_paths: set[int] = set(
@@ -2099,11 +2385,11 @@ class Controller:
         if not data_paths.issubset(iso_link.data_paths):
             return struct.pack(
                 '<BH',
-                HCI_COMMAND_DISALLOWED_ERROR,
+                hci.HCI_COMMAND_DISALLOWED_ERROR,
                 command.connection_handle,
             )
         iso_link.data_paths.difference_update(data_paths)
-        return struct.pack('<BH', HCI_SUCCESS, command.connection_handle)
+        return struct.pack('<BH', hci.HCI_SUCCESS, command.connection_handle)
 
     def on_hci_le_set_host_feature_command(
         self, _command: hci.HCI_LE_Set_Host_Feature_Command
@@ -2111,4 +2397,4 @@ class Controller:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.115 LE Set Host Feature command
         '''
-        return bytes([HCI_SUCCESS])
+        return bytes([hci.HCI_SUCCESS])