complete BLE init with device and power settings

just after the HCI_RESET command sent

Signed-off-by: Francois Ramu <[email protected]>

Author: FRASTM

src/utility/HCISharedMemTransport.cpp

@@ -35,8 +35,6 @@ extern "C" { void HW_IPCC_Rx_Handler(void);}
 /* Private variables ---------------------------------------------------------*/
 PLACE_IN_SECTION("MB_MEM1") ALIGN(4) static TL_CmdPacket_t BleCmdBuffer;
 
-/*PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t HciAclDataBuffer[MAX_HCI_ACL_PACKET_SIZE];
-*/
 PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t EvtPool[POOL_SIZE];
 PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static TL_CmdPacket_t SystemCmdBuffer;
 PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t
@@ -52,6 +50,11 @@ PLACE_IN_SECTION("MB_MEM2") ALIGN(4) static uint8_t
   uint16_t _write_index;
   uint16_t _write_index_initial;
 
+/** Bluetooth Device Address */
+static uint8_t bd_addr_udn[6];
+static bool phase_bd_addr = false;
+static bool phase_tx_power = false;
+
 HCISharedMemTransportClass::HCISharedMemTransportClass(BLEChip_t ble_chip) :
   _ble_chip(ble_chip)
 {
@@ -71,12 +74,26 @@ static void evt_received(TL_EvtPacket_t *hcievt)
     // We need to memcpy the data before passing to higher layers.
     switch (hcievt->evtserial.type) {
         case TL_BLEEVT_PKT_TYPE:
+
+        /* capture event after HCI_RESET */
+        if (phase_bd_addr) {
+            phase_bd_addr = false;
+            bt_ipm_set_addr();
+            phase_tx_power = true;
+        } else if (phase_tx_power) {
+            phase_tx_power = false;
+            bt_ipm_set_power();
+        } else {
+            phase_bd_addr = false;
+            phase_tx_power = false;
+
             len = hcievt->evtserial.evt.plen + TL_EVT_HDR_SIZE;
             /* store received data in the _rxbuff buffer */
             memcpy((uint8_t *)&_rxbuff, (uint8_t *)&hcievt->evtserial, len);
             /* move index */
             _write_index += len;
             //TODO: control the _rxbuff cannot overflow
+        }            
             break;
         case TL_ACL_DATA_PKT_TYPE: {
             TL_AclDataSerial_t *acl = &(((TL_AclDataPacket_t *)hcievt)->AclDataSerial);
@@ -155,30 +172,6 @@ static bool sysevt_check(void)
     }
 }
 
-#if 0
-void shci_cmd_resp_release(uint32_t flag)
-{
-	/* the semaphore is released here, so the variable becomes true. */
-    sys_resp = true;
-    return;
-}
-
-void shci_cmd_resp_wait(uint32_t timeout)
-{
-    /* TO DO: manage timeouts if we can return an error */
-//    for (unsigned long start = millis(); (millis() - start) < 10000;) {
-    while(1) {
-        /* Wait for 10sec max - if not return an error */
-        if (sys_resp) { break; }
-    }
-
-    if (!sys_resp) {
-        /*  no event received, timeout occurs */
-        return;
-    }
-}
-#endif
-
 static void acl_data_ack(void)
 {
     /**
@@ -266,12 +259,20 @@ int HCISharedMemTransportClass::begin()
              */
 
 
-        /* Now start BLE service on firmware side, using Vendor specific
-         * command on the System Channel
-         */
-        stm32wb_start_ble();
+            /* Now start BLE service on firmware side, using Vendor specific
+             * command on the System Channel
+             */
+            stm32wb_start_ble();
 
             /* "IPM Channel Open Completed" */
+
+            /* Once reset complete event is received we willneed
+             * to send a few more commands:
+             * set bd addr with bt_ipm_set_addr(); */
+            phase_bd_addr = false;
+            /* and Tx power with bt_ipm_set_power(); */
+            phase_tx_power = false;
+
             return 1;
        } else {
             /* "Error opening IPM channel" */
@@ -344,6 +345,13 @@ int HCISharedMemTransportClass::read()
 
 size_t HCISharedMemTransportClass::write(const uint8_t* data, size_t length)
 {
+    /* check if the reset phase is in progress */
+    if ((data[1] == (HCI_RESET & 0x000000FF)) && (data[2] == ((HCI_RESET & 0x0000FF00) >> 8))) {
+        /* this is the HCI Reset command being sent */
+        phase_bd_addr = true;
+        /* after receiving, the address will be send */
+    }
+
     const uint8_t* msg_data;
     msg_data = &data[1];
 
@@ -488,11 +496,96 @@ size_t HCISharedMemTransportClass::write(const uint8_t* data, size_t length)
 
     }
 
+#if 1
+/* This function fills in a BD address table */
+bool get_bd_address(uint8_t *bd_addr)
+{
+    uint8_t *otp_addr;
+    uint32_t udn;
+    uint32_t company_id;
+    uint32_t device_id;
+    bool bd_found;
+
+    udn = LL_FLASH_GetUDN();
+
+    if (udn != 0xFFFFFFFF) {
+        /* "Found Unique Device Number: %#06x", udn) */
+
+        company_id = LL_FLASH_GetSTCompanyID();
+        device_id = LL_FLASH_GetDeviceID();
+
+        bd_addr[0] = (uint8_t)(udn & 0x000000FF);
+        bd_addr[1] = (uint8_t)((udn & 0x0000FF00) >> 8);
+        bd_addr[2] = (uint8_t)((udn & 0x00FF0000) >> 16);
+        bd_addr[3] = (uint8_t)device_id;
+        bd_addr[4] = (uint8_t)(company_id & 0x000000FF);
+        bd_addr[5] = (uint8_t)((company_id & 0x0000FF00) >> 8);
+
+        bd_found = true;
+    } else {
+        bd_addr =NULL;
+        bd_found = false;
+    }
+
+    return bd_found;
+}
+
+static int bt_ipm_set_addr(void)
+{
+    /* the specific table for set addr is 8 bytes:
+     * one byte for config_offset
+     * one byte for length
+     * 6 bytes for payload */
+    uint8_t data[4+8];
+
+    if (get_bd_address(bd_addr_udn)) {
+        /* create ACI_HAL_WRITE_CONFIG_DATA */
+
+        data[0] = BT_BUF_CMD;
+        data[1] = uint8_t(ACI_WRITE_CONFIG_DATA_OPCODE & 0x000000FF); /* OCF */
+        data[2] = uint8_t((ACI_WRITE_CONFIG_DATA_OPCODE & 0x0000FF00) >> 8); /* OGF */
+        data[3] = 8; /* length of parameters */
+        /* fill the ACI_HAL_WRITE_CONFIG_DATA with the addr*/
+        data[4] = CONFIG_DATA_PUBADDR_OFFSET; /* the offset */
+        data[5] = 6; /* is the length of the bd_addr table */
+        memcpy(data + 6, bd_addr_udn, 6);
+        /* send the ACI_HAL_WRITE_CONFIG_DATA */
+        mbox_write(data[0], 11, &data[1]);
+
+        return 1; /* success */
+    } else {
+        return 0; /* Error */
+    }
+}
+
+static int bt_ipm_set_power(void)
+{
+    /* the specific table for power is 3 bytes:
+     * one byte for cmd
+     * two bytes for value */
+    uint8_t data[4+3];
+
+    data[0] = BT_BUF_CMD; /* the type */
+    data[1] = (uint8_t)(ACI_HAL_SET_TX_POWER_LEVEL & 0x000000FF); /* the OPCODE */
+    data[2] = (uint8_t)((ACI_HAL_SET_TX_POWER_LEVEL & 0x0000FF00) >> 8);
+    data[3] = 3; /* the length */
+    /* fill the ACI_HAL_WRITE_CONFIG_DATA */
+    data[4] = 0x0F; /* the command */
+    data[5] = 0x18;
+    data[6] = 0x01;
+
+    /* send the ACI_HAL_WRITE_CONFIG_DATA */
+    mbox_write(data[0], 3, &data[1]);
+
+    return 1; /* success */
+}
+
+#else
     int bt_ipm_ble_init(void)
     {
         uint16_t       opcode;
         static uint8_t randCnt;
-#if 0
+
         /* if event is a command complete event */
         if (*pMsg == HCI_CMD_CMPL_EVT) {
             /* "Command Complete Event Command" */
@@ -707,9 +800,10 @@ size_t HCISharedMemTransportClass::write(const uint8_t* data, size_t length)
 #endif /* DEBUG */
             }
         }
-#endif
-	    return 0;
+
+	    return 1; /* success */
     }
+#endif
 
     uint16_t mbox_write(uint8_t type, uint16_t len, const uint8_t *pData)
     {
@@ -817,40 +911,3 @@ static void init_debug(void)
 
     return;
 }
-
-/* This function fills in a BD address table */
-bool get_bd_address(uint8_t *bd_addr)
-{
-    uint8_t *otp_addr;
-    uint32_t udn;
-    uint32_t company_id;
-    uint32_t device_id;
-    bool bd_found;
-
-    udn = LL_FLASH_GetUDN();
-
-    if (udn != 0xFFFFFFFF) {
-#if defined(DEBUG)
-        tr_info("Found Unique Device Number: %#06x", udn);
-#endif /* DEBUG */
-        company_id = LL_FLASH_GetSTCompanyID();
-        device_id = LL_FLASH_GetDeviceID();
-
-        bd_addr[0] = (uint8_t)(udn & 0x000000FF);
-        bd_addr[1] = (uint8_t)((udn & 0x0000FF00) >> 8);
-        bd_addr[2] = (uint8_t)((udn & 0x00FF0000) >> 16);
-        bd_addr[3] = (uint8_t)device_id;
-        bd_addr[4] = (uint8_t)(company_id & 0x000000FF);
-        bd_addr[5] = (uint8_t)((company_id & 0x0000FF00) >> 8);
-
-        bd_found = true;
-    } else {
-#if defined(DEBUG)
-        tr_info("Cannot find Bluetooth Device ADDRESS to program - will leave hw default");
-#endif /* DEBUG */
-            bd_addr = NULL;
-            bd_found = false;
-    }
-
-    return bd_found;
-}

src/utility/HCISharedMemTransport.h

@@ -53,12 +53,16 @@
 #define ACI_READ_CONFIG_DATA_OPCODE 0xFC0D
 #define MAX_HCI_ACL_PACKET_SIZE (sizeof(TL_PacketHeader_t) + 5 + 251)
 #define MAX_HACI_EVT_SIZE (255+5)
+#define HCI_RESET 0x0C03
 
 #ifndef BLE_SHARED_MEM_BYTE_ORDER
 #define BLE_SHARED_MEM_BYTE_ORDER  MSBFIRST
 #endif
 #define BLE_MODULE_SHARED_MEM_BUFFER_SIZE 128
 
+#define BT_BUF_CMD 1
+#define BT_BUF_ACL_OUT 2
+
 struct aci_set_tx_power {
             uint8_t cmd;
             uint8_t value[2];
@@ -101,6 +105,8 @@ static void acl_data_ack(void);
 static bool acl_data_wait(void);
 static void init_debug(void);
 static bool get_bd_address(uint8_t *bd_addr);
+static int bt_ipm_set_addr(void);
+static int bt_ipm_set_power(void);
 static bool sysevt_wait(void);
 static bool sysevt_check(void);
 static void sysevt_received(void *pdata);