Changeset 152

Timestamp:

Jan 14, 2016, 1:17:21 PM (8 years ago)

Author:

coas-nagasima

Message:

・デジタルPinとアナログPinのWAMPトピックを追加し、PubSubできるように機能追加。

デジタルPINのトピックは、

「com.sonycsl.kadecot.arduino.topic.pinXX」（XXは0から13）

アナログPINのトピックは、

「com.sonycsl.kadecot.arduino.topic.pinXX.thrYYY」（XXは14から19、YYYは閾値十進）

・デバッグ用の使用していない文字列が、ROM領域に残ってしまうのを修正
・WebSocket接続時のHTTPヘッダーを１行ずつNAK応答を待って送信しているのを、一括で送るよう変更

Location:

uKadecot/trunk

Files:

• csp/flash/ukadecot_20160108143049.mot (deleted)
• csp/flash/ukadecot_20160114084821.mot (added)
• csp/ukadecot/ukadecot.mtpj (modified) (2 diffs)
• ecnl_ssp/echonet.c (modified) (13 diffs)
• ecnl_ssp/echonet_dbg.c (modified) (1 diff)
• ecnl_ssp/echonet_dbg.h (modified) (1 diff)
• ecnl_ssp/echonet_task.c (modified) (66 diffs)
• ecnl_ssp/echonet_uip_task.c (modified) (36 diffs)
• kadecot/wamp_broker.c (modified) (11 diffs)
• kadecot/wamp_broker.h (modified) (5 diffs)
• src/ukadecot/main.c (modified) (62 diffs)
• src/ukadecot/main.h (modified) (1 diff)
• uip/apps/webserver/httpd.c (modified) (3 diffs)

uKadecot/trunk/csp/ukadecot/ukadecot.mtpj

@@ -1355 +1355 @@
 </LinkOptionCommandLine-DefaultValue>
       <IsLockedByUser>False</IsLockedByUser>
-      <TimeTagModified--0>-8587688264305376439</TimeTagModified--0>
+      <TimeTagModified--0>-8587488782341293937</TimeTagModified--0>
       <LinkOptionCpu-0>False</LinkOptionCpu-0>
       <LinkOptionForm-0>Absolute</LinkOptionForm-0>
@@ -1363 +1363 @@
       <LinkOptionOptimize-0>None</LinkOptionOptimize-0>
       <LinkOptionStack-0>False</LinkOptionStack-0>
-      <LinkOptionStart-0>SI,SU/00000000,R,R_2,R_1,B,B_2,B_1/00000800,BETH_MEMORY/00019F00,C$VECT,P,D,D_2,D_1,W,W_2,W_1,C,C_2,C_1,L/0FFFC0000,FVECT/0FFFFFF80</LinkOptionStart-0>
+      <LinkOptionStart-0>SI,SU/00000000,R,R_2,R_1,B,B_2,B_1/00000800,BETH_MEMORY/0001C000,C$VECT,P,D,D_2,D_1,W,W_2,W_1,C,C_2,C_1,L/0FFFC0000,FVECT/0FFFFFF80</LinkOptionStart-0>
       <LinkOptionCompress-0>False</LinkOptionCompress-0>
       <LinkOptionCpuInformation-0 />

uKadecot/trunk/ecnl_ssp/echonet.c

@@ -235 +235 @@
         a_ret = _ecn_fbs_add_data_ex(*(ECN_FBS_ID *)&ppk_esv, &ppk_esv->hdr.edata.opc, 1);
         if (a_ret) {
-                ECN_DBG_PUT "ecn_trn_set_get(): _ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("ecn_trn_set_get(): _ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret));
                 return a_ret;
         }
@@ -264 +264 @@
         a_wr_opc = _ecn_fbs_peek(*(ECN_FBS_ID *)&ppk_esv, fa_trn_pos);
         if (a_wr_opc < 0) {
-                ECN_DBG_PUT "ecn_end_set_get(): _ecn_fbs_peek() result = %d:%s", a_wr_opc, itron_strerror(a_wr_opc) ECN_DBG_END;
+                ECN_DBG_PUT("ecn_end_set_get(): _ecn_fbs_peek() result = %d:%s", a_wr_opc, itron_strerror(a_wr_opc));
                 return a_wr_opc;
         }
@@ -274 +274 @@
         a_ret = _ecn_fbs_poke(*(ECN_FBS_ID *)&ppk_esv, fa_trn_pos, a_rd_opc);
         if (a_ret) {
-                ECN_DBG_PUT "ecn_end_set_get(): _ecn_fbs_poke() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("ecn_end_set_get(): _ecn_fbs_poke() result = %d:%s", a_ret, itron_strerror(a_ret));
                 return a_ret;
         }
@@ -328 +328 @@
         a_ret = _ecn_fbs_add_data_ex(a_fbs_id, &a_ecn_prp, sizeof(a_ecn_prp));
         if (a_ret) {
-                ECN_DBG_PUT "ecn_add_edt(): _ecn_fbs_add_data_ex(*, ecn_prp{epc:0x%02X}, %u) result = %d:%s",
+                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) ECN_DBG_END;
+                        a_ret, itron_strerror(a_ret));
                 goto lb_except;
         }
@@ -337 +337 @@
                 a_ret = _ecn_fbs_add_data_ex(a_fbs_id, p_edt, fa_pdc);
                 if (a_ret) {
-                        ECN_DBG_PUT "ecn_add_edt(): _ecn_fbs_add_data_ex(*, ecn_prp{epc:0x%02X} edt, %u) result = %d:%s",
+                        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) ECN_DBG_END;
+                                a_ret, itron_strerror(a_ret));
                         goto lb_except;
                 }
@@ -523 +523 @@
 
 #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 ECN_CAP_PUT(;
 #endif
         if (pk_itr->count <= pk_itr->got_ct && 0 < pk_itr->next_blk_ct) {
@@ -550 +550 @@
                 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_END;
+                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; /* データ終了 */
@@ -566 +566 @@
                         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 ECN_DBG_END;
+                        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; /* データ終了 */
@@ -576 +576 @@
 
 #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 ECN_CAP_PUT(;
 #endif
 
@@ -605 +605 @@
         a_ret = _ecn_tsk_snd_mbx(a_fbs_id, true);
         if (a_ret) {
-                ECN_DBG_PUT "_ecn_tsk_snd_mbx() result = %d:%s",
-                        a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_tsk_snd_mbx() result = %d:%s",
+                        a_ret, itron_strerror(a_ret));
                 goto lb_except;
         }
@@ -637 +637 @@
         a_fbs.ptr = (T_ECN_FST_BLK *)pk_esv;
         if (a_fbs.ptr->hdr.type != ECN_MSG_USER_BREAK) {
-                ECN_DBG_PUT "ecn_get_brk_dat: fbs-type:%d != ECN_MSG_USER_BREAK",
-                        a_fbs.ptr->hdr.type ECN_DBG_END;
+                ECN_DBG_PUT("ecn_get_brk_dat: fbs-type:%d != ECN_MSG_USER_BREAK",
+                        a_fbs.ptr->hdr.type);
                 return E_PAR;
         }
@@ -645 +645 @@
         a_ret = _ecn_fbs_set_rpos(a_fbs, 0);
         if (a_ret) {
-                ECN_DBG_PUT "_ecn_fbs_set_rpos(*, 0) result = %d:%s",
-                        a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_fbs_set_rpos(*, 0) result = %d:%s",
+                        a_ret, itron_strerror(a_ret));
                 return a_ret;
         }
@@ -655 +655 @@
                 a_ret = _ecn_fbs_get_data(a_fbs, p_buf, fa_bufsz, &a_len);
                 if (a_ret || !a_len) {
-                        ECN_DBG_PUT "_ecn_fbs_get_data(*, p_buf, fa_bufsz) result = %d:%s",
-                                a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                        ECN_DBG_PUT("_ecn_fbs_get_data(*, p_buf, fa_bufsz) result = %d:%s",
+                                a_ret, itron_strerror(a_ret));
                         return E_PAR;
                 }

uKadecot/trunk/ecnl_ssp/echonet_dbg.c

@@ -109 +109 @@
 /*
  * デバッグ出力
- * 例：           ECN_DBG_PUT "task start" ECN_DBG_END;
+ * 例：           ECN_DBG_PUT("task start");
  */
 int _ecn_dbg_dbgput(const char *fp_srcloc, const char *fp_form, ...)

uKadecot/trunk/ecnl_ssp/echonet_dbg.h

@@ -50 +50 @@
 
 #ifdef ECN_DBG_PUT_ENA
-#define ECN_DBG_PUT syslog(LOG_WARNING,
-#define ECN_DBG_END )
-/* 例：           ECN_DBG_PUT "task start" ECN_DBG_END; */
+#define ECN_DBG_PUT(...) syslog(LOG_WARNING, __VA_ARGS__)
 #else
-#define ECN_DBG_PUT for (;0;
-#define ECN_DBG_END )
+#define ECN_DBG_PUT(...)
 #endif
 
 /* デバッグ出力(CARP) */
 #ifdef ECN_CAP_PUT_ENA
-#define ECN_CAP_PUT syslog(LOG_DEBUG,
-#define ECN_CAP_END )
-/* 例：           ECN_CAP_PUT "task start" ECN_CAP_END; */
+#define ECN_CAP_PUT(syslog(LOG_DEBUG, __VA_ARGS__)
 #else
-#define ECN_CAP_PUT for (;0;
-#define ECN_CAP_END )
+#define ECN_CAP_PUT(...)
 #endif
 

uKadecot/trunk/ecnl_ssp/echonet_task.c

@@ -141 +141 @@
         }
 #ifdef ECN_DBG_PUT_ENA
-        ECN_DBG_PUT "psnd_dtq(%d, 0x%08X-0x%08X)", mbxid, (intptr_t)msg, a_fbs_sub1 ECN_DBG_END;
+        ECN_DBG_PUT("psnd_dtq(%d, 0x%08X-0x%08X)", mbxid, (intptr_t)msg, a_fbs_sub1);
         _ecn_dbg_bindmp((const uint8_t *)msg, 256);
 #endif
         a_ret = psnd_dtq(mbxid, msg);
 #ifdef ECN_DBG_PUT_ENA
-        ECN_DBG_PUT "psnd_dtq(%d, 0x%08X-0x%08X) result = %d:%s", mbxid, (intptr_t)msg, a_fbs_sub1, a_ret, itron_strerror(a_ret) ECN_DBG_END;
+        ECN_DBG_PUT("psnd_dtq(%d, 0x%08X-0x%08X) result = %d:%s", mbxid, (intptr_t)msg, a_fbs_sub1, a_ret, itron_strerror(a_ret));
 #endif
         return a_ret;
@@ -193 +193 @@
                 return;
 
-        /* ECN_DBG_PUT "[ECHONET MainTask:%d] started", tskid ECN_DBG_END; */
+        /* ECN_DBG_PUT("[ECHONET MainTask:%d] started", tskid); */
         syslog(LOG_NOTICE, "[ECHONET MainTask] started");
 
@@ -225 +225 @@
         a_ret = sta_cyc(ecn_svc_cychdrid);
         if (a_ret != E_OK) {
-                ECN_DBG_PUT "sta_cyc() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("sta_cyc() result = %d:%s", a_ret, itron_strerror(a_ret));
                 PT_EXIT(&s.pt);
         }
@@ -233 +233 @@
         a_ret2 = get_tim(&a_now);
         if (a_ret2 != E_OK) {
-                ECN_DBG_PUT "get_tim() result = %d:%s", a_ret2, itron_strerror(a_ret2) ECN_DBG_END;
+                ECN_DBG_PUT("get_tim() result = %d:%s", a_ret2, itron_strerror(a_ret2));
                 PT_EXIT(&s.pt);
         }
@@ -256 +256 @@
                         || ((a_ret = timer_expired(&s.timer) ? E_TMOUT : E_WBLK) == E_TMOUT)));
                 if ((a_ret != E_OK) && (a_ret != E_TMOUT)) {
-                        ECN_DBG_PUT "trcv_dtq() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                        ECN_DBG_PUT("trcv_dtq() result = %d:%s", a_ret, itron_strerror(a_ret));
                         PT_EXIT(&s.pt);
                 }
@@ -262 +262 @@
                 a_ret2 = get_tim(&a_now);
                 if (a_ret2 != E_OK) {
-                        ECN_DBG_PUT "get_tim() result = %d:%s", a_ret2, itron_strerror(a_ret2) ECN_DBG_END;
+                        ECN_DBG_PUT("get_tim() result = %d:%s", a_ret2, itron_strerror(a_ret2));
                         PT_EXIT(&s.pt);
                 }
@@ -273 +273 @@
 
                 if (a_ret == E_OK) {
-                        ECN_DBG_PUT "trcv_dtq() mbx recv (%d byte)", _ecn_fbs_get_datalen(a_mdt.fbs_id) ECN_DBG_END;
+                        ECN_DBG_PUT("trcv_dtq() mbx recv (%d byte)", _ecn_fbs_get_datalen(a_mdt.fbs_id));
                         g_release_esv = true;
 
@@ -376 +376 @@
         a_ret = _ecn_fbs_cre(a_size, &a_fbs_id);
         if (a_ret != E_OK || !a_fbs_id.ptr) { /* 確保失敗 */
-                ECN_DBG_PUT "_ecn_fbs_cre(%d) result = %d:%s",
+                ECN_DBG_PUT("_ecn_fbs_cre(%d) result = %d:%s",
                         a_size,
-                        a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                        a_ret, itron_strerror(a_ret));
                 return E_NOMEM;
         }
@@ -396 +396 @@
         a_ret = _ecn_fbs_add_data_ex(a_fbs_id, &a_ecn_hdp, a_size);
         if (a_ret) {
-                ECN_DBG_PUT "_ecn_fbs_add_data_ex(*, ecn_hdp{esv:0x%02X,epc:0x%02X}, %d) result = %d:%s",
+                ECN_DBG_PUT("_ecn_fbs_add_data_ex(*, ecn_hdp{esv:0x%02X,epc:0x%02X}, %d) result = %d:%s",
                         a_ecn_hdp.edata.esv, a_ecn_hdp.ecn_prp.epc, a_size,
-                        a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                        a_ret, itron_strerror(a_ret));
                 goto lb_except;
         }
@@ -405 +405 @@
                 a_ret = _ecn_fbs_add_data_ex(a_fbs_id, p_edt, fa_pdc);
                 if (a_ret) {
-                        ECN_DBG_PUT "_ecn_fbs_add_data_ex(*, ecn_hdp{esv:0x%02X,epc:0x%02X} edt, %d) result = %d:%s",
+                        ECN_DBG_PUT("_ecn_fbs_add_data_ex(*, ecn_hdp{esv:0x%02X,epc:0x%02X} edt, %d) result = %d:%s",
                                 a_ecn_hdp.edata.esv, a_ecn_hdp.ecn_prp.epc, fa_pdc,
-                                a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                                a_ret, itron_strerror(a_ret));
                         goto lb_except;
                 }
         }
         if (fa_deoj == 0) {
-                ECN_DBG_PUT "%s", "マルチキャスト" ECN_DBG_END;
+                ECN_DBG_PUT("%s", "マルチキャスト");
                 /* fa_deoj == 0 : マルチキャスト */
                 ((T_EDATA *)a_fbs_id.ptr)->hdr.edata.deoj.eojx1 = EOJ_X1_PROFILE;
@@ -420 +420 @@
         }
         else if (fa_deoj <= tmax_eobjid) {
-                ECN_DBG_PUT "fa_deoj = %d", fa_deoj ECN_DBG_END;
+                ECN_DBG_PUT("fa_deoj = %d", fa_deoj);
                 /* if (fa_deoj < 1 || tmax_eobjid < fa_deoj) …の異常系は関数冒頭で除外済みとする */
                 a_eobj = &eobjinib_table[fa_deoj - 1];
@@ -446 +446 @@
                 if (a_fbs_id.ptr->hdr.target == ENOD_NOT_MATCH_ID) {
                         goto lb_except;
-                        ECN_DBG_PUT "deoj = %02X %02X %02x : enod not match",
+                        ECN_DBG_PUT("deoj = %02X %02X %02x : enod not match",
                                 ((T_EDATA *)a_fbs_id.ptr)->hdr.edata.deoj.eojx1,
                                 ((T_EDATA *)a_fbs_id.ptr)->hdr.edata.deoj.eojx2,
-                                ((T_EDATA *)a_fbs_id.ptr)->hdr.edata.deoj.eojx3 ECN_DBG_END;
+                                ((T_EDATA *)a_fbs_id.ptr)->hdr.edata.deoj.eojx3);
                 }
 #ifdef ECN_DBG_PUT_ENA
                 else {
-                        ECN_DBG_PUT "deoj = %02X %02X %02x : %s",
+                        ECN_DBG_PUT("deoj = %02X %02X %02x : %s",
                                 ((T_EDATA *)a_fbs_id.ptr)->hdr.edata.deoj.eojx1,
                                 ((T_EDATA *)a_fbs_id.ptr)->hdr.edata.deoj.eojx2,
                                 ((T_EDATA *)a_fbs_id.ptr)->hdr.edata.deoj.eojx3,
-                                _ecn_dbg_enod2str(a_fbs_id.ptr->hdr.target) ECN_DBG_END;
+                                _ecn_dbg_enod2str(a_fbs_id.ptr->hdr.target));
                 }
 #endif
@@ -465 +465 @@
                 T_ECN_EOJ eoj;
                 ECN_ENOD_ID enodid;
-                ECN_DBG_PUT "fa_deoj = %d", fa_deoj ECN_DBG_END;
+                ECN_DBG_PUT("fa_deoj = %d", fa_deoj);
                 /* オブジェクトIDからEOJとノードIDを取得 */
                 if(ecn_agent_get_eoj_enodid(fa_deoj, &eoj, &enodid)){
@@ -474 +474 @@
                 else {
                         goto lb_except;
-                        ECN_DBG_PUT "deoj = %02X %02X %02x : enod not match",
+                        ECN_DBG_PUT("deoj = %02X %02X %02x : enod not match",
                                 ((T_EDATA *)a_fbs_id.ptr)->hdr.edata.deoj.eojx1,
                                 ((T_EDATA *)a_fbs_id.ptr)->hdr.edata.deoj.eojx2,
-                                ((T_EDATA *)a_fbs_id.ptr)->hdr.edata.deoj.eojx3 ECN_DBG_END;
+                                ((T_EDATA *)a_fbs_id.ptr)->hdr.edata.deoj.eojx3);
                 }
 #ifdef ECN_DBG_PUT_ENA
                 else {
-                        ECN_DBG_PUT "deoj = %02X %02X %02x : %s",
+                        ECN_DBG_PUT("deoj = %02X %02X %02x : %s",
                                 ((T_EDATA *)a_fbs_id.ptr)->hdr.edata.deoj.eojx1,
                                 ((T_EDATA *)a_fbs_id.ptr)->hdr.edata.deoj.eojx2,
                                 ((T_EDATA *)a_fbs_id.ptr)->hdr.edata.deoj.eojx3,
-                                _ecn_dbg_enod2str(a_fbs_id.ptr->hdr.target) ECN_DBG_END;
+                                _ecn_dbg_enod2str(a_fbs_id.ptr->hdr.target));
                 }
 #endif
@@ -529 +529 @@
         switch (a_im.command) {
         case ECN_INM_NOTIFY_INSTANCELIST:
-                ECN_DBG_PUT "do _ecn_tsk_int_startup()" ECN_DBG_END;
+                ECN_DBG_PUT("do _ecn_tsk_int_startup()");
                 _ecn_tsk_int_startup(fa_exinf);
                 break;
@@ -537 +537 @@
                         break;
 #endif
-                ECN_DBG_PUT "recv: unefined internal-msg: %d", a_im.command ECN_DBG_END;
+                ECN_DBG_PUT("recv: unefined internal-msg: %d", a_im.command);
                 break;
         }
@@ -578 +578 @@
         const EOBJINIB *eobj;
 
-        ECN_DBG_PUT "do _ecn_tsk_ntf_inl()" ECN_DBG_END;
+        ECN_DBG_PUT("do _ecn_tsk_ntf_inl()");
 
         memset(&a_hdr, 0, sizeof(a_hdr));
@@ -830 +830 @@
                 g_release_esv = false;
 
-                ECN_CAP_PUT "redirect ecn_svc_mailboxid → ecn_api_mailboxid (esv:0x%02X)",
-                        p_esv->edata.esv ECN_CAP_END;
+                ECN_CAP_PUT("redirect ecn_svc_mailboxid → ecn_api_mailboxid (esv:0x%02X)",
+                        p_esv->edata.esv);
                 fa_fbs_id.ptr->hdr.target = ENOD_API_ID;
                 a_ret = psnd_dtq(ecn_api_mailboxid, (intptr_t)fa_fbs_id.ptr);
@@ -858 +858 @@
         case ESV_SET_I:
                 if (!p_obj) {
-                        ECN_DBG_PUT "_ecn_tsk_ecn_msg_main() eoj %06X not found.",
-                                p_esv->edata.deoj.eojx1 << 16 | p_esv->edata.deoj.eojx2 << 8 | p_esv->edata.deoj.eojx3 ECN_DBG_END;
+                        ECN_DBG_PUT("_ecn_tsk_ecn_msg_main() eoj %06X not found.",
+                                p_esv->edata.deoj.eojx1 << 16 | p_esv->edata.deoj.eojx2 << 8 | p_esv->edata.deoj.eojx3);
                         result = -1;
                         break;
@@ -870 +870 @@
         case ESV_SET_C:
                 if (!p_obj) {
-                        ECN_DBG_PUT "_ecn_tsk_ecn_msg_main() eoj %06X not found.",
-                                p_esv->edata.deoj.eojx1 << 16 | p_esv->edata.deoj.eojx2 << 8 | p_esv->edata.deoj.eojx3 ECN_DBG_END;
+                        ECN_DBG_PUT("_ecn_tsk_ecn_msg_main() eoj %06X not found.",
+                                p_esv->edata.deoj.eojx1 << 16 | p_esv->edata.deoj.eojx2 << 8 | p_esv->edata.deoj.eojx3);
                         result = -1;
                         break;
@@ -882 +882 @@
         case ESV_GET:
                 if (!p_obj) {
-                        ECN_DBG_PUT "_ecn_tsk_ecn_msg_main() eoj %06X not found.",
-                                p_esv->edata.deoj.eojx1 << 16 | p_esv->edata.deoj.eojx2 << 8 | p_esv->edata.deoj.eojx3 ECN_DBG_END;
+                        ECN_DBG_PUT("_ecn_tsk_ecn_msg_main() eoj %06X not found.",
+                                p_esv->edata.deoj.eojx1 << 16 | p_esv->edata.deoj.eojx2 << 8 | p_esv->edata.deoj.eojx3);
                         result = -1;
                         break;
@@ -894 +894 @@
         case ESV_INF_REQ:
                 if (!p_obj) {
-                        ECN_DBG_PUT "_ecn_tsk_ecn_msg_main() eoj %06X not found.",
-                                p_esv->edata.deoj.eojx1 << 16 | p_esv->edata.deoj.eojx2 << 8 | p_esv->edata.deoj.eojx3 ECN_DBG_END;
+                        ECN_DBG_PUT("_ecn_tsk_ecn_msg_main() eoj %06X not found.",
+                                p_esv->edata.deoj.eojx1 << 16 | p_esv->edata.deoj.eojx2 << 8 | p_esv->edata.deoj.eojx3);
                         result = -1;
                         break;
@@ -907 +907 @@
         case ESV_SET_GET:
                 if (!p_obj) {
-                        ECN_DBG_PUT "_ecn_tsk_ecn_msg_main() eoj %06X not found.",
-                                p_esv->edata.deoj.eojx1 << 16 | p_esv->edata.deoj.eojx2 << 8 | p_esv->edata.deoj.eojx3 ECN_DBG_END;
+                        ECN_DBG_PUT("_ecn_tsk_ecn_msg_main() eoj %06X not found.",
+                                p_esv->edata.deoj.eojx1 << 16 | p_esv->edata.deoj.eojx2 << 8 | p_esv->edata.deoj.eojx3);
                         result = -1;
                         break;
@@ -942 +942 @@
         case ESV_GET_SNA:               /* 0x52 プロパティ値読み出し不可応答 */
                 if (!p_sobj) {
-                        ECN_DBG_PUT "_ecn_tsk_ecn_msg_main() eoj %06X not found.",
-                                p_esv->edata.seoj.eojx1 << 16 | p_esv->edata.seoj.eojx2 << 8 | p_esv->edata.seoj.eojx3 ECN_DBG_END;
+                        ECN_DBG_PUT("_ecn_tsk_ecn_msg_main() eoj %06X not found.",
+                                p_esv->edata.seoj.eojx1 << 16 | p_esv->edata.seoj.eojx2 << 8 | p_esv->edata.seoj.eojx3);
                         result = -1;
                         break;
@@ -955 +955 @@
         case ESV_INF_SNA:               /* 0x53 プロパティ値通知不可応答 */
                 if (!p_sobj) {
-                        ECN_DBG_PUT "_ecn_tsk_ecn_msg_main() eoj %06X not found.",
-                                p_esv->edata.seoj.eojx1 << 16 | p_esv->edata.seoj.eojx2 << 8 | p_esv->edata.seoj.eojx3 ECN_DBG_END;
+                        ECN_DBG_PUT("_ecn_tsk_ecn_msg_main() eoj %06X not found.",
+                                p_esv->edata.seoj.eojx1 << 16 | p_esv->edata.seoj.eojx2 << 8 | p_esv->edata.seoj.eojx3);
                         result = -1;
                         break;
@@ -968 +968 @@
         case ESV_SET_GET_SNA:   /* 0x5E プロパティ値書き込み・読み出し不可応答 */
                 if (!p_sobj) {
-                        ECN_DBG_PUT "_ecn_tsk_ecn_msg_main() eoj %06X not found.",
-                                p_esv->edata.seoj.eojx1 << 16 | p_esv->edata.seoj.eojx2 << 8 | p_esv->edata.seoj.eojx3 ECN_DBG_END;
+                        ECN_DBG_PUT("_ecn_tsk_ecn_msg_main() eoj %06X not found.",
+                                p_esv->edata.seoj.eojx1 << 16 | p_esv->edata.seoj.eojx2 << 8 | p_esv->edata.seoj.eojx3);
                         result = -1;
                         break;
@@ -1004 +1004 @@
         ECN_FBS_ID fa_fbs_id)
 {
-        ECN_DBG_PUT "%s() %s eoj src:%06X dest:%06X",
+        ECN_DBG_PUT("%s() %s eoj src:%06X dest:%06X",
                 fp_fncnm, fp_varnm,
                 ((T_EDATA *)fa_fbs_id.ptr)->hdr.edata.seoj.eojx1 << 16 | ((T_EDATA *)fa_fbs_id.ptr)->hdr.edata.seoj.eojx2 << 8 | ((T_EDATA *)fa_fbs_id.ptr)->hdr.edata.seoj.eojx3,
-                ((T_EDATA *)fa_fbs_id.ptr)->hdr.edata.deoj.eojx1 << 16 | ((T_EDATA *)fa_fbs_id.ptr)->hdr.edata.deoj.eojx2 << 8 | ((T_EDATA *)fa_fbs_id.ptr)->hdr.edata.deoj.eojx3 ECN_DBG_END;
+                ((T_EDATA *)fa_fbs_id.ptr)->hdr.edata.deoj.eojx1 << 16 | ((T_EDATA *)fa_fbs_id.ptr)->hdr.edata.deoj.eojx2 << 8 | ((T_EDATA *)fa_fbs_id.ptr)->hdr.edata.deoj.eojx3);
 }
 #else
@@ -1029 +1029 @@
                 return p;
         }
-        ECN_DBG_PUT "_ecn_tsk_eoj_get_property(0x%02X-0x%02X-0x%02X, epc:0x%02X) not found.",
+        ECN_DBG_PUT("_ecn_tsk_eoj_get_property(0x%02X-0x%02X-0x%02X, epc:0x%02X) not found.",
                 fp_obj->eojx1, fp_obj->eojx2, fp_obj->eojx3,
-                fa_epc ECN_DBG_END;
+                fa_epc);
 
         return NULL;
@@ -1044 +1044 @@
                 return -1;
 
-        ECN_DBG_PUT "_ecn_tsk_eoj_set_edt(epc:0x%02X) call eprpset()",
-                fp_prp->eprpcd ECN_DBG_END;
+        ECN_DBG_PUT("_ecn_tsk_eoj_set_edt(epc:0x%02X) call eprpset()",
+                fp_prp->eprpcd);
 
         return fp_prp->eprpset(fp_prp, fp_src, fa_srcsz, fa_anno);
@@ -1058 +1058 @@
                 return -1;
 
-        ECN_DBG_PUT "_ecn_tsk_eoj_get_edt(epc:0x%02X) call eprpget()",
-                fp_prp->eprpcd ECN_DBG_END;
+        ECN_DBG_PUT("_ecn_tsk_eoj_get_edt(epc:0x%02X) call eprpget()",
+                fp_prp->eprpcd);
 
         return fp_prp->eprpget(fp_prp, fp_dst, fp_prp->eprpsz);
@@ -1090 +1090 @@
                 p_blk = (T_ECN_SUB_BLK *)_ecn_fbs_mbx_get(sizeof(*p_blk));
                 if (!p_blk) {
-                        ECN_DBG_PUT "_ecn_fbs_mbx_get() fault." ECN_DBG_END;
+                        ECN_DBG_PUT("_ecn_fbs_mbx_get() fault.");
                         return 0;       /* メモリ不足 */
                 }
@@ -1100 +1100 @@
         a_ret = _ecn_fbs_get_data(fa_fbs_id, fp_prp, sizeof(*fp_prp), &a_size);
         if (a_ret || a_size < (int)sizeof(*fp_prp)) {
-                ECN_DBG_PUT "_ecn_fbs_get_data() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_fbs_get_data() result = %d:%s", a_ret, itron_strerror(a_ret));
                 goto lb_except;
         }
@@ -1109 +1109 @@
                 a_ret = _ecn_fbs_get_data(fa_fbs_id, p_blk, fp_prp->pdc, &a_size);
                 if (a_ret || a_size < (int)fp_prp->pdc) {
-                        ECN_DBG_PUT "_ecn_fbs_get_data() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                        ECN_DBG_PUT("_ecn_fbs_get_data() result = %d:%s", a_ret, itron_strerror(a_ret));
                         goto lb_except;
                 }
@@ -1146 +1146 @@
                 p_edt = _ecn_tsk_get_prp_pce(fa_fbs_id, &a_prp, p_edt);
                 if (!p_edt) {
-                        ECN_DBG_PUT "_ecn_tsk_eoj_set_main(): _ecn_tsk_get_prp_pce() fault." ECN_DBG_END;
+                        ECN_DBG_PUT("_ecn_tsk_eoj_set_main(): _ecn_tsk_get_prp_pce() fault.");
                         goto lb_except;
                 }
@@ -1166 +1166 @@
                 }
                 if (a_ans == a_size) {
-                        ECN_DBG_PUT "_ecn_tsk_eoj_set_edt(0x%06X, 0x%02x, 0x%02X..., %u) ok.",
+                        ECN_DBG_PUT("_ecn_tsk_eoj_set_edt(0x%06X, 0x%02x, 0x%02X..., %u) ok.",
                                 fp_obj->eojx1 << 16 | fp_obj->eojx2 << 8 | fp_obj->eojx3,
-                                a_prp.epc, p_edt->payload[0], a_size ECN_DBG_END;
+                                a_prp.epc, p_edt->payload[0], a_size);
                         a_prp.pdc = 0;
                 } else {
-                        ECN_DBG_PUT "_ecn_tsk_eoj_set_edt(0x%06X, 0x%02x, 0x%02X..., %u) fault.",
+                        ECN_DBG_PUT("_ecn_tsk_eoj_set_edt(0x%06X, 0x%02x, 0x%02X..., %u) fault.",
                                 fp_obj->eojx1 << 16 | fp_obj->eojx2 << 8 | fp_obj->eojx3,
-                                a_prp.epc, p_edt->payload[0], a_size ECN_DBG_END;
+                                a_prp.epc, p_edt->payload[0], a_size);
                         *p_sw_ok = 0;   /* プロパティ設定失敗 */
                         /* 応答処理の場合EDTは設定しない */
@@ -1183 +1183 @@
                 a_ret = _ecn_fbs_add_data_ex(a_fbs_res, &a_prp, sizeof(a_prp));
                 if (a_ret) {
-                        ECN_DBG_PUT "_ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                        ECN_DBG_PUT("_ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret));
                         goto lb_except;
                 }
@@ -1191 +1191 @@
                         a_ret = _ecn_fbs_add_data_ex(a_fbs_res, p_edt->payload, a_prp.pdc);
                         if (a_ret) {
-                                ECN_DBG_PUT "_ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                                ECN_DBG_PUT("_ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret));
                                 goto lb_except;
                         }
@@ -1240 +1240 @@
         p_prp_buf = _ecn_fbs_mbx_get(ECHONET_MEMPOOL_BLOCK_SIZE);
         if (!p_prp_buf) {
-                ECN_DBG_PUT "_ecn_fbs_mbx_get() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_fbs_mbx_get() result = %d:%s", a_ret, itron_strerror(a_ret));
                 goto lb_except; /* メモリ不足 */
         }
@@ -1248 +1248 @@
                 p_edt = _ecn_tsk_get_prp_pce(fa_fbs_id, &a_prp, p_edt);
                 if (!p_edt) {
-                        ECN_DBG_PUT "_ecn_tsk_eoj_get_main(): _ecn_tsk_get_prp_pce() fault." ECN_DBG_END;
+                        ECN_DBG_PUT("_ecn_tsk_eoj_get_main(): _ecn_tsk_get_prp_pce() fault.");
                         goto lb_except;
                 }
@@ -1273 +1273 @@
                 a_ret = _ecn_fbs_add_data_ex(a_fbs_res, &a_prp, sizeof(a_prp));
                 if (a_ret) {
-                        ECN_DBG_PUT "_ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                        ECN_DBG_PUT("_ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret));
                         goto lb_except;
                 }
@@ -1280 +1280 @@
                         a_ret = _ecn_fbs_add_data_ex(a_fbs_res, p_prp_buf, a_ans);
                         if (a_ret) {
-                                ECN_DBG_PUT "_ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                                ECN_DBG_PUT("_ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret));
                                 goto lb_except;
                         }
@@ -1319 +1319 @@
         p_prp_buf = _ecn_fbs_mbx_get(ECHONET_MEMPOOL_BLOCK_SIZE);
         if (!p_prp_buf) {
-                ECN_DBG_PUT "_ecn_fbs_mbx_get() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_fbs_mbx_get() result = %d:%s", a_ret, itron_strerror(a_ret));
                 goto lb_except; /* メモリ不足 */
         }
@@ -1327 +1327 @@
                 p_edt = _ecn_tsk_get_prp_pce(fa_fbs_id, &a_prp, p_edt);
                 if (!p_edt) {
-                        ECN_DBG_PUT "_ecn_tsk_eoj_get_main(): _ecn_tsk_get_prp_pce() fault." ECN_DBG_END;
+                        ECN_DBG_PUT("_ecn_tsk_eoj_get_main(): _ecn_tsk_get_prp_pce() fault.");
                         goto lb_except;
                 }
@@ -1336 +1336 @@
                 a_ret = _ecn_fbs_add_data_ex(a_fbs_res, &a_prp, sizeof(a_prp));
                 if (a_ret) {
-                        ECN_DBG_PUT "_ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                        ECN_DBG_PUT("_ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret));
                         goto lb_except;
                 }
@@ -1374 +1374 @@
                 a_ret = _ecn_fbs_get_data(fa_fbs_id, &a_prp, sizeof(a_prp), &a_size);
                 if (a_ret || a_size < (int)sizeof(a_prp)) {
-                        ECN_DBG_PUT "_ecn_fbs_get_data() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                        ECN_DBG_PUT("_ecn_fbs_get_data() result = %d:%s", a_ret, itron_strerror(a_ret));
                         goto lb_except;
                 }
@@ -1381 +1381 @@
                 a_ret = _ecn_fbs_seek_rpos(fa_fbs_id, a_prp.pdc);
                 if (a_ret) {
-                        ECN_DBG_PUT "_ecn_fbs_seek_rpos() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                        ECN_DBG_PUT("_ecn_fbs_seek_rpos() result = %d:%s", a_ret, itron_strerror(a_ret));
                         goto lb_except;
                 }
@@ -1543 +1543 @@
         a_ret = _ecn_fbs_cre(a_size, &a_fbs_res);
         if (a_ret != E_OK || !a_fbs_res.ptr) { /* 確保失敗 */
-                ECN_DBG_PUT "_ecn_fbs_cre() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_fbs_cre() result = %d:%s", a_ret, itron_strerror(a_ret));
                 goto lb_finally;
         }
@@ -1559 +1559 @@
                         sizeof(a_ecn_hdp.ecn_hdr) + sizeof(a_ecn_hdp.edata));
         if (a_ret) {
-                ECN_DBG_PUT "_ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret));
                 goto lb_except;
         }
@@ -1566 +1566 @@
         a_ret = _ecn_fbs_set_rpos(fa_fbs_id, offsetof(T_ECN_EDT_HDR, ecn_prp));
         if (a_ret) {
-                ECN_DBG_PUT "_ecn_fbs_set_rpos() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_fbs_set_rpos() result = %d:%s", a_ret, itron_strerror(a_ret));
                 goto lb_except;
         }
@@ -1577 +1577 @@
                 ((T_EDATA *)fa_fbs_id.ptr)->hdr.edata.opc, &a_sw_ok);
         if (a_ret) {
-                ECN_DBG_PUT "_ecn_tsk_eoj_get_main() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_tsk_eoj_get_main() result = %d:%s", a_ret, itron_strerror(a_ret));
                 goto lb_except;
         }
@@ -1601 +1601 @@
         a_ret = _ecn_tsk_snd_mbx(a_fbs_res, false);
         if (a_ret != E_OK) {
-                ECN_DBG_PUT "_ecn_tsk_snd_mbx() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_tsk_snd_mbx() result = %d:%s", a_ret, itron_strerror(a_ret));
                 goto lb_except;
         }
@@ -1634 +1634 @@
         a_ret = _ecn_fbs_cre(a_size, &a_fbs_res);
         if (a_ret != E_OK || !a_fbs_res.ptr) { /* 確保失敗 */
-                ECN_DBG_PUT "_ecn_fbs_cre() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_fbs_cre() result = %d:%s", a_ret, itron_strerror(a_ret));
                 goto lb_finally;
         }
@@ -1647 +1647 @@
                         sizeof(a_ecn_hdp.ecn_hdr) + sizeof(a_ecn_hdp.edata));
         if (a_ret) {
-                ECN_DBG_PUT "_ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret));
                 goto lb_except;
         }
@@ -1654 +1654 @@
         a_ret = _ecn_fbs_set_rpos(fa_fbs_id, offsetof(T_ECN_EDT_HDR, ecn_prp));
         if (a_ret) {
-                ECN_DBG_PUT "_ecn_fbs_set_rpos() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_fbs_set_rpos() result = %d:%s", a_ret, itron_strerror(a_ret));
                 goto lb_except;
         }
@@ -1665 +1665 @@
                 ((T_EDATA *)fa_fbs_id.ptr)->hdr.edata.opc, &a_sw_ok);
         if (a_ret) {
-                ECN_DBG_PUT "_ecn_tsk_eoj_res_main() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_tsk_eoj_res_main() result = %d:%s", a_ret, itron_strerror(a_ret));
                 goto lb_except;
         }
@@ -1689 +1689 @@
         a_ret = _ecn_tsk_snd_mbx(a_fbs_res, false);
         if (a_ret != E_OK) {
-                ECN_DBG_PUT "_ecn_tsk_snd_mbx() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_tsk_snd_mbx() result = %d:%s", a_ret, itron_strerror(a_ret));
                 goto lb_except;
         }
@@ -1718 +1718 @@
         memset(&a_ecn_hdp, 0, sizeof(a_ecn_hdp));
 
-        ECN_DBG_PUT "_ecn_tsk_eoj_set_get() eoj:%06X",
-                fp_obj->eojx1 << 16 | fp_obj->eojx2 << 8 | fp_obj->eojx3 ECN_DBG_END;
+        ECN_DBG_PUT("_ecn_tsk_eoj_set_get() eoj:%06X",
+                fp_obj->eojx1 << 16 | fp_obj->eojx2 << 8 | fp_obj->eojx3);
 
         /* 初期取得サイズ */
@@ -1761 +1761 @@
                 goto lb_except;
         }
-        ECN_DBG_PUT "_ecn_tsk_eoj_set_get() eoj:%06X _ecn_tsk_eoj_set_main() ok sw_ok:%s",
+        ECN_DBG_PUT("_ecn_tsk_eoj_set_get() eoj:%06X _ecn_tsk_eoj_set_main() ok sw_ok:%s",
                 fp_obj->eojx1 << 16 | fp_obj->eojx2 << 8 | fp_obj->eojx3,
-                (a_sw_ok ? "true" : "false") ECN_DBG_END;
+                (a_sw_ok ? "true" : "false"));
 
         /* 次の件数を読み取る(1byte)                                             */
@@ -1794 +1794 @@
                 goto lb_except;
         }
-        ECN_DBG_PUT "_ecn_tsk_eoj_set_get() eoj:%06X _ecn_tsk_eoj_get_main() ok sw_ok:%s",
+        ECN_DBG_PUT("_ecn_tsk_eoj_set_get() eoj:%06X _ecn_tsk_eoj_get_main() ok sw_ok:%s",
                 fp_obj->eojx1 << 16 | fp_obj->eojx2 << 8 | fp_obj->eojx3,
-                (a_sw_ok ? "true" : "false") ECN_DBG_END;
+                (a_sw_ok ? "true" : "false"));
 
         /* プロパティ読み込み件数書き込み時のヘッド情報で、読み出し件数を記録 */
@@ -1839 +1839 @@
         memset(&a_ecn_hdp, 0, sizeof(a_ecn_hdp));
 
-        ECN_DBG_PUT "_ecn_tsk_eoj_set_get_res() eoj:%06X",
-                fp_obj->eojx1 << 16 | fp_obj->eojx2 << 8 | fp_obj->eojx3 ECN_DBG_END;
+        ECN_DBG_PUT("_ecn_tsk_eoj_set_get_res() eoj:%06X",
+                fp_obj->eojx1 << 16 | fp_obj->eojx2 << 8 | fp_obj->eojx3);
 
         /* 初期取得サイズ */
@@ -1867 +1867 @@
                 goto lb_except;
         }
-        ECN_DBG_PUT "_ecn_tsk_eoj_set_get_res() eoj:%06X _ecn_tsk_eoj_set_main() ok sw_ok:%s",
+        ECN_DBG_PUT("_ecn_tsk_eoj_set_get_res() eoj:%06X _ecn_tsk_eoj_set_main() ok sw_ok:%s",
                 fp_obj->eojx1 << 16 | fp_obj->eojx2 << 8 | fp_obj->eojx3,
-                (a_sw_ok ? "true" : "false") ECN_DBG_END;
+                (a_sw_ok ? "true" : "false"));
 
         /* 次の件数を読み取る(1byte)                                             */
@@ -1888 +1888 @@
                 goto lb_except;
         }
-        ECN_DBG_PUT "_ecn_tsk_eoj_set_get_res() eoj:%06X _ecn_tsk_eoj_get_main() ok sw_ok:%s",
+        ECN_DBG_PUT("_ecn_tsk_eoj_set_get_res() eoj:%06X _ecn_tsk_eoj_get_main() ok sw_ok:%s",
                 fp_obj->eojx1 << 16 | fp_obj->eojx2 << 8 | fp_obj->eojx3,
-                (a_sw_ok ? "true" : "false") ECN_DBG_END;
+                (a_sw_ok ? "true" : "false"));
 
         goto lb_finally;
@@ -1964 +1964 @@
         ret = _ecn_fbs_cre(1, &req);
         if (ret != E_OK) {
-                ECN_DBG_PUT "_ecn_tsk_cre_req_fbs() : _ecn_fbs_cre() result = %d:%s", ret, itron_strerror(ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_tsk_cre_req_fbs() : _ecn_fbs_cre() result = %d:%s", ret, itron_strerror(ret));
                 return ret;
         }
@@ -1971 +1971 @@
         if (ret != E_OK) {
                 _ecn_fbs_del(req);
-                ECN_DBG_PUT "_ecn_tsk_cre_req_fbs() : _ecn_fbs_add_data() result = %d:%s", ret, itron_strerror(ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_tsk_cre_req_fbs() : _ecn_fbs_add_data() result = %d:%s", ret, itron_strerror(ret));
                 return ret;
         }
@@ -1993 +1993 @@
         ret = _ecn_fbs_cre(1, &res);
         if (ret != E_OK) {
-                ECN_DBG_PUT "_ecn_tsk_cre_res_fbs() : _ecn_fbs_cre() result = %d:%s", ret, itron_strerror(ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_tsk_cre_res_fbs() : _ecn_fbs_cre() result = %d:%s", ret, itron_strerror(ret));
                 return ret;
         }
@@ -2000 +2000 @@
         if (ret != E_OK) {
                 _ecn_fbs_del(res);
-                ECN_DBG_PUT "_ecn_tsk_cre_res_fbs() : _ecn_fbs_add_data() result = %d:%s", ret, itron_strerror(ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_tsk_cre_res_fbs() : _ecn_fbs_add_data() result = %d:%s", ret, itron_strerror(ret));
                 return ret;
         }

uKadecot/trunk/ecnl_ssp/echonet_uip_task.c

@@ -108 +108 @@
         if (    a_rcv_pkt.t_esv->ecn_hdr.ehd1 != ECN_EDH1_ECHONET_LITE  /* ECHONET Lite規格       */
         ||      a_rcv_pkt.t_esv->ecn_hdr.ehd2 != ECN_EDH2_FORMAT_1                      /* 電文形式1                */) {
-                ECN_DBG_PUT "[UDP ECHO SRV] illegal type (0x%02X,0x%02X)", a_rcv_pkt.t_esv->ecn_hdr.ehd1, a_rcv_pkt.t_esv->ecn_hdr.ehd2 ECN_DBG_END;
+                ECN_DBG_PUT("[UDP ECHO SRV] illegal type (0x%02X,0x%02X)", a_rcv_pkt.t_esv->ecn_hdr.ehd1, a_rcv_pkt.t_esv->ecn_hdr.ehd2);
                 return E_PAR;
         }
@@ -118 +118 @@
         a_ret = _ecn_fbs_cre(fa_len, &a_fbs_id);
         if (a_ret != E_OK) {
-                ECN_DBG_PUT "[UDP ECHO SRV] _ecn_fbs_cre() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("[UDP ECHO SRV] _ecn_fbs_cre() result = %d:%s", a_ret, itron_strerror(a_ret));
                 return a_ret;
         }
         a_ret = _ecn_fbs_add_data_ex(a_fbs_id, buffer, fa_len);
         if (a_ret) {
-                ECN_DBG_PUT "[UDP ECHO SRV] _ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("[UDP ECHO SRV] _ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret));
                 goto lb_except;
         }
@@ -133 +133 @@
         a_enod_id = udp_get_id((T_EDATA *)a_fbs_id.ptr, dst->ipaddr, dst->portno);
         if (a_enod_id < 0 || tnum_enodadr <= a_enod_id) {
-                ECN_DBG_PUT "[UDP ECHO SRV] udp src(%s) echonet-node not found.",
-                        ip2str(NULL, dst->ipaddr) ECN_DBG_END;
+                ECN_DBG_PUT("[UDP ECHO SRV] udp src(%s) echonet-node not found.",
+                        ip2str(NULL, dst->ipaddr));
         } else {
                 /* 送信元ECHONETノードを記録 */
@@ -144 +144 @@
         a_ret = psnd_dtq(ecn_svc_mailboxid, (intptr_t)a_fbs_id.ptr);
         if (a_ret != E_OK) {
-                ECN_DBG_PUT "[UDP ECHO SRV] psnd_dtq(ecn_svc_mailboxid) result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("[UDP ECHO SRV] psnd_dtq(ecn_svc_mailboxid) result = %d:%s", a_ret, itron_strerror(a_ret));
                 goto lb_except;
         }
@@ -185 +185 @@
 
         uip_gethostaddr(a_src);
-        ECN_DBG_PUT "[UDP TSK:%d] started, IP Address: %s ether_max_len: %u",
+        ECN_DBG_PUT("[UDP TSK:%d] started, IP Address: %s ether_max_len: %u",
                 ecn_udp_taskid,
                 ip2str(NULL, a_src),
-                UIP_BUFSIZE ECN_DBG_END;
+                UIP_BUFSIZE);
         uip_ipaddr_copy(enodadrb_table[ENOD_LOCAL_ID].ipaddr, a_src);
 
         UDP_CEPID = udp_acre_cep(&ccep);
         if (UDP_CEPID == NULL) {
-                ECN_DBG_PUT "udp_acre_cep()" ECN_DBG_END;
+                ECN_DBG_PUT("udp_acre_cep()");
                 PT_EXIT(&pt);
         }
@@ -200 +200 @@
         a_ret = sta_cyc(ecn_udp_cychdrid);
         if (a_ret != E_OK) {
-                ECN_DBG_PUT "sta_cyc() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("sta_cyc() result = %d:%s", a_ret, itron_strerror(a_ret));
                 PT_EXIT(&pt);
         }
@@ -206 +206 @@
         a_ret = act_tsk(ecn_svc_taskid);
         if (a_ret != E_OK) {
-                ECN_DBG_PUT "act_tsk() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("act_tsk() result = %d:%s", a_ret, itron_strerror(a_ret));
                 PT_EXIT(&pt);
         }
@@ -212 +212 @@
         a_ret = get_tim(&a_now);
         if (a_ret != E_OK) {
-                ECN_DBG_PUT "get_tim() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("get_tim() result = %d:%s", a_ret, itron_strerror(a_ret));
                 PT_EXIT(&pt);
         }
@@ -226 +226 @@
                         || ((a_ret = timer_expired(&timer) ? E_TMOUT : E_WBLK) == E_TMOUT)));
                 if ((a_ret != E_OK) && (a_ret != E_TMOUT)) {
-                        ECN_DBG_PUT "trcv_dtq() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                        ECN_DBG_PUT("trcv_dtq() result = %d:%s", a_ret, itron_strerror(a_ret));
                         PT_EXIT(&pt);
                 }
@@ -232 +232 @@
                 a_ret2 = get_tim(&a_now);
                 if (a_ret2 != E_OK) {
-                        ECN_DBG_PUT "get_tim() result = %d:%s", a_ret2, itron_strerror(a_ret2) ECN_DBG_END;
+                        ECN_DBG_PUT("get_tim() result = %d:%s", a_ret2, itron_strerror(a_ret2));
                         PT_EXIT(&pt);
                 }
@@ -243 +243 @@
                         a_snd_len = _ecn_fbs_get_datalen(a_mdt.fbs_id);
 
-                        ECN_DBG_PUT "[UDP TSK] trcv_dtq() mbx recv (%d byte)", a_snd_len ECN_DBG_END;
+                        ECN_DBG_PUT("[UDP TSK] trcv_dtq() mbx recv (%d byte)", a_snd_len);
 
                         if (0 < a_snd_len) {
@@ -289 +289 @@
         ret = _ecn_fbs_cre(1, &req);
         if (ret != E_OK) {
-                ECN_DBG_PUT "_ecn_udp_cre_req_fbs() : _ecn_fbs_cre() result = %d:%s", ret, itron_strerror(ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_udp_cre_req_fbs() : _ecn_fbs_cre() result = %d:%s", ret, itron_strerror(ret));
                 return ret;
         }
@@ -296 +296 @@
         if (ret != E_OK) {
                 _ecn_fbs_del(req);
-                ECN_DBG_PUT "_ecn_udp_cre_req_fbs() : _ecn_fbs_add_data() result = %d:%s", ret, itron_strerror(ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_udp_cre_req_fbs() : _ecn_fbs_add_data() result = %d:%s", ret, itron_strerror(ret));
                 return ret;
         }
@@ -318 +318 @@
         ret = _ecn_fbs_cre(1, &res);
         if (ret != E_OK) {
-                ECN_DBG_PUT "_ecn_udp_cre_res_fbs() : _ecn_fbs_cre() result = %d:%s", ret, itron_strerror(ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_udp_cre_res_fbs() : _ecn_fbs_cre() result = %d:%s", ret, itron_strerror(ret));
                 return ret;
         }
@@ -325 +325 @@
         if (ret != E_OK) {
                 _ecn_fbs_del(res);
-                ECN_DBG_PUT "_ecn_udp_cre_res_fbs() : _ecn_fbs_add_data() result = %d:%s", ret, itron_strerror(ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_udp_cre_res_fbs() : _ecn_fbs_add_data() result = %d:%s", ret, itron_strerror(ret));
                 return ret;
         }
@@ -353 +353 @@
         a_ret = _ecn_fbs_get_data(fbs_id, &cmd, 1, &len);
         if (a_ret != E_OK) {
-                ECN_DBG_PUT "[UDP TSK] _ecn_fbs_get_data() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("[UDP TSK] _ecn_fbs_get_data() result = %d:%s", a_ret, itron_strerror(a_ret));
                 return;
         }
@@ -368 +368 @@
                 a_ret = _ecn_fbs_get_data(fbs_id, &msg, sizeof(msg), &a_snd_len);
                 if (a_ret != E_OK) {
-                        ECN_DBG_PUT "[UDP TSK] _ecn_fbs_get_data() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                        ECN_DBG_PUT("[UDP TSK] _ecn_fbs_get_data() result = %d:%s", a_ret, itron_strerror(a_ret));
                 }
 
@@ -384 +384 @@
                 if (a_ret != E_OK) {
                         _ecn_fbs_del(buf);
-                        ECN_DBG_PUT "_ecn_int_msg() : _ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                        ECN_DBG_PUT("_ecn_int_msg() : _ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret));
                         return;
                 }
@@ -391 +391 @@
                 if (a_ret != E_OK) {
                         _ecn_fbs_del(buf);
-                        ECN_DBG_PUT "_ecn_int_msg() : _ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                        ECN_DBG_PUT("_ecn_int_msg() : _ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret));
                         return;
                 }
@@ -398 +398 @@
                 if (a_ret != E_OK) {
                         _ecn_fbs_del(buf);
-                        ECN_DBG_PUT "_ecn_int_msg() : psnd_dtq() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                        ECN_DBG_PUT("_ecn_int_msg() : psnd_dtq() result = %d:%s", a_ret, itron_strerror(a_ret));
                         return;
                 }
@@ -414 +414 @@
         if (a_ret != E_OK) {
                 _ecn_fbs_del(buf);
-                ECN_DBG_PUT "_ecn_int_msg() : _ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_int_msg() : _ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret));
                 return;
         }
@@ -421 +421 @@
         if (a_ret != E_OK) {
                 _ecn_fbs_del(buf);
-                ECN_DBG_PUT "_ecn_int_msg() : psnd_dtq() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("_ecn_int_msg() : psnd_dtq() result = %d:%s", a_ret, itron_strerror(a_ret));
                 return;
         }
@@ -443 +443 @@
         a_ret = udp_get_ip(&a_dst, fbs_id.ptr->hdr.target);
         if (!a_ret) {
-                ECN_DBG_PUT "[UDP TSK] echonet-node 0x%02X-0x%02X-0x%02X → udp dest(%s)",
+                ECN_DBG_PUT("[UDP TSK] echonet-node 0x%02X-0x%02X-0x%02X → udp dest(%s)",
                         ((T_EDATA *)fbs_id.ptr)->hdr.edata.deoj.eojx1,
                         ((T_EDATA *)fbs_id.ptr)->hdr.edata.deoj.eojx2,
                         ((T_EDATA *)fbs_id.ptr)->hdr.edata.deoj.eojx3,
-                        ip2str(NULL, a_dst.ipaddr) ECN_DBG_END;
+                        ip2str(NULL, a_dst.ipaddr));
 
                 /* fbsから出力領域にデータを抽出 */
@@ -453 +453 @@
                 a_ret = _ecn_fbs_get_data(fbs_id, buffer, sizeof(buffer), &a_snd_len);
                 if (a_ret != E_OK) {
-                        ECN_DBG_PUT "[UDP TSK] _ecn_fbs_get_data() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                        ECN_DBG_PUT("[UDP TSK] _ecn_fbs_get_data() result = %d:%s", a_ret, itron_strerror(a_ret));
                 }
                 else if(uip_ipaddr_cmp(a_dst.ipaddr, localhost)) {
                         /* 送信先が127.0.0.1 → mbxに転送 */
-                        ECN_DBG_PUT "redirect ecn_udp_mailboxid → ecn_svc_mailboxid (esv:0x%02X)",
-                                ((T_EDATA *)fbs_id.ptr)->hdr.edata.esv ECN_DBG_END;
+                        ECN_DBG_PUT("redirect ecn_udp_mailboxid → ecn_svc_mailboxid (esv:0x%02X)",
+                                ((T_EDATA *)fbs_id.ptr)->hdr.edata.esv);
 
                         a_ret = _ecn_udp2mbx((const uint8_t *)buffer, a_snd_len, &a_dst);
@@ -466 +466 @@
                 }
                 else {
-                        ECN_DBG_PUT "[UDP TSK] udp_snd_dat() to:%s %ubyte(s)",
-                                ip2str(NULL, a_dst.ipaddr), a_snd_len ECN_DBG_END;
+                        ECN_DBG_PUT("[UDP TSK] udp_snd_dat() to:%s %ubyte(s)",
+                                ip2str(NULL, a_dst.ipaddr), a_snd_len);
 #ifdef ECN_DBG_PUT_ENA
                         _ecn_dbg_bindmp((const uint8_t *)buffer, a_snd_len);
@@ -474 +474 @@
                         a_ret = udp_snd_dat(UDP_CEPID, &a_dst, buffer, a_snd_len);
                         if (a_ret < 0) {
-                                ECN_DBG_PUT "[UDP TSK] send, error: %s", itron_strerror(a_ret) ECN_DBG_END;
+                                ECN_DBG_PUT("[UDP TSK] send, error: %s", itron_strerror(a_ret));
                         }
                 }
@@ -480 +480 @@
                 /* データが長すぎて1パケットに収まらなかった場合 */
                 if (_ecn_fbs_exist_data(fbs_id)) {
-                        ECN_DBG_PUT "[UDP TSK] send, data so long: %dbyte(s)", _ecn_fbs_get_datalen(fbs_id) ECN_DBG_END;
+                        ECN_DBG_PUT("[UDP TSK] send, data so long: %dbyte(s)", _ecn_fbs_get_datalen(fbs_id));
                 }
         } else {
-                ECN_DBG_PUT "[UDP TSK] echonet-node 0x%02X-0x%02X-0x%02X not found.",
+                ECN_DBG_PUT("[UDP TSK] echonet-node 0x%02X-0x%02X-0x%02X not found.",
                         ((T_EDATA *)fbs_id.ptr)->hdr.edata.deoj.eojx1,
                         ((T_EDATA *)fbs_id.ptr)->hdr.edata.deoj.eojx2,
-                        ((T_EDATA *)fbs_id.ptr)->hdr.edata.deoj.eojx3 ECN_DBG_END;
+                        ((T_EDATA *)fbs_id.ptr)->hdr.edata.deoj.eojx3);
         }
 }
@@ -505 +505 @@
         PT_BEGIN(&s.pt);
 
-        /* ECN_CAP_PUT "[UDP ECHO SRV] callback_nblk_udp() recv: %u", *(int *)p_parblk ECN_CAP_END; */
+        /* ECN_CAP_PUT("[UDP ECHO SRV] callback_nblk_udp() recv: %u", *(int *)p_parblk); */
         memset(buffer, 0, sizeof(buffer));
 
@@ -519 +519 @@
         }
 #endif
-        ECN_CAP_PUT "[UDP ECHO SRV] recv, addr: %s:%d, len: %d, msg: '%s'",
-                        ip2str(NULL, dst.ipaddr), dst.portno, a_len, buffer ECN_CAP_END;
+        ECN_CAP_PUT("[UDP ECHO SRV] recv, addr: %s:%d, len: %d, msg: '%s'",
+                        ip2str(NULL, dst.ipaddr), dst.portno, a_len, buffer);
         if ((int)sizeof(buffer) <= a_len)
                 a_len = (int)sizeof(buffer) - 1;
@@ -583 +583 @@
                         break;
                 }
-                ECN_DBG_PUT "is_match(): ecn_itr_nxt() result: epc=0x%02X, pdc=%d", epc, pdc ECN_DBG_END;
+                ECN_DBG_PUT("is_match(): ecn_itr_nxt() result: epc=0x%02X, pdc=%d", epc, pdc);
                 /* インスタンスリスト通知または自ノードインスタンスリストＳ以外は除外 */
                 if ((epc != 0xD5) && (epc != 0xD6)) {
@@ -641 +641 @@
                         continue;
 
-                ECN_CAP_PUT "udp_get_id(): ip-found remote(%d) = %s",
-                        i - ENOD_REMOTE_ID, ip2str(NULL, ipaddr) ECN_CAP_END;
+                ECN_CAP_PUT("udp_get_id(): ip-found remote(%d) = %s",
+                        i - ENOD_REMOTE_ID, ip2str(NULL, ipaddr));
                 return (ECN_ENOD_ID)i;
         }
@@ -660 +660 @@
                 uip_ipaddr_copy(ea->ipaddr, ipaddr);
 
-                ECN_CAP_PUT "udp_get_id(): enod-found remote(%d) = %s",
-                        i - ENOD_REMOTE_ID, ip2str(NULL, ipaddr) ECN_CAP_END;
+                ECN_CAP_PUT("udp_get_id(): enod-found remote(%d) = %s",
+                        i - ENOD_REMOTE_ID, ip2str(NULL, ipaddr));
                 return (ECN_ENOD_ID)i;
         }
@@ -673 +673 @@
                 uip_ipaddr_copy(ea->ipaddr, ipaddr);
 
-                ECN_CAP_PUT "udp_get_id(): empty-found remote(%d) = %s",
-                        i - ENOD_REMOTE_ID, ip2str(NULL, ipaddr) ECN_CAP_END;
+                ECN_CAP_PUT("udp_get_id(): empty-found remote(%d) = %s",
+                        i - ENOD_REMOTE_ID, ip2str(NULL, ipaddr));
                 return (ECN_ENOD_ID)i;
         }
@@ -732 +732 @@
         if (a_ret != E_OK) {
                 _ecn_fbs_del(req);
-                ECN_DBG_PUT "ecn_udp_get_ipaddr() : _ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("ecn_udp_get_ipaddr() : _ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret));
                 return a_ret;
         }
@@ -739 +739 @@
         if (a_ret != E_OK) {
                 _ecn_fbs_del(req);
-                ECN_DBG_PUT "ecn_udp_get_ipaddr() : _ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("ecn_udp_get_ipaddr() : _ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret));
                 return a_ret;
         }
@@ -746 +746 @@
         if (a_ret != E_OK) {
                 _ecn_fbs_del(req);
-                ECN_DBG_PUT "ecn_udp_get_ipaddr() : _ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret) ECN_DBG_END;
+                ECN_DBG_PUT("ecn_udp_get_ipaddr() : _ecn_fbs_add_data_ex() result = %d:%s", a_ret, itron_strerror(a_ret));
                 return a_ret;
         }

uKadecot/trunk/kadecot/wamp_broker.c

@@ -80 +80 @@
 void wamp_broker_subscribe_topic(wamp_broker_t *broker, const char *value)
 {
-        static const char topic[] = "com.sonycsl.kadecot.echonetlite.topic.";
+        static const char echonetlite_topic[] = "com.sonycsl.kadecot.echonetlite.topic.";
+        static const char arduino_topic[] = "com.sonycsl.kadecot.arduino.topic.";
+
+        if (strncmp(echonetlite_topic, value, sizeof(echonetlite_topic) - 1) == 0)
+                wamp_broker_subscribe_echonetlite_topic(broker, value, sizeof(echonetlite_topic) - 1);
+        else if (strncmp(arduino_topic, value, sizeof(arduino_topic) - 1) == 0)
+                wamp_broker_subscribe_arduino_topic(broker, value, sizeof(arduino_topic) - 1);
+}
+
+void wamp_broker_subscribe_echonetlite_topic(wamp_broker_t *broker, const char *value, int val_pos)
+{
         char *pos, *end;
         wamp_subscription_t *subscription;
+        wamp_echonetlite_subscription_t *echonetlite;
         uint16_t devType;
         uint8_t epc;
 
-        if(strncmp(topic, value, sizeof(topic) - 1) != 0)
-                return;
-
         subscription = wamp_broker_new_subscription(broker);
         if(subscription == NULL)
                 return;
-
-        subscription->deviceName[0] = '\0';
-        strcpy_s(subscription->deviceName, sizeof(subscription->deviceName), &value[sizeof(topic) - 1]);
-        subscription->deviceName[sizeof(subscription->deviceName) - 1] = '\0';
-
-        end = &subscription->deviceName[sizeof(subscription->deviceName)];
-        for(pos = subscription->deviceName; pos < end; pos++){
+        subscription->kind = WAMP_SUBSCRIPTION_KIND_ECHONETLITE;
+        echonetlite = &subscription->echonetlite;
+
+        echonetlite->deviceName[0] = '\0';
+        strcpy_s(echonetlite->deviceName, sizeof(echonetlite->deviceName), &value[val_pos]);
+        echonetlite->deviceName[sizeof(echonetlite->deviceName) - 1] = '\0';
+
+        end = &echonetlite->deviceName[sizeof(echonetlite->deviceName)];
+        for(pos = echonetlite->deviceName; pos < end; pos++){
                 if(*pos != '.')
                         continue;
 
                 *pos = '\0';
-                subscription->proprtyName = pos + 1;
-                break;
-        }
-
-        devType = kadecot_names_get_device_type(subscription->deviceName,
-                strnlen(subscription->deviceName, sizeof(subscription->deviceName)));
+                echonetlite->proprtyName = pos + 1;
+                break;
+        }
+
+        devType = kadecot_names_get_device_type(echonetlite->deviceName,
+                strnlen(echonetlite->deviceName, sizeof(echonetlite->deviceName)));
         if(devType == 0){
                 wamp_broker_delete_subscription(broker, subscription);
@@ -114 +124 @@
         }
 
-        epc = kadecot_names_get_property_code(subscription->proprtyName,
-                strnlen(subscription->proprtyName, subscription->proprtyName - subscription->deviceName), devType);
+        epc = kadecot_names_get_property_code(echonetlite->proprtyName,
+                strnlen(echonetlite->proprtyName, echonetlite->proprtyName - echonetlite->deviceName), devType);
         if(epc == 0){
                 wamp_broker_delete_subscription(broker, subscription);
@@ -121 +131 @@
         }
 
-        subscription->devType = devType;
-        subscription->epc = epc;
+        echonetlite->devType = devType;
+        echonetlite->epc = epc;
+
+        wamp_subscription_t *spos, *send = &broker->subscriptions[sizeof(broker->subscriptions) / sizeof(broker->subscriptions[0])];
+
+        for (spos = broker->subscriptions; spos < send; spos++) {
+                if ((spos == subscription) || (spos->subscriptionId == 0) || (spos->kind != WAMP_SUBSCRIPTION_KIND_ECHONETLITE))
+                        continue;
+
+                if ((spos->echonetlite.devType != devType) || (spos->echonetlite.epc != epc))
+                        continue;
+
+                wamp_broker_delete_subscription(broker, subscription);
+                subscription = spos;
+                break;
+        }
 
         broker->current_subscription = subscription;
 }
 
-static void wamp_broker_subscribe_res(wamp_broker_t *broker);
+void wamp_broker_subscribe_arduino_topic(wamp_broker_t *broker, const char *value, int val_pos)
+{
+        char *pos, *end;
+        wamp_subscription_t *subscription;
+        wamp_arduino_subscription_t *arduino;
+        char pinno[40], *threshold = NULL;
+
+        subscription = wamp_broker_new_subscription(broker);
+        if (subscription == NULL)
+                return;
+        subscription->kind = WAMP_SUBSCRIPTION_KIND_ARDUINO;
+        arduino = &subscription->arduino;
+
+        pinno[0] = '\0';
+        strcpy_s(pinno, sizeof(pinno), &value[val_pos]);
+        pinno[sizeof(pinno) - 1] = '\0';
+
+        if (pinno[0] != 'p' || pinno[1] != 'i' || pinno[2] != 'n') {
+                wamp_broker_delete_subscription(broker, subscription);
+                return;
+        }
+
+        end = &pinno[sizeof(pinno)];
+        for (pos = pinno; pos < end; pos++) {
+                if (*pos != '.')
+                        continue;
+
+                *pos = '\0';
+                threshold = pos + 1;
+                if (threshold[0] != 't' || threshold[1] != 'h' || threshold[2] != 'r') {
+                        threshold = NULL;
+                }
+                break;
+        }
+
+        arduino->pinno = atoi(&pinno[3]);
+        if (threshold != NULL) {
+                arduino->threshold = atoi(&threshold[3]);
+        }
+        else {
+                arduino->threshold = 0;
+        }
+
+        wamp_subscription_t *spos, *send = &broker->subscriptions[sizeof(broker->subscriptions) / sizeof(broker->subscriptions[0])];
+
+        for (spos = broker->subscriptions; spos < send; spos++) {
+                if ((spos == subscription) || (spos->subscriptionId == 0) || (spos->kind != WAMP_SUBSCRIPTION_KIND_ARDUINO))
+                        continue;
+
+                if ((spos->arduino.pinno != arduino->pinno) || (spos->arduino.threshold != arduino->threshold))
+                        continue;
+
+                wamp_broker_delete_subscription(broker, subscription);
+                subscription = spos;
+                break;
+        }
+
+        broker->current_subscription = subscription;
+}
+
+static void wamp_broker_subscribe_echonetlite_res(wamp_broker_t *broker);
+static void wamp_broker_subscribe_arduino_res(wamp_broker_t *broker);
 
 void wamp_broker_subscribe_close(struct wamp_state *s)
@@ -137 +222 @@
 
         // send RESULT
-        wamp_broker_subscribe_res(broker);
+        if (broker->current_subscription != NULL) {
+                switch (broker->current_subscription->kind) {
+                case WAMP_SUBSCRIPTION_KIND_ECHONETLITE:
+                        wamp_broker_subscribe_echonetlite_res(broker);
+                        break;
+                case WAMP_SUBSCRIPTION_KIND_ARDUINO:
+                        wamp_broker_subscribe_arduino_res(broker);
+                        break;
+                default:
+                        break;
+                }
+        }
 
         if (broker->error != NULL){
@@ -148 +244 @@
 }
 
-static void wamp_broker_subscribe_res(wamp_broker_t *broker)
+static void wamp_broker_subscribe_echonetlite_res(wamp_broker_t *broker)
 {
         struct wamp_state *s = broker->s;
@@ -157 +253 @@
         ER ret;
 
-        if ((subscription == NULL) || (subscription->devType == 0) || (subscription->epc == 0))
+        if ((subscription == NULL) || (subscription->echonetlite.devType == 0) || (subscription->echonetlite.epc == 0))
                 return;
 
@@ -175 +271 @@
         ret = main_send_message(buf, s->wbsid);
         if (ret != E_OK) {
-                syslog(LOG_WARNING, "wamp_broker_subscribe_close() : main_send_message() result = %d", ret);
+                syslog(LOG_WARNING, "wamp_broker_subscribe_echonetlite_res() : main_send_message() result = %d", ret);
+                return;
+        }
+
+        broker->error = NULL;
+}
+
+static void wamp_broker_subscribe_arduino_res(wamp_broker_t *broker)
+{
+        struct wamp_state *s = broker->s;
+        wamp_subscription_t *subscription = broker->current_subscription;
+        // send SUBSCRIBED or ERROR
+        ECN_FBS_ID buf;
+        ECN_FBS_SSIZE_T pos = 0;
+        ER ret;
+
+        if ((subscription == NULL)
+                || ((subscription->arduino.pinno < 0) || (subscription->arduino.pinno > 19)))
+                return;
+
+        if (subscription->arduino.pinno >= 14)
+                main_add_threshold(subscription->subscriptionId, subscription->arduino.pinno, subscription->arduino.threshold);
+
+        ret = _ecn_fbs_cre(1, &buf);
+        if (ret != E_OK) {
+                syslog(LOG_WARNING, "_ecn_fbs_cre() result = %d", ret);
+                return;
+        }
+
+        ret = fbs_printf(buf, &pos, "[33,%d,%d]", broker->requestId, subscription->subscriptionId);
+        if (ret != E_OK) {
+                syslog(LOG_WARNING, "fbs_printf() result = %d", ret);
+                _ecn_fbs_del(buf);
+                return;
+        }
+
+        ret = main_send_message(buf, s->wbsid);
+        if (ret != E_OK) {
+                syslog(LOG_WARNING, "wamp_broker_subscribe_arduino_res() : main_send_message() result = %d", ret);
                 return;
         }
@@ -218 +352 @@
                 return;
 
+        if (subscription->kind == WAMP_SUBSCRIPTION_KIND_ARDUINO)
+                main_del_threshold(subscription->subscriptionId);
+
         wamp_broker_delete_subscription(broker, subscription);
 
@@ -318 +455 @@
 
         for(subscription = broker->subscriptions; subscription < end; subscription++){
-                if (subscription->subscriptionId == 0)
-                        continue;
-
-                if ((subscription->devType != devType) || (subscription->epc != epc))
+                if ((subscription->subscriptionId == 0) || (subscription->kind != WAMP_SUBSCRIPTION_KIND_ECHONETLITE))
+                        continue;
+
+                if ((subscription->echonetlite.devType != devType) || (subscription->echonetlite.epc != epc))
                         continue;
 
@@ -339 +476 @@
 
                 ret = fbs_printf(buf, &pos, "{\"propertyName\":\"%s\",\"propertyValue\":[",
-                        subscription->proprtyName);
+                        subscription->echonetlite.proprtyName);
                 if (ret != E_OK) {
                         syslog(LOG_WARNING, "fbs_printf() result = %d", ret);
@@ -374 +511 @@
         }
 }
+
+void wamp_broker_publish_pin(wamp_broker_t *broker, uint16_t pubId, int deviceId, int pinno, uint16_t value)
+{
+        struct wamp_state *s = broker->s;
+        wamp_subscription_t *subscription, *end = &broker->subscriptions[sizeof(broker->subscriptions) / sizeof(broker->subscriptions[0])];
+        ECN_FBS_ID buf;
+        ECN_FBS_SSIZE_T pos = 0;
+        ER ret;
+
+        for (subscription = broker->subscriptions; subscription < end; subscription++) {
+                if ((subscription->subscriptionId == 0) || (subscription->kind != WAMP_SUBSCRIPTION_KIND_ARDUINO))
+                        continue;
+
+                if (subscription->arduino.pinno != pinno)
+                        continue;
+
+                ret = _ecn_fbs_cre(1, &buf);
+                if (ret != E_OK) {
+                        syslog(LOG_WARNING, "_ecn_fbs_cre() result = %d", ret);
+                        break;
+                }
+
+                ret = fbs_printf(buf, &pos, "[36,%d,%d,{\"deviceId\":%d},[],",
+                        subscription->subscriptionId, pubId, deviceId);
+                if (ret != E_OK) {
+                        syslog(LOG_WARNING, "fbs_printf() result = %d", ret);
+                        _ecn_fbs_del(buf);
+                        break;
+                }
+
+                if ((pinno >= 0) && (pinno <= 13)) {
+                        ret = fbs_printf(buf, &pos, "{\"pin\":%d,\"value\":\"%s\"}]",
+                                subscription->arduino.pinno, (value == 0) ? "LOW" : "HIGH");
+                        if (ret != E_OK) {
+                                syslog(LOG_WARNING, "fbs_printf() result = %d", ret);
+                                _ecn_fbs_del(buf);
+                                break;
+                        }
+                }
+                else {
+                        ret = fbs_printf(buf, &pos, "{\"pin\":%d,\"value\":%d}]",
+                                subscription->arduino.pinno, value);
+                        if (ret != E_OK) {
+                                syslog(LOG_WARNING, "fbs_printf() result = %d", ret);
+                                _ecn_fbs_del(buf);
+                                break;
+                        }
+                }
+
+                ret = main_send_message(buf, s->wbsid);
+                if (ret != E_OK) {
+                        syslog(LOG_WARNING, "wamp_broker_publish_inf() : main_send_message() result = %d", ret);
+                }
+                break;
+        }
+}

uKadecot/trunk/kadecot/wamp_broker.h

@@ -39 +39 @@
 #define WAMP_BROKER_H
 
+typedef enum wamp_subscription_kind
+{
+        WAMP_SUBSCRIPTION_KIND_NONE,
+        WAMP_SUBSCRIPTION_KIND_ECHONETLITE,
+        WAMP_SUBSCRIPTION_KIND_ARDUINO,
+} wamp_subscription_kind_t;
+
+typedef struct wamp_echonetlite_subscription
+{
+        char deviceName[40];
+        char *proprtyName;
+        uint16_t devType;
+        uint8_t epc;
+} wamp_echonetlite_subscription_t;
+
+typedef struct wamp_arduino_subscription
+{
+        uint8_t pinno;
+        uint16_t threshold;
+} wamp_arduino_subscription_t;
+
 typedef struct wamp_subscription
 {
@@ -44 +65 @@
         unsigned int requestId;
         int subscriptionId;
-        char deviceName[40];
-        char *proprtyName;
-        uint16_t devType;
-        uint8_t epc;
+        wamp_subscription_kind_t kind;
+        union{
+                wamp_echonetlite_subscription_t echonetlite;
+                wamp_arduino_subscription_t arduino;
+        };
 } wamp_subscription_t;
 
@@ -55 +77 @@
         unsigned int requestId;
         int subscriptionId;
-        wamp_subscription_t subscriptions[10];
+        wamp_subscription_t subscriptions[30];
         wamp_subscription_t *current_subscription;
         const char *error;
@@ -66 +88 @@
 void wamp_broker_subscribe_options(wamp_broker_t *broker);
 void wamp_broker_subscribe_topic(wamp_broker_t *broker, const char *value);
+void wamp_broker_subscribe_echonetlite_topic(wamp_broker_t *broker, const char *value, int pos);
+void wamp_broker_subscribe_arduino_topic(wamp_broker_t *broker, const char *value, int pos);
 void wamp_broker_subscribe_close(struct wamp_state *s);
 
@@ -89 +113 @@
 void wamp_broker_publish_inf(wamp_broker_t *broker, uint16_t pubId, int deviceId,
         uint16_t devType, uint8_t epc, uint8_t pdc, uint8_t *p_edt);
+void wamp_broker_publish_pin(wamp_broker_t *broker, uint16_t pubId, int deviceId,
+        int pinno, uint16_t value);
 
 #endif // WAMP_BROKER_H

uKadecot/trunk/src/ukadecot/main.c

@@ -1 +1 @@
 /*
  *  TOPPERS ECHONET Lite Communication Middleware
- * 
+ *
  *  Copyright (C) 2014 Cores Co., Ltd. Japan
- * 
+ *
  *  上記著作権者は，以下の(1)〜(4)の条件を満たす場合に限り，本ソフトウェ
  *  ア（本ソフトウェアを改変したものを含む．以下同じ）を使用・複製・改
@@ -26 +26 @@
  *      由に基づく請求からも，上記著作権者およびTOPPERSプロジェクトを
  *      免責すること．
- * 
+ *
  *  本ソフトウェアは，無保証で提供されているものである．上記著作権者お
  *  よびTOPPERSプロジェクトは，本ソフトウェアに関して，特定の使用目的
@@ -32 +32 @@
  *  アの利用により直接的または間接的に生じたいかなる損害に関しても，そ
  *  の責任を負わない．
- * 
+ *
  *  @(#) $Id$
  */
 
-/* 
+/*
  *  サンプルプログラム(1)の本体
  */
@@ -64 +64 @@
 #include "data_flash.h"
 
-uint8_t mac_addr[6] = { 0x12, 0x34, 0x56, 0x78, 0x9A, 0xB8 };
+uint8_t mac_addr[6] = {0x12, 0x34, 0x56, 0x78, 0x9A, 0xB8};
 bool_t dhcp_enable = true;
 
@@ -97 +97 @@
 {
         /* サイズが１以外は受け付けない */
-        if(size != 1)
+        if (size != 1)
                 return 0;
 
         *anno = *((uint8_t*)item->exinf) != *((uint8_t*)src);
 
-        switch(*(uint8_t *)src){
+        switch (*(uint8_t *)src) {
         /* ONの場合 */
         case 0x30:
@@ -129 +129 @@
 {
         /* サイズが2以外は受け付けない */
-        if(size != 2)
+        if (size != 2)
                 return 0;
 
-        if((*(uint16_t *)src >= 0x0) && (*(uint16_t *)src <= 0x3ec)){
+        if ((*(uint16_t *)src >= 0x0) && (*(uint16_t *)src <= 0x3ec)) {
                 *((uint16_t *)item->exinf) = *((uint16_t *)src);
                 /* TODO: このの場合の処理*/
         }
         /* 上記以外は受け付けない */
-        else{
+        else {
                 return 0;
         }
@@ -150 +150 @@
 {
         /* サイズが１以外は受け付けない */
-        if(size != 1)
+        if (size != 1)
                 return 0;
 
         *anno = *((uint8_t *)item->exinf) != *((uint8_t *)src);
 
-        switch(*(uint8_t *)src){
+        switch (*(uint8_t *)src) {
         /* 異常発生ありの場合 */
         case 0x41:
@@ -177 +177 @@
         uint8_t *p_src;
 
-        if(size != 2)
+        if (size != 2)
                 return 0;
 
@@ -196 +196 @@
         uint8_t *p_dst;
 
-        if(size != 2)
+        if (size != 2)
                 return 0;
 
@@ -214 +214 @@
         uint8_t *p_src;
 
-        if(size != 4)
+        if (size != 4)
                 return 0;
 
@@ -234 +234 @@
         uint8_t *p_dst;
 
-        if(size != 4)
+        if (size != 4)
                 return 0;
 
@@ -305 +305 @@
 
         ret2 = get_tim(&now);
-        if (ret2 != E_OK){
+        if (ret2 != E_OK) {
                 syslog(LOG_ERROR, "get_tim");
                 PT_EXIT(&main_pt);
         }
 
-        for(;;){
+        for (;;) {
                 prev = now;
 
@@ -320 +320 @@
                 PT_WAIT_UNTIL(&main_pt, (((ret = ecn_prcv_esv(&esv)) == E_OK) || (ret == E_BRK)
                         || ((ret = timer_expired(&main_pt_timer) ? E_TMOUT : E_WBLK) == E_TMOUT)));
-                if ((ret != E_OK) && (ret != E_BRK) && (ret != E_TMOUT)){
+                if ((ret != E_OK) && (ret != E_BRK) && (ret != E_TMOUT)) {
                         syslog(LOG_ERROR, "ecn_trcv_esv");
                         PT_EXIT(&main_pt);
@@ -326 +326 @@
 
                 ret2 = get_tim(&now);
-                if (ret2 != E_OK){
+                if (ret2 != E_OK) {
                         syslog(LOG_ERROR, "get_tim");
                         PT_EXIT(&main_pt);
@@ -341 +341 @@
                         /* 領域解放 */
                         ret = ecn_rel_esv(esv);
-                        if (ret != E_OK){
+                        if (ret != E_OK) {
                                 syslog(LOG_ERROR, "ECNL ecn_rel_esv result = %d", ret);
                                 PT_EXIT(&main_pt);
@@ -348 +348 @@
                 /* 応答電文待ちの割り込みの場合 */
                 else if (ret == E_BRK) {
-                        ECN_FBS_ID msg = { (T_ECN_FST_BLK *)esv };
+                        ECN_FBS_ID msg = {(T_ECN_FST_BLK *)esv};
                         bool_t rel_msg = true;
                         switch (msg.ptr->hdr.type) {
-                        case 0: 
+                        case 0:
                                 rel_msg = main_wbs_msg(msg);
                                 break;
@@ -360 +360 @@
                                 /* 応答電文待ちの割り込みデータ取得 */
                                 ret = ecn_get_brk_dat(esv, brkdat, sizeof(brkdat), &len);
-                                if (ret != E_OK){
+                                if (ret != E_OK) {
                                         syslog(LOG_ERROR, "ecn_get_brk_dat");
                                         PT_EXIT(&main_pt);
@@ -373 +373 @@
                         if (rel_msg) {
                                 ret = ecn_rel_esv(esv);
-                                if (ret != E_OK){
+                                if (ret != E_OK) {
                                         syslog(LOG_ERROR, "BRK ecn_rel_esv msg = %p, type = %d, result = %d", esv, msg.ptr->hdr.type, ret);
                                         PT_EXIT(&main_pt);
@@ -384 +384 @@
 
                 /* キューに溜まったメッセージを処理 */
-                while(main_wbs_que_msg());
+                while (main_wbs_que_msg());
         }
 
@@ -400 +400 @@
 }
 
-bool_t main_btn1_state;
-int main_btn1_count = 0;
-bool_t main_btn2_state;
-int main_btn2_count = 0;
+typedef struct gpio_state {
+        bool_t state;
+        int count;
+} gpio_state_t;
+
+gpio_state_t main_gpio[2/*btn1, btn2*/ + 14/*arduino pin*/];
+
+#define MAIN_GPIO_BTN1 0
+#define MAIN_GPIO_BTN2 1
+#define MAIN_GPIO_ARDUINO_PIN0 2
+#define MAIN_GPIO_COUNT (sizeof(main_gpio) / sizeof(main_gpio[0]))
+
+typedef struct analog_state {
+        int subscriptionId;
+        int pinno;
+        bool_t state;
+        int count;
+        uint16_t threshold;
+} analog_state_t;
+
+analog_state_t main_analog[16];
+
+#define MAIN_ANALOG_COUNT (sizeof(main_analog) / sizeof(main_analog[0]))
+
+int main_gpio_pubid;
 
 enum request_info_state_t {
@@ -430 +451 @@
 wamp_state_t wamp;
 
+#define MAIN_REQUEST_INFOS_COUNT (sizeof(request_infos) / sizeof(request_infos[0]))
+
 /*
  * 初期化
@@ -448 +471 @@
 
         ret = data_flash_init();
-        while(ret == E_OK){
+        while (ret == E_OK) {
                 ret = data_flash_read(0, data);
-                if(ret != E_OK){
+                if (ret != E_OK) {
                         break;
                 }
@@ -463 +486 @@
         }
 
-        for(i = 0, j = 0; i < sizeof(mac_addr); i++){
+        for (i = 0, j = 0; i < sizeof(mac_addr); i++) {
                 c = mac_addr[i] >> 4;
                 data[j++] = (c < 10) ? ('0' + c) : ('A' - 10 + c);
@@ -489 +512 @@
         btn1 = sil_reb_mem((uint8_t *)0x0008C04A);
         /*btn1 = sil_reb_mem((uint8_t *)0x0008C040);*/
-        btn2 = sil_reb_mem((uint8_t *) 0x0008C040);
-        main_btn1_state = (btn1 & 0x80/*0x0x20*/) != 0;
-        main_btn2_state = (btn2 & 0x80) != 0;
-
-        for (i = 0; i< sizeof(request_infos) / sizeof(request_infos[0]); i++) {
+        btn2 = sil_reb_mem((uint8_t *)0x0008C040);
+        main_gpio[MAIN_GPIO_BTN1].state = (btn1 & 0x80/*0x0x20*/) != 0;
+        main_gpio[MAIN_GPIO_BTN2].state = (btn2 & 0x80) != 0;
+        for (i = MAIN_GPIO_ARDUINO_PIN0; i < MAIN_GPIO_COUNT; i++) {
+                arduino_digital_value_t dval;
+                arduino_digitalRead(i - MAIN_GPIO_ARDUINO_PIN0, &dval);
+                main_gpio[i].state = dval == ARDUINO_DIGITAL_VALUE_HIGH;
+        }
+
+        for (i = 0; i < MAIN_ANALOG_COUNT; i++) {
+                main_analog[i].state = true; /* たぶんプルアップされている */
+        }
+
+        for (i = 0; i < MAIN_REQUEST_INFOS_COUNT; i++) {
                 request_infos[i].timer = TMO_FEVR;
         }
@@ -506 +538 @@
         TMO timer = main_timer, temp;
 
-        for (i = 0; i< sizeof(request_infos) / sizeof(request_infos[0]); i++) {
+        for (i = 0; i < sizeof(request_infos) / sizeof(request_infos[0]); i++) {
                 temp = request_infos[i].timer;
                 if (temp != TMO_FEVR) {
@@ -528 +560 @@
         if (main_timer != TMO_FEVR) {
                 main_timer -= interval;
-                if(main_timer < 0){
+                if (main_timer < 0) {
                         main_timer = 0;
                 }
         }
 
-        for (i = 0; i< sizeof(request_infos) / sizeof(request_infos[0]); i++) {
+        for (i = 0; i < sizeof(request_infos) / sizeof(request_infos[0]); i++) {
                 temp = request_infos[i].timer;
                 if (temp != TMO_FEVR) {
                         temp -= interval;
-                        if(temp < 0){
+                        if (temp < 0) {
                                 temp = 0;
                         }
@@ -554 +586 @@
         request_info_t *request_info = &request_infos[0];
 
-        switch(esv->hdr.edata.esv){
+        switch (esv->hdr.edata.esv) {
         case ESV_SET_RES:
         case ESV_SET_C_SNA:
@@ -562 +594 @@
                 }
 
-                switch(request_info->state){
+                switch (request_info->state) {
                 case request_info_state_kadecot_set:
                         main_kadecot_set_res(esv);
@@ -578 +610 @@
                 }
 
-                switch(request_info->state){
+                switch (request_info->state) {
                 case request_info_state_kadecot_get:
                         main_kadecot_get_res(esv);
@@ -594 +626 @@
                 }
 
-                switch(request_info->state){
+                switch (request_info->state) {
                 case request_info_state_ecnl_setget:
                         main_ecnl_setget_res(esv);
@@ -621 +653 @@
                 return false;
         }
-        
+
         wamp_put_msg(&wamp, msg, ((ID *)msg.ptr->_gap)[0]);
         return true;
@@ -660 +692 @@
         }
 
-        switch(cmd){
+        switch (cmd) {
         case ECN_INM_GET_DEVICE_LIST_RES:
                 main_get_device_list_res(msg);
@@ -678 +710 @@
 static void main_break_wait(uint8_t *brkdat, int32_t len)
 {
-        switch(main_state){
+        switch (main_state) {
         case main_state_start:
                 main_start_service();
@@ -700 +732 @@
         data[0] = 0x01;
         ret = ecn_brk_wai(data, sizeof(data));
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_brk_wai");
         }
@@ -720 +752 @@
         /* ECHONETミドルウェアを起動 */
         ret = ecn_sta_svc();
-        if(ret != E_OK)
+        if (ret != E_OK)
                 return;
 }
@@ -739 +771 @@
         }
 
-        for (i = 0; i< sizeof(request_infos) / sizeof(request_infos[0]); i++) {
+        for (i = 0; i < sizeof(request_infos) / sizeof(request_infos[0]); i++) {
                 temp = request_infos[i].timer;
                 if (temp != 0)
@@ -750 +782 @@
 static void main_btn1_change(bool_t push);
 static void main_btn2_change(bool_t push);
+static void main_gpio_change(int pinno, uint16_t high);
 static ER main_search_device();
 
 static void main_btn_timeout()
 {
-        uint8_t btn1, btn2;
-
-        if(main_timer != 0)
-                return;
-
-        switch(main_state){
+        gpio_state_t *gpio;
+        analog_state_t *analog;
+        arduino_digital_value_t dval;
+        int aval;
+        bool_t val;
+        int i;
+
+        if (main_timer != 0)
+                return;
+
+        switch (main_state) {
         case main_state_idle:
                 /* 10ms後にボタン状態を確認 */
@@ -766 +804 @@
                 arduino_tick();
 
-                /* ボタン状態読み込み */
-                btn1 = sil_reb_mem((uint8_t *)0x0008C04A);
-                /*btn1 = sil_reb_mem((uint8_t *)0x0008C040);*/
-                btn2 = sil_reb_mem((uint8_t *) 0x0008C040);
-
-                /* ボタン１の処理 */
-                if(((btn1 & 0x80/*0x20*/) != 0) && !main_btn1_state){
-                        main_btn1_count++;
-                        if(main_btn1_count > 10){
-                                main_btn1_count = 0;
-                                main_btn1_state = true;
-
-                                main_btn1_change(true);
+                for (i = 0; i < MAIN_GPIO_COUNT; i++) {
+                        gpio = &main_gpio[i];
+
+                        /* GPIO状態読み込み */
+                        switch (i) {
+                        case MAIN_GPIO_BTN1:
+                                val = (sil_reb_mem((uint8_t *)0x0008C04A) & 0x80) != 0;
+                                /*val = (sil_reb_mem((uint8_t *)0x0008C040) & 0x20) != 0;*/
+                                break;
+                        case MAIN_GPIO_BTN2:
+                                val = (sil_reb_mem((uint8_t *)0x0008C040) & 0x80) != 0;
+                                break;
+                        default:
+                                arduino_digitalRead(i - MAIN_GPIO_ARDUINO_PIN0, &dval);
+                                val = dval == ARDUINO_DIGITAL_VALUE_HIGH;
+                                break;
                         }
-                }
-                else if(((btn1 & 0x80/*0x20*/) == 0) && main_btn1_state){
-                        main_btn1_count++;
-                        if(main_btn1_count > 10){
-                                main_btn1_count = 0;
-                                main_btn1_state = false;
-
-                                main_btn1_change(false);
+
+                        if (val && !gpio->state) {
+                                gpio->count++;
+                                if (gpio->count > 10) {
+                                        gpio->count = 0;
+                                        gpio->state = true;
+
+                                        switch (i) {
+                                        case MAIN_GPIO_BTN1:
+                                                main_btn1_change(true);
+                                                break;
+                                        case MAIN_GPIO_BTN2:
+                                                main_btn2_change(true);
+                                                break;
+                                        default:
+                                                main_gpio_change(i - MAIN_GPIO_ARDUINO_PIN0, 1);
+                                                break;
+                                        }
+                                }
                         }
-                }
-                else{
-                        main_btn1_count = 0;
-                }
-
-                /* ボタン２の処理 */
-                if(((btn2 & 0x80) != 0) && !main_btn2_state){
-                        main_btn2_count++;
-                        if(main_btn2_count > 10){
-                                main_btn2_count = 0;
-                                main_btn2_state = true;
-
-                                main_btn2_change(true);
+                        else if (!val && gpio->state) {
+                                gpio->count++;
+                                if (gpio->count > 10) {
+                                        gpio->count = 0;
+                                        gpio->state = false;
+
+                                        switch (i) {
+                                        case MAIN_GPIO_BTN1:
+                                                main_btn1_change(false);
+                                                break;
+                                        case MAIN_GPIO_BTN2:
+                                                main_btn2_change(false);
+                                                break;
+                                        default:
+                                                main_gpio_change(i - MAIN_GPIO_ARDUINO_PIN0, 0);
+                                                break;
+                                        }
+                                }
                         }
-                }
-                else if(((btn2 & 0x80) == 0) && main_btn2_state){
-                        main_btn2_count++;
-                        if(main_btn2_count > 10){
-                                main_btn2_count = 0;
-                                main_btn2_state = false;
-
-                                main_btn2_change(false);
+                        else {
+                                gpio->count = 0;
                         }
                 }
-                else{
-                        main_btn2_count = 0;
-                }
-                break;
-        }
+
+                for (i = 0; i < MAIN_ANALOG_COUNT; i++) {
+                        analog = &main_analog[i];
+
+                        if (analog->subscriptionId == 0)
+                                continue;
+
+                        /* GPIO状態読み込み */
+                        arduino_analogRead(analog->pinno, &aval);
+
+                        if (analog->state)
+                                val = aval < analog->threshold;
+                        else
+                                val = aval > analog->threshold;
+
+                        if (val && !analog->state) {
+                                analog->count++;
+                                if (analog->count > 10) {
+                                        analog->count = 0;
+                                        analog->state = true;
+
+                                        main_gpio_change(analog->pinno, aval);
+                                }
+                        }
+                        else if (val && analog->state) {
+                                analog->count++;
+                                if (analog->count > 10) {
+                                        analog->count = 0;
+                                        analog->state = false;
+
+                                        main_gpio_change(analog->pinno, aval);
+                                }
+                        }
+                        else {
+                                analog->count = 0;
+                        }
+                }
+                break;
+        }
+}
+
+ER main_add_threshold(int subscriptionId, int pinno, uint16_t threshold)
+{
+        int i, aval;
+        analog_state_t *analog;
+
+        if ((pinno < 14) || (pinno > 19))
+                return E_PAR;
+
+        for (i = 0; i < MAIN_ANALOG_COUNT; i++) {
+                analog = &main_analog[i];
+                if (analog->subscriptionId != 0)
+                        continue;
+
+                analog->subscriptionId = subscriptionId;
+                analog->pinno = pinno;
+                analog->threshold = threshold;
+
+                arduino_analogRead(analog->pinno, &aval);
+
+                analog->state = (aval < analog->threshold);
+                analog->count = 0;
+
+                return E_OK;
+        }
+
+        return E_NOMEM;
+}
+
+ER main_del_threshold(int subscriptionId)
+{
+        int i;
+        analog_state_t *analog;
+
+        for (i = 0; i < MAIN_ANALOG_COUNT; i++) {
+                analog = &main_analog[i];
+                if (analog->subscriptionId != subscriptionId)
+                        continue;
+
+                analog->subscriptionId = 0;
+
+                return E_OK;
+        }
+
+        return E_OBJ;
 }
 
@@ -829 +960 @@
 
         ret = ecn_itr_ini(&enm, esv);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_itr_ini");
                 return;
         }
 
-        for(;;) {
-                while((ret = ecn_itr_nxt(&enm, &epc, &pdc, p_edt)) == E_OK) {
+        for (;;) {
+                while ((ret = ecn_itr_nxt(&enm, &epc, &pdc, p_edt)) == E_OK) {
                         switch (epc) {
                         case 0x80:
@@ -843 +974 @@
                         }
                 }
-                if(ret != E_BOVR){
+                if (ret != E_BOVR) {
                         syslog(LOG_ERROR, "ecn_itr_nxt");
                         break;
                 }
-                if(enm.is_eof)
+                if (enm.is_eof)
                         break;
         }
@@ -858 +989 @@
 {
         /* 押されて戻った時に処理する */
-        if(push)
+        if (push)
                 return;
 
@@ -873 +1004 @@
 
 /*
+ * GPIO状態変化処理
+ */
+static void main_gpio_change(int pinno, uint16_t value)
+{
+        main_gpio_pubid++;
+
+        wamp_broker_publish_pin(&wamp.broker, main_gpio_pubid, 1, pinno, value);
+}
+
+/*
  * 機器の検索
  */
@@ -882 +1023 @@
         /* 機器の検索 */
         ret = ecn_esv_inf_req(&esv, EOBJ_NULL, 0xD6);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_esv_inf_req");
                 return ret;
@@ -889 +1030 @@
         /* 電文送信 */
         ret = ecn_snd_esv(esv);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_snd_esv");
                 return ret;
@@ -906 +1047 @@
 
         ret = psnd_dtq(WEBSOCKET_MBXID, (intptr_t)msg.ptr);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "psnd_dtq(WEBSOCKET_MBXID) : result=%d", ret);
                 _ecn_fbs_del(msg);
@@ -923 +1064 @@
         ER ret;
 
-        if(request_info->requestId != 0)
+        if (request_info->requestId != 0)
                 return E_QOVR;
 
         /* 機器の検索 */
         ret = main_search_device();
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 return ret;
         }
@@ -948 +1089 @@
         for (;;) {
                 ret = ecn_agent_get_device_list(ECHONET_API_MAILBOX, request_info->requestId, &req);
-                if(ret != E_OK){
+                if (ret != E_OK) {
                         syslog(LOG_ERROR, "ecn_agent_get_device_list");
                         break;
@@ -1005 +1146 @@
         ECN_FBS_ID req;
 
-        if(request_info->requestId != 0)
+        if (request_info->requestId != 0)
                 return E_QOVR;
 
         ret = ecn_udp_get_ipaddr(ECHONET_API_MAILBOX, requestId, addrid, &req);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 return ret;
         }
@@ -1063 +1204 @@
         ECN_FBS_ID req;
 
-        if(request_info->requestId != 0)
+        if (request_info->requestId != 0)
                 return E_QOVR;
 
         ret = ecn_agent_get_device_info(ECHONET_API_MAILBOX, requestId, eobjid, &req);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 return ret;
         }
@@ -1118 +1259 @@
         T_EDATA *esv;
 
-        if(request_info->requestId != 0)
+        if (request_info->requestId != 0)
                 return E_QOVR;
 
         /* プロパティ取得電文作成 */
         ret = ecn_esv_get(&esv, eobjid, epc);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_esv_get");
                 return ret;
@@ -1130 +1271 @@
         /* 電文送信 */
         ret = ecn_snd_esv(esv);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_snd_esv");
                 return ret;
@@ -1156 +1297 @@
         T_ENUM_EPC enm;
 
-        if(request_info->eobjid != eobjid)
+        if (request_info->eobjid != eobjid)
                 return;
 
@@ -1166 +1307 @@
 
         ret = ecn_itr_ini(&enm, esv);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_itr_ini");
                 return;
         }
 
-        for(;;) {
-                while((ret = ecn_itr_nxt(&enm, &epc, &pdc, p_edt)) == E_OK) {
+        for (;;) {
+                while ((ret = ecn_itr_nxt(&enm, &epc, &pdc, p_edt)) == E_OK) {
                         if (request_info->epc == epc) {
                                 wamp_dealer_kadecot_get(dealer, eobjid, epc, pdc, p_edt);
                         }
                 }
-                if(ret != E_BOVR){
+                if (ret != E_BOVR) {
                         syslog(LOG_ERROR, "ecn_itr_nxt");
                         break;
                 }
-                if(enm.is_eof)
+                if (enm.is_eof)
                         break;
         }
@@ -1193 +1334 @@
         T_EDATA *esv;
 
-        if(request_info->requestId != 0)
+        if (request_info->requestId != 0)
                 return E_QOVR;
 
         /* プロパティ取得電文作成 */
         ret = ecn_esv_setc(&esv, eobjid, epc, pdc, edt);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_esv_setc");
                 return ret;
@@ -1205 +1346 @@
         /* 電文送信 */
         ret = ecn_snd_esv(esv);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_snd_esv");
                 return ret;
@@ -1234 +1375 @@
                 return;
 
-        if(request_info->eobjid != eobjid)
+        if (request_info->eobjid != eobjid)
                 return;
 
@@ -1243 +1384 @@
 
         ret = ecn_itr_ini(&enm, esv);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_itr_ini");
                 return;
         }
 
-        for(;;) {
-                while((ret = ecn_itr_nxt(&enm, &epc, &pdc, p_edt)) == E_OK) {
+        for (;;) {
+                while ((ret = ecn_itr_nxt(&enm, &epc, &pdc, p_edt)) == E_OK) {
                         if (request_info->epc == epc) {
                                 wamp_dealer_kadecot_set(dealer, eobjid, epc);
                         }
                 }
-                if(ret != E_BOVR){
+                if (ret != E_BOVR) {
                         syslog(LOG_ERROR, "ecn_itr_nxt");
                         break;
                 }
-                if(enm.is_eof)
+                if (enm.is_eof)
                         break;
         }
@@ -1268 +1409 @@
         ER ret;
 
-        if(request_info->requestId != 0)
+        if (request_info->requestId != 0)
                 return E_QOVR;
 
         /* 電文送信 */
         ret = ecn_snd_esv(esv);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_snd_esv");
                 return ret;
@@ -1304 +1445 @@
         ER ret;
 
-        if(request_info->requestId != 0)
+        if (request_info->requestId != 0)
                 return E_QOVR;
 
         /* 電文送信 */
         ret = ecn_snd_esv(esv);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_snd_esv");
                 return ret;
@@ -1340 +1481 @@
         ER ret;
 
-        if(request_info->requestId != 0)
+        if (request_info->requestId != 0)
                 return E_QOVR;
 
         /* 電文送信 */
         ret = ecn_snd_esv(esv);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_snd_esv");
                 return ret;
@@ -1375 +1516 @@
         struct wamp_dealer *dealer = request_info->dealer;
 
-        switch(request_info->state) {
+        switch (request_info->state) {
         case request_info_state_search_device:
                 main_search_device_timeout();
@@ -1422 +1563 @@
 
         ret = ecn_itr_ini(&enm, esv);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_itr_ini");
                 return;
         }
 
-        for(;;) {
-                while((ret = ecn_itr_nxt(&enm, &epc, &pdc, p_edt)) == E_OK) {
+        for (;;) {
+                while ((ret = ecn_itr_nxt(&enm, &epc, &pdc, p_edt)) == E_OK) {
                         wamp_broker_publish_inf(&wamp.broker, esv->hdr.ecn_hdr.tid, eobjid,
                                 devType, epc, pdc, p_edt);
                 }
-                if(ret != E_BOVR){
+                if (ret != E_BOVR) {
                         syslog(LOG_ERROR, "ecn_itr_nxt");
                         break;
                 }
-                if(enm.is_eof)
-                        break;
-        }
-}
+                if (enm.is_eof)
+                        break;
+        }
+}

uKadecot/trunk/src/ukadecot/main.h

@@ -191 +191 @@
 ER main_ecnl_set(unsigned int requestId, struct wamp_dealer *dealer, ID eobjid, T_EDATA *esv);
 ER main_ecnl_setget(unsigned int requestId, struct wamp_dealer *dealer, ID eobjid, T_EDATA *esv);
+ER main_add_threshold(int subscriptionId, int pinno, uint16_t threshold);
+ER main_del_threshold(int subscriptionId);
 
 #endif /* TOPPERS_MACRO_ONLY */

uKadecot/trunk/uip/apps/webserver/httpd.c

@@ -89 +89 @@
 #endif
 
+#define MAX(a, b) ((a > b) ? a : b)
+
+union temp_type_t {
+        char binary[sizeof(http_content_type_binary)];
+        char html[sizeof(http_content_type_html)];
+        char css[sizeof(http_content_type_css)];
+        char js[sizeof(http_content_type_js)];
+        char json[sizeof(http_content_type_json)];
+        char png[sizeof(http_content_type_png)];
+        char gif[sizeof(http_content_type_gif)];
+        char jpg[sizeof(http_content_type_jpg)];
+        char svg[sizeof(http_content_type_svg)];
+        char plain[sizeof(http_content_type_plain)];
+};
+
+struct temp_buf_t{
+        char headers[MAX(sizeof(http_header_404), sizeof(http_header_200))
+                + sizeof(http_content_encoding_gzip)
+                + sizeof(union temp_type_t)
+        ];
+        char ws_headers[sizeof(http_header_101)
+                + sizeof(http_upgrade) + sizeof(((struct httpd_state *)0)->message.upgrade) + sizeof(http_crnl)
+                + sizeof(http_connection) + sizeof(((struct httpd_state *)0)->message.connection) + sizeof(http_crnl)
+                + sizeof(http_sec_websocket_accept) + sizeof(((struct httpd_state *)0)->message.response_key) + sizeof(http_crnl)
+                + sizeof(http_sec_websocket_protocol) + sizeof(((struct httpd_state *)0)->message.sec_websocket_protocol) + sizeof(http_crnl)
+                + sizeof(http_crnl)
+        ];
+};
+static char temp_buf[sizeof(struct temp_buf_t)];
+
 int httpd_strnicmp(const char *s1, const char *s2, size_t n)
 {
@@ -159 +189 @@
 PT_THREAD(send_headers(struct httpd_state *s, const char *statushdr))
 {
+  char *pos = temp_buf;
+  int len;
   char *ptr;
 
   PSOCK_BEGIN(&s->sout);
 
-  PSOCK_SEND_STR(&s->sout, statushdr);
-
-  PSOCK_SEND_STR(&s->sout, http_content_encoding_gzip);
+  len = strlen(statushdr);
+  memcpy(pos, statushdr, len); pos += len;
+
+  len = strlen(http_content_encoding_gzip);
+  memcpy(pos, http_content_encoding_gzip, len); pos += len;
 
   ptr = strrchr(s->message.request_url, ISO_period);
   if (ptr == NULL) {
-    PSOCK_SEND_STR(&s->sout, http_content_type_binary);
+    len = strlen(http_content_type_binary);
+    memcpy(pos, http_content_type_binary, len); pos += len;
   } else if (strncmp(http_html, ptr, 5) == 0 ||
     strncmp(http_shtml, ptr, 6) == 0) {
-    PSOCK_SEND_STR(&s->sout, http_content_type_html);
+    len = strlen(http_content_type_html);
+    memcpy(pos, http_content_type_html, len); pos += len;
   } else if (strncmp(http_css, ptr, 4) == 0) {
-    PSOCK_SEND_STR(&s->sout, http_content_type_css);
+    len = strlen(http_content_type_css);
+    memcpy(pos, http_content_type_css, len); pos += len;
   } else if (strncmp(http_js, ptr, 3) == 0) {
-    PSOCK_SEND_STR(&s->sout, http_content_type_js);
+    len = strlen(http_content_type_js);
+    memcpy(pos, http_content_type_js, len); pos += len;
   } else if (strncmp(http_json, ptr, 5) == 0) {
-    PSOCK_SEND_STR(&s->sout, http_content_type_json);
+    len = strlen(http_content_type_json);
+    memcpy(pos, http_content_type_json, len); pos += len;
   } else if (strncmp(http_png, ptr, 4) == 0) {
-    PSOCK_SEND_STR(&s->sout, http_content_type_png);
+    len = strlen(http_content_type_png);
+    memcpy(pos, http_content_type_png, len); pos += len;
   } else if (strncmp(http_gif, ptr, 4) == 0) {
-    PSOCK_SEND_STR(&s->sout, http_content_type_gif);
+    len = strlen(http_content_type_gif);
+    memcpy(pos, http_content_type_gif, len); pos += len;
   } else if (strncmp(http_jpg, ptr, 4) == 0) {
-    PSOCK_SEND_STR(&s->sout, http_content_type_jpg);
+    len = strlen(http_content_type_jpg);
+    memcpy(pos, http_content_type_jpg, len); pos += len;
   } else if (strncmp(http_svg, ptr, 4) == 0) {
-    PSOCK_SEND_STR(&s->sout, http_content_type_svg);
+    len = strlen(http_content_type_svg);
+    memcpy(pos, http_content_type_svg, len); pos += len;
   } else {
-    PSOCK_SEND_STR(&s->sout, http_content_type_plain);
-  }
+    len = strlen(http_content_type_plain);
+    memcpy(pos, http_content_type_plain, len); pos += len;
+  }
+  *pos = '\0';
+
+  PSOCK_SEND(&s->sout, temp_buf, pos - temp_buf);
+
   PSOCK_END(&s->sout);
 }
@@ -222 +270 @@
 PT_THREAD(send_ws_headers(struct httpd_state *s, const char *statushdr))
 {
+  char *pos = temp_buf;
+  int len;
+
   PSOCK_BEGIN(&s->sout);
 
-  PSOCK_SEND_STR(&s->sout, statushdr);
-
-  PSOCK_SEND_STR(&s->sout, http_upgrade);
-  PSOCK_SEND_STR(&s->sout, s->message.upgrade);
-  PSOCK_SEND_STR(&s->sout, http_crnl);
-
-  PSOCK_SEND_STR(&s->sout, http_connection);
-  PSOCK_SEND_STR(&s->sout, s->message.connection);
-  PSOCK_SEND_STR(&s->sout, http_crnl);
-
-  PSOCK_SEND_STR(&s->sout, http_sec_websocket_accept);
-  PSOCK_SEND_STR(&s->sout, s->message.response_key);
-  PSOCK_SEND_STR(&s->sout, http_crnl);
-
-  PSOCK_SEND_STR(&s->sout, http_sec_websocket_protocol);
-  PSOCK_SEND_STR(&s->sout, s->message.sec_websocket_protocol);
-  PSOCK_SEND_STR(&s->sout, http_crnl);
-
-  PSOCK_SEND_STR(&s->sout, http_crnl);
+  len = strlen(statushdr);
+  memcpy(pos, statushdr, len); pos += len;
+
+  len = strlen(http_upgrade);
+  memcpy(pos, http_upgrade, len); pos += len;
+  len = strlen(s->message.upgrade);
+  memcpy(pos, s->message.upgrade, len); pos += len;
+  len = strlen(http_crnl);
+  memcpy(pos, http_crnl, len); pos += len;
+
+  len = strlen(http_connection);
+  memcpy(pos, http_connection, len); pos += len;
+  len = strlen(s->message.connection);
+  memcpy(pos, s->message.connection, len); pos += len;
+  len = strlen(http_crnl);
+  memcpy(pos, http_crnl, len); pos += len;
+
+  len = strlen(http_sec_websocket_accept);
+  memcpy(pos, http_sec_websocket_accept, len); pos += len;
+  len = strlen(s->message.response_key);
+  memcpy(pos, s->message.response_key, len); pos += len;
+  len = strlen(http_crnl);
+  memcpy(pos, http_crnl, len); pos += len;
+
+  len = strlen(http_sec_websocket_protocol);
+  memcpy(pos, http_sec_websocket_protocol, len); pos += len;
+  len = strlen(s->message.sec_websocket_protocol);
+  memcpy(pos, s->message.sec_websocket_protocol, len); pos += len;
+  len = strlen(http_crnl);
+  memcpy(pos, http_crnl, len); pos += len;
+
+  len = strlen(http_crnl);
+  memcpy(pos, http_crnl, len); pos += len;
+  *pos = '\0';
+
+  PSOCK_SEND(&s->sout, temp_buf, pos - temp_buf);
 
   PSOCK_END(&s->sout);