control the init / running phase to detect error in the Rx EVT

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

Author: FRASTM

src/utility/HCISharedMemTransport.cpp

@@ -63,6 +63,7 @@ static bool phase_bd_addr = false;
 static bool phase_tx_power = false;
 static bool phase_reset = false;
 static bool phase_cnx = false;
+static bool phase_running = false;
 
 HCISharedMemTransportClass::HCISharedMemTransportClass(BLEChip_t ble_chip) :
   _ble_chip(ble_chip)
@@ -99,13 +100,20 @@ static void evt_received(TL_EvtPacket_t *hcievt)
 #endif /* PRINT_HCI_DATA */
 #endif /* DEBUG */
 
+    if (phase_running == false) {
         /* check the Rx event of complete the previous bd_addr opcode 0xfc0c */
         if ((hcievt->evtserial.evt.evtcode == TL_BLEEVT_CC_OPCODE) &&
            (hcievt->evtserial.evt.payload[0] == 0x01) &&
            (hcievt->evtserial.evt.payload[1] == 0x0C) &&
            (hcievt->evtserial.evt.payload[2] == 0xFC)) {
-           phase_bd_addr = true;
+            phase_bd_addr = true;
             /* rx data is no more useful */
+            if (hcievt->evtserial.evt.payload[3] != 0) {
+#if defined(DEBUG)
+                printf("Error: wrong BD Addr\r\n");
+#endif /* DEBUG */
+                return;
+            }
             break;
         } 
         /* check the Rx event of complete the previous tx power opcode 0xFC0F */
@@ -115,17 +123,32 @@ static void evt_received(TL_EvtPacket_t *hcievt)
             (hcievt->evtserial.evt.payload[2] == 0xFC)) {
             phase_tx_power = true;
             /* rx data is no more useful */
+            if (hcievt->evtserial.evt.payload[3] != 0) {
+#if defined(DEBUG)
+                printf("Error: wrong Tx power\r\n");
+#endif /* DEBUG */
+                return;
+            }
             break;
         }
-
         /* check if the reset phase is in progress (opcode is 0x0C03) */
         if ((hcievt->evtserial.evt.evtcode == TL_BLEEVT_CC_OPCODE) &&
            (hcievt->evtserial.evt.payload[0] == 0x01) &&
            (hcievt->evtserial.evt.payload[1] == 0x03) &&
            (hcievt->evtserial.evt.payload[2] == 0x0C)) {
             phase_reset = true;
+            if (hcievt->evtserial.evt.payload[3] != 0) {
+#if defined(DEBUG)
+                printf("Error: wrong reset\r\n");
+#endif /* DEBUG */
+                return;
+            }
         }
 
+        if ((phase_bd_addr == true) && (phase_bd_addr == true) && (phase_reset == true)) {
+            phase_running = true;
+        }
+    }
         /* check if the connection phase is up (event code is 0x3E) */
         if ((hcievt->evtserial.evt.evtcode == 0x3E)) {
             phase_cnx = true;
@@ -633,7 +656,7 @@ static int bt_ipm_set_addr(void)
 
         /* now wait for the corresponding Rx event */
         while (!phase_bd_addr);
-        phase_bd_addr = false; /* this sequence is now complete */
+        /* this sequence is now complete */
 
         return 1; /* success */
     } else {
@@ -662,7 +685,7 @@ static int bt_ipm_set_power(void)
 
     /* now wait for the corresponding Rx event */
     while (!phase_tx_power);
-    phase_tx_power = false; /* this sequence is now complete */
+    /* this sequence is now complete */
 
     return 1; /* success */
 }