Changeset 265 for uKadecot/trunk/ecnl_ssp/echonet.c

Timestamp:

Nov 18, 2016, 5:30:16 PM (8 years ago)

Author:

coas-nagasima

Message:

ECNL 1.0.3の修正内容を盛り込み
内蔵Webアプリで機器が取得できないのを修正

File:

• uKadecot/trunk/ecnl_ssp/echonet.c (modified) (9 diffs)

uKadecot/trunk/ecnl_ssp/echonet.c

@@ -329 +329 @@
         if (a_ret) {
                 ECN_DBG_PUT("ecn_add_edt(): _ecn_fbs_add_data_ex(*, ecn_prp{epc:0x%02X}, %u) result = %d:%s",
-                        a_ecn_prp.epc, sizeof(a_ecn_prp),
-                        a_ret, itron_strerror(a_ret));
+                        a_ecn_prp.epc, sizeof(a_ecn_prp), a_ret, itron_strerror(a_ret));
                 goto lb_except;
         }
@@ -338 +337 @@
                 if (a_ret) {
                         ECN_DBG_PUT("ecn_add_edt(): _ecn_fbs_add_data_ex(*, ecn_prp{epc:0x%02X} edt, %u) result = %d:%s",
-                                a_ecn_prp.epc, fa_pdc,
-                                a_ret, itron_strerror(a_ret));
+                                a_ecn_prp.epc, fa_pdc, a_ret, itron_strerror(a_ret));
                         goto lb_except;
                 }
@@ -409 +407 @@
 
         p_esv = &pk_esv->hdr;
-        p_snod = _ecn_eno_fnd(((T_ECN_FST_BLK *)pk_esv)->hdr.sender);
+        p_snod = _ecn_eno_fnd(((T_ECN_FST_BLK *)pk_esv)->hdr.sender.id);
         if (p_snod != NULL) {
                 p_sobj = p_snod->profile;
@@ -433 +431 @@
 
         p_esv = &pk_esv->hdr;
-        p_snod = _ecn_eno_fnd(((T_ECN_FST_BLK *)pk_esv)->hdr.sender);
+        p_snod = _ecn_eno_fnd(((T_ECN_FST_BLK *)pk_esv)->hdr.sender.id);
         if (p_snod != NULL) {
                 /* ノードプロファイルの場合 */
@@ -503 +501 @@
         if (!p_pdc)
                 return E_PAR;
-        if (!p_edt)
-                return E_PAR;
         if (!pk_itr->pk_esv)
                 return E_PAR;
@@ -510 +506 @@
         if (pk_itr->is_eof)
                 return E_BOVR; /* データ終了 */
-        if (    pk_itr->count <= pk_itr->got_ct
-        &&      pk_itr->next_blk_ct < 1) {
+        if (pk_itr->count <= pk_itr->got_ct && pk_itr->next_blk_ct < 1) {
                 pk_itr->is_eof = 1;                     /* 終端に達した時、非0 */
                 return E_BOVR; /* データ終了 */
@@ -523 +518 @@
 
 #ifdef ECN_ENA_ITR_NXT_CARP
-        ECN_CAP_PUT("ecn_itr_nxt() rd.cur=b%dp%d", pk_itr->cur.blk, pk_itr->cur.pos ECN_CAP_PUT(;
+        ECN_CAP_PUT("ecn_itr_nxt() rd.cur=b%dp%d", pk_itr->cur.blk, pk_itr->cur.pos);
 #endif
         if (pk_itr->count <= pk_itr->got_ct && 0 < pk_itr->next_blk_ct) {
@@ -550 +545 @@
                 goto lb_except;
         if (a_rd_len < sizeof(a_ecn_prp)) {
-                ECN_DBG_PUT("ecn_itr_nxt() ecn_prp read fault." 
-                        " rd.cur=%d", pk_itr->cur);
+                ECN_DBG_PUT("ecn_itr_nxt() ecn_prp read fault. rd.cur=%d", pk_itr->cur);
                 pk_itr->is_eof = 1;                     /* 終端に達した時、非0 */
                 a_ret = E_BOVR; /* データ終了 */
@@ -560 +554 @@
 
         if (0 < a_ecn_prp.pdc) {
-                /* 付随データを読み取る */
-                a_rd_len = 0;
-                a_ret = _ecn_fbs_get_data(a_fbs_id, p_edt, a_ecn_prp.pdc, &a_rd_len);
-                if (a_ret != E_OK)
-                        goto lb_except;
-                if (a_rd_len < (ECN_FBS_SSIZE_T)a_ecn_prp.pdc) {
-                        ECN_DBG_PUT("ecn_itr_nxt() edt read fault."
-                                " rd.cur=%d,epc=0x%02X,pdc=%u", pk_itr->cur, a_ecn_prp.epc , a_ecn_prp.pdc);
-                        pk_itr->is_eof = 1;                     /* 終端に達した時、非0 */
-                        a_ret = E_BOVR; /* データ終了 */
-                        goto lb_finally;
+                if (p_edt == NULL) {
+                        a_ret = _ecn_fbs_seek_rpos(a_fbs_id, a_ecn_prp.pdc);
+                        if (a_ret != E_OK)
+                                goto lb_except;
                 }
+                else {
+                        /* 付随データを読み取る */
+                        a_rd_len = 0;
+                        a_ret = _ecn_fbs_get_data(a_fbs_id, p_edt, a_ecn_prp.pdc, &a_rd_len);
+                        if (a_ret != E_OK)
+                                goto lb_except;
+                        if (a_rd_len < (ECN_FBS_SSIZE_T)a_ecn_prp.pdc) {
+                                ECN_DBG_PUT("ecn_itr_nxt() edt read fault. rd.cur=%d,epc=0x%02X,pdc=%u",
+                                        pk_itr->cur, a_ecn_prp.epc , a_ecn_prp.pdc);
+                                pk_itr->is_eof = 1;                     /* 終端に達した時、非0 */
+                                a_ret = E_BOVR; /* データ終了 */
+                                goto lb_finally;
+                        }
+                }
         }
         pk_itr->got_ct++;
 
 #ifdef ECN_ENA_ITR_NXT_CARP
-        ECN_CAP_PUT("ecn_itr_nxt() read: ct=%d/%d", pk_itr->got_ct, pk_itr->count ECN_CAP_PUT(;
+        ECN_CAP_PUT("ecn_itr_nxt() read: ct=%d/%d", pk_itr->got_ct, pk_itr->count);
 #endif