pbio/drv/bluetooth_btstack: Allow other firmware files.

For platforms like EV3, the firmware patch is dynamically determined. We can apply the same technique for the STM32 platforms for conistency.

Also move the firmware files to the Bluetooth folder since they are not associated with one particular hub.

Author: laurensvalk

bricks/_common/sources.mk

@@ -118,6 +118,7 @@ PBIO_SRC_C = $(addprefix lib/pbio/,\
 	drv/bluetooth/bluetooth_simulation.c \
 	drv/bluetooth/bluetooth_stm32_bluenrg.c \
 	drv/bluetooth/bluetooth_stm32_cc2640.c \
+	drv/bluetooth/firmware/bluetooth_init_cc2564C_1.4.c \
 	drv/bluetooth/pybricks_service_server.c \
 	drv/button/button_gpio.c \
 	drv/button/button_nxt.c \
@@ -187,7 +188,6 @@ PBIO_SRC_C = $(addprefix lib/pbio/,\
 	drv/watchdog/watchdog_ev3.c \
 	drv/watchdog/watchdog_stm32.c \
 	platform/$(PBIO_PLATFORM)/platform.c \
-	platform/prime_hub/bluetooth_init_cc2564C_1.4.c \
 	src/angle.c \
 	src/battery.c \
 	src/busy_count.c \

lib/pbio/drv/bluetooth/bluetooth_btstack.c

@@ -1117,6 +1117,10 @@ static pbio_error_t pbdrv_bluetooth_hci_process_thread(pbio_os_state_t *state, v
     return bluetooth_thread_err;
 }
 
+// Have to be defined, but are not used.
+const uint32_t cc256x_init_script_size = 0;
+const uint8_t cc256x_init_script[] = {};
+
 void pbdrv_bluetooth_init_hci(void) {
 
     static btstack_packet_callback_registration_t hci_event_callback_registration;

lib/pbio/drv/bluetooth/bluetooth_btstack.h

@@ -6,10 +6,21 @@
 #ifndef _INTERNAL_PBDRV_BLUETOOTH_BTSTACK_H_
 #define _INTERNAL_PBDRV_BLUETOOTH_BTSTACK_H_
 
+#include <btstack.h>
 #include <btstack_chipset.h>
 #include <btstack_control.h>
 #include <btstack_uart_block.h>
 
+/** Chipset info */
+typedef struct {
+    /** Version */
+    const uint16_t lmp_version;
+    /** Initialization script */
+    const uint8_t *init_script;
+    /** Initialization script size */
+    const uint32_t init_script_size;
+} pbdrv_bluetooth_btstack_chipset_info_t;
+
 void pbdrv_bluetooth_btstack_run_loop_trigger(void);
 
 /**

lib/pbio/drv/bluetooth/bluetooth_btstack_stm32_hal.c

@@ -20,12 +20,23 @@
 #include "bluetooth_btstack_stm32_hal.h"
 #include "hci_transport_h4.h"
 
+#include "btstack_chipset_cc256x.h"
+
 #include <pbdrv/gpio.h>
 
 void pbdrv_bluetooth_btstack_set_chipset(uint16_t lmp_pal_subversion) {
+
+    const pbdrv_bluetooth_btstack_platform_data_t *pdata =
+        &pbdrv_bluetooth_btstack_platform_data;
+
     // All platforms supported by this abstraction use a cc2560x with the same
-    // init script, so nothing to do here.
-}
+    // init script.
+    extern const pbdrv_bluetooth_btstack_chipset_info_t cc2564c_info;
+    btstack_chipset_cc256x_set_init_script((uint8_t *)cc2564c_info.init_script, cc2564c_info.init_script_size);
+
+    // Needed to apply init script.
+    hci_set_chipset(pdata->chipset_instance());
+};
 
 static int btstack_control_gpio_on(void) {
     const pbdrv_bluetooth_btstack_stm32_platform_data_t *pdata =

…m/prime_hub/bluetooth_init_cc2564C_1.4.c …th/firmware/bluetooth_init_cc2564C_1.4.clib/pbio/platform/prime_hub/bluetooth_init_cc2564C_1.4.c renamed to lib/pbio/drv/bluetooth/firmware/bluetooth_init_cc2564C_1.4.c lib/pbio/platform/prime_hub/bluetooth_init_cc2564C_1.4.c renamed to lib/pbio/drv/bluetooth/firmware/bluetooth_init_cc2564C_1.4.c

@@ -8,22 +8,17 @@
 // - AKA TIInit_6.12.26.bts
 // - initscripts-TIInit_6.12.26_ble_add-on_v1.4.bts
 #include <stdint.h>
-#include "btstack_chipset_cc256x.h"
 
-
-const uint16_t cc256x_init_script_lmp_subversion = 0x9a1a;
-
-uint16_t btstack_chipset_cc256x_lmp_subversion(void) {
-    return cc256x_init_script_lmp_subversion;
-}
+#include "../bluetooth_btstack.h"
 
 #if defined(__GNUC__) && defined(__MSP430X__) && (__MSP430X__ > 0)
 __attribute__((section(".fartext")))
 #endif
 #ifdef __AVR__
 __attribute__((__progmem__))
 #endif
-const uint8_t cc256x_init_script[] = {
+
+static const uint8_t cc2564c_init_script[] = {
 
     // #--------------------------------------------------------------------------------
     // # Description : Orca C ROM Initialization Script
@@ -600,6 +595,10 @@ const uint8_t cc256x_init_script[] = {
 
 };
 
-const uint32_t cc256x_init_script_size = 6646;
+const pbdrv_bluetooth_btstack_chipset_info_t cc2564c_info = {
+    .lmp_version = 0x9a1a,
+    .init_script = cc2564c_init_script,
+    .init_script_size = sizeof(cc2564c_init_script),
+};
 
 #endif // PBDRV_CONFIG_BLUETOOTH_BTSTACK_CC2564C

lib/pbio/test/Makefile

@@ -125,10 +125,6 @@ PBIO_SRC = $(PBIO_DIR)/platform/test/platform.c \
 	$(shell find $(PBIO_DIR)/sys -name "*.c") \
 	$(shell find $(PBIO_DIR)/src/motor -name "*.c") \
 
-PBIO_SRC += $(addprefix $(PBIO_DIR)/,\
-	platform/prime_hub/bluetooth_init_cc2564C_1.4.c \
-	)
-
 # tests
 TEST_INC = -I. -I$(PBIO_DIR)/platform/test
 TEST_SRC = $(shell find . -name "*.c")