Changeset 364 for asp3_tinet_ecnl_rx/trunk/ntshell/echonet/echonet_task.c

Timestamp:

Feb 1, 2019, 9:57:09 PM (5 years ago)

Author:

coas-nagasima

Message:

TINETとSocket APIなどを更新

File:

• asp3_tinet_ecnl_rx/trunk/ntshell/echonet/echonet_task.c (modified) (9 diffs)

asp3_tinet_ecnl_rx/trunk/ntshell/echonet/echonet_task.c

@@ -77 +77 @@
 static bool_t g_release_esv;
 
-ER _ecn_tsk_ntf_inl(intptr_t fa_exinf);
-
 ER _ecn_tsk_snd_dtq(ECN_FBS_ID fa_rsp_fbs, bool_t from_app)
 {
         ER      a_ret;
         T_MSG *msg = (T_MSG *)fa_rsp_fbs.ptr;
-        ID dtqid = ecn_udp_mailboxid;
+        ID dtqid = ecn_udp_dataqueueid;
         int i;
 #ifdef ECN_DBG_PUT_ENA
@@ -90 +88 @@
         if (from_app && (((T_EDATA *)fa_rsp_fbs.ptr)->hdr.edata.esv == ESV_INFC)) {
                 g_api_tid = ((T_EDATA *)fa_rsp_fbs.ptr)->hdr.ecn_hdr.tid;
-                dtqid = ecn_svc_mailboxid;
+                dtqid = ecn_svc_dataqueueid;
         }
         else {
@@ -98 +96 @@
                                 g_api_tid = ((T_EDATA *)fa_rsp_fbs.ptr)->hdr.ecn_hdr.tid;
 
-                        dtqid = ecn_udp_mailboxid;
+                        dtqid = ecn_udp_dataqueueid;
                         break;
                 case ENOD_LOCAL_ID:
                         if (from_app)
-                                dtqid = ecn_svc_mailboxid;
+                                dtqid = ecn_svc_dataqueueid;
                         else
-                                dtqid = ecn_api_mailboxid;
+                                dtqid = ecn_api_dataqueueid;
                         break;
                 case ENOD_API_ID:
-                        dtqid = ecn_api_mailboxid;
+                        dtqid = ecn_api_dataqueueid;
                         break;
                 default:
@@ -121 +119 @@
                                 switch (eobjcb_table[i].profile->eobjatr) {
                                 case EOBJ_SYNC_REMOTE_NODE:
-                                        dtqid = ecn_udp_mailboxid;
+                                        dtqid = ecn_udp_dataqueueid;
                                         break;
                                 case EOBJ_ASYNC_REMOTE_NODE:
-                                        dtqid = ecn_svc_mailboxid;
+                                        dtqid = ecn_svc_dataqueueid;
                                         break;
                                 default:
@@ -131 +129 @@
                         }
                         else {
-                                dtqid = ecn_udp_mailboxid;
+                                dtqid = ecn_udp_dataqueueid;
                         }
                         break;
@@ -242 +240 @@
 #endif
 
-                a_ret = trcv_dtq(ecn_svc_mailboxid, (intptr_t *)&a_mdt.p_msg, a_timer);
+                a_ret = trcv_dtq(ecn_svc_dataqueueid, (intptr_t *)&a_mdt.p_msg, a_timer);
                 if ((a_ret != E_OK) && (a_ret != E_TMOUT)) {
                         ECN_DBG_PUT_2("trcv_dtq() result = %d:%s", a_ret, itron_strerror(a_ret));
@@ -867 +865 @@
                 g_release_esv = false;
 
-                ECN_CAP_PUT_1("redirect ecn_svc_mailboxid → ecn_api_mailboxid (esv:0x%02X)",
+                ECN_CAP_PUT_1("redirect ecn_svc_dataqueueid → ecn_api_dataqueueid (esv:0x%02X)",
                         p_esv->edata.esv);
                 fa_fbs_id.ptr->hdr.target.id = ENOD_API_ID;
-                a_ret = snd_dtq(ecn_api_mailboxid, (intptr_t)fa_fbs_id.ptr);
+                a_ret = snd_dtq(ecn_api_dataqueueid, (intptr_t)fa_fbs_id.ptr);
                 if (a_ret != E_OK) {
                         syslog(LOG_WARNING, "_ecn_tsk_ecn_msg() : snd_dtq() result = %d:%s", a_ret, itron_strerror(a_ret));
@@ -2024 +2022 @@
         req.ptr->hdr.type = ECN_MSG_INTERNAL;
         req.ptr->hdr.sender.dtqid = sender;
-        req.ptr->hdr.target.dtqid = ecn_svc_mailboxid;
+        req.ptr->hdr.target.dtqid = ecn_svc_dataqueueid;
         req.ptr->hdr.reply.dtqid = sender;
 
@@ -2052 +2050 @@
 
         res.ptr->hdr.type = ECN_MSG_INTERNAL;
-        res.ptr->hdr.sender.dtqid = ecn_svc_mailboxid;
+        res.ptr->hdr.sender.dtqid = ecn_svc_dataqueueid;
         res.ptr->hdr.target.dtqid = req.ptr->hdr.reply.dtqid;
-        res.ptr->hdr.reply.dtqid = ecn_svc_mailboxid;
+        res.ptr->hdr.reply.dtqid = ecn_svc_dataqueueid;
 
         *pk_res = res;