valid connection and service to switch led on/off

FRASTM · FRASTM · commit 8e720d076f23 · 2020-11-04T08:34:23.000+01:00
Signed-off-by: Francois Ramu &lt;francois.ramu@st.com&gt;
diff --git a/src/utility/HCISharedMemTransport.cpp b/src/utility/HCISharedMemTransport.cpp
@@ -84,8 +84,7 @@ 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:
-
+        case TL_BLEEVT_PKT_TYPE: {
 #if defined(DEBUG)
 #if defined(PRINT_HCI_DATA)
                 printf("RX<< EVT : ");
@@ -101,7 +100,7 @@ static void evt_received(TL_EvtPacket_t *hcievt)
 #endif /* DEBUG */
 
     if (phase_running == false) {
-        /* check the Rx event of complete the previous bd_addr opcode 0xfc0c */
+        /* 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) &&
@@ -157,31 +156,32 @@ __disable_irq();
             _write_index += len;
             //TODO: control the _rxbuff cannot overflow
 __enable_irq();
+            }
             break;
         case TL_ACL_DATA_PKT_TYPE: {
+            TL_AclDataSerial_t *acl = &(((TL_AclDataPacket_t *)hcievt)->AclDataSerial);
+__disable_irq();
+            len = acl->length + 5;
+            memcpy((uint8_t *)&_rxbuff[_write_index], (uint8_t *)acl, len);
+            /* move index */
+            _write_index += len;
+            //TODO: control the _rxbuff cannot overflow
+__enable_irq();
 #if defined(DEBUG)
 #if defined(PRINT_HCI_DATA)
                 printf("RX<< ACL : ");
-                printf(" Type %#x", hcievt->evtserial.type);
-                printf(" evt %#x", hcievt->evtserial.evt.evtcode);
-                printf(" Len %#d", hcievt->evtserial.evt.plen);
+                printf(" Type %#x", acl->type);
+                printf(" evt %#x", acl->handle);
+                printf(" Len %#d", acl->length);
                 printf(" :");
-                for (uint8_t i = 0; i < hcievt->evtserial.evt.plen; i++) {
-                    printf(" %02X", hcievt->evtserial.evt.payload[i]);
+                for (uint8_t i = 0; i < acl->length; i++) {
+                    printf(" %02X", acl->acl_data[i]);
                 }
                 printf("\r\n");
 #endif /* PRINT_HCI_DATA */
 #endif /* DEBUG */
-            TL_AclDataSerial_t *acl = &(((TL_AclDataPacket_t *)hcievt)->AclDataSerial);
-__disable_irq();
-            len = acl->length + 5;
-            memcpy((uint8_t *)&_rxbuff[_write_index], (uint8_t *)&acl, len);
-            /* move index */
-            _write_index += len;
-            //TODO: control the _rxbuff cannot overflow
-__enable_irq();
         }
-        break;
+            break;
         default:
             // should not happen - let's block to check
 #if defined(DEBUG)
@@ -388,16 +388,11 @@ int HCISharedMemTransportClass::available()
         if (_read_index != _write_index) {
             return 1;
         } else {
-                return 0;
+            return 0;
         }
     } else {
         return 0;
     }
-    if (sys_event) {
-        sys_event = false;
-
-        return 1;
-    }
 
     return 0;
 }
@@ -474,12 +469,8 @@ size_t HCISharedMemTransportClass::write(const uint8_t* data, size_t length)
             LL_RCC_ReleaseBackupDomainReset();
         }
 
-        /* Switch OFF LSI */
+        /* Switch OFF LSI as LSE is the source clock */
 	    LL_RCC_LSI2_Disable();
-
-        /* Select wakeup source of BLE RF */
-        LL_RCC_SetRFWKPClockSource(LL_RCC_RFWKP_CLKSOURCE_LSE);
-
 }
 
     void stm32wb_reset(void)
@@ -595,10 +586,8 @@ size_t HCISharedMemTransportClass::write(const uint8_t* data, size_t length)
         tl_ble_config.IoBusEvtCallBack = evt_received;
         tl_ble_config.IoBusAclDataTxAck = acl_data_ack;
         TL_BLE_Init((void *)&tl_ble_config);
-
     }
 
-#if 1
 /* This function fills in a BD address table */
 bool get_bd_address(uint8_t *bd_addr)
 {
@@ -692,7 +681,7 @@ static int bt_ipm_set_power(void)
     return 1; /* success */
 }
 
-#else
+#if 0
     int bt_ipm_ble_init(void)
     {
         uint16_t       opcode;
@@ -953,16 +942,11 @@ static int bt_ipm_set_power(void)
                 TL_BLE_SendCmd(NULL, 0); // unused parameters for now
                 break;
             case 2://ACL DATA
-                if (!acl_data) {
-#if defined(DEBUG)
-                    printf("ERROR: previous ACL message not ACK'd\r\n");
-#endif /* DEBUG */
-                    /*  return number of bytes sent, 0 in this error case */
-                    return 0;
-                }
-                memcpy((void *)
-		       &((TL_AclDataPacket_t *)HciAclDataBuffer)->AclDataSerial, pData, len);
-                TL_BLE_SendAclData(NULL, 0); // unused parameters for now
+                /*memcpy((void *)
+		       &((TL_AclDataPacket_t *)HciAclDataBuffer)->AclDataSerial, pData, len);*/
+                TL_AclDataSerial_t *aclDataSerial = (TL_AclDataSerial_t *)(HciAclDataBuffer + sizeof(TL_PacketHeader_t));
+                aclDataSerial->type = type; // for now this param is overwritten in TL_BLE_SendCmd
+                memcpy(HciAclDataBuffer + + sizeof(TL_PacketHeader_t) + sizeof(type), pData, len);
 #if defined(DEBUG)
 #if defined(PRINT_HCI_DATA)
                 printf("TX>> ACL : ");
@@ -972,6 +956,7 @@ static int bt_ipm_set_power(void)
                 printf("\r\n");
 #endif /* PRINT_HCI_DATA */
 #endif /* DEBUG */
+                TL_BLE_SendAclData(NULL, 0); // unused parameters for now
                 break;
         }
         return len;
