bumble 0.0.212__py3-none-any.whl → 0.0.214__py3-none-any.whl

bumble/tools/intel_util.py

@@ -17,7 +17,6 @@
 # -----------------------------------------------------------------------------
 import logging
 import asyncio
-import os
 from typing import Any, Optional
 
 import click
@@ -26,6 +25,8 @@ from bumble.colors import color
 from bumble import transport
 from bumble.drivers import intel
 from bumble.host import Host
+import bumble.logging
+
 
 # -----------------------------------------------------------------------------
 # Logging
@@ -107,7 +108,7 @@ async def do_bootloader(usb_transport: str, force: bool) -> None:
 # -----------------------------------------------------------------------------
 @click.group()
 def main():
-    logging.basicConfig(level=os.environ.get('BUMBLE_LOGLEVEL', 'INFO').upper())
+    bumble.logging.setup_basic_logging()
 
 
 @main.command

bumble/tools/rtk_util.py

@@ -15,15 +15,16 @@
 # -----------------------------------------------------------------------------
 # Imports
 # -----------------------------------------------------------------------------
-import logging
 import asyncio
-import os
+import logging
 
 import click
 
 from bumble import transport
 from bumble.host import Host
 from bumble.drivers import rtk
+import bumble.logging
+
 
 # -----------------------------------------------------------------------------
 # Logging
@@ -50,7 +51,7 @@ def do_parse(firmware_path):
 
 # -----------------------------------------------------------------------------
 async def do_load(usb_transport, force):
-    async with await transport.open_transport_or_link(usb_transport) as (
+    async with await transport.open_transport(usb_transport) as (
         hci_source,
         hci_sink,
     ):
@@ -69,7 +70,7 @@ async def do_load(usb_transport, force):
 
 # -----------------------------------------------------------------------------
 async def do_drop(usb_transport):
-    async with await transport.open_transport_or_link(usb_transport) as (
+    async with await transport.open_transport(usb_transport) as (
         hci_source,
         hci_sink,
     ):
@@ -112,7 +113,7 @@ async def do_info(usb_transport, force):
 # -----------------------------------------------------------------------------
 @click.group()
 def main():
-    logging.basicConfig(level=os.environ.get('BUMBLE_LOGLEVEL', 'INFO').upper())
+    bumble.logging.setup_basic_logging()
 
 
 @main.command

bumble/transport/__init__.py

@@ -20,9 +20,9 @@ import logging
 import os
 from typing import Optional
 
+from bumble import utils
 from bumble.transport.common import (
     Transport,
-    AsyncPipeSink,
     SnoopingTransport,
     TransportSpecError,
 )
@@ -195,6 +195,7 @@ async def _open_transport(scheme: str, spec: Optional[str]) -> Transport:
 
 
 # -----------------------------------------------------------------------------
+@utils.deprecated("RemoteLink has been removed. Use open_transport instead.")
 async def open_transport_or_link(name: str) -> Transport:
     """
     Open a transport or a link relay.
@@ -205,21 +206,6 @@ async def open_transport_or_link(name: str) -> Transport:
         When the name starts with "link-relay:", open a link relay (see RemoteLink
         for details on what the arguments are).
         For other namespaces, see `open_transport`.
-
     """
-    if name.startswith('link-relay:'):
-        logger.warning('Link Relay has been deprecated.')
-        from bumble.controller import Controller
-        from bumble.link import RemoteLink  # lazy import
-
-        link = RemoteLink(name[11:])
-        await link.wait_until_connected()
-        controller = Controller('remote', link=link)  # type:ignore[arg-type]
-
-        class LinkTransport(Transport):
-            async def close(self):
-                link.close()
-
-        return _wrap_transport(LinkTransport(controller, AsyncPipeSink(controller)))
 
     return await open_transport(name)

bumble/transport/android_netsim.py

@@ -22,7 +22,7 @@ import os
 import pathlib
 import platform
 import sys
-from typing import Dict, Optional
+from typing import Optional
 
 import grpc.aio
 
@@ -143,7 +143,7 @@ def publish_grpc_port(grpc_port: int, instance_number: int) -> bool:
 
 # -----------------------------------------------------------------------------
 async def open_android_netsim_controller_transport(
-    server_host: Optional[str], server_port: int, options: Dict[str, str]
+    server_host: Optional[str], server_port: int, options: dict[str, str]
 ) -> Transport:
     if not server_port:
         raise TransportSpecError('invalid port')
@@ -288,7 +288,7 @@ async def open_android_netsim_controller_transport(
 async def open_android_netsim_host_transport_with_address(
     server_host: Optional[str],
     server_port: int,
-    options: Optional[Dict[str, str]] = None,
+    options: Optional[dict[str, str]] = None,
 ):
     if server_host == '_' or not server_host:
         server_host = 'localhost'
@@ -313,7 +313,7 @@ async def open_android_netsim_host_transport_with_address(
 
 # -----------------------------------------------------------------------------
 async def open_android_netsim_host_transport_with_channel(
-    channel, options: Optional[Dict[str, str]] = None
+    channel, options: Optional[dict[str, str]] = None
 ):
     # Wrapper for I/O operations
     class HciDevice:
@@ -451,7 +451,7 @@ async def open_android_netsim_transport(spec: Optional[str]) -> Transport:
         port = 0
         params_offset = 0
 
-    options: Dict[str, str] = {}
+    options: dict[str, str] = {}
     for param in params[params_offset:]:
         if '=' not in param:
             raise TransportSpecError('invalid parameter, expected <name>=<value>')

bumble/transport/common.py

@@ -21,7 +21,7 @@ import struct
 import asyncio
 import logging
 import io
-from typing import Any, ContextManager, Tuple, Optional, Protocol, Dict
+from typing import Any, ContextManager, Optional, Protocol
 
 from bumble import core
 from bumble import hci
@@ -38,7 +38,7 @@ logger = logging.getLogger(__name__)
 # Information needed to parse HCI packets with a generic parser:
 # For each packet type, the info represents:
 # (length-size, length-offset, unpack-type)
-HCI_PACKET_INFO: Dict[int, Tuple[int, int, str]] = {
+HCI_PACKET_INFO: dict[int, tuple[int, int, str]] = {
     hci.HCI_COMMAND_PACKET: (1, 2, 'B'),
     hci.HCI_ACL_DATA_PACKET: (2, 2, 'H'),
     hci.HCI_SYNCHRONOUS_DATA_PACKET: (1, 2, 'B'),
@@ -108,8 +108,8 @@ class PacketParser:
     NEED_BODY = 2
 
     sink: Optional[TransportSink]
-    extended_packet_info: Dict[int, Tuple[int, int, str]]
-    packet_info: Optional[Tuple[int, int, str]] = None
+    extended_packet_info: dict[int, tuple[int, int, str]]
+    packet_info: Optional[tuple[int, int, str]] = None
 
     def __init__(self, sink: Optional[TransportSink] = None) -> None:
         self.sink = sink

bumble/transport/pyusb.py

@@ -23,7 +23,7 @@ import time
 import usb.core
 import usb.util
 
-from typing import Optional, Set
+from typing import Optional
 from usb.core import Device as UsbDevice
 from usb.core import USBError
 from usb.util import CTRL_TYPE_CLASS, CTRL_RECIPIENT_OTHER
@@ -49,7 +49,7 @@ logger = logging.getLogger(__name__)
 # -----------------------------------------------------------------------------
 # Global
 # -----------------------------------------------------------------------------
-devices_in_use: Set[int] = set()
+devices_in_use: set[int] = set()
 
 
 # -----------------------------------------------------------------------------

bumble/utils.py

@@ -27,11 +27,8 @@ from typing import (
     Any,
     Awaitable,
     Callable,
-    List,
     Optional,
     Protocol,
-    Set,
-    Tuple,
     TypeVar,
     Union,
     overload,
@@ -156,7 +153,7 @@ class EventWatcher:
     ```
     '''
 
-    handlers: List[Tuple[pyee.EventEmitter, str, Callable[..., Any]]]
+    handlers: list[tuple[pyee.EventEmitter, str, Callable[..., Any]]]
 
     def __init__(self) -> None:
         self.handlers = []
@@ -329,7 +326,7 @@ class AsyncRunner:
     default_queue = WorkQueue()
 
     # Shared set of running tasks
-    running_tasks: Set[Awaitable] = set()
+    running_tasks: set[Awaitable] = set()
 
     @staticmethod
     def run_in_task(queue=None):

bumble/vendor/android/hci.py

@@ -15,21 +15,12 @@
 # -----------------------------------------------------------------------------
 # Imports
 # -----------------------------------------------------------------------------
+import dataclasses
+from dataclasses import field
 import struct
-from typing import Dict, Optional, Type
-
-from bumble.hci import (
-    name_or_number,
-    hci_vendor_command_op_code,
-    Address,
-    HCI_Constant,
-    HCI_Object,
-    HCI_Command,
-    HCI_Event,
-    HCI_Extended_Event,
-    HCI_VENDOR_EVENT,
-    STATUS_SPEC,
-)
+from typing import Optional
+
+from bumble import hci
 
 
 # -----------------------------------------------------------------------------
@@ -41,22 +32,28 @@ from bumble.hci import (
 #
 # pylint: disable-next=line-too-long
 # See https://source.android.com/docs/core/connect/bluetooth/hci_requirements#chip-capabilities-and-configuration
-HCI_LE_GET_VENDOR_CAPABILITIES_COMMAND = hci_vendor_command_op_code(0x153)
-HCI_LE_APCF_COMMAND = hci_vendor_command_op_code(0x157)
-HCI_GET_CONTROLLER_ACTIVITY_ENERGY_INFO_COMMAND = hci_vendor_command_op_code(0x159)
-HCI_A2DP_HARDWARE_OFFLOAD_COMMAND = hci_vendor_command_op_code(0x15D)
-HCI_BLUETOOTH_QUALITY_REPORT_COMMAND = hci_vendor_command_op_code(0x15E)
-HCI_DYNAMIC_AUDIO_BUFFER_COMMAND = hci_vendor_command_op_code(0x15F)
+HCI_LE_GET_VENDOR_CAPABILITIES_COMMAND = hci.hci_vendor_command_op_code(0x153)
+HCI_LE_APCF_COMMAND = hci.hci_vendor_command_op_code(0x157)
+HCI_GET_CONTROLLER_ACTIVITY_ENERGY_INFO_COMMAND = hci.hci_vendor_command_op_code(0x159)
+HCI_A2DP_HARDWARE_OFFLOAD_COMMAND = hci.hci_vendor_command_op_code(0x15D)
+HCI_BLUETOOTH_QUALITY_REPORT_COMMAND = hci.hci_vendor_command_op_code(0x15E)
+HCI_DYNAMIC_AUDIO_BUFFER_COMMAND = hci.hci_vendor_command_op_code(0x15F)
 
 HCI_BLUETOOTH_QUALITY_REPORT_EVENT = 0x58
 
-HCI_Command.register_commands(globals())
+hci.HCI_Command.register_commands(globals())
 
 
 # -----------------------------------------------------------------------------
-@HCI_Command.command(
-    return_parameters_fields=[
-        ('status', STATUS_SPEC),
+@hci.HCI_Command.command
+@dataclasses.dataclass
+class HCI_LE_Get_Vendor_Capabilities_Command(hci.HCI_Command):
+    # pylint: disable=line-too-long
+    '''
+    See https://source.android.com/docs/core/connect/bluetooth/hci_requirements#vendor-specific-capabilities
+    '''
+    return_parameters_fields = [
+        ('status', hci.STATUS_SPEC),
         ('max_advt_instances', 1),
         ('offloaded_resolution_of_private_address', 1),
         ('total_scan_results_storage', 2),
@@ -73,12 +70,6 @@ HCI_Command.register_commands(globals())
         ('bluetooth_quality_report_support', 1),
         ('dynamic_audio_buffer_support', 4),
     ]
-)
-class HCI_LE_Get_Vendor_Capabilities_Command(HCI_Command):
-    # pylint: disable=line-too-long
-    '''
-    See https://source.android.com/docs/core/connect/bluetooth/hci_requirements#vendor-specific-capabilities
-    '''
 
     @classmethod
     def parse_return_parameters(cls, parameters):
@@ -86,13 +77,13 @@ class HCI_LE_Get_Vendor_Capabilities_Command(HCI_Command):
         # there are no more bytes to parse, and leave un-signal parameters set to
         # None (older versions)
         nones = {field: None for field, _ in cls.return_parameters_fields}
-        return_parameters = HCI_Object(cls.return_parameters_fields, **nones)
+        return_parameters = hci.HCI_Object(cls.return_parameters_fields, **nones)
 
         try:
             offset = 0
             for field in cls.return_parameters_fields:
                 field_name, field_type = field
-                field_value, field_size = HCI_Object.parse_field(
+                field_value, field_size = hci.HCI_Object.parse_field(
                     parameters, offset, field_type
                 )
                 setattr(return_parameters, field_name, field_value)
@@ -104,30 +95,9 @@ class HCI_LE_Get_Vendor_Capabilities_Command(HCI_Command):
 
 
 # -----------------------------------------------------------------------------
-@HCI_Command.command(
-    fields=[
-        (
-            'opcode',
-            {
-                'size': 1,
-                'mapper': lambda x: HCI_LE_APCF_Command.opcode_name(x),
-            },
-        ),
-        ('payload', '*'),
-    ],
-    return_parameters_fields=[
-        ('status', STATUS_SPEC),
-        (
-            'opcode',
-            {
-                'size': 1,
-                'mapper': lambda x: HCI_LE_APCF_Command.opcode_name(x),
-            },
-        ),
-        ('payload', '*'),
-    ],
-)
-class HCI_LE_APCF_Command(HCI_Command):
+@hci.HCI_Command.command
+@dataclasses.dataclass
+class HCI_LE_APCF_Command(hci.HCI_Command):
     # pylint: disable=line-too-long
     '''
     See https://source.android.com/docs/core/connect/bluetooth/hci_requirements#le_apcf_command
@@ -137,80 +107,50 @@ class HCI_LE_APCF_Command(HCI_Command):
     '''
 
     # APCF Subcommands
-    # TODO: use the OpenIntEnum class (when upcoming PR is merged)
-    APCF_ENABLE = 0x00
-    APCF_SET_FILTERING_PARAMETERS = 0x01
-    APCF_BROADCASTER_ADDRESS = 0x02
-    APCF_SERVICE_UUID = 0x03
-    APCF_SERVICE_SOLICITATION_UUID = 0x04
-    APCF_LOCAL_NAME = 0x05
-    APCF_MANUFACTURER_DATA = 0x06
-    APCF_SERVICE_DATA = 0x07
-    APCF_TRANSPORT_DISCOVERY_SERVICE = 0x08
-    APCF_AD_TYPE_FILTER = 0x09
-    APCF_READ_EXTENDED_FEATURES = 0xFF
-
-    OPCODE_NAMES = {
-        APCF_ENABLE: 'APCF_ENABLE',
-        APCF_SET_FILTERING_PARAMETERS: 'APCF_SET_FILTERING_PARAMETERS',
-        APCF_BROADCASTER_ADDRESS: 'APCF_BROADCASTER_ADDRESS',
-        APCF_SERVICE_UUID: 'APCF_SERVICE_UUID',
-        APCF_SERVICE_SOLICITATION_UUID: 'APCF_SERVICE_SOLICITATION_UUID',
-        APCF_LOCAL_NAME: 'APCF_LOCAL_NAME',
-        APCF_MANUFACTURER_DATA: 'APCF_MANUFACTURER_DATA',
-        APCF_SERVICE_DATA: 'APCF_SERVICE_DATA',
-        APCF_TRANSPORT_DISCOVERY_SERVICE: 'APCF_TRANSPORT_DISCOVERY_SERVICE',
-        APCF_AD_TYPE_FILTER: 'APCF_AD_TYPE_FILTER',
-        APCF_READ_EXTENDED_FEATURES: 'APCF_READ_EXTENDED_FEATURES',
-    }
-
-    @classmethod
-    def opcode_name(cls, opcode):
-        return name_or_number(cls.OPCODE_NAMES, opcode)
+    class Opcode(hci.SpecableEnum):
+        ENABLE = 0x00
+        SET_FILTERING_PARAMETERS = 0x01
+        BROADCASTER_ADDRESS = 0x02
+        SERVICE_UUID = 0x03
+        SERVICE_SOLICITATION_UUID = 0x04
+        LOCAL_NAME = 0x05
+        MANUFACTURER_DATA = 0x06
+        SERVICE_DATA = 0x07
+        TRANSPORT_DISCOVERY_SERVICE = 0x08
+        AD_TYPE_FILTER = 0x09
+        READ_EXTENDED_FEATURES = 0xFF
+
+    opcode: int = dataclasses.field(metadata=Opcode.type_metadata(1))
+    payload: bytes = dataclasses.field(metadata=hci.metadata("*"))
+
+    return_parameters_fields = [
+        ('status', hci.STATUS_SPEC),
+        ('opcode', Opcode.type_spec(1)),
+        ('payload', '*'),
+    ]
 
 
 # -----------------------------------------------------------------------------
-@HCI_Command.command(
-    return_parameters_fields=[
-        ('status', STATUS_SPEC),
-        ('total_tx_time_ms', 4),
-        ('total_rx_time_ms', 4),
-        ('total_idle_time_ms', 4),
-        ('total_energy_used', 4),
-    ],
-)
-class HCI_Get_Controller_Activity_Energy_Info_Command(HCI_Command):
+@hci.HCI_Command.command
+@dataclasses.dataclass
+class HCI_Get_Controller_Activity_Energy_Info_Command(hci.HCI_Command):
     # pylint: disable=line-too-long
     '''
     See https://source.android.com/docs/core/connect/bluetooth/hci_requirements#le_get_controller_activity_energy_info
     '''
+    return_parameters_fields = [
+        ('status', hci.STATUS_SPEC),
+        ('total_tx_time_ms', 4),
+        ('total_rx_time_ms', 4),
+        ('total_idle_time_ms', 4),
+        ('total_energy_used', 4),
+    ]
 
 
 # -----------------------------------------------------------------------------
-@HCI_Command.command(
-    fields=[
-        (
-            'opcode',
-            {
-                'size': 1,
-                'mapper': lambda x: HCI_A2DP_Hardware_Offload_Command.opcode_name(x),
-            },
-        ),
-        ('payload', '*'),
-    ],
-    return_parameters_fields=[
-        ('status', STATUS_SPEC),
-        (
-            'opcode',
-            {
-                'size': 1,
-                'mapper': lambda x: HCI_A2DP_Hardware_Offload_Command.opcode_name(x),
-            },
-        ),
-        ('payload', '*'),
-    ],
-)
-class HCI_A2DP_Hardware_Offload_Command(HCI_Command):
+@hci.HCI_Command.command
+@dataclasses.dataclass
+class HCI_A2DP_Hardware_Offload_Command(hci.HCI_Command):
     # pylint: disable=line-too-long
     '''
     See https://source.android.com/docs/core/connect/bluetooth/hci_requirements#a2dp-hardware-offload-support
@@ -220,45 +160,24 @@ class HCI_A2DP_Hardware_Offload_Command(HCI_Command):
     '''
 
     # A2DP Hardware Offload Subcommands
-    # TODO: use the OpenIntEnum class (when upcoming PR is merged)
-    START_A2DP_OFFLOAD = 0x01
-    STOP_A2DP_OFFLOAD = 0x02
+    class Opcode(hci.SpecableEnum):
+        START_A2DP_OFFLOAD = 0x01
+        STOP_A2DP_OFFLOAD = 0x02
 
-    OPCODE_NAMES = {
-        START_A2DP_OFFLOAD: 'START_A2DP_OFFLOAD',
-        STOP_A2DP_OFFLOAD: 'STOP_A2DP_OFFLOAD',
-    }
+    opcode: int = dataclasses.field(metadata=Opcode.type_metadata(1))
+    payload: bytes = dataclasses.field(metadata=hci.metadata("*"))
 
-    @classmethod
-    def opcode_name(cls, opcode):
-        return name_or_number(cls.OPCODE_NAMES, opcode)
+    return_parameters_fields = [
+        ('status', hci.STATUS_SPEC),
+        ('opcode', Opcode.type_spec(1)),
+        ('payload', '*'),
+    ]
 
 
 # -----------------------------------------------------------------------------
-@HCI_Command.command(
-    fields=[
-        (
-            'opcode',
-            {
-                'size': 1,
-                'mapper': lambda x: HCI_Dynamic_Audio_Buffer_Command.opcode_name(x),
-            },
-        ),
-        ('payload', '*'),
-    ],
-    return_parameters_fields=[
-        ('status', STATUS_SPEC),
-        (
-            'opcode',
-            {
-                'size': 1,
-                'mapper': lambda x: HCI_Dynamic_Audio_Buffer_Command.opcode_name(x),
-            },
-        ),
-        ('payload', '*'),
-    ],
-)
-class HCI_Dynamic_Audio_Buffer_Command(HCI_Command):
+@hci.HCI_Command.command
+@dataclasses.dataclass
+class HCI_Dynamic_Audio_Buffer_Command(hci.HCI_Command):
     # pylint: disable=line-too-long
     '''
     See https://source.android.com/docs/core/connect/bluetooth/hci_requirements#dynamic-audio-buffer-command
@@ -268,27 +187,28 @@ class HCI_Dynamic_Audio_Buffer_Command(HCI_Command):
     '''
 
     # Dynamic Audio Buffer Subcommands
-    # TODO: use the OpenIntEnum class (when upcoming PR is merged)
-    GET_AUDIO_BUFFER_TIME_CAPABILITY = 0x01
+    class Opcode(hci.SpecableEnum):
+        GET_AUDIO_BUFFER_TIME_CAPABILITY = 0x01
 
-    OPCODE_NAMES = {
-        GET_AUDIO_BUFFER_TIME_CAPABILITY: 'GET_AUDIO_BUFFER_TIME_CAPABILITY',
-    }
+    opcode: int = dataclasses.field(metadata=Opcode.type_metadata(1))
+    payload: bytes = dataclasses.field(metadata=hci.metadata("*"))
 
-    @classmethod
-    def opcode_name(cls, opcode):
-        return name_or_number(cls.OPCODE_NAMES, opcode)
+    return_parameters_fields = [
+        ('status', hci.STATUS_SPEC),
+        ('opcode', Opcode.type_spec(1)),
+        ('payload', '*'),
+    ]
 
 
 # -----------------------------------------------------------------------------
-class HCI_Android_Vendor_Event(HCI_Extended_Event):
-    event_code: int = HCI_VENDOR_EVENT
-    subevent_classes: Dict[int, Type[HCI_Extended_Event]] = {}
+class HCI_Android_Vendor_Event(hci.HCI_Extended_Event):
+    event_code: int = hci.HCI_VENDOR_EVENT
+    subevent_classes: dict[int, type[hci.HCI_Extended_Event]] = {}
 
     @classmethod
     def subclass_from_parameters(
         cls, parameters: bytes
-    ) -> Optional[HCI_Extended_Event]:
+    ) -> Optional[hci.HCI_Extended_Event]:
         subevent_code = parameters[0]
         if subevent_code == HCI_BLUETOOTH_QUALITY_REPORT_EVENT:
             quality_report_id = parameters[1]
@@ -299,45 +219,43 @@ class HCI_Android_Vendor_Event(HCI_Extended_Event):
 
 
 HCI_Android_Vendor_Event.register_subevents(globals())
-HCI_Event.add_vendor_factory(HCI_Android_Vendor_Event.subclass_from_parameters)
+hci.HCI_Event.add_vendor_factory(HCI_Android_Vendor_Event.subclass_from_parameters)
 
 
 # -----------------------------------------------------------------------------
-@HCI_Extended_Event.event(
-    fields=[
-        ('quality_report_id', 1),
-        ('packet_types', 1),
-        ('connection_handle', 2),
-        ('connection_role', {'size': 1, 'mapper': HCI_Constant.role_name}),
-        ('tx_power_level', -1),
-        ('rssi', -1),
-        ('snr', 1),
-        ('unused_afh_channel_count', 1),
-        ('afh_select_unideal_channel_count', 1),
-        ('lsto', 2),
-        ('connection_piconet_clock', 4),
-        ('retransmission_count', 4),
-        ('no_rx_count', 4),
-        ('nak_count', 4),
-        ('last_tx_ack_timestamp', 4),
-        ('flow_off_count', 4),
-        ('last_flow_on_timestamp', 4),
-        ('buffer_overflow_bytes', 4),
-        ('buffer_underflow_bytes', 4),
-        ('bdaddr', Address.parse_address),
-        ('cal_failed_item_count', 1),
-        ('tx_total_packets', 4),
-        ('tx_unacked_packets', 4),
-        ('tx_flushed_packets', 4),
-        ('tx_last_subevent_packets', 4),
-        ('crc_error_packets', 4),
-        ('rx_duplicate_packets', 4),
-        ('rx_unreceived_packets', 4),
-        ('vendor_specific_parameters', '*'),
-    ]
-)
+@hci.HCI_Extended_Event.event
+@dataclasses.dataclass
 class HCI_Bluetooth_Quality_Report_Event(HCI_Android_Vendor_Event):
     # pylint: disable=line-too-long
     '''
     See https://source.android.com/docs/core/connect/bluetooth/hci_requirements#bluetooth-quality-report-sub-event
     '''
+    quality_report_id: int = field(metadata=hci.metadata(1))
+    packet_types: int = field(metadata=hci.metadata(1))
+    connection_handle: int = field(metadata=hci.metadata(2))
+    connection_role: int = field(metadata=hci.Role.type_metadata(1))
+    tx_power_level: int = field(metadata=hci.metadata(-1))
+    rssi: int = field(metadata=hci.metadata(-1))
+    snr: int = field(metadata=hci.metadata(1))
+    unused_afh_channel_count: int = field(metadata=hci.metadata(1))
+    afh_select_unideal_channel_count: int = field(metadata=hci.metadata(1))
+    lsto: int = field(metadata=hci.metadata(2))
+    connection_piconet_clock: int = field(metadata=hci.metadata(4))
+    retransmission_count: int = field(metadata=hci.metadata(4))
+    no_rx_count: int = field(metadata=hci.metadata(4))
+    nak_count: int = field(metadata=hci.metadata(4))
+    last_tx_ack_timestamp: int = field(metadata=hci.metadata(4))
+    flow_off_count: int = field(metadata=hci.metadata(4))
+    last_flow_on_timestamp: int = field(metadata=hci.metadata(4))
+    buffer_overflow_bytes: int = field(metadata=hci.metadata(4))
+    buffer_underflow_bytes: int = field(metadata=hci.metadata(4))
+    bdaddr: hci.Address = field(metadata=hci.metadata(hci.Address.parse_address))
+    cal_failed_item_count: int = field(metadata=hci.metadata(1))
+    tx_total_packets: int = field(metadata=hci.metadata(4))
+    tx_unacked_packets: int = field(metadata=hci.metadata(4))
+    tx_flushed_packets: int = field(metadata=hci.metadata(4))
+    tx_last_subevent_packets: int = field(metadata=hci.metadata(4))
+    crc_error_packets: int = field(metadata=hci.metadata(4))
+    rx_duplicate_packets: int = field(metadata=hci.metadata(4))
+    rx_unreceived_packets: int = field(metadata=hci.metadata(4))
+    vendor_specific_parameters: bytes = field(metadata=hci.metadata('*'))