Changeset 364 for asp3_tinet_ecnl_arm/trunk/ntshell/echonet/echonet_task.c
- Timestamp:
- Feb 1, 2019, 9:57:09 PM (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
asp3_tinet_ecnl_arm/trunk/ntshell/echonet/echonet_task.c
r352 r364 77 77 static bool_t g_release_esv; 78 78 79 ER _ecn_tsk_ntf_inl(intptr_t fa_exinf);80 81 79 ER _ecn_tsk_snd_dtq(ECN_FBS_ID fa_rsp_fbs, bool_t from_app) 82 80 { 83 81 ER a_ret; 84 82 T_MSG *msg = (T_MSG *)fa_rsp_fbs.ptr; 85 ID dtqid = ecn_udp_ mailboxid;83 ID dtqid = ecn_udp_dataqueueid; 86 84 int i; 87 85 #ifdef ECN_DBG_PUT_ENA … … 90 88 if (from_app && (((T_EDATA *)fa_rsp_fbs.ptr)->hdr.edata.esv == ESV_INFC)) { 91 89 g_api_tid = ((T_EDATA *)fa_rsp_fbs.ptr)->hdr.ecn_hdr.tid; 92 dtqid = ecn_svc_ mailboxid;90 dtqid = ecn_svc_dataqueueid; 93 91 } 94 92 else { … … 98 96 g_api_tid = ((T_EDATA *)fa_rsp_fbs.ptr)->hdr.ecn_hdr.tid; 99 97 100 dtqid = ecn_udp_ mailboxid;98 dtqid = ecn_udp_dataqueueid; 101 99 break; 102 100 case ENOD_LOCAL_ID: 103 101 if (from_app) 104 dtqid = ecn_svc_ mailboxid;102 dtqid = ecn_svc_dataqueueid; 105 103 else 106 dtqid = ecn_api_ mailboxid;104 dtqid = ecn_api_dataqueueid; 107 105 break; 108 106 case ENOD_API_ID: 109 dtqid = ecn_api_ mailboxid;107 dtqid = ecn_api_dataqueueid; 110 108 break; 111 109 default: … … 121 119 switch (eobjcb_table[i].profile->eobjatr) { 122 120 case EOBJ_SYNC_REMOTE_NODE: 123 dtqid = ecn_udp_ mailboxid;121 dtqid = ecn_udp_dataqueueid; 124 122 break; 125 123 case EOBJ_ASYNC_REMOTE_NODE: 126 dtqid = ecn_svc_ mailboxid;124 dtqid = ecn_svc_dataqueueid; 127 125 break; 128 126 default: … … 131 129 } 132 130 else { 133 dtqid = ecn_udp_ mailboxid;131 dtqid = ecn_udp_dataqueueid; 134 132 } 135 133 break; … … 242 240 #endif 243 241 244 a_ret = trcv_dtq(ecn_svc_ mailboxid, (intptr_t *)&a_mdt.p_msg, a_timer);242 a_ret = trcv_dtq(ecn_svc_dataqueueid, (intptr_t *)&a_mdt.p_msg, a_timer); 245 243 if ((a_ret != E_OK) && (a_ret != E_TMOUT)) { 246 244 ECN_DBG_PUT_2("trcv_dtq() result = %d:%s", a_ret, itron_strerror(a_ret)); … … 867 865 g_release_esv = false; 868 866 869 ECN_CAP_PUT_1("redirect ecn_svc_ mailboxid → ecn_api_mailboxid (esv:0x%02X)",867 ECN_CAP_PUT_1("redirect ecn_svc_dataqueueid → ecn_api_dataqueueid (esv:0x%02X)", 870 868 p_esv->edata.esv); 871 869 fa_fbs_id.ptr->hdr.target.id = ENOD_API_ID; 872 a_ret = snd_dtq(ecn_api_ mailboxid, (intptr_t)fa_fbs_id.ptr);870 a_ret = snd_dtq(ecn_api_dataqueueid, (intptr_t)fa_fbs_id.ptr); 873 871 if (a_ret != E_OK) { 874 872 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; 2025 2023 req.ptr->hdr.sender.dtqid = sender; 2026 req.ptr->hdr.target.dtqid = ecn_svc_ mailboxid;2024 req.ptr->hdr.target.dtqid = ecn_svc_dataqueueid; 2027 2025 req.ptr->hdr.reply.dtqid = sender; 2028 2026 … … 2052 2050 2053 2051 res.ptr->hdr.type = ECN_MSG_INTERNAL; 2054 res.ptr->hdr.sender.dtqid = ecn_svc_ mailboxid;2052 res.ptr->hdr.sender.dtqid = ecn_svc_dataqueueid; 2055 2053 res.ptr->hdr.target.dtqid = req.ptr->hdr.reply.dtqid; 2056 res.ptr->hdr.reply.dtqid = ecn_svc_ mailboxid;2054 res.ptr->hdr.reply.dtqid = ecn_svc_dataqueueid; 2057 2055 2058 2056 *pk_res = res;
Note:
See TracChangeset
for help on using the changeset viewer.