修改Eccom 文件 编译通过

src/cisAsynEntry.c

@@ -122,10 +122,10 @@ static void prvObserveNotify(void* context,cis_uri_t* uri,cis_mid_t mid)
     }
 
     if(object == NULL){
-        ECOMM_TRACE(UNILOG_PLA_APP, prv_observeNotify_0, P_ERROR, 0, "prv_observeNotify return");
+        ECOMM_TRACE(UNILOG_PLA_APP, x1_prv_observeNotify_0, P_ERROR, 0, "prv_observeNotify return");
         return;
     }
-    ECOMM_TRACE(UNILOG_PLA_APP, prv_observeNotify_1, P_INFO, 0, "prv_observeNotify called");
+    ECOMM_TRACE(UNILOG_PLA_APP, x1_prv_observeNotify_1, P_INFO, 0, "prv_observeNotify called");
 
     if(!CIS_URI_IS_SET_INSTANCE(uri) && !CIS_URI_IS_SET_RESOURCE(uri))
     {
@@ -577,7 +577,7 @@ static void prvUpdateObserveContext()
     uint8_t i = 0;
     while(node != NULL)
     {
-        ECOMM_TRACE(UNILOG_PLA_APP, prvUpdateObserveContext_0, P_INFO, 1, "prvUpdateObserveContext mid=%d", node->mid);
+        ECOMM_TRACE(UNILOG_PLA_APP, x1_prvUpdateObserveContext_0, P_INFO, 1, "prvUpdateObserveContext mid=%d", node->mid);
         node = node->next;
         i++;
     }
@@ -594,12 +594,12 @@ static void prvUpdateObserveContext()
 
     if(BSP_QSPI_Erase_Safe(APP_BACKUP_NONXIP_ADDR, APP_BACKUP_SIZE) != QSPI_OK) //erase
     {
-        ECOMM_TRACE(UNILOG_PLA_APP, prvUpdateObserveContext_1, P_ERROR, 0, "erase flash error!!!");
+        ECOMM_TRACE(UNILOG_PLA_APP, x1_prvUpdateObserveContext_1, P_ERROR, 0, "erase flash error!!!");
     }
-    ECOMM_TRACE(UNILOG_PLA_APP, prvUpdateObserveContext_2, P_INFO, 0, "prvUpdateObserveContext BSP_QSPI_Write_Safe");
+    ECOMM_TRACE(UNILOG_PLA_APP, x1_prvUpdateObserveContext_2, P_INFO, 0, "prvUpdateObserveContext BSP_QSPI_Write_Safe");
     if(BSP_QSPI_Write_Safe((uint8_t *)&gOnenetContextRunning, APP_BACKUP_NONXIP_ADDR, sizeof(onenet_context_t))!=QSPI_OK) //programe
     {
-        ECOMM_TRACE(UNILOG_PLA_APP, prvUpdateObserveContext_3, P_ERROR, 0, "write flash error!!!");
+        ECOMM_TRACE(UNILOG_PLA_APP, x1_prvUpdateObserveContext_3, P_ERROR, 0, "write flash error!!!");
     }
 }
 void prvMakeUserdata()
@@ -774,25 +774,25 @@ cis_coapret_t cisAsynOnParams(void* context,cis_uri_t* uri,cis_observe_attr_t pa
 
 void cisAsynOnEvent(void* context,cis_evt_t eid,void* param)
 {
-    ECOMM_TRACE(UNILOG_PLA_APP, cisAsynOnEvent_0, P_SIG, 1, "cisAsynOnEvent=%d", eid); 
+    ECOMM_TRACE(UNILOG_PLA_APP, x1_cisAsynOnEvent_0, P_SIG, 1, "cisAsynOnEvent=%d", eid); 
     switch(eid)
     {
         case CIS_EVENT_RESPONSE_FAILED:
         case CIS_EVENT_NOTIFY_FAILED:       
             gNotifyOngoing = false;
-            ECOMM_TRACE(UNILOG_PLA_APP, cisAsynOnEvent_2, P_INFO, 1, "cisAsynOnEvent response failed mid:%d", (int32_t)param); 
+            ECOMM_TRACE(UNILOG_PLA_APP, x1_cisAsynOnEvent_2, P_INFO, 1, "cisAsynOnEvent response failed mid:%d", (int32_t)param); 
             break;
         case CIS_EVENT_NOTIFY_SUCCESS:
             gNotifyOngoing = false;
             cisAsynSetNotifyOnceStatus(true);
             break;
         case CIS_EVENT_UPDATE_NEED:
-            ECOMM_TRACE(UNILOG_PLA_APP, cisAsynOnEvent_3, P_INFO, 1, "cisAsynOnEvent need to update,reserve time:%ds", (int32_t)param); 
+            ECOMM_TRACE(UNILOG_PLA_APP, x1_cisAsynOnEvent_3, P_INFO, 1, "cisAsynOnEvent need to update,reserve time:%ds", (int32_t)param); 
             cis_update_reg(gCisContext,LIFETIME_INVALID,false, PS_SOCK_RAI_NO_INFO);
             break;
         case CIS_EVENT_REG_SUCCESS:
             {
-                ECOMM_TRACE(UNILOG_PLA_APP, cisAsynOnEvent_4, P_INFO, 1, "cisAsynOnEvent=CIS_EVENT_REG_SUCCESS, will clean g_observeList"); 
+                ECOMM_TRACE(UNILOG_PLA_APP, x1_cisAsynOnEvent_4, P_INFO, 1, "cisAsynOnEvent=CIS_EVENT_REG_SUCCESS, will clean g_observeList"); 
                 struct st_observe_info* delnode;
                 while(g_observeList != NULL){
                     g_observeList =(struct st_observe_info *)CIS_LIST_RM((cis_list_t *)g_observeList,g_observeList->mid,(cis_list_t **)&delnode);
@@ -1092,7 +1092,7 @@ void cisDataObserveReport()
     struct st_observe_info* node = g_observeList;
     if (node == NULL)
         return;
-    ECOMM_TRACE(UNILOG_PLA_APP, cisDataObserveReport_0, P_INFO, 2, "cisDataObserveReport g_notifyLast=%d nowtime=%d", g_notifyLast, nowtime);
+    ECOMM_TRACE(UNILOG_PLA_APP, x1_cisDataObserveReport_0, P_INFO, 2, "cisDataObserveReport g_notifyLast=%d nowtime=%d", g_notifyLast, nowtime);
     // if diff time is more than 10S, continue to allow to report
     if((nowtime - g_notifyLast > 10*1000) && (!gNotifyOngoing))
     {
@@ -1101,13 +1101,13 @@ void cisDataObserveReport()
         {
              if(node->mid == 0)
              {
-                ECOMM_TRACE(UNILOG_PLA_APP, cisDataObserveReport_1, P_INFO, 0, "cisDataObserveReport mid = 0");
+                ECOMM_TRACE(UNILOG_PLA_APP, x1_cisDataObserveReport_1, P_INFO, 0, "cisDataObserveReport mid = 0");
                 node = node->next;
                 continue;
              }
              if(node->uri.flag == 0)
              {
-                ECOMM_TRACE(UNILOG_PLA_APP, cisDataObserveReport_2, P_INFO, 0, "cisDataObserveReport uri flag = 0");
+                ECOMM_TRACE(UNILOG_PLA_APP, x1_cisDataObserveReport_2, P_INFO, 0, "cisDataObserveReport uri flag = 0");
                 node = node->next;
                 continue;
              }
@@ -1115,13 +1115,13 @@ void cisDataObserveReport()
              uriLocal = node->uri;
              prvObserveNotify(gCisContext,&uriLocal,node->mid);
              node = node->next;
-             ECOMM_TRACE(UNILOG_PLA_APP, cisDataObserveReport_3, P_INFO, 0, "cisDataObserveReport");
+             ECOMM_TRACE(UNILOG_PLA_APP, x1_cisDataObserveReport_3, P_INFO, 0, "cisDataObserveReport");
              gNotifyOngoing = true;
         }
     }
     if ((nowtime - g_notifyLast > 20*100)&&(gNotifyOngoing))
     {
-        ECOMM_TRACE(UNILOG_PLA_APP, cisDataObserveReport_4, P_ERROR, 0, "cisDataObserveReport too long reset gNotifyOngoing");
+        ECOMM_TRACE(UNILOG_PLA_APP, x1_cisDataObserveReport_4, P_ERROR, 0, "cisDataObserveReport too long reset gNotifyOngoing");
         gNotifyOngoing = false;
     }