pbio/drv/bluetooth_btstack: Read full HCI version info payload.

Co-authored-by: James Aguilar <aguilar.james@gmail.com>

Author: laurensvalk

lib/pbio/drv/bluetooth/bluetooth_btstack.c

@@ -228,18 +228,23 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
             const uint8_t *rp = hci_event_command_complete_get_return_parameters(packet);
             switch (hci_event_command_complete_get_command_opcode(packet)) {
                 case HCI_OPCODE_HCI_READ_LOCAL_VERSION_INFORMATION: {
-                    uint16_t lmp_pal_subversion = pbio_get_uint16_le(&rp[7]);
-                    pbdrv_bluetooth_btstack_set_chipset(lmp_pal_subversion);
+                    pbdrv_bluetooth_btstack_device_discriminator_t info;
+                    info.hci_version = rp[1];
+                    info.hci_revision = pbio_get_uint16_le(&rp[2]);
+                    info.lmp_pal_version = rp[4];
+                    info.manufacturer = pbio_get_uint16_le(&rp[5]);
+                    info.lmp_pal_subversion = pbio_get_uint16_le(&rp[7]);
+                    pbdrv_bluetooth_btstack_set_chipset(&info);
 
                     #if DEBUG
                     // Show version in ev3dev format.
-                    uint16_t chip = (lmp_pal_subversion & 0x7C00) >> 10;
-                    uint16_t min_ver = (lmp_pal_subversion & 0x007F);
-                    uint16_t maj_ver = (lmp_pal_subversion & 0x0380) >> 7;
-                    if (lmp_pal_subversion & 0x8000) {
+                    uint16_t chip = (info.lmp_pal_subversion & 0x7C00) >> 10;
+                    uint16_t min_ver = (info.lmp_pal_subversion & 0x007F);
+                    uint16_t maj_ver = (info.lmp_pal_subversion & 0x0380) >> 7;
+                    if (info.lmp_pal_subversion & 0x8000) {
                         maj_ver |= 0x0008;
                     }
-                    DEBUG_PRINT("LMP %04x: TIInit_%d.%d.%d.bts\n", lmp_pal_subversion, chip, maj_ver, min_ver);
+                    DEBUG_PRINT("LMP %04x: TIInit_%d.%d.%d.bts\n", info.lmp_pal_subversion, chip, maj_ver, min_ver);
                     #endif
                     break;
                 }

lib/pbio/drv/bluetooth/bluetooth_btstack.h

@@ -37,13 +37,31 @@ typedef struct {
     const uint32_t init_script_size;
 } pbdrv_bluetooth_btstack_chipset_info_t;
 
+/**
+ * Device discriminator info from the HCI read local version information command.
+ */
+typedef struct {
+    /** HCI version. */
+    uint8_t hci_version;
+    /** HCI revision. */
+    uint16_t hci_revision;
+    /** LMP/PAL version. */
+    uint8_t lmp_pal_version;
+    /** Manufacturer. */
+    uint16_t manufacturer;
+    /** LMP/PAL subversion. */
+    uint16_t lmp_pal_subversion;
+} pbdrv_bluetooth_btstack_device_discriminator_t;
+
 /**
  * Hook called when BTstack reads the local version information.
  *
  * This is called _after_ hci_set_chipset but _before_ the init script is sent
  * over the wire, so this can be used to dynamically select the init script.
+ *
+ * @param device_info The device information read from the Bluetooth chip.
  */
-void pbdrv_bluetooth_btstack_set_chipset(uint16_t lmp_pal_subversion);
+void pbdrv_bluetooth_btstack_set_chipset(pbdrv_bluetooth_btstack_device_discriminator_t *device_info);
 
 typedef struct {
     const hci_transport_t *(*transport_instance)(void);

lib/pbio/drv/bluetooth/bluetooth_btstack_ev3.c

@@ -73,8 +73,8 @@ pbio_error_t pbdrv_bluetooth_btstack_platform_init(void) {
 void pbdrv_bluetooth_btstack_platform_poll(void) {
 }
 
-void pbdrv_bluetooth_btstack_set_chipset(uint16_t lmp_pal_subversion) {
-    const pbdrv_bluetooth_btstack_chipset_info_t *info = lmp_pal_subversion == cc2560_info.lmp_version ?
+void pbdrv_bluetooth_btstack_set_chipset(pbdrv_bluetooth_btstack_device_discriminator_t *device_info) {
+    const pbdrv_bluetooth_btstack_chipset_info_t *info = device_info->lmp_pal_subversion == cc2560_info.lmp_version ?
         &cc2560_info : &cc2560a_info;
     btstack_chipset_cc256x_set_init_script((uint8_t *)info->init_script, info->init_script_size);
 

lib/pbio/drv/bluetooth/bluetooth_btstack_stm32_hal.c

@@ -33,7 +33,7 @@ pbio_error_t pbdrv_bluetooth_btstack_platform_init(void) {
 void pbdrv_bluetooth_btstack_platform_poll(void) {
 }
 
-void pbdrv_bluetooth_btstack_set_chipset(uint16_t lmp_pal_subversion) {
+void pbdrv_bluetooth_btstack_set_chipset(pbdrv_bluetooth_btstack_device_discriminator_t *device_info) {
 
     const pbdrv_bluetooth_btstack_platform_data_t *pdata =
         &pbdrv_bluetooth_btstack_platform_data;

lib/pbio/test/drv/test_bluetooth_btstack.c

@@ -770,7 +770,7 @@ static void handle_data_source(btstack_data_source_t *ds,  btstack_data_source_c
     }
 }
 
-void pbdrv_bluetooth_btstack_set_chipset(uint16_t lmp_pal_subversion) {
+void pbdrv_bluetooth_btstack_set_chipset(pbdrv_bluetooth_btstack_device_discriminator_t *device_info) {
 }
 
 pbio_error_t pbdrv_bluetooth_btstack_platform_init(void) {