add print message for debug

define DEBUG to output information
define PRINT_HCI_DATA to trace the exact content of the TX packet

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

Author: FRASTM

src/utility/HCISharedMemTransport.cpp

@@ -26,9 +26,11 @@ volatile bool sys_resp;
 volatile bool acl_data; /* true : data acknowledged by the BLE */
 volatile bool data_available;
 
-/* this one is for printing 
-#define DEBUG */
-/* this must be defined */
+/* this one is for printing */
+#define DEBUG
+//#define PRINT_HCI_DATA
+
+/* this CONFIG_DEBUG must be defined */
 #define CONFIG_DEBUG
 
 #define HW_IPCC_Tx_Handler IPCC_C1_TX_IRQHandler
@@ -83,6 +85,20 @@ static void evt_received(TL_EvtPacket_t *hcievt)
     switch (hcievt->evtserial.type) {
         case TL_BLEEVT_PKT_TYPE:
 
+#if defined(DEBUG)
+#if defined(PRINT_HCI_DATA)
+                printf("RX<< BLE EVT : ");
+                printf(" Type %#x", hcievt->evtserial.type);
+                printf(" evt %#x", hcievt->evtserial.evt.evtcode);
+                printf(" Len %#d", hcievt->evtserial.evt.plen);
+                printf(" :");
+                for (uint8_t i = 0; i < hcievt->evtserial.evt.plen; i++) {
+                    printf(" %02X", hcievt->evtserial.evt.payload[i]);
+                }
+                printf("\r\n");
+#endif /* PRINT_HCI_DATA */
+#endif /* DEBUG */
+
         /* 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) &&
@@ -133,19 +149,18 @@ __enable_irq();
         default:
             // should not happen - let's block to check
 #if defined(DEBUG)
-            printf("BLE TL evt_received, wrong type:%d", hcievt->evtserial.type);
+            printf("BLE TL evt_received, wrong type:%d\r\n", hcievt->evtserial.type);
 #endif /* DEBUG */
             break;
     }
 
     if (_write_index > BLE_MODULE_SHARED_MEM_BUFFER_SIZE) {
 #if defined(DEBUG)
-        printf("Error: data read overflow");
+        printf("Error: data read overflow\r\n");
 #endif /* DEBUG */
         data_available = true;
     }
 
-
     /*  In case Event belongs to the Evt Pool we need to inform  */
     if (((uint8_t *)hcievt >= EvtPool) && ((uint8_t *)hcievt < (EvtPool + POOL_SIZE))) {
         /*  Free the message from shared memory */
@@ -286,12 +301,10 @@ int HCISharedMemTransportClass::begin()
             WirelessFwInfo_t wireless_info_instance;
             WirelessFwInfo_t *p_wireless_info = &wireless_info_instance;
             SHCI_GetWirelessFwInfo(p_wireless_info);
-            /* 
-             * tr_info("WIRELESS COPROCESSOR FW VERSION ID = %d.%d.%d", p_wireless_info->VersionMajor, p_wireless_info->VersionMinor, p_wireless_info->VersionSub);
-             * tr_info("WIRELESS COPROCESSOR FW STACK TYPE = %d", p_wireless_info->StackType);
-             */
-
-
+#if defined(DEBUG)
+            printf("WIRELESS COPROCESSOR FW VERSION ID = %d.%d.%d\r\n", p_wireless_info->VersionMajor, p_wireless_info->VersionMinor, p_wireless_info->VersionSub);
+            printf("WIRELESS COPROCESSOR FW STACK TYPE = %d\r\n", p_wireless_info->StackType);
+#endif
             /* Now start BLE service on firmware side, using Vendor specific
              * command on the System Channel
              */
@@ -653,10 +666,11 @@ static int bt_ipm_set_power(void)
         /* if event is a command complete event */
         if (*pMsg == HCI_CMD_CMPL_EVT) {
             /* "Command Complete Event Command" */
-#if (PRINT_HCI_DATA)
+#if defined(PRINT_HCI_DATA)
             for (uint8_t i = 0; i < 20; i++) {
-                tr_debug("  %02X", *((uint8_t *)pMsg + i));
+                printf("  %02X", *((uint8_t *)pMsg + i));
             }
+            printf("\r\n");
 #endif
             /* parse parameters */
             pMsg += HCI_EVT_HDR_LEN;
@@ -831,7 +845,7 @@ static int bt_ipm_set_power(void)
 
                 default:
 #if defined(DEBUG)
-                    printf("Complete Event in reset seq with unknown opcode =0x%4X", opcode);
+                    printf("Complete Event in reset seq with unknown opcode =0x%4X\r\n", opcode);
 #endif /* DEBUG */
                     break;
             }
@@ -845,7 +859,7 @@ static int bt_ipm_set_power(void)
             pMsg++;                   /* skip num packets */
             BSTREAM_TO_UINT16(opcode, pMsg);
 #if defined(DEBUG)
-            printf("Command Status event, status:%d, opcode=0x%4X", status, opcode);
+            printf("Command Status event, status:%d, opcode=0x%4X\r\n", status, opcode);
 #endif /* DEBUG */
         } else {
             /**
@@ -856,11 +870,11 @@ static int bt_ipm_set_power(void)
                 pMsg += HCI_EVT_HDR_LEN;
                 BSTREAM_TO_UINT16(opcode, pMsg);
 #if defined(DEBUG)
-                printf("Vendor specific event, opcode=0x%4X", opcode);
+                printf("Vendor specific event, opcode=0x%4X\r\n", opcode);
 #endif /* DEBUG */
             } else {
 #if defined(DEBUG)
-                printf("Unknown event %d!", pMsg[0]);
+                printf("Unknown event %d!\r\n", pMsg[0]);
 #endif /* DEBUG */
             }
         }
@@ -878,9 +892,7 @@ static int bt_ipm_set_power(void)
         // type 02 ACL DATA
         // type 03 SCO Voice (not supported)
         // type 04 event - uplink (not suported)
-#if defined(DEBUG)
-        printf("mbox_write type:%d, len:%d", type, len);
-#endif /* DEBUG */
+
         /*  TO DO : MANAGE ACL DATA CASE in separate buffer */
         switch (type) {
             case 1://BLE command
@@ -890,23 +902,25 @@ static int bt_ipm_set_power(void)
                 /* We're tracing here the command, after copy in shared mem but before
                  * * M0 trigger. */
 #if defined(DEBUG)
-                printf("TX>> BLE CMD");
-#endif /* DEBUG */
-#if (PRINT_HCI_DATA)
+#if defined(PRINT_HCI_DATA)
                 /* Trace the buffer including Type (+1 on lngth) */
-                tr_debug("  Type %#x", bleCmdBuf->cmdserial.type);
-                tr_debug("   Cmd %#x", bleCmdBuf->cmdserial.cmd.cmdcode);
-                tr_debug("   Len %#x", bleCmdBuf->cmdserial.cmd.plen);
+                printf("TX>> CMD : ");
+                printf(" Type %#x", bleCmdBuf->cmdserial.type);
+                printf(" Cmd %#x", bleCmdBuf->cmdserial.cmd.cmdcode);
+                printf(" Len %#d", bleCmdBuf->cmdserial.cmd.plen);
+                printf(" :");
                 for (uint8_t i = 0; i < bleCmdBuf->cmdserial.cmd.plen; i++) {
-                    tr_debug("  %02X", *(((uint8_t *)&bleCmdBuf->cmdserial.cmd.payload) + i));
+                    printf(" %02X", *(((uint8_t *)&bleCmdBuf->cmdserial.cmd.payload) + i));
                 }
+                printf("\r\n");
 #endif /* PRINT_HCI_DATA */
+#endif /* DEBUG */
                 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");
+                    printf("ERROR: previous ACL message not ACK'd\r\n");
 #endif /* DEBUG */
                     /*  return number of bytes sent, 0 in this error case */
                     return 0;
@@ -915,13 +929,14 @@ static int bt_ipm_set_power(void)
 		       &((TL_AclDataPacket_t *)HciAclDataBuffer)->AclDataSerial, pData, len);
                 TL_BLE_SendAclData(NULL, 0); // unused parameters for now
 #if defined(DEBUG)
-                printf("TX>> BLE ACL");
-#endif /* DEBUG */
-#if PRINT_HCI_DATA
+#if defined(PRINT_HCI_DATA)
+                printf("TX>> ACL : ");
                 for (uint8_t i = 0; i < len + 1 + 8; i++) {
-                    tr_debug("  %02x", *(((uint8_t *) aclDataBuffer) + i));
+                    printf("%02x ", *(((uint8_t *) HciAclDataBuffer) + i));
                 }
-#endif
+                printf("\r\n");
+#endif /* PRINT_HCI_DATA */
+#endif /* DEBUG */
                 break;
         }
         return len;
@@ -938,7 +953,7 @@ static void init_debug(void)
 
 #if defined(CONFIG_DEBUG)
 #if defined(DEBUG)
-    printf("init_debug ENABLED");
+    printf("init_debug ENABLED\r\n");
 #endif /* DEBUG */
     /**
      * Keep debugger enabled while in any low power mode
@@ -953,7 +968,7 @@ static void init_debug(void)
 
 #else
 #if defined(DEBUG)
-    printf("init_debug DISABLED");
+    printf("init_debug DISABLED\n\r");
 #endif /* DEBUG */
     GPIO_InitTypeDef gpio_config = {0};