Changeset 364 for asp3_tinet_ecnl_arm

Timestamp:

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

Author:

coas-nagasima

Message:

TINETとSocket APIなどを更新

Location:

asp3_tinet_ecnl_arm/trunk

Files:

• app1_usb_watt_meter/.cproject (modified) (7 diffs)
• app1_usb_watt_meter/Debug/Makefile (modified) (9 diffs)
• app1_usb_watt_meter/DebugEnbt/Makefile (modified) (9 diffs)
• app1_usb_watt_meter/DebugEther/Makefile (modified) (9 diffs)
• app1_usb_watt_meter/src/client.c (modified) (14 diffs)
• app1_usb_watt_meter/src/client.h (modified) (1 diff)
• app1_usb_watt_meter/src/echonet_main.c (modified) (43 diffs)
• app1_usb_watt_meter/src/jsonsl.c (added)
• app1_usb_watt_meter/src/jsonsl.h (added)
• app1_usb_watt_meter/src/main.c (modified) (8 diffs)
• app1_usb_watt_meter/src/main.cfg (modified) (1 diff)
• app2_light/.cproject (modified) (4 diffs)
• app2_light/Debug/Makefile (modified) (7 diffs)
• app2_light/DebugEther/Makefile (modified) (7 diffs)
• app2_light/src/echonet_main.c (modified) (45 diffs)
• app2_light/src/main.c (modified) (5 diffs)
• app2_light/src/main.cfg (modified) (1 diff)
• app3_human_detec/.cproject (modified) (4 diffs)
• app3_human_detec/Debug/Makefile (modified) (7 diffs)
• app3_human_detec/DebugEther/Makefile (modified) (7 diffs)
• app3_human_detec/src/echonet_main.c (modified) (38 diffs)
• app3_human_detec/src/main.c (modified) (5 diffs)
• app3_human_detec/src/main.cfg (modified) (1 diff)
• app4_aircon/.cproject (modified) (4 diffs)
• app4_aircon/Debug/Makefile (modified) (8 diffs)
• app4_aircon/DebugEther/Makefile (modified) (8 diffs)
• app4_aircon/src/echonet_main.c (modified) (62 diffs)
• app4_aircon/src/main.c (modified) (5 diffs)
• app4_aircon/src/main.cfg (modified) (1 diff)
• app5_temp_sensor/.cproject (modified) (4 diffs)
• app5_temp_sensor/Debug/Makefile (modified) (8 diffs)
• app5_temp_sensor/DebugEther/Makefile (modified) (8 diffs)
• app5_temp_sensor/src/echonet_main.c (modified) (61 diffs)
• app5_temp_sensor/src/main.c (modified) (5 diffs)
• app5_temp_sensor/src/main.cfg (modified) (1 diff)
• app6_hot_water_pot/.cproject (modified) (2 diffs)
• app6_hot_water_pot/Debug/Makefile (modified) (7 diffs)
• app6_hot_water_pot/DebugEther/Makefile (modified) (7 diffs)
• app6_hot_water_pot/src/echonet_main.c (modified) (44 diffs)
• app6_hot_water_pot/src/main.c (modified) (5 diffs)
• app6_hot_water_pot/src/main.cfg (modified) (1 diff)
• app7_buzzer/.cproject (modified) (4 diffs)
• app7_buzzer/Debug/Makefile (modified) (7 diffs)
• app7_buzzer/DebugEther/Makefile (modified) (7 diffs)
• app7_buzzer/src/echonet_main.c (modified) (38 diffs)
• app7_buzzer/src/main.c (modified) (5 diffs)
• app7_buzzer/src/main.cfg (modified) (1 diff)
• asp3_dcre/.cproject (modified) (3 diffs)
• asp3_dcre/Debug/Makefile (modified) (10 diffs)
• asp3_dcre/gdic/adafruit_ssd1306 (added)
• asp3_dcre/gdic/adafruit_ssd1306/Makefile.config (added)
• asp3_dcre/gdic/adafruit_ssd1306/adafruit_ssd1306.c (added)
• asp3_dcre/gdic/adafruit_ssd1306/adafruit_ssd1306.h (added)
• asp3_dcre/gdic/adafruit_st7735/adafruit_st7735.c (modified) (2 diffs)
• asp3_dcre/gdic/adafruit_st7735/adafruit_st7735.h (modified) (5 diffs)
• asp3_dcre/mbed/hal/spi_api.h (modified) (1 diff)
• asp3_dcre/mbed/platform/mbed_rtc_time.c (modified) (2 diffs)
• asp3_dcre/mbed/targets/TARGET_RENESAS/TARGET_RZ_A1H/spi_api.c (modified) (1 diff)
• asp3_dcre/sample/Makefile (modified) (1 diff)
• asp3_dcre/syssvc/serial.h (modified) (1 diff)
• asp3_dcre/syssvc/tSerialAdapter.c (modified) (2 diffs)
• asp3_dcre/syssvc/tSerialPort.cdl (modified) (1 diff)
• asp3_dcre/syssvc/tSerialPortMain.c (modified) (2 diffs)
• asp3_dcre/tinet/Makefile.tinet (modified) (2 diffs)
• asp3_dcre/tinet/net/ethernet.h (modified) (3 diffs)
• asp3_dcre/tinet/net/net_asp.cfg (modified) (2 diffs)
• asp3_dcre/tinet/net/net_buf.c (modified) (10 diffs)
• asp3_dcre/tinet/netapp/dbg_cons.c (modified) (7 diffs)
• asp3_dcre/tinet/netapp/dhcp4_cli.c (modified) (2 diffs)
• asp3_dcre/tinet/netapp/wwws.c (modified) (2 diffs)
• asp3_dcre/tinet/netinet/icmp6.h (modified) (1 diff)
• asp3_dcre/tinet/netinet/in4_subr.c (modified) (1 diff)
• asp3_dcre/tinet/netinet/in_itron.h (modified) (2 diffs)
• asp3_dcre/tinet/netinet/tcp_input.c (modified) (1 diff)
• asp3_dcre/tinet/netinet/tcp_output.c (modified) (1 diff)
• asp3_dcre/tinet/netinet/tcp_usrreq.c (modified) (1 diff)
• asp3_dcre/tinet/netinet/udp_var.h (modified) (1 diff)
• asp3_dcre/tinet/netinet/udpn_input.c (modified) (5 diffs)
• asp3_dcre/tinet/netinet/udpn_usrreq.c (modified) (2 diffs)
• asp3_dcre/tinet/netinet/udpn_usrreq_nblk.c (modified) (1 diff)
• asp3_dcre/tinet/netinet6/in6_subr.c (modified) (2 diffs)
• asp3_dcre/tinet/netinet6/in6_var.h (modified) (1 diff)
• asp3_dcre/tinet/netinet6/nd6.c (modified) (2 diffs)
• asp3_dcre/tinet/netinet6/nd6.h (modified) (2 diffs)
• asp3_dcre/tinet/tcpip_sym.def (modified) (1 diff)
• asp3_dcre/tinet/tinet_asp.cfg (modified) (1 diff)
• bnep_bridge/.cproject (modified) (3 diffs)
• bnep_bridge/Debug/Makefile (modified) (6 diffs)
• bnep_bridge/src/main.c (modified) (4 diffs)
• btstack/.cproject (modified) (2 diffs)
• curl-7.57.0/.cproject (modified) (3 diffs)
• curl-7.57.0/lib/curl_config.h (modified) (3 diffs)
• curl-7.57.0/lib/mprintf.c (modified) (3 diffs)
• musl-1.1.18/.cproject (modified) (2 diffs)
• musl-1.1.18/arch/arm/syscall_arch.h (modified) (1 diff)
• musl-1.1.18/src/internal/syscall.h (modified) (2 diffs)
• ntshell/echonet/echonet.c (modified) (3 diffs)
• ntshell/echonet/echonet.h (modified) (4 diffs)
• ntshell/echonet/echonet.trb (modified) (1 diff)
• ntshell/echonet/echonet_asp.cfg (modified) (2 diffs)
• ntshell/echonet/echonet_rename.h (modified) (1 diff)
• ntshell/echonet/echonet_task.c (modified) (9 diffs)
• ntshell/echonet/echonet_task.h (modified) (1 diff)
• ntshell/echonet/echonet_udp6_task.c (modified) (7 diffs)
• ntshell/echonet/echonet_udp6_task.h (modified) (1 diff)
• ntshell/echonet/echonet_udp_task.c (modified) (7 diffs)
• ntshell/echonet/echonet_udp_task.h (modified) (1 diff)
• ntshell/fatfs/ffarch.h (modified) (1 diff)
• ntshell/lcd/draw_font.c (modified) (11 diffs)
• ntshell/lcd/draw_font.h (modified) (2 diffs)
• ntshell/lcd/misaki_font.c (modified) (5 diffs)
• ntshell/lcd/misaki_font.h (modified) (3 diffs)
• ntshell/lcd/shnm12_font.c (added)
• ntshell/lcd/shnm12_font.h (added)
• ntshell/lcd/shnm16_font.c (added)
• ntshell/lcd/shnm16_font.h (added)
• ntshell/src/echonet_app_config.h (modified) (1 diff)
• ntshell/src/fdtable.c (modified) (13 diffs)
• ntshell/src/net_misc.h (modified) (1 diff)
• ntshell/src/netcmd.c (modified) (6 diffs)
• ntshell/src/ntp_cli.c (modified) (1 diff)
• ntshell/src/ntshell_main.c (modified) (8 diffs)
• ntshell/src/ntshell_main.cfg (modified) (1 diff)
• ntshell/src/ntshell_main.h (modified) (3 diffs)
• ntshell/src/shellif.h (modified) (6 diffs)
• ntshell/src/socket_stub.c (modified) (24 diffs)
• ntshell/src/socket_stub.h (modified) (1 diff)
• ntshell/src/syscall.c (modified) (5 diffs)
• wolfssl-3.12.2/.cproject (modified) (4 diffs)
• wolfssl-3.12.2/src/internal.c (modified) (1 diff)
• wolfssl-3.12.2/user_settings.h (modified) (1 diff)
• zlib-1.2.11/.cproject (modified) (2 diffs)

asp3_tinet_ecnl_arm/trunk/app1_usb_watt_meter/.cproject

@@ -22 +22 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -59 +59 @@
                                                         <option id="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack.2041552637" name="Warn if stack size exceeds the limit (-Wstack-usage) (H')" superClass="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack" useByScannerDiscovery="false" value="100" valueType="string"/>
                                                         <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.1106389026" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-                                                        <builder buildPath="${workspace_loc:/app1_usb_watt_meter}/Debug" id="com.renesas.cdt.managedbuild.gcc.rz.builder.1499740602" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="false" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
+                                                        <builder buildPath="${workspace_loc:/app1_usb_watt_meter}/Debug" id="com.renesas.cdt.managedbuild.gcc.rz.builder.1499740602" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
                                                         <tool id="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler.473685659" name="Cross ARM GNU Assembler" superClass="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler">
                                                                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.600330630" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" useByScannerDiscovery="false" value="true" valueType="boolean"/>
@@ -127 +127 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -164 +164 @@
                                                         <option id="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack.504056262" name="Warn if stack size exceeds the limit (-Wstack-usage) (H')" superClass="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack" useByScannerDiscovery="false" value="100" valueType="string"/>
                                                         <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.211973441" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-                                                        <builder buildPath="${workspace_loc:/app1_usb_watt_meter}/DebugEther" id="com.renesas.cdt.managedbuild.gcc.rz.builder.559752886" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="false" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
+                                                        <builder buildPath="${workspace_loc:/app1_usb_watt_meter}/DebugEther" id="com.renesas.cdt.managedbuild.gcc.rz.builder.559752886" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
                                                         <tool id="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler.541834310" name="Cross ARM GNU Assembler" superClass="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler">
                                                                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1603061550" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" useByScannerDiscovery="false" value="true" valueType="boolean"/>
@@ -232 +232 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -269 +269 @@
                                                         <option id="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack.1222794445" name="Warn if stack size exceeds the limit (-Wstack-usage) (H')" superClass="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack" useByScannerDiscovery="false" value="100" valueType="string"/>
                                                         <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.1527919964" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-                                                        <builder buildPath="${workspace_loc:/app1_usb_watt_meter}/DebugEnbt" id="com.renesas.cdt.managedbuild.gcc.rz.builder.896433184" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="false" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
+                                                        <builder buildPath="${workspace_loc:/app1_usb_watt_meter}/DebugEnbt" id="com.renesas.cdt.managedbuild.gcc.rz.builder.896433184" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
                                                         <tool id="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler.893283254" name="Cross ARM GNU Assembler" superClass="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler">
                                                                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1741240748" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" useByScannerDiscovery="false" value="true" valueType="boolean"/>
@@ -341 +341 @@
                 </configuration>
         </storageModule>
+        <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
 </cproject>

asp3_tinet_ecnl_arm/trunk/app1_usb_watt_meter/Debug/Makefile

@@ -182 +182 @@
         CDEFS := -DTOPPERS_OMIT_TECS $(CDEFS)
 endif
-CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DECHONET_USE_MALLOC -DHAVE_CONFIG_H -DWOLFSSL_USER_SETTINGS -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
+CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DNOUSE_MPF_NET_BUF -DECHONET_USE_MALLOC -DHAVE_CONFIG_H -DWOLFSSL_USER_SETTINGS -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
 INCLUDES := -I. -I$(SRCDIR)/include -I$(SRCDIR) \
         -I$(SRCDIR)/../btstack/include \
@@ -196 +196 @@
         -I$(SRCDIR)/../curl-7.57.0 \
         $(INCLUDES)
-LDFLAGS := $(LDFLAGS) -Wl,-Map=$(OBJNAME).map,--cref -L.
+LDFLAGS := $(LDFLAGS) -L.
 LIBS := $(LIBS) $(CXXLIBS)
 CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES)
@@ -207 +207 @@
 APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o sdfs.o ccsbcs.o ntshell.o text_editor.o text_history.o usrcmd.o vtrecv.o vtsend.o ntlibc.o ntstdio.o ntopt.o syscall.o tlsf.o
 APPLDIRS := $(APPLDIRS) ../../ntshell/lcd
-APPL_COBJS := $(APPL_COBJS) draw_font.o misaki_font.o
+APPL_COBJS := $(APPL_COBJS) draw_font.o shnm12_font.o
+APPL_CFLAGS := $(APPL_CFLAGS) -DSHNM12_FONT
 
 #
@@ -220 +221 @@
 APPL_ASMOBJS :=
 ifdef USE_CXX
-        APPL_CXXOBJS := main.o ntshell_main.o echonet_main.o client.o
+        APPL_CXXOBJS := main.o ntshell_main.o echonet_main.o client.o jsonsl.o
         APPL_COBJS := $(APPL_COBJS)
 else
-        APPL_COBJS := $(APPL_COBJS) main.o ntshell_main.o echonet_main.o client.o
+        APPL_COBJS := $(APPL_COBJS) main.o ntshell_main.o echonet_main.o client.o jsonsl.o
 endif
 APPL_COBJS := $(APPL_COBJS) log_output.o vasyslog.o t_perror.o strerror.o
@@ -232 +233 @@
 endif
 
-
-#
-#  ネットワークサービスの定義
-#
-NO_USE_TINET_LIBRARY = true
-
-#  ネットワークインタフェースの選択、何れか一つ選択する。
-NET_IF = ether
-
-#  イーサネット・ディバイスドライバの選択
-NET_DEV = if_btusb
-
-#  ネットワーク層の選択
-#SUPPORT_INET6 = true
-SUPPORT_INET4 = true
-
-#  API に組込む機能の選択
-#API_CFG_IP4MAPPED_ADDR = true
-
-#  トランスポート層の選択
-SUPPORT_TCP = true
-SUPPORT_UDP = true
-
-# IGMPを有効に設定
-SUPPORT_IGMP = true
-
-#
-#  ネットワークサービスの Makefile のインクルード
-#
-include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+ifdef TINETDIR
+        #
+        #  ネットワークサービスの定義
+        #
+        NO_USE_TINET_LIBRARY = true
+
+        #  ネットワークインタフェースの選択、何れか一つ選択する。
+        NET_IF = ether
+
+        #  イーサネット・ディバイスドライバの選択
+        NET_DEV = if_btusb
+
+        #  ネットワーク層の選択
+        #SUPPORT_INET6 = true
+        SUPPORT_INET4 = true
+
+        #  API に組込む機能の選択
+        #API_CFG_IP4MAPPED_ADDR = true
+
+        #  トランスポート層の選択
+        SUPPORT_TCP = true
+        SUPPORT_UDP = true
+
+        # IGMPを有効に設定
+        SUPPORT_IGMP = true
+
+        #
+        #  ネットワークサービスの Makefile のインクルード
+        #
+        include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+endif
 
 #
@@ -294 +296 @@
 #  コンフィギュレータに関する定義
 #
-CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
-CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
+ifndef TINETDIR
+  CFG_TRB := -T $(TARGETDIR)/target_kernel.trb
+  CFG_TABS := --api-table $(SRCDIR)/kernel/kernel_api.def \
+                        --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+else
+  CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
+  CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
                         --api-table ../../ntshell/echonet/echonet_api.def:echonet \
                         --api-table $(SRCDIR)/kernel/kernel_api.def:kernel \
@@ -301 +308 @@
                         --symval-table ../../ntshell/echonet/echonet_sym.def \
                         --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+endif
 CFG_ASMOBJS := $(CFG_ASMOBJS)
 CFG_COBJS := kernel_cfg.o echonet_cfg.o $(CFG_COBJS)
@@ -446 +454 @@
 
 #
+#  並列makeのための依存関係の定義
+#
+$(APPL_OBJS) $(filter-out $(CFG_DMY), $(SYSSVC_OBJS)): | kernel_cfg.timestamp
+$(APPL_ASMOBJS) $(filter-out $(CFG_DMY), $(SYSSVC_ASMOBJS)) $(KERNEL_ASMOBJS) $(CFG_ASMOBJS): \
+                                                                                                                | offset.timestamp
+
+#
 #  特別な依存関係の定義
 #
@@ -454 +469 @@
 #
 $(OBJFILE): $(ALL_OBJS) $(LIBS_DEP)
-        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) \
+        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) -Wl,-Map=$(OBJNAME).map,--cref \
                         $(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \
                         -Wl,--start-group $(ALL_LIBS) -Wl,--end-group $(END_OBJS)

asp3_tinet_ecnl_arm/trunk/app1_usb_watt_meter/DebugEnbt/Makefile

@@ -182 +182 @@
         CDEFS := -DTOPPERS_OMIT_TECS $(CDEFS)
 endif
-CDEFS := $(CDEFS) -DIF_ETHER_MULTI_NIC -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DECHONET_USE_MALLOC -DHAVE_CONFIG_H -DWOLFSSL_USER_SETTINGS -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
+CDEFS := $(CDEFS) -DIF_ETHER_MULTI_NIC -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DNOUSE_MPF_NET_BUF -DECHONET_USE_MALLOC -DHAVE_CONFIG_H -DWOLFSSL_USER_SETTINGS -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
 INCLUDES := -I. -I$(SRCDIR)/include -I$(SRCDIR) \
         -I$(SRCDIR)/../btstack/include \
@@ -196 +196 @@
         -I$(SRCDIR)/../curl-7.57.0 \
         $(INCLUDES)
-LDFLAGS := $(LDFLAGS) -Wl,-Map=$(OBJNAME).map,--cref -L.
+LDFLAGS := $(LDFLAGS) -L.
 LIBS := $(LIBS) $(CXXLIBS)
 CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES)
@@ -207 +207 @@
 APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o sdfs.o ccsbcs.o ntshell.o text_editor.o text_history.o usrcmd.o vtrecv.o vtsend.o ntlibc.o ntstdio.o ntopt.o syscall.o tlsf.o
 APPLDIRS := $(APPLDIRS) ../../ntshell/lcd
-APPL_COBJS := $(APPL_COBJS) draw_font.o misaki_font.o
+APPL_COBJS := $(APPL_COBJS) draw_font.o shnm12_font.o
+APPL_CFLAGS := $(APPL_CFLAGS) -DSHNM12_FONT
 
 #
@@ -220 +221 @@
 APPL_ASMOBJS :=
 ifdef USE_CXX
-        APPL_CXXOBJS := main.o ntshell_main.o echonet_main.o client.o
+        APPL_CXXOBJS := main.o ntshell_main.o echonet_main.o client.o jsonsl.o
         APPL_COBJS := $(APPL_COBJS)
 else
-        APPL_COBJS := $(APPL_COBJS) main.o ntshell_main.o echonet_main.o client.o
+        APPL_COBJS := $(APPL_COBJS) main.o ntshell_main.o echonet_main.o client.o jsonsl.o
 endif
 APPL_COBJS := $(APPL_COBJS) log_output.o vasyslog.o t_perror.o strerror.o
@@ -232 +233 @@
 endif
 
-
-#
-#  ネットワークサービスの定義
-#
-NO_USE_TINET_LIBRARY = true
-
-#  ネットワークインタフェースの選択、何れか一つ選択する。
-NET_IF = ether
-
-#  イーサネット・ディバイスドライバの選択
-NET_DEV = if_enbt
-
-#  ネットワーク層の選択
-#SUPPORT_INET6 = true
-SUPPORT_INET4 = true
-
-#  API に組込む機能の選択
-#API_CFG_IP4MAPPED_ADDR = true
-
-#  トランスポート層の選択
-SUPPORT_TCP = true
-SUPPORT_UDP = true
-
-# IGMPを有効に設定
-SUPPORT_IGMP = true
-
-#
-#  ネットワークサービスの Makefile のインクルード
-#
-include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+ifdef TINETDIR
+        #
+        #  ネットワークサービスの定義
+        #
+        NO_USE_TINET_LIBRARY = true
+
+        #  ネットワークインタフェースの選択、何れか一つ選択する。
+        NET_IF = ether
+
+        #  イーサネット・ディバイスドライバの選択
+        NET_DEV = if_enbt
+
+        #  ネットワーク層の選択
+        #SUPPORT_INET6 = true
+        SUPPORT_INET4 = true
+
+        #  API に組込む機能の選択
+        #API_CFG_IP4MAPPED_ADDR = true
+
+        #  トランスポート層の選択
+        SUPPORT_TCP = true
+        SUPPORT_UDP = true
+
+        # IGMPを有効に設定
+        SUPPORT_IGMP = true
+
+        #
+        #  ネットワークサービスの Makefile のインクルード
+        #
+        include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+endif
 
 #
@@ -294 +296 @@
 #  コンフィギュレータに関する定義
 #
-CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
-CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
+ifndef TINETDIR
+  CFG_TRB := -T $(TARGETDIR)/target_kernel.trb
+  CFG_TABS := --api-table $(SRCDIR)/kernel/kernel_api.def \
+                        --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+else
+  CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
+  CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
                         --api-table ../../ntshell/echonet/echonet_api.def:echonet \
                         --api-table $(SRCDIR)/kernel/kernel_api.def:kernel \
@@ -301 +308 @@
                         --symval-table ../../ntshell/echonet/echonet_sym.def \
                         --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+endif
 CFG_ASMOBJS := $(CFG_ASMOBJS)
 CFG_COBJS := kernel_cfg.o echonet_cfg.o $(CFG_COBJS)
@@ -446 +454 @@
 
 #
+#  並列makeのための依存関係の定義
+#
+$(APPL_OBJS) $(filter-out $(CFG_DMY), $(SYSSVC_OBJS)): | kernel_cfg.timestamp
+$(APPL_ASMOBJS) $(filter-out $(CFG_DMY), $(SYSSVC_ASMOBJS)) $(KERNEL_ASMOBJS) $(CFG_ASMOBJS): \
+                                                                                                                | offset.timestamp
+
+#
 #  特別な依存関係の定義
 #
@@ -454 +469 @@
 #
 $(OBJFILE): $(ALL_OBJS) $(LIBS_DEP)
-        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) \
+        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) -Wl,-Map=$(OBJNAME).map,--cref \
                         $(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \
                         -Wl,--start-group $(ALL_LIBS) -Wl,--end-group $(END_OBJS)

asp3_tinet_ecnl_arm/trunk/app1_usb_watt_meter/DebugEther/Makefile

@@ -182 +182 @@
         CDEFS := -DTOPPERS_OMIT_TECS $(CDEFS)
 endif
-CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DECHONET_USE_MALLOC -DHAVE_CONFIG_H -DWOLFSSL_USER_SETTINGS -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
+CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DNOUSE_MPF_NET_BUF -DECHONET_USE_MALLOC -DHAVE_CONFIG_H -DWOLFSSL_USER_SETTINGS -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
 INCLUDES := -I. -I$(SRCDIR)/include -I$(SRCDIR) \
         -I$(SRCDIR)/../btstack/include \
@@ -196 +196 @@
         -I$(SRCDIR)/../curl-7.57.0 \
         $(INCLUDES)
-LDFLAGS := $(LDFLAGS) -Wl,-Map=$(OBJNAME).map,--cref -L.
+LDFLAGS := $(LDFLAGS) -L.
 LIBS := $(LIBS) $(CXXLIBS)
 CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES)
@@ -207 +207 @@
 APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o sdfs.o ccsbcs.o ntshell.o text_editor.o text_history.o usrcmd.o vtrecv.o vtsend.o ntlibc.o ntstdio.o ntopt.o syscall.o tlsf.o
 APPLDIRS := $(APPLDIRS) ../../ntshell/lcd
-APPL_COBJS := $(APPL_COBJS) draw_font.o misaki_font.o
+APPL_COBJS := $(APPL_COBJS) draw_font.o shnm12_font.o
+APPL_CFLAGS := $(APPL_CFLAGS) -DSHNM12_FONT
 
 #
@@ -220 +221 @@
 APPL_ASMOBJS :=
 ifdef USE_CXX
-        APPL_CXXOBJS := main.o ntshell_main.o echonet_main.o client.o
+        APPL_CXXOBJS := main.o ntshell_main.o echonet_main.o client.o jsonsl.o
         APPL_COBJS := $(APPL_COBJS)
 else
-        APPL_COBJS := $(APPL_COBJS) main.o ntshell_main.o echonet_main.o client.o
+        APPL_COBJS := $(APPL_COBJS) main.o ntshell_main.o echonet_main.o client.o jsonsl.o
 endif
 APPL_COBJS := $(APPL_COBJS) log_output.o vasyslog.o t_perror.o strerror.o
@@ -232 +233 @@
 endif
 
-
-#
-#  ネットワークサービスの定義
-#
-NO_USE_TINET_LIBRARY = true
-
-#  ネットワークインタフェースの選択、何れか一つ選択する。
-NET_IF = ether
-
-#  イーサネット・ディバイスドライバの選択
+ifdef TINETDIR
+        #
+        #  ネットワークサービスの定義
+        #
+        NO_USE_TINET_LIBRARY = true
+
+        #  ネットワークインタフェースの選択、何れか一つ選択する。
+        NET_IF = ether
+
+        #  イーサネット・ディバイスドライバの選択
         NET_DEV = if_mbed
 
-#  ネットワーク層の選択
-#SUPPORT_INET6 = true
-SUPPORT_INET4 = true
-
-#  API に組込む機能の選択
-#API_CFG_IP4MAPPED_ADDR = true
-
-#  トランスポート層の選択
-SUPPORT_TCP = true
-SUPPORT_UDP = true
-
-# IGMPを有効に設定
-SUPPORT_IGMP = true
-
-#
-#  ネットワークサービスの Makefile のインクルード
-#
-include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+        #  ネットワーク層の選択
+        #SUPPORT_INET6 = true
+        SUPPORT_INET4 = true
+
+        #  API に組込む機能の選択
+        #API_CFG_IP4MAPPED_ADDR = true
+
+        #  トランスポート層の選択
+        SUPPORT_TCP = true
+        SUPPORT_UDP = true
+
+        # IGMPを有効に設定
+        SUPPORT_IGMP = true
+
+        #
+        #  ネットワークサービスの Makefile のインクルード
+        #
+        include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+endif
 
 #
@@ -294 +296 @@
 #  コンフィギュレータに関する定義
 #
-CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
-CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
+ifndef TINETDIR
+  CFG_TRB := -T $(TARGETDIR)/target_kernel.trb
+  CFG_TABS := --api-table $(SRCDIR)/kernel/kernel_api.def \
+                        --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+else
+  CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
+  CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
                         --api-table ../../ntshell/echonet/echonet_api.def:echonet \
                         --api-table $(SRCDIR)/kernel/kernel_api.def:kernel \
@@ -301 +308 @@
                         --symval-table ../../ntshell/echonet/echonet_sym.def \
                         --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+endif
 CFG_ASMOBJS := $(CFG_ASMOBJS)
 CFG_COBJS := kernel_cfg.o echonet_cfg.o $(CFG_COBJS)
@@ -446 +454 @@
 
 #
+#  並列makeのための依存関係の定義
+#
+$(APPL_OBJS) $(filter-out $(CFG_DMY), $(SYSSVC_OBJS)): | kernel_cfg.timestamp
+$(APPL_ASMOBJS) $(filter-out $(CFG_DMY), $(SYSSVC_ASMOBJS)) $(KERNEL_ASMOBJS) $(CFG_ASMOBJS): \
+                                                                                                                | offset.timestamp
+
+#
 #  特別な依存関係の定義
 #
@@ -454 +469 @@
 #
 $(OBJFILE): $(ALL_OBJS) $(LIBS_DEP)
-        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) \
+        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) -Wl,-Map=$(OBJNAME).map,--cref \
                         $(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \
                         -Wl,--start-group $(ALL_LIBS) -Wl,--end-group $(END_OBJS)

asp3_tinet_ecnl_arm/trunk/app1_usb_watt_meter/src/client.c

@@ -1 +1 @@
 /*
  *  TOPPERS ECHONET Lite Communication Middleware
- * 
+ *
  *  Copyright (C) 2016 Cores Co., Ltd. Japan
- * 
+ *
  *  上記著作権者は，以下の(1)～(4)の条件を満たす場合に限り，本ソフトウェ
  *  ア（本ソフトウェアを改変したものを含む．以下同じ）を使用・複製・改
@@ -26 +26 @@
  *      由に基づく請求からも，上記著作権者およびTOPPERSプロジェクトを
  *      免責すること．
- * 
+ *
  *  本ソフトウェアは，無保証で提供されているものである．上記著作権者お
  *  よびTOPPERSプロジェクトは，本ソフトウェアに関して，特定の使用目的
@@ -32 +32 @@
  *  アの利用により直接的または間接的に生じたいかなる損害に関しても，そ
  *  の責任を負わない．
- * 
+ *
  *  @(#) $Id$
  */
@@ -48 +48 @@
 #include "ff.h"
 #include "util/ntstdio.h"
+#include "client.h"
+#include "jsonsl.h"
 
 #define SKIP_PEER_VERIFICATION
 //#define SKIP_HOSTNAME_VERIFICATION
+
+const char SCOPE_DRIVE_FILE[] = "https://www.googleapis.com/auth/drive.file";
+const char GRANT_TYPE_DEVICE[] = "http://oauth.net/grant_type/device/1.0";
+
 char response[80];
-extern ntstdio_t ntstdio;
+char errbuf[CURL_ERROR_SIZE];
+
+google_drive_t google_drive;
+
+void curl_setopt_common(CURL *curl);
+int google_drive_error_callback(jsonsl_t jsn, jsonsl_error_t err,
+        struct jsonsl_state_st *state, char *errat);
+void google_drive_state_callback(jsonsl_t jsn, jsonsl_action_t action,
+        struct jsonsl_state_st *state, const char *buf);
 
 void client_init(void)
 {
+        google_drive_t *gd = &google_drive;
+        jsonsl_t jsn;
+
+        memset(gd, 0, sizeof(google_drive_t));
+        memcpy(gd->fname, "1:/log/20160101000000.log", sizeof(gd->fname));
+
+        jsn = gd->jsn = jsonsl_new(3);
+        jsn->data = gd;
+        jsn->error_callback = google_drive_error_callback;
+        jsn->action_callback = google_drive_state_callback;
+        jsonsl_enable_all_callbacks(jsn);
+
         //uITRON4_minit(ITRON_POOL_SIZE);
 
@@ -61 +87 @@
 }
 
-size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp)
-{
-        int rest = size * nmemb;
+size_t write_callback(void *buffer, size_t size, size_t nmemb, void *arg)
+{
+        google_drive_t *gd = (google_drive_t *)arg;
+        jsonsl_t jsn = gd->jsn;
+        size_t len = size * nmemb, pos;
+        jsonsl_char_t data;
+
+        for (pos = 0; pos < len; pos++) {
+                data = *((jsonsl_char_t *)&((uint8_t *)buffer)[pos]);
+
+                if ((gd->jsn_buf_pos >= 0) && (gd->jsn_buf_pos < sizeof(gd->jsn_buf)))
+                        gd->jsn_buf[gd->jsn_buf_pos++] = data;
+                jsonsl_feed(jsn, &data, 1);
+        }
+
+        return len;
+}
+
+void get_device_id_state_start(google_drive_t *gd, struct jsonsl_state_st *state, const char *buf)
+{
+        switch (gd->state) {
+        case psRoot:
+                if (state->level != 2) {
+                        break;
+                }
+                else if (strcmp(buf, "device_code") == 0) {
+                        gd->state = psDeviceCode;
+                }
+                else if (strcmp(buf, "user_code") == 0) {
+                        gd->state = psUserCode;
+                }
+                else if (strcmp(buf, "expires_in") == 0) {
+                        gd->state = psExpiresIn;
+                }
+                else if (strcmp(buf, "interval") == 0) {
+                        gd->state = psInterval;
+                }
+                else if (strcmp(buf, "verification_url") == 0) {
+                        gd->state = psVerificationUrl;
+                }
+                else if (strcmp(buf, "error") == 0) {
+                        gd->state = psError;
+                }
+                else if (strcmp(buf, "error_description") == 0) {
+                        gd->state = psErrorDescription;
+                }
+                break;
+        case psDeviceCode:
+                if (state->type == JSONSL_T_STRING) {
+                        strlcpy(gd->credential.device_code, buf, sizeof(gd->credential.device_code));
+                        gd->state = psRoot;
+                }
+                break;
+        case psUserCode:
+                if (state->type == JSONSL_T_STRING) {
+                        strlcpy(gd->credential.user_code, buf, sizeof(gd->credential.user_code));
+                        gd->state = psRoot;
+                }
+                break;
+        case psExpiresIn:
+                if (state->type == JSONSL_T_SPECIAL) {
+                        gd->credential.expires_in = atoi(buf);
+                        gd->state = psRoot;
+                }
+                break;
+        case psInterval:
+                if (state->type == JSONSL_T_SPECIAL) {
+                        gd->credential.interval = atoi(buf);
+                        gd->state = psRoot;
+                }
+                break;
+        case psVerificationUrl:
+                if (state->type == JSONSL_T_STRING) {
+                        strlcpy(gd->credential.verification_url, buf, sizeof(gd->credential.verification_url));
+                        gd->state = psRoot;
+                }
+                break;
+        case psError:
+                if (state->type == JSONSL_T_STRING) {
+                        strlcpy(gd->error.error, buf, sizeof(gd->error.error));
+                        gd->state = psRoot;
+                }
+                break;
+        case psErrorDescription:
+                if (state->type == JSONSL_T_STRING) {
+                        strlcpy(gd->error.error_description, buf, sizeof(gd->error.error_description));
+                        gd->state = psRoot;
+                }
+                break;
+        }
+}
+
+void get_device_id_state_end(google_drive_t *gd, struct jsonsl_state_st *state, const char *buf)
+{
+}
+
+int get_device_id(google_drive_t *gd, const char *scope)
+{
+        client_info_t *client_info = &gd->client_info;
+        credential_t *credential = &gd->credential;
+        CURLcode ret;
+        CURL *curl;
+        struct curl_slist *slist1;
+        size_t len;
+        char *postdata;
+        jsonsl_t jsn = gd->jsn;
+
+        gd->jsn_buf_pos = -1;
+
+        jsonsl_reset(jsn);
+        gd->start = get_device_id_state_start;
+        gd->end = get_device_id_state_end;
+
+        slist1 = NULL;
+        slist1 = curl_slist_append(slist1, "Content-Type: application/x-www-form-urlencoded");
+
+        curl = curl_easy_init();
+
+        char *client_id = curl_easy_escape(curl, client_info->client_id, strnlen(client_info->client_id, sizeof(client_info->client_id)));
+        char *esc_scope = curl_easy_escape(curl, scope, strlen(scope));
+
+        len = sizeof("client_id=") + strlen(client_id) + sizeof("scope=") + strlen(esc_scope);
+        postdata = malloc(len);
+        snprintf(postdata, len, "client_id=%s&scope=%s", client_id, esc_scope);
+
+        curl_free(client_id);
+        curl_free(esc_scope);
+
+        curl_easy_setopt(curl, CURLOPT_URL, "https://accounts.google.com/o/oauth2/device/code");
+        curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postdata);
+        curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE_LARGE, (curl_off_t)strnlen(postdata, len));
+        curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist1);
+        curl_setopt_common(curl);
+
+        curl_easy_setopt(curl, CURLOPT_WRITEDATA, gd);
+        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback);
+
+        ret = curl_easy_perform(curl);
+
+        free(postdata);
+
+        curl_easy_cleanup(curl);
+        curl = NULL;
+        curl_slist_free_all(slist1);
+        slist1 = NULL;
+
+        return (int)ret;
+}
+
+void get_access_token_state_start(google_drive_t *gd, struct jsonsl_state_st *state, const char *buf)
+{
+        switch (gd->state) {
+        case psRoot:
+                if (state->level != 2) {
+                        break;
+                }
+                else if (strcmp(buf, "access_token") == 0) {
+                        gd->state = psAccessToken;
+                }
+                else if (strcmp(buf, "expires_in") == 0) {
+                        gd->state = psExpiresIn;
+                }
+                else if (strcmp(buf, "refresh_token") == 0) {
+                        gd->state = psRefreshToken;
+                }
+                else if (strcmp(buf, "scope") == 0) {
+                        gd->state = psScope;
+                }
+                else if (strcmp(buf, "token_type") == 0) {
+                        gd->state = psTokenType;
+                }
+                else if (strcmp(buf, "error") == 0) {
+                        gd->state = psError;
+                }
+                else if (strcmp(buf, "error_description") == 0) {
+                        gd->state = psErrorDescription;
+                }
+                break;
+        case psAccessToken:
+                if (state->type == JSONSL_T_STRING) {
+                        strlcpy(gd->credential.access_token, buf, sizeof(gd->credential.access_token));
+                        gd->state = psRoot;
+                }
+                break;
+        case psExpiresIn:
+                if (state->type == JSONSL_T_SPECIAL) {
+                        gd->credential.expires_in = atoi(buf);
+                        gd->state = psRoot;
+                }
+                break;
+        case psRefreshToken:
+                if (state->type == JSONSL_T_STRING) {
+                        strlcpy(gd->credential.refresh_token, buf, sizeof(gd->credential.refresh_token));
+                        gd->state = psRoot;
+                }
+                break;
+        case psScope:
+                if (state->type == JSONSL_T_STRING) {
+                        strlcpy(gd->credential.scope, buf, sizeof(gd->credential.scope));
+                        gd->state = psRoot;
+                }
+                break;
+        case psTokenType:
+                if (state->type == JSONSL_T_STRING) {
+                        strlcpy(gd->credential.token_type, buf, sizeof(gd->credential.token_type));
+                        gd->state = psRoot;
+                }
+                break;
+        case psError:
+                if (state->type == JSONSL_T_STRING) {
+                        strlcpy(gd->error.error, buf, sizeof(gd->error.error));
+                        gd->state = psRoot;
+                }
+                break;
+        case psErrorDescription:
+                if (state->type == JSONSL_T_STRING) {
+                        strlcpy(gd->error.error_description, buf, sizeof(gd->error.error_description));
+                        gd->state = psRoot;
+                }
+                break;
+        }
+}
+
+void get_access_token_state_end(google_drive_t *gd, struct jsonsl_state_st *state, const char *buf)
+{
+}
+
+int get_access_token(google_drive_t *gd)
+{
+        client_info_t *client_info = &gd->client_info;
+        credential_t *credential = &gd->credential;
+        CURLcode ret;
+        CURL *curl;
+        struct curl_slist *slist1;
+        size_t len;
+        char *postdata;
+        jsonsl_t jsn = gd->jsn;
+
+        gd->jsn_buf_pos = -1;
+
+        jsonsl_reset(jsn);
+        gd->start = get_access_token_state_start;
+        gd->end = get_access_token_state_end;
+
+        slist1 = NULL;
+        slist1 = curl_slist_append(slist1, "Content-Type: application/x-www-form-urlencoded");
+
+        curl = curl_easy_init();
+
+        char *client_id = curl_easy_escape(curl, client_info->client_id, strnlen(client_info->client_id, sizeof(client_info->client_id)));
+        char *client_secret = curl_easy_escape(curl, client_info->client_secret, strnlen(client_info->client_secret, sizeof(client_info->client_secret)));
+        char *grant_type = curl_easy_escape(curl, GRANT_TYPE_DEVICE, strnlen(GRANT_TYPE_DEVICE, sizeof(GRANT_TYPE_DEVICE)));
+
+        len = sizeof("client_id=") + strlen(client_id) + sizeof("client_secret=") + strlen(client_secret)
+                + sizeof("code=") + strlen(credential->device_code) + sizeof("grant_type=") + strlen(grant_type);
+        postdata = malloc(len);
+        snprintf(postdata, len, "client_id=%s&client_secret=%s&code=%s&grant_type=%s",
+                client_id, client_secret, credential->device_code, grant_type);
+
+        curl_free(client_id);
+        curl_free(client_secret);
+        curl_free(grant_type);
+
+        curl_easy_setopt(curl, CURLOPT_URL, "https://www.googleapis.com/oauth2/v4/token");
+        curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postdata);
+        curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE_LARGE, (curl_off_t)strnlen(postdata, len));
+        curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist1);
+        curl_setopt_common(curl);
+
+        curl_easy_setopt(curl, CURLOPT_WRITEDATA, gd);
+        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback);
+
+        ret = curl_easy_perform(curl);
+
+        free(postdata);
+
+        curl_easy_cleanup(curl);
+        curl = NULL;
+        curl_slist_free_all(slist1);
+        slist1 = NULL;
+
+        return (int)ret;
+}
+
+void update_access_token_state_start(google_drive_t *gd, struct jsonsl_state_st *state, const char *buf)
+{
+        switch (gd->state) {
+        case psRoot:
+                if (state->level != 2) {
+                        break;
+                }
+                else if (strcmp(buf, "access_token") == 0) {
+                        gd->state = psAccessToken;
+                }
+                else if (strcmp(buf, "expires_in") == 0) {
+                        gd->state = psExpiresIn;
+                }
+                else if (strcmp(buf, "scope") == 0) {
+                        gd->state = psScope;
+                }
+                else if (strcmp(buf, "token_type") == 0) {
+                        gd->state = psTokenType;
+                }
+                else if (strcmp(buf, "error") == 0) {
+                        gd->state = psError;
+                }
+                else if (strcmp(buf, "error_description") == 0) {
+                        gd->state = psErrorDescription;
+                }
+                break;
+        case psAccessToken:
+                if (state->type == JSONSL_T_STRING) {
+                        strlcpy(gd->credential.access_token, buf, sizeof(gd->credential.access_token));
+                        gd->state = psRoot;
+                }
+                break;
+        case psExpiresIn:
+                if (state->type == JSONSL_T_SPECIAL) {
+                        gd->credential.expires_in = atoi(buf);
+                        gd->state = psRoot;
+                }
+                break;
+        case psScope:
+                if (state->type == JSONSL_T_STRING) {
+                        strlcpy(gd->credential.scope, buf, sizeof(gd->credential.scope));
+                        gd->state = psRoot;
+                }
+                break;
+        case psTokenType:
+                if (state->type == JSONSL_T_STRING) {
+                        strlcpy(gd->credential.token_type, buf, sizeof(gd->credential.token_type));
+                        gd->state = psRoot;
+                }
+                break;
+        case psError:
+                if (state->type == JSONSL_T_STRING) {
+                        strlcpy(gd->error.error, buf, sizeof(gd->error.error));
+                        gd->state = psRoot;
+                }
+                break;
+        case psErrorDescription:
+                if (state->type == JSONSL_T_STRING) {
+                        strlcpy(gd->error.error_description, buf, sizeof(gd->error.error_description));
+                        gd->state = psRoot;
+                }
+                break;
+        }
+}
+
+void update_access_token_state_end(google_drive_t *gd, struct jsonsl_state_st *state, const char *buf)
+{
+}
+
+int update_access_token(google_drive_t *gd)
+{
+        client_info_t *client_info = &gd->client_info;
+        credential_t *credential = &gd->credential;
+        CURLcode ret;
+        CURL *curl;
+        struct curl_slist *slist1;
+        size_t len;
+        char *postdata;
+        jsonsl_t jsn = gd->jsn;
+
+        gd->jsn_buf_pos = -1;
+
+        jsonsl_reset(jsn);
+        gd->start = update_access_token_state_start;
+        gd->end = update_access_token_state_end;
+
+        slist1 = NULL;
+        slist1 = curl_slist_append(slist1, "Content-Type: application/x-www-form-urlencoded");
+
+        curl = curl_easy_init();
+
+        char *client_id = curl_easy_escape(curl, client_info->client_id, strnlen(client_info->client_id, sizeof(client_info->client_id)));
+        char *client_secret = curl_easy_escape(curl, client_info->client_secret, strnlen(client_info->client_secret, sizeof(client_info->client_secret)));
+
+        len = sizeof("client_id=") + strlen(client_id) + sizeof("client_secret=") + strlen(client_secret)
+                + sizeof("refresh_token=") + strlen(credential->refresh_token);
+        postdata = malloc(len);
+        snprintf(postdata, len, "client_id=%s&client_secret=%s&code=%s&grant_type=refresh_token",
+                client_id, client_secret, credential->refresh_token);
+
+        curl_free(client_id);
+        curl_free(client_secret);
+
+        curl_easy_setopt(curl, CURLOPT_URL, "https://www.googleapis.com/oauth2/v4/token");
+        curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postdata);
+        curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE_LARGE, (curl_off_t)strnlen(postdata, len));
+        curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist1);
+        curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "POST");
+        curl_setopt_common(curl);
+
+        curl_easy_setopt(curl, CURLOPT_WRITEDATA, gd);
+        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback);
+
+        ret = curl_easy_perform(curl);
+
+        free(postdata);
+
+        curl_easy_cleanup(curl);
+        curl = NULL;
+        curl_slist_free_all(slist1);
+        slist1 = NULL;
+
+        return (int)ret;
+}
+
+void revoke_device_state_start(google_drive_t *gd, struct jsonsl_state_st *state, const char *buf)
+{
+}
+
+void revoke_device_state_end(google_drive_t *gd, struct jsonsl_state_st *state, const char *buf)
+{
+}
+
+int revoke_device(google_drive_t *gd)
+{
+        client_info_t *client_info = &gd->client_info;
+        credential_t *credential = &gd->credential;
+        CURLcode ret;
+        CURL *curl;
+        size_t len;
+        struct curl_slist *slist1;
+        char *postdata;
+        jsonsl_t jsn = gd->jsn;
+
+        gd->jsn_buf_pos = -1;
+
+        jsonsl_reset(jsn);
+        gd->start = revoke_device_state_start;
+        gd->end = revoke_device_state_end;
+
+        slist1 = NULL;
+        slist1 = curl_slist_append(slist1, "Content-Type: application/x-www-form-urlencoded");
+
+        curl = curl_easy_init();
+
+        len = sizeof("token=") + strlen(credential->access_token);
+        postdata = malloc(len);
+        snprintf(postdata, len, "token=%s", credential->access_token);
+
+        curl_easy_setopt(curl, CURLOPT_URL, "https://accounts.google.com/o/oauth2/revoke");
+        curl_easy_setopt(curl, CURLOPT_POSTFIELDS, postdata);
+        curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE_LARGE, (curl_off_t)strnlen(postdata, len));
+        curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist1);
+        curl_setopt_common(curl);
+
+        curl_easy_setopt(curl, CURLOPT_WRITEDATA, gd);
+        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback);
+
+        ret = curl_easy_perform(curl);
+
+        free(postdata);
+
+        curl_easy_cleanup(curl);
+        curl = NULL;
+        curl_slist_free_all(slist1);
+        slist1 = NULL;
+
+        return (int)ret;
+}
+
+void upload_file_state_start(google_drive_t *gd, struct jsonsl_state_st *state, const char *buf)
+{
+        switch (gd->state) {
+        case psRoot:
+                if (state->level != 2) {
+                        break;
+                }
+                else if (strcmp(buf, "kind") == 0) {
+                        gd->state = psKind;
+                }
+                else if (strcmp(buf, "id") == 0) {
+                        gd->state = psId;
+                }
+                else if (strcmp(buf, "name") == 0) {
+                        gd->state = psName;
+                }
+                else if (strcmp(buf, "mimeType") == 0) {
+                        gd->state = psMimeType;
+                }
+                else if (strcmp(buf, "error") == 0) {
+                        gd->state = psError;
+                }
+                else if (strcmp(buf, "error_description") == 0) {
+                        gd->state = psErrorDescription;
+                }
+                break;
+        case psKind:
+                if (state->type == JSONSL_T_STRING) {
+                        strlcpy(gd->file.kind, buf, sizeof(gd->file.kind));
+                        gd->state = psRoot;
+                }
+                break;
+        case psId:
+                if (state->type == JSONSL_T_STRING) {
+                        strlcpy(gd->file.id, buf, sizeof(gd->file.id));
+                        gd->state = psRoot;
+                }
+                break;
+        case psName:
+                if (state->type == JSONSL_T_STRING) {
+                        strlcpy(gd->file.name, buf, sizeof(gd->file.name));
+                        gd->state = psRoot;
+                }
+                break;
+        case psMimeType:
+                if (state->type == JSONSL_T_STRING) {
+                        strlcpy(gd->file.mimeType, buf, sizeof(gd->file.mimeType));
+                        gd->state = psRoot;
+                }
+                break;
+        case psError:
+                if (state->type == JSONSL_T_STRING) {
+                        strlcpy(gd->error.error, buf, sizeof(gd->error.error));
+                        gd->state = psRoot;
+                }
+                break;
+        case psErrorDescription:
+                if (state->type == JSONSL_T_STRING) {
+                        strlcpy(gd->error.error_description, buf, sizeof(gd->error.error_description));
+                        gd->state = psRoot;
+                }
+                break;
+        }
+}
+
+void upload_file_state_end(google_drive_t *gd, struct jsonsl_state_st *state, const char *buf)
+{
+}
+
+size_t read_callback(char *buffer, size_t size, size_t nitems, void *arg)
+{
+        FIL *file = (FIL *)arg;
+        UINT ret = 0;
+        FRESULT res;
+
+        res = f_read(file, buffer, size * nitems, &ret);
+        if (res != FR_OK)
+                return 0;
+
+        int rest = ret;
         int len;
 
@@ -76 +643 @@
                 response[len] = '\0';
 
-                ntstdio_printf(&ntstdio, response);
-
-                dly_tsk(100 * 1000);
+                printf(response);
+
+                dly_tsk(100);
 
                 rest -= len;
@@ -84 +651 @@
         }
 
-        return size * nmemb;
-}
-
-size_t read_data(char *buffer, size_t size, size_t nitems, void *instream)
-{
-        FIL *file = (FIL *)instream;
-        UINT ret = 0;
-        FRESULT res;
-
-        res = f_read(file, buffer, size * nitems, &ret);
-        if (res != FR_OK)
-                return 0;
-
-        int rest = ret;
-        int len;
-
-        while (rest > 0) {
-                len = rest;
-                if (len > (sizeof(response) - 1)) {
-                        len = sizeof(response) - 1;
-                }
-
-                memcpy(response, buffer, len);
-
-                response[len] = '\0';
-
-                ntstdio_printf(&ntstdio, response);
-
-                dly_tsk(100);
-
-                rest -= len;
-                buffer = (char *)buffer + len;
-        }
-
         return ret;
 }
 
-char errbuf[CURL_ERROR_SIZE];
+int seek_callback(void *arg, curl_off_t offset, int origin)
+{
+        FIL *file = (FIL *)arg;
+        BYTE mode;
+        FRESULT ret;
+
+        switch (origin) {
+        case SEEK_SET:
+                mode = F_SEEK_SET;
+                break;
+        case SEEK_CUR:
+                mode = F_SEEK_CUR;
+                break;
+        case SEEK_END:
+                mode = F_SEEK_END;
+                break;
+        default:
+                return CURL_SEEKFUNC_FAIL;
+        }
+
+        ret = f_seek(file, offset, mode);
+        if (ret != F_OK)
+                return CURL_SEEKFUNC_FAIL;
+
+        return CURL_SEEKFUNC_OK;
+}
+
+int upload_file(google_drive_t *gd, const char *filename, const char *localfilepath)
+{
+        CURLcode ret;
+        CURL *curl;
+        curl_mime *mime;
+        curl_mimepart *part;
+        struct curl_slist *slist1;
+        size_t len;
+        char *postdata, *authorization;
+        static const char buf[] = "Expect:";
+        jsonsl_t jsn = gd->jsn;
+        FIL file;
+        FRESULT fret;
+
+        gd->jsn_buf_pos = -1;
+
+        jsonsl_reset(jsn);
+        gd->start = upload_file_state_start;
+        gd->end = upload_file_state_end;
+
+        fret = f_open(&file, localfilepath, FA_READ);
+        if (fret != FR_OK) {
+                printf("log file open error %d\n", fret);
+                return -1;
+        }
+
+        len = sizeof("{\"name\":\"\"}") + strlen(filename);
+        postdata = malloc(len);
+        snprintf(postdata, len, "{\"name\":\"%s\"}", filename);
+
+        curl = curl_easy_init();
+
+        mime = curl_mime_init(curl);
+        part = curl_mime_addpart(mime);
+        curl_mime_name(part, "metadata");
+        curl_mime_type(part, "application/json;charset=utf-8");
+        curl_mime_data(part, postdata, CURL_ZERO_TERMINATED);
+        free(postdata);
+
+        part = curl_mime_addpart(mime);
+        curl_mime_name(part, "file");
+        curl_mime_type(part, "application/json");
+        curl_mime_data_cb(part, file.fsize, read_callback, seek_callback, NULL, &file);
+
+        len = sizeof("Authorization: Bearer ") + strnlen(gd->credential.access_token, sizeof(gd->credential.access_token));
+        authorization = malloc(len);
+        snprintf(authorization, len, "Authorization: Bearer %s", gd->credential.access_token);
+        slist1 = NULL;
+        slist1 = curl_slist_append(slist1, authorization);
+        free(authorization);
+
+        slist1 = curl_slist_append(slist1, buf);
+
+        curl_easy_setopt(curl, CURLOPT_URL, "https://www.googleapis.com/upload/drive/v3/files?uploadType=multipart");
+        curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
+        curl_easy_setopt(curl, CURLOPT_MIMEPOST, mime);
+        curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist1);
+        curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "POST");
+        curl_setopt_common(curl);
+
+        curl_easy_setopt(curl, CURLOPT_WRITEDATA, gd);
+        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback);
+
+        ret = curl_easy_perform(curl);
+
+        curl_easy_cleanup(curl);
+        curl = NULL;
+        curl_mime_free(mime);
+        mime = NULL;
+        curl_slist_free_all(slist1);
+        slist1 = NULL;
+
+        f_close(&file);
+
+        return (int)ret;
+}
+
+int google_drive_error_callback(jsonsl_t jsn, jsonsl_error_t err,
+        struct jsonsl_state_st *state, char *errat)
+{
+        return 0;
+}
+
+void google_drive_state_callback(jsonsl_t jsn, jsonsl_action_t action,
+        struct jsonsl_state_st *state, const char *buf)
+{
+        google_drive_t *gd = (google_drive_t *)jsn->data;
+
+        switch (action) {
+        case JSONSL_ACTION_PUSH:
+                switch (state->type) {
+                case JSONSL_T_SPECIAL:
+                        gd->jsn_buf[0] = *buf;
+                        gd->jsn_buf_pos = 1;
+                        break;
+                case JSONSL_T_STRING:
+                case JSONSL_T_HKEY:
+                        gd->jsn_buf_pos = 0;
+                        break;
+                default:
+                        gd->jsn_buf_pos = -1;
+                }
+                break;
+        case JSONSL_ACTION_POP:
+                switch (state->type) {
+                case JSONSL_T_SPECIAL:
+                case JSONSL_T_STRING:
+                case JSONSL_T_HKEY:
+                        gd->jsn_buf_pos--;
+                        if (gd->jsn_buf_pos < sizeof(gd->jsn_buf)) {
+                                gd->jsn_buf[gd->jsn_buf_pos] = '\0';
+                        }
+                        gd->start(gd, state, gd->jsn_buf);
+                        break;
+                default:
+                        gd->jsn_buf[0] = '\0';
+                        break;
+                }
+                gd->jsn_buf_pos = -1;
+                break;
+        default:
+                gd->jsn_buf_pos = -1;
+                break;
+        }
+}
 
 static void get_logfname(char *fname)
@@ -185 +869 @@
         ret = f_open(&file, fname, FA_CREATE_ALWAYS | FA_WRITE);
         if (ret != FR_OK) {
-                ntstdio_printf(&ntstdio, "not open a upload file %d\n", ret);
+                printf("not open a upload file %d\n", ret);
                 return ret;
         }
@@ -232 +916 @@
         f_putc('}', &file);
 
-file_close:
         f_close(&file);
 
@@ -238 +921 @@
 }
 
-void client_task(intptr_t exinf)
-{
-        CURL *curl;
+void curl_setopt_common(CURL *curl)
+{
         CURLcode res;
-        int error = 0;
-        //const char *data = "{\"value\":\"data post\"}";
-        struct curl_slist *list = NULL;
-        FIL file;
-        FRESULT ret;
-        char fname[] = {"1:/log/20160101000000.log"};
-
-        get_logfname(fname);
-
-        ret = write_log(fname);
-        if (ret != FR_OK) {
-                ntstdio_printf(&ntstdio, "log file write error %d\n", ret);
-                return;
-        }
-
-        ret = f_open(&file, fname, FA_READ);
-        if (ret != FR_OK) {
-                ntstdio_printf(&ntstdio, "log file open error %d\n", ret);
-                return;
-        }
-
-        ntstdio_printf(&ntstdio, "cURL start\n");
-
-        curl = curl_easy_init();
-        if (curl == NULL) {
-                ntstdio_printf(&ntstdio, "curl_easy_init() failed\n");
-                goto file_close;
-        }
 
         /* ask libcurl to show us the verbose output */
-        curl_easy_setopt(curl, CURLOPT_VERBOSE, true);
-
-        res = curl_easy_setopt(curl, CURLOPT_URL, "https://www.example.com/");
+        res = curl_easy_setopt(curl, CURLOPT_VERBOSE, true);
         if (res != CURLE_OK)
-                ntstdio_printf(&ntstdio, "CURLOPT_URL failed: %s\n",
+                printf("CURLOPT_VERBOSE failed: %s\n",
                         curl_easy_strerror(res));
 
@@ -283 +935 @@
 
         /* provide a buffer to store errors in */
-        curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errbuf);
+        res = curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errbuf);
+        if (res != CURLE_OK)
+                printf("CURLOPT_ERRORBUFFER failed: %s\n",
+                        curl_easy_strerror(res));
 
 #ifdef SKIP_PEER_VERIFICATION
@@ -298 +953 @@
         res = curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
         if (res != CURLE_OK)
-                ntstdio_printf(&ntstdio, "CURLOPT_SSL_VERIFYPEER failed: %s\n",
+                printf("CURLOPT_SSL_VERIFYPEER failed: %s\n",
                         curl_easy_strerror(res));
 #else
         res = curl_easy_setopt(curl, CURLOPT_CAINFO, "0:/certs/ca-cert.pem");
         if (res != CURLE_OK)
-                ntstdio_printf(&ntstdio, "CURLOPT_CAINFO failed: %s\n",
+                printf("CURLOPT_CAINFO failed: %s\n",
                         curl_easy_strerror(res));
 
         res = curl_easy_setopt(curl, CURLOPT_SSLCERT, "0:/certs/client-cert.pem");
         if (res != CURLE_OK)
-                ntstdio_printf(&ntstdio, "CURLOPT_SSLCERT failed: %s\n",
+                printf("CURLOPT_SSLCERT failed: %s\n",
                         curl_easy_strerror(res));
 
         res = curl_easy_setopt(curl, CURLOPT_SSLKEY, "0:/certs/client-key.pem");
         if (res != CURLE_OK)
-                ntstdio_printf(&ntstdio, "CURLOPT_SSLKEY failed: %s\n",
+                printf("CURLOPT_SSLKEY failed: %s\n",
                         curl_easy_strerror(res));
 #endif
@@ -326 +981 @@
         res = curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
         if (res != CURLE_OK)
-                ntstdio_printf(&ntstdio, "CURLOPT_SSL_VERIFYHOST failed: %s\n",
+                printf("CURLOPT_SSL_VERIFYHOST failed: %s\n",
                         curl_easy_strerror(res));
 #endif
@@ -332 +987 @@
         /*res = curl_easy_setopt(curl, CURLOPT_PROXY, "https://proxy.example.com:8080");
         if (res != CURLE_OK)
-                ntstdio_printf(&ntstdio, "CURLOPT_PROXY failed: %s\n",
+                printf("CURLOPT_PROXY failed: %s\n",
                         curl_easy_strerror(res));*/
 
-        curl_easy_setopt(curl, CURLOPT_POST, 1);
-
-        /* size of the POST data */
-        //curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, strlen(data));
-        curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, file.fsize);
-
-        /* pass in a pointer to the data - libcurl will not copy */
-        //curl_easy_setopt(curl, CURLOPT_POSTFIELDS, data);
-
-        list = curl_slist_append(list, "Content-Type: application/json");
-
-        curl_easy_setopt(curl, CURLOPT_HTTPHEADER, list);
-
-        curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&error);
-
-        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
-
-        /* now specify which file to upload */
-        curl_easy_setopt(curl, CURLOPT_READDATA, &file);
-
-        /* we want to use our own read function */
-        curl_easy_setopt(curl, CURLOPT_READFUNCTION, read_data);
-
-        ntstdio_printf(&ntstdio, "cURL perform the request\n");
-        tslp_tsk(100 * 1000);
-
-        /* Perform the request, res will get the return code */
-        res = curl_easy_perform(curl);
-        /* Check for errors */
-        if (res != CURLE_OK) {
-                ntstdio_printf(&ntstdio, "curl_easy_perform() failed: %s\n",
+        res = curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1L);
+        if (res != CURLE_OK)
+                printf("CURLOPT_NOPROGRESS failed: %s\n",
                         curl_easy_strerror(res));
-                ntstdio_printf(&ntstdio, errbuf);
-        }
-
-        /* always cleanup */
-        curl_easy_cleanup(curl);
-
-        ntstdio_printf(&ntstdio, "cURL end\n");
-
-file_close:
-        f_close(&file);
-}
-
-void client_fin(void)
-{
+
+        res = curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 50L);
+        if (res != CURLE_OK)
+                printf("CURLOPT_MAXREDIRS failed: %s\n",
+                        curl_easy_strerror(res));
+
+        res = curl_easy_setopt(curl, CURLOPT_TCP_KEEPALIVE, 1L);
+        if (res != CURLE_OK)
+                printf("CURLOPT_TCP_KEEPALIVE failed: %s\n",
+                        curl_easy_strerror(res));
+}
+
+void client_set_client_id(const char *client_id)
+{
+        google_drive_t *gd = &google_drive;
+
+        strlcpy(gd->client_info.client_id, client_id, sizeof(gd->client_info.client_id));
+}
+
+void client_set_client_secret(const char *client_secret)
+{
+        google_drive_t *gd = &google_drive;
+
+        strlcpy(gd->client_info.client_secret, client_secret, sizeof(gd->client_info.client_secret));
+}
+
+int client_get_device_id(int argc, char **argv)
+{
+        google_drive_t *gd = &google_drive;
+        int ret;
+
+        ret = get_device_id(gd, SCOPE_DRIVE_FILE);
+        if (ret == 0) {
+                printf("Device was registered. Enter the code at the following URL\n");
+                printf("url:  %s\n", gd->credential.verification_url);
+                printf("code: %s\n", gd->credential.user_code);
+        }
+        else {
+                printf("Device register failed! %d\n", ret);
+        }
+
+        return ret;
+}
+
+int client_get_access_token(int argc, char **argv)
+{
+        google_drive_t *gd = &google_drive;
+        int ret;
+
+        ret = get_access_token(gd);
+        if (ret == 0) {
+                printf("Access token was give\n");
+                printf("Refresh token: %s\n", gd->credential.refresh_token);
+                printf("Access token: %s\n", gd->credential.access_token);
+        }
+        else {
+                printf("Access token gain failed. %d\n", ret);
+        }
+
+        return ret;
+}
+
+int client_update_access_token(int argc, char **argv)
+{
+        google_drive_t *gd = &google_drive;
+        int ret;
+
+        ret = update_access_token(gd);
+        if (ret == 0) {
+                printf("Access token was update\n");
+                printf("Access token: %s\n", gd->credential.access_token);
+        }
+        else {
+                printf("Access token update failed. %d\n", ret);
+        }
+
+        return ret;
+}
+
+int client_revoke(int argc, char **argv)
+{
+        google_drive_t *gd = &google_drive;
+        int ret;
+
+        ret = revoke_device(gd);
+        if (ret == 0) {
+                printf("Device was revoked.\n");
+        }
+        else {
+                printf("Device revoke failed. %d\n", ret);
+        }
+
+        return ret;
+}
+
+int client_upload_file(int argc, char **argv)
+{
+        google_drive_t *gd = &google_drive;
+        int ret;
+        FRESULT fret;
+        char fname[] = { "1:/log/20160101000000.log" };
+
+        get_logfname(fname);
+
+        fret = write_log(fname);
+        if (fret != FR_OK) {
+                printf("log file write error %d\n", fret);
+                return (int)fret;
+        }
+
+        ret = upload_file(gd, &fname[7], fname);
+        if (ret == 0) {
+                printf("%s was uploaded.\n", &fname[7]);
+        }
+        else {
+                printf("%s upload failed. %d\n", &fname[7], ret);
+        }
+
+        return ret;
+}
+
+void client_final(void)
+{
+        google_drive_t *gd = &google_drive;
+        jsonsl_t jsn = gd->jsn;
+
         curl_global_cleanup();
-}
+        jsonsl_destroy(jsn);
+}

asp3_tinet_ecnl_arm/trunk/app1_usb_watt_meter/src/client.h

@@ -39 +39 @@
 #define _CLIENT_H_
 
-#include <kernel.h>
-#include "target_kernel_impl.h"
+typedef struct client_info_t {
+        char client_id[80];
+        char client_secret[32];
+} client_info_t;
 
-#define CLIENT_PRIORITY         4               /* クライアントタスクの優先度 */
+typedef struct credential_t {
+        char device_code[100];
+        char user_code[12];
+        int expires_in;
+        int interval;
+        char verification_url[32];
+        char access_token[132];
+        char refresh_token[64];
+        char scope[64];
+        char token_type[16];
+} credential_t;
 
-#define CLIENT_STACK_SIZE       6144    /* スタック領域のサイズ */
+typedef struct error_response_t {
+        char error[64];
+        char error_description[64];
+} error_response_t;
 
-extern void client_init(void);
-extern void client_task(intptr_t exinf);
-extern void client_fin(void);
+typedef struct drive_file_t {
+        char kind[32];
+        char id[36];
+        char name[256];
+        char mimeType[40];
+} drive_file_t;
+
+typedef enum google_drive_parse_state_t {
+        psRoot,
+        psDeviceCode,
+        psUserCode,
+        psExpiresIn,
+        psInterval,
+        psVerificationUrl,
+        psAccessToken,
+        psRefreshToken,
+        psScope,
+        psTokenType,
+        psKind,
+        psId,
+        psName,
+        psMimeType,
+        psError,
+        psErrorDescription,
+} google_drive_parse_state_t;
+
+struct jsonsl_st;
+typedef struct jsonsl_st *jsonsl_t;
+
+typedef void (*parser_callback_t)(struct google_drive_t *gd, struct jsonsl_state_st *state, const char *buf);
+
+typedef struct google_drive_t {
+        client_info_t client_info;
+        credential_t credential;
+        drive_file_t file;
+        error_response_t error;
+        jsonsl_t jsn;
+        google_drive_parse_state_t state;
+        char fname[sizeof("1:/log/20160101000000.log")];
+        char jsn_buf[256];
+        int jsn_buf_pos;
+        parser_callback_t start;
+        parser_callback_t end;
+} google_drive_t;
+
+extern google_drive_t google_drive;
+
+void client_init(void);
+void client_final(void);
+
+void client_set_client_id(const char *client_id);
+void client_set_client_secret(const char *client_secret);
+int client_get_device_id(int argc, char **argv);
+int client_get_access_token(int argc, char **argv);
+int client_update_access_token(int argc, char **argv);
+int client_revoke(int argc, char **argv);
+int client_upload_file(int argc, char **argv);
 
 #endif /* _CLIENT_H_ */

asp3_tinet_ecnl_arm/trunk/app1_usb_watt_meter/src/echonet_main.c

@@ -1 +1 @@
 /*
  *  TOPPERS ECHONET Lite Communication Middleware
- * 
+ *
  *  Copyright (C) 2016-2018 Cores Co., Ltd. Japan
- * 
+ *
  *  上記著作権者は，以下の(1)～(4)の条件を満たす場合に限り，本ソフトウェ
  *  ア（本ソフトウェアを改変したものを含む．以下同じ）を使用・複製・改
@@ -26 +26 @@
  *      由に基づく請求からも，上記著作権者およびTOPPERSプロジェクトを
  *      免責すること．
- * 
+ *
  *  本ソフトウェアは，無保証で提供されているものである．上記著作権者お
  *  よびTOPPERSプロジェクトは，本ソフトウェアに関して，特定の使用目的
@@ -32 +32 @@
  *  アの利用により直接的または間接的に生じたいかなる損害に関しても，そ
  *  の責任を負わない．
- * 
+ *
  *  @(#) $Id$
  */
 
-/* 
+/*
  *  サンプルプログラム(1)の本体
  */
@@ -164 +164 @@
 {
         /* サイズが１以外は受け付けない */
-        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:
@@ -196 +196 @@
 {
         /* サイズが１以外は受け付けない */
-        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:
@@ -271 +271 @@
 int date_prop_set(const EPRPINIB *item, const void *src, int size, bool_t *anno)
 {
-        uint8_t *p_src;
+        const uint8_t *p_src;
         time_t temp;
         struct tm _tm;
@@ -283 +283 @@
         /* 年月日設定 */
         p_src = (uint8_t *)src;
-        _tm.tm_year = (*(p_src++) * 100) + *p_src++;
+        _tm.tm_year = (*p_src++ * 100) + *p_src++;
         _tm.tm_mon = (*p_src++) - 1;
         _tm.tm_mday = *p_src++;
@@ -325 +325 @@
 
         /* サイズが4以外は受け付けない */
-        if(size != 4)
+        if (size != 4)
                 return 0;
 
@@ -345 +345 @@
 
         len = 48 - meter->current_pos;
-        if(len > 0)
+        if (len > 0)
                 memcpy(dst, &meter->integral_electric_energy_measurement_log[meter->current_pos], sizeof(uint32_t) * len);
         dst = &((uint8_t *)dst)[len];
@@ -404 +404 @@
 
         ret2 = get_tim(&now);
-        if (ret2 != E_OK){
+        if (ret2 != E_OK) {
                 syslog(LOG_ERROR, "get_tim");
                 return;
         }
 
-        for(;;){
+        for (;;) {
                 prev = now;
 
@@ -417 +417 @@
                 /* 応答電文待ち */
                 ret = ecn_trcv_esv(&esv, timer);
-                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");
                         break;
@@ -423 +423 @@
 
                 ret2 = get_tim(&now);
-                if (ret2 != E_OK){
+                if (ret2 != E_OK) {
                         syslog(LOG_ERROR, "get_tim");
                         break;
@@ -438 +438 @@
                         /* 領域解放 */
                         ret = ecn_rel_esv(esv);
-                        if (ret != E_OK){
+                        if (ret != E_OK) {
                                 syslog(LOG_ERROR, "ecn_rel_esv");
                                 break;
@@ -447 +447 @@
                         /* 応答電文待ちの割り込みデータ取得 */
                         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");
                                 break;
@@ -457 +457 @@
                         /* 領域解放 */
                         ret = ecn_rel_esv(esv);
-                        if (ret != E_OK){
+                        if (ret != E_OK) {
                                 syslog(LOG_ERROR, "ecn_rel_esv");
                                 break;
@@ -468 +468 @@
 }
 
-bool_t started = false;
-
 void echonet_change_netif_link(uint8_t link_up, uint8_t up)
 {
@@ -477 +475 @@
                 return;
 
-        if (up && !started) {
-                started = true;
-
-                /* ECHONETミドルウェアを起動 */
-                ret = ecn_sta_svc();
-                if (ret != E_OK)
-                        return;
-
-                /* ECHONETミドルウェアを起動するのを待つ */
-                dly_tsk(100);
+        if (up) {
+                /* インスタンスリスト通知の送信 */
+                ret = ecn_ntf_inl();
+                if (ret != E_OK) {
+                        syslog(LOG_ERROR, "ecn_ntf_inl");
+                }
         }
 
@@ -500 +494 @@
 }
 
-enum main_state_t{
+enum main_state_t {
+        main_state_start,
         main_state_idle,
 };
 
 int main_timer = TMO_FEVR;
-enum main_state_t main_state = main_state_idle;
+enum main_state_t main_state = main_state_start;
 int main_lcd_state = 0;
 int main_lcd_timer = TMO_FEVR;
@@ -557 +552 @@
         analogin_init(&joystick, P1_12);
 
-        /* 10ms後にボタン状態を確認 */
-        main_timer = 10 * 1000;
-
-        /* ボタン状態読み込み */
+        /* ECHONETミドルウェアを起動するのを待つ */
+        main_state = main_state_start;
+        main_timer = 1000 * 1000;
+
         btn = main_read_button(&joystick);
         main_btn1_state = btn == BUTTON_LEFT;
@@ -568 +563 @@
         spi_init(&lcd.hspi, P10_14, P10_15, P10_12, NC);
         spi_format(&lcd.hspi, 8, 0, 0);
-        spi_frequency(&lcd.hspi, 1000000);
+        spi_frequency(&lcd.hspi, 4000000);
 
         gpio_init_out(&lcd.cs_pin, P10_13);
@@ -590 +585 @@
         main_adv_timer = 1000 * 1000;
 
+        /* メインタスクを起動 */
         ER ret = act_tsk(MAIN_TASK);
         if (ret != E_OK) {
@@ -603 +599 @@
         int result = main_timer;
 
-        if((result == TMO_FEVR)
-                || ((main_lcd_timer != TMO_FEVR) && (main_lcd_timer < result))){
+        if ((result == TMO_FEVR)
+                || ((main_lcd_timer != TMO_FEVR) && (main_lcd_timer < result))) {
                 result = main_lcd_timer;
         }
@@ -621 +617 @@
 static void main_progress(int interval)
 {
-        if(main_timer != TMO_FEVR){
+        if (main_timer != TMO_FEVR) {
                 main_timer -= interval;
-                if(main_timer < 0){
+                if (main_timer < 0) {
                         main_timer = 0;
                 }
         }
 
-        if(main_lcd_timer != TMO_FEVR){
+        if (main_lcd_timer != TMO_FEVR) {
                 main_lcd_timer -= interval;
-                if(main_lcd_timer < 0){
+                if (main_lcd_timer < 0) {
                         main_lcd_timer = 0;
                 }
@@ -655 +651 @@
 
         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:
@@ -669 +665 @@
                         }
                 }
-                if(ret != E_BOVR){
+                if (ret != E_BOVR) {
                         syslog(LOG_ERROR, "ecn_itr_nxt");
                         break;
                 }
-                if(enm.is_eof)
+                if (enm.is_eof)
                         break;
         }
@@ -684 +680 @@
 {
         char mac_text[30] = "mac: ";
-        char ipaddr_text[30] = "ipaddr: ";
-        T_IN4_ADDR *ip4_addr;
+        char ipaddr_text[30] = "ipadr: ";
+        const T_IN4_ADDR *ip4_addr;
         int pos;
 
-        switch(main_state){
+        switch (main_state) {
         case main_state_idle:
                 if (len == 0)
@@ -704 +700 @@
                         pos = str_macaddr(&mac_text[4], sizeof(mac_text) - 4, mac_addr, 0);
                         mac_text[pos + 4] = '\0';
-                        lcd_drawString(&lcd, mac_text, X_LINE_TO_PIX(&lcd, 0) + 10, Y_ROW_TO_PIX(&lcd, 14) + 10, ST7735_BLACK, ST7735_WHITE);
+                        lcd_drawString(&lcd, mac_text, X_LINE_TO_PIX(&lcd, 0), Y_ROW_TO_PIX(&lcd, 11), ST7735_BLACK, ST7735_WHITE);
 
                         ip4_addr = in4_get_ifaddr(0);
-                        pos = str_ipv4addr(&ipaddr_text[7], sizeof(ipaddr_text) - 7, ip4_addr, 0);
-                        ipaddr_text[pos + 7] = '\0';
-                        lcd_drawString(&lcd, ipaddr_text, X_LINE_TO_PIX(&lcd, 0) + 10, Y_ROW_TO_PIX(&lcd, 15) + 10, ST7735_BLACK, ST7735_WHITE);
+                        pos = str_ipv4addr(&ipaddr_text[6], sizeof(ipaddr_text) - 6, ip4_addr, 0);
+                        ipaddr_text[pos + 6] = '\0';
+                        lcd_drawString(&lcd, ipaddr_text, X_LINE_TO_PIX(&lcd, 0), Y_ROW_TO_PIX(&lcd, 12), ST7735_BLACK, ST7735_WHITE);
                 }
                 break;
@@ -724 +720 @@
 static void main_timeout()
 {
-        if(main_timer == 0){
+        if (main_timer == 0) {
                 main_ontimer();
         }
 
-        if(main_lcd_timer == 0){
+        if (main_lcd_timer == 0) {
                 main_lcd_ontimer();
         }
@@ -746 +742 @@
         int port_no, btn;
 
-        switch(main_lcd_state) {
+        switch (main_lcd_state) {
         case 0:
         case 1:
@@ -757 +753 @@
                 text[16] = '0' + main_7seg[port_no][2];
                 text[17] = '0' + main_7seg[port_no][3];
-                lcd_drawString(&lcd, &text[14], X_LINE_HALF_TO_PIX(&lcd, 11) + 10, Y_ROW_TO_PIX(&lcd, main_lcd_state + 4) + 10, ST7735_BLACK, ST7735_WHITE);
+                lcd_drawString(&lcd, &text[14], X_LINE_HALF_TO_PIX(&lcd, 11), Y_ROW_TO_PIX(&lcd, main_lcd_state + 2), ST7735_BLACK, ST7735_WHITE);
                 main_lcd_state++;
                 break;
         case 6:
                 btn = main_read_button(&joystick);
-                lcd_drawString(&lcd, btn_texts[btn], X_LINE_TO_PIX(&lcd, 0) + 10, Y_ROW_TO_PIX(&lcd, 10) + 10, ST7735_BLACK, ST7735_WHITE);
+                lcd_drawString(&lcd, btn_texts[btn], X_LINE_TO_PIX(&lcd, 0), Y_ROW_TO_PIX(&lcd, 9), ST7735_BLACK, ST7735_WHITE);
                 main_lcd_state++;
                 break;
@@ -769 +765 @@
                 break;
         case 10:
-                lcd_drawString(&lcd, "USB電力計", X_LINE_TO_PIX(&lcd, 10) + 10, Y_ROW_TO_PIX(&lcd, 0) + 10, ST7735_BLACK, ST7735_WHITE);
+                lcd_drawString(&lcd, "USB電力計", X_LINE_TO_PIX(&lcd, 6), Y_ROW_TO_PIX(&lcd, 0), ST7735_BLACK, ST7735_WHITE);
                 for (port_no = 0; port_no < 6; port_no++) {
                         text[3] = '1' + port_no;
-                        lcd_drawString(&lcd, text, X_LINE_TO_PIX(&lcd, 0) + 10, Y_ROW_TO_PIX(&lcd, port_no + 4) + 10, ST7735_BLACK, ST7735_WHITE);
+                        lcd_drawString(&lcd, text, X_LINE_TO_PIX(&lcd, 0), Y_ROW_TO_PIX(&lcd, port_no + 2), ST7735_BLACK, ST7735_WHITE);
                 }
                 main_lcd_state = 0;
@@ -802 +798 @@
 static void main_ontimer()
 {
+        ER ret;
         uint8_t btn;
         uint16_t ad_value;
 
-        switch(main_state){
+        switch (main_state) {
+        case main_state_start:
+                /* ECHONETミドルウェアを起動 */
+                ret = ecn_sta_svc();
+                if (ret != E_OK) {
+                        syslog(LOG_ERROR, "ecn_sta_svc");
+                }
+
+                /* 10ms後にボタン状態を確認 */
+                main_state = main_state_idle;
+                main_timer = 10 * 1000;
+                break;
         case main_state_idle:
                 /* 10ms後にボタン状態を確認 */
@@ -845 +853 @@
 
                 /* ボタン１の処理 */
-                if((btn == BUTTON_LEFT) && !main_btn1_state){
+                if ((btn == BUTTON_LEFT) && !main_btn1_state) {
                         main_btn1_count++;
-                        if(main_btn1_count > 10){
+                        if (main_btn1_count > 10) {
                                 main_btn1_count = 0;
                                 main_btn1_state = true;
@@ -854 +862 @@
                         }
                 }
-                else if((btn != BUTTON_LEFT) && main_btn1_state){
+                else if ((btn != BUTTON_LEFT) && main_btn1_state) {
                         main_btn1_count++;
-                        if(main_btn1_count > 10){
+                        if (main_btn1_count > 10) {
                                 main_btn1_count = 0;
                                 main_btn1_state = false;
@@ -865 +873 @@
 
                 /* ボタン２の処理 */
-                if((btn == BUTTON_RIGHT) && !main_btn2_state){
+                if ((btn == BUTTON_RIGHT) && !main_btn2_state) {
                         main_btn2_count++;
-                        if(main_btn2_count > 10){
+                        if (main_btn2_count > 10) {
                                 main_btn2_count = 0;
                                 main_btn2_state = true;
@@ -874 +882 @@
                         }
                 }
-                else if((btn != BUTTON_RIGHT) && main_btn2_state){
+                else if ((btn != BUTTON_RIGHT) && main_btn2_state) {
                         main_btn2_count++;
-                        if(main_btn2_count > 10){
+                        if (main_btn2_count > 10) {
                                 main_btn2_count = 0;
                                 main_btn2_state = false;
@@ -897 +905 @@
 static uint8_t main_read_button(analogin_t *obj)
 {
-    float a = analogin_read(obj);
-
-    a *= 5.0;
-
-    //printf("Button read analog = %f\r\n",a);
-    if (a < 0.2)
-        return BUTTON_DOWN;
-    if (a < 1.0)
-        return BUTTON_RIGHT;
-    if (a < 1.7)
-        return BUTTON_SELECT;
-    if (a < 2.6)
-        return BUTTON_UP;
-    if (a < 4.6)
-        return BUTTON_LEFT;
-    else
-        return BUTTON_NONE;
+        float a = analogin_read(obj);
+
+        a *= 5.0;
+
+        //printf("Button read analog = %f\r\n",a);
+        if (a < 0.2)
+                return BUTTON_DOWN;
+        if (a < 1.0)
+                return BUTTON_RIGHT;
+        if (a < 1.7)
+                return BUTTON_SELECT;
+        if (a < 2.6)
+                return BUTTON_UP;
+        if (a < 4.6)
+                return BUTTON_LEFT;
+        else
+                return BUTTON_NONE;
 }
 
@@ -924 +932 @@
 {
         /* 押されて戻った時に処理する */
-        if(push)
+        if (push)
                 return;
 
         /* 表示ポート番号 */
-        if(!main_rev){
+        if (!main_rev) {
                 main_port_no--;
-                if(main_port_no < 1){
+                if (main_port_no < 1) {
                         main_port_no = 1;
                         main_rev = true;
@@ -936 +944 @@
                 }
         }
-        else{
+        else {
                 main_port_no++;
-                if(main_port_no > main_ad_count){
+                if (main_port_no > main_ad_count) {
                         main_port_no = main_ad_count;
                         main_rev = false;
@@ -952 +960 @@
 {
         /* 押されて戻った時に処理する */
-        if(push)
+        if (push)
                 return;
 
@@ -961 +969 @@
 
         /* 表示ポート番号 */
-        if(!main_rev){
+        if (!main_rev) {
                 main_port_no++;
-                if(main_port_no > main_ad_count){
+                if (main_port_no > main_ad_count) {
                         main_port_no = main_ad_count;
                         main_rev = false;
@@ -969 +977 @@
                 }
         }
-        else{
+        else {
                 main_port_no--;
-                if(main_port_no < 1){
+                if (main_port_no < 1) {
                         main_port_no = 1;
                         main_rev = true;
@@ -988 +996 @@
 
         main_port_no++;
-        if(main_port_no > main_ad_count)
+        if (main_port_no > main_ad_count)
                 main_port_no = 1;
 

asp3_tinet_ecnl_arm/trunk/app1_usb_watt_meter/src/main.c

@@ -45 +45 @@
 #include <sil.h>
 #include <setjmp.h>
+#include <stdlib.h>
 #include <string.h>
 #include "syssvc/serial.h"
@@ -80 +81 @@
 
 ID ws_api_mailboxid = MAIN_DATAQUEUE;
+#ifndef NOUSE_MPF_NET_BUF
 ID ws_mempoolid = MPF_NET_BUF_256;
+#endif
 
 #if defined(IF_ETHER_BTUSB) || defined(IF_ETHER_ENBT)
@@ -114 +117 @@
 static void main_timeout();
 
+extern int ntshell_exit;
+
 int uart_read(char *buf, int cnt, void *extobj)
 {
-        return serial_rea_dat(SIO_PORTID, (char *)buf, cnt);
+        struct main_t *obj = (struct main_t *)extobj;
+        int result;
+        ER ret;
+        int timer;
+
+        obj->prev = obj->now;
+
+        /* タイマー取得 */
+        timer = main_get_timer();
+
+        /* 待ち */
+        ret = serial_trea_dat(SIO_PORTID, buf, cnt, timer);
+        if ((ret < 0) && (ret != E_OK) && (ret != E_TMOUT)) {
+                syslog(LOG_NOTICE, "tslp_tsk ret: %s %d", itron_strerror(ret), timer);
+                ntshell_exit = 1;
+                return -1;
+        }
+        result = (int)ret;
+
+        ret = get_tim(&obj->now);
+        if (ret != E_OK) {
+                syslog(LOG_NOTICE, "get_tim ret: %s", itron_strerror(ret));
+                ntshell_exit = 1;
+                return -1;
+        }
+
+                        /* 時間経過 */
+        int elapse = obj->now - obj->prev;
+        main_progress(elapse);
+
+        /* タイムアウト処理 */
+        main_timeout();
+
+        return result;
 }
 
@@ -122 +160 @@
 {
         return serial_wri_dat(SIO_PORTID, buf, cnt);
-}
-
-unsigned char ntstdio_xi(struct ntstdio_t *handle)
-{
-        char buf[1];
-        if(serial_rea_dat(SIO_PORTID, buf, 1) != 1)
-                return -EIO;
-        return buf[0];
-}
-
-void ntstdio_xo(struct ntstdio_t *handle, unsigned char c)
-{
-        char buf[1];
-        buf[0] = c;
-        serial_wri_dat(SIO_PORTID, buf, 1);
 }
 
@@ -156 +179 @@
         main_initialize();
 
-        ntshell_init(&ntshell, uart_read, uart_write, cmd_execute, NULL);
+        ntshell_init(&ntshell, uart_read, uart_write, cmd_execute, &main_obj);
         ntshell_set_prompt(&ntshell, "NTShell>");
         ntshell_execute(&ntshell);
@@ -176 +199 @@
         ER ret;
 
+#ifdef TOPPERS_OMIT_TECS
+        serial_opn_por(SIO_PORTID);
+#endif
+        serial_ctl_por(SIO_PORTID, IOCTL_FCSND | IOCTL_FCRCV);
+
         //wolfSSL_Debugging_ON();
 
-        ntshell_task_init();
+        ntshell_task_init(uart_read, uart_write, &main_obj);
 
         main_obj.timer = TMO_FEVR;
@@ -313 +341 @@
 }
 
+int cmd_creid(int argc, char **argv)
+{
+        if (argc != 2) {
+                printf("creid {client_id}\n");
+                return 0;
+        }
+
+        client_set_client_id(argv[1]);
+
+        return 0;
+}
+
+int cmd_secret(int argc, char **argv)
+{
+        if (argc != 2) {
+                printf("secret {client_secret}\n");
+                return 0;
+        }
+
+        client_set_client_secret(argv[1]);
+
+        return 0;
+}
+
 int cmd_logupload(int argc, char **argv)
 {
-        client_task(0);
-        return 0;
+        return client_upload_file(argc, argv);
 }
 
@@ -335 +386 @@
         {"dnsc", "DNS client", usrcmd_dnsc },
         {"ntpc", "NTP client", usrcmd_ntpc },
+        {"creid", "Regster device", cmd_creid},
+        {"secret", "Regster device", cmd_secret},
+        {"gdi", "get_device_id", client_get_device_id},
+        {"gat", "get_access_token", client_get_access_token},
+        {"uat", "update_access_token", client_update_access_token},
+        {"rd", "revoke device", client_revoke},
+        {"uf", "upload_file", client_upload_file},
         {"logupload", "Upload log to server", cmd_logupload},
         {"info", "This is a description text string for info command.", usrcmd_info},

asp3_tinet_ecnl_arm/trunk/app1_usb_watt_meter/src/main.cfg

@@ -54 +54 @@
 INCLUDE("tinet/tinet_asp.cfg");
 INCLUDE("tinet_main.cfg");
-INCLUDE("netinet/ip_igmp.cfg");
 
 /* DHCP クライアント */

asp3_tinet_ecnl_arm/trunk/app2_light/.cproject

@@ -22 +22 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -59 +59 @@
                                                         <option id="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack.913962636" name="Warn if stack size exceeds the limit (-Wstack-usage) (H')" superClass="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack" useByScannerDiscovery="false" value="100" valueType="string"/>
                                                         <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.812015080" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-                                                        <builder buildPath="${workspace_loc:/app2_light}/Debug" id="com.renesas.cdt.managedbuild.gcc.rz.builder.1678746512" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="false" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
+                                                        <builder buildPath="${workspace_loc:/app2_light}/Debug" id="com.renesas.cdt.managedbuild.gcc.rz.builder.1678746512" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
                                                         <tool id="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler.1300910948" name="Cross ARM GNU Assembler" superClass="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler">
                                                                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.821934622" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" useByScannerDiscovery="false" value="true" valueType="boolean"/>
@@ -127 +127 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -164 +164 @@
                                                         <option id="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack.296419460" name="Warn if stack size exceeds the limit (-Wstack-usage) (H')" superClass="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack" useByScannerDiscovery="false" value="100" valueType="string"/>
                                                         <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.1982161542" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-                                                        <builder buildPath="${workspace_loc:/app2_light}/DebugEther" id="com.renesas.cdt.managedbuild.gcc.rz.builder.648260189" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="false" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
+                                                        <builder buildPath="${workspace_loc:/app2_light}/DebugEther" id="com.renesas.cdt.managedbuild.gcc.rz.builder.648260189" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
                                                         <tool id="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler.1287580563" name="Cross ARM GNU Assembler" superClass="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler">
                                                                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1691990754" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" useByScannerDiscovery="false" value="true" valueType="boolean"/>

asp3_tinet_ecnl_arm/trunk/app2_light/Debug/Makefile

@@ -173 +173 @@
         CDEFS := -DTOPPERS_OMIT_TECS $(CDEFS)
 endif
-CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DECHONET_USE_MALLOC -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
+CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DNOUSE_MPF_NET_BUF -DECHONET_USE_MALLOC -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
 INCLUDES := -I. -I$(SRCDIR)/include -I$(SRCDIR) \
         -I$(SRCDIR)/../btstack/include \
@@ -181 +181 @@
         -I$(SRCDIR)/../usbhost/src \
         $(INCLUDES)
-LDFLAGS := $(LDFLAGS) -Wl,-Map=$(OBJNAME).map,--cref -L.
+LDFLAGS := $(LDFLAGS) -L.
 LIBS := $(LIBS) $(CXXLIBS)
 CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES)
@@ -215 +215 @@
 endif
 
-
-#
-#  ネットワークサービスの定義
-#
-NO_USE_TINET_LIBRARY = true
-
-#  ネットワークインタフェースの選択、何れか一つ選択する。
-NET_IF = ether
-
-#  イーサネット・ディバイスドライバの選択
-NET_DEV = if_btusb
-
-#  ネットワーク層の選択
-#SUPPORT_INET6 = true
-SUPPORT_INET4 = true
-
-#  API に組込む機能の選択
-#API_CFG_IP4MAPPED_ADDR = true
-
-#  トランスポート層の選択
-SUPPORT_TCP = true
-SUPPORT_UDP = true
-
-# IGMPを有効に設定
-SUPPORT_IGMP = true
-
-#
-#  ネットワークサービスの Makefile のインクルード
-#
-include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+ifdef TINETDIR
+        #
+        #  ネットワークサービスの定義
+        #
+        NO_USE_TINET_LIBRARY = true
+
+        #  ネットワークインタフェースの選択、何れか一つ選択する。
+        NET_IF = ether
+
+        #  イーサネット・ディバイスドライバの選択
+        NET_DEV = if_btusb
+
+        #  ネットワーク層の選択
+        #SUPPORT_INET6 = true
+        SUPPORT_INET4 = true
+
+        #  API に組込む機能の選択
+        #API_CFG_IP4MAPPED_ADDR = true
+
+        #  トランスポート層の選択
+        SUPPORT_TCP = true
+        SUPPORT_UDP = true
+
+        # IGMPを有効に設定
+        SUPPORT_IGMP = true
+
+        #
+        #  ネットワークサービスの Makefile のインクルード
+        #
+        include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+endif
 
 #
@@ -277 +278 @@
 #  コンフィギュレータに関する定義
 #
-CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
-CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
+ifndef TINETDIR
+  CFG_TRB := -T $(TARGETDIR)/target_kernel.trb
+  CFG_TABS := --api-table $(SRCDIR)/kernel/kernel_api.def \
+                        --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+else
+  CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
+  CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
                         --api-table ../../ntshell/echonet/echonet_api.def:echonet \
                         --api-table $(SRCDIR)/kernel/kernel_api.def:kernel \
@@ -284 +290 @@
                         --symval-table ../../ntshell/echonet/echonet_sym.def \
                         --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+endif
 CFG_ASMOBJS := $(CFG_ASMOBJS)
 CFG_COBJS := kernel_cfg.o echonet_cfg.o $(CFG_COBJS)
@@ -429 +436 @@
 
 #
+#  並列makeのための依存関係の定義
+#
+$(APPL_OBJS) $(filter-out $(CFG_DMY), $(SYSSVC_OBJS)): | kernel_cfg.timestamp
+$(APPL_ASMOBJS) $(filter-out $(CFG_DMY), $(SYSSVC_ASMOBJS)) $(KERNEL_ASMOBJS) $(CFG_ASMOBJS): \
+                                                                                                                | offset.timestamp
+
+#
 #  特別な依存関係の定義
 #
@@ -437 +451 @@
 #
 $(OBJFILE): $(ALL_OBJS) $(LIBS_DEP)
-        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) \
+        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) -Wl,-Map=$(OBJNAME).map,--cref \
                         $(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \
                         -Wl,--start-group $(ALL_LIBS) -Wl,--end-group $(END_OBJS)

asp3_tinet_ecnl_arm/trunk/app2_light/DebugEther/Makefile

@@ -171 +171 @@
         CDEFS := -DTOPPERS_OMIT_TECS $(CDEFS)
 endif
-CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DECHONET_USE_MALLOC -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
+CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DNOUSE_MPF_NET_BUF -DECHONET_USE_MALLOC -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
 INCLUDES := -I. -I$(SRCDIR)/include -I$(SRCDIR) \
         -I$(SRCDIR)/../btstack/include \
@@ -179 +179 @@
         -I$(SRCDIR)/../usbhost/src \
         $(INCLUDES)
-LDFLAGS := $(LDFLAGS) -Wl,-Map=$(OBJNAME).map,--cref -L.
+LDFLAGS := $(LDFLAGS) -L.
 LIBS := $(LIBS) $(CXXLIBS)
 CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES)
@@ -213 +213 @@
 endif
 
-
-#
-#  ネットワークサービスの定義
-#
-NO_USE_TINET_LIBRARY = true
-
-#  ネットワークインタフェースの選択、何れか一つ選択する。
-NET_IF = ether
-
-#  イーサネット・ディバイスドライバの選択
+ifdef TINETDIR
+        #
+        #  ネットワークサービスの定義
+        #
+        NO_USE_TINET_LIBRARY = true
+
+        #  ネットワークインタフェースの選択、何れか一つ選択する。
+        NET_IF = ether
+
+        #  イーサネット・ディバイスドライバの選択
         NET_DEV = if_mbed
 
-#  ネットワーク層の選択
-#SUPPORT_INET6 = true
-SUPPORT_INET4 = true
-
-#  API に組込む機能の選択
-#API_CFG_IP4MAPPED_ADDR = true
-
-#  トランスポート層の選択
-SUPPORT_TCP = true
-SUPPORT_UDP = true
-
-# IGMPを有効に設定
-SUPPORT_IGMP = true
-
-#
-#  ネットワークサービスの Makefile のインクルード
-#
-include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+        #  ネットワーク層の選択
+        #SUPPORT_INET6 = true
+        SUPPORT_INET4 = true
+
+        #  API に組込む機能の選択
+        #API_CFG_IP4MAPPED_ADDR = true
+
+        #  トランスポート層の選択
+        SUPPORT_TCP = true
+        SUPPORT_UDP = true
+
+        # IGMPを有効に設定
+        SUPPORT_IGMP = true
+
+        #
+        #  ネットワークサービスの Makefile のインクルード
+        #
+        include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+endif
 
 #
@@ -275 +276 @@
 #  コンフィギュレータに関する定義
 #
-CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
-CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
+ifndef TINETDIR
+  CFG_TRB := -T $(TARGETDIR)/target_kernel.trb
+  CFG_TABS := --api-table $(SRCDIR)/kernel/kernel_api.def \
+                        --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+else
+  CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
+  CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
                         --api-table ../../ntshell/echonet/echonet_api.def:echonet \
                         --api-table $(SRCDIR)/kernel/kernel_api.def:kernel \
@@ -282 +288 @@
                         --symval-table ../../ntshell/echonet/echonet_sym.def \
                         --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+endif
 CFG_ASMOBJS := $(CFG_ASMOBJS)
 CFG_COBJS := kernel_cfg.o echonet_cfg.o $(CFG_COBJS)
@@ -427 +434 @@
 
 #
+#  並列makeのための依存関係の定義
+#
+$(APPL_OBJS) $(filter-out $(CFG_DMY), $(SYSSVC_OBJS)): | kernel_cfg.timestamp
+$(APPL_ASMOBJS) $(filter-out $(CFG_DMY), $(SYSSVC_ASMOBJS)) $(KERNEL_ASMOBJS) $(CFG_ASMOBJS): \
+                                                                                                                | offset.timestamp
+
+#
 #  特別な依存関係の定義
 #
@@ -435 +449 @@
 #
 $(OBJFILE): $(ALL_OBJS) $(LIBS_DEP)
-        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) \
+        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) -Wl,-Map=$(OBJNAME).map,--cref \
                         $(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \
                         -Wl,--start-group $(ALL_LIBS) -Wl,--end-group $(END_OBJS)

asp3_tinet_ecnl_arm/trunk/app2_light/src/echonet_main.c

@@ -1 +1 @@
 /*
  *  TOPPERS ECHONET Lite Communication Middleware
- * 
+ *
  *  Copyright (C) 2014-2018 Cores Co., Ltd. Japan
- * 
+ *
  *  上記著作権者は，以下の(1)～(4)の条件を満たす場合に限り，本ソフトウェ
  *  ア（本ソフトウェアを改変したものを含む．以下同じ）を使用・複製・改
@@ -26 +26 @@
  *      由に基づく請求からも，上記著作権者およびTOPPERSプロジェクトを
  *      免責すること．
- * 
+ *
  *  本ソフトウェアは，無保証で提供されているものである．上記著作権者お
  *  よびTOPPERSプロジェクトは，本ソフトウェアに関して，特定の使用目的
@@ -32 +32 @@
  *  アの利用により直接的または間接的に生じたいかなる損害に関しても，そ
  *  の責任を負わない．
- * 
+ *
  *  @(#) $Id$
  */
 
-/* 
+/*
  *  サンプルプログラム(1)の本体
  */
@@ -127 +127 @@
 {
         /* サイズが１以外は受け付けない */
-        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:
@@ -163 +163 @@
 {
         /* サイズが１以外は受け付けない */
-        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:
@@ -189 +189 @@
 {
         /* サイズが1以外は受け付けない */
-        if(size != 1)
-                return 0;
-
-        switch(*(uint8_t *)src){
+        if (size != 1)
+                return 0;
+
+        switch (*(uint8_t *)src) {
         /* 自動の場合 */
         case 0x41:
@@ -241 +241 @@
         uint8_t data[2];
 
-        if(size != 1)
-                return 0;
-
-        switch(*(uint8_t *)src){
+        if (size != 1)
+                return 0;
+
+        switch (*(uint8_t *)src) {
         /* 人体検出ありの場合 */
         case 0x41:
@@ -253 +253 @@
                 data[1] = *(uint8_t *)src;
                 ret = ecn_brk_wai(data, sizeof(data));
-                if(ret != E_OK){
+                if (ret != E_OK) {
                         syslog(LOG_ERROR, "ecn_brk_wai");
                         return 1;
@@ -266 +266 @@
                 data[1] = *(uint8_t *)src;
                 ret = ecn_brk_wai(data, sizeof(data));
-                if(ret != E_OK){
+                if (ret != E_OK) {
                         syslog(LOG_ERROR, "ecn_brk_wai");
                         return 1;
@@ -288 +288 @@
         struct tm _tm;
 
-        if(size != 2)
+        if (size != 2)
                 return 0;
 
@@ -315 +315 @@
         struct tm _tm;
 
-        if(size != 2)
+        if (size != 2)
                 return 0;
 
@@ -338 +338 @@
         struct tm _tm;
 
-        if(size != 4)
+        if (size != 4)
                 return 0;
 
@@ -365 +365 @@
         struct tm _tm;
 
-        if(size != 4)
+        if (size != 4)
                 return 0;
 
@@ -403 +403 @@
 
         ret2 = get_tim(&now);
-        if (ret2 != E_OK){
+        if (ret2 != E_OK) {
                 syslog(LOG_ERROR, "get_tim");
                 return;
         }
 
-        for(;;){
+        for (;;) {
                 prev = now;
 
@@ -416 +416 @@
                 /* 応答電文待ち */
                 ret = ecn_trcv_esv(&esv, timer);
-                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");
                         break;
@@ -422 +422 @@
 
                 ret2 = get_tim(&now);
-                if (ret2 != E_OK){
+                if (ret2 != E_OK) {
                         syslog(LOG_ERROR, "get_tim");
                         break;
@@ -437 +437 @@
                         /* 領域解放 */
                         ret = ecn_rel_esv(esv);
-                        if (ret != E_OK){
+                        if (ret != E_OK) {
                                 syslog(LOG_ERROR, "ecn_rel_esv");
                                 break;
@@ -446 +446 @@
                         /* 応答電文待ちの割り込みデータ取得 */
                         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");
                                 break;
@@ -456 +456 @@
                         /* 領域解放 */
                         ret = ecn_rel_esv(esv);
-                        if (ret != E_OK){
+                        if (ret != E_OK) {
                                 syslog(LOG_ERROR, "ecn_rel_esv");
                                 break;
@@ -467 +467 @@
 }
 
-bool_t started = false;
-
 void echonet_change_netif_link(uint8_t link_up, uint8_t up)
 {
@@ -476 +474 @@
                 return;
 
-        if (up && !started) {
-                started = true;
-
-                /* ECHONETミドルウェアを起動 */
-                ret = ecn_sta_svc();
-                if (ret != E_OK)
-                        return;
-
-                /* ECHONETミドルウェアを起動するのを待つ */
-                dly_tsk(100);
+        if (up) {
+                /* インスタンスリスト通知の送信 */
+                ret = ecn_ntf_inl();
+                if (ret != E_OK) {
+                        syslog(LOG_ERROR, "ecn_ntf_inl");
+                }
         }
 
@@ -499 +493 @@
 }
 
-enum main_state_t{
+enum main_state_t {
+        main_state_start,
         main_state_idle,
         main_state_search,
@@ -506 +501 @@
 int main_timer = TMO_FEVR;
 int main_btn_timer = TMO_FEVR;
-enum main_state_t main_state = main_state_idle;
+enum main_state_t main_state = main_state_start;
 bool_t main_btn1_state;
 int main_btn1_count = 0;
@@ -535 +530 @@
         gpio_write(&led_red, 0);
 
-        /* １秒後に人体検知センサを検索 */
-        main_state = main_state_search;
+        /* ECHONETミドルウェアを起動するのを待つ */
+        main_state = main_state_start;
         main_timer = 1000 * 1000;
 
@@ -548 +543 @@
         main_btn2_state = btn2 != 0;
 
+        /* メインタスクを起動 */
         ER ret = act_tsk(MAIN_TASK);
         if (ret != E_OK) {
@@ -561 +557 @@
         int result = main_timer;
 
-        if((result == TMO_FEVR)
-                || ((main_btn_timer != TMO_FEVR) && (main_btn_timer < result))){
+        if ((result == TMO_FEVR)
+                || ((main_btn_timer != TMO_FEVR) && (main_btn_timer < result))) {
                 result = main_btn_timer;
         }
@@ -574 +570 @@
 static void main_progress(int interval)
 {
-        if(main_timer != TMO_FEVR){
+        if (main_timer != TMO_FEVR) {
                 main_timer -= interval;
-                if(main_timer < 0){
+                if (main_timer < 0) {
                         main_timer = 0;
                 }
         }
 
-        if(main_btn_timer != TMO_FEVR){
+        if (main_btn_timer != TMO_FEVR) {
                 main_btn_timer -= interval;
-                if(main_btn_timer < 0){
+                if (main_btn_timer < 0) {
                         main_btn_timer = 0;
                 }
@@ -602 +598 @@
 
         eobjid = ecn_get_eobj(esv);
-        if(eobjid == EOBJ_NULL){
+        if (eobjid == EOBJ_NULL) {
                 syslog(LOG_ERROR, "ecn_get_eobj");
         }
 
         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 0xD6:
-                                switch(main_state){
+                                switch (main_state) {
                                 case main_state_search:
                                         if (eobjid == HUMAN_DETECTION_SENSER_ENOD) {
@@ -628 +624 @@
                         }
                 }
-                if(ret != E_BOVR){
+                if (ret != E_BOVR) {
                         syslog(LOG_ERROR, "ecn_itr_nxt");
                         break;
                 }
-                if(enm.is_eof)
+                if (enm.is_eof)
                         break;
         }
@@ -646 +642 @@
         ER ret;
 
-        switch(main_state){
+        switch (main_state) {
         case main_state_idle:
                 if (len < 2)
@@ -670 +666 @@
 static void main_timeout()
 {
-        if(main_timer == 0){
+        if (main_timer == 0) {
                 main_ontimer();
         }
 
-        if(main_btn_timer == 0){
+        if (main_btn_timer == 0) {
                 main_btn_ontimer();
         }
@@ -683 +679 @@
 static void main_ontimer()
 {
-        switch(main_state){
+        ER ret;
+
+        switch (main_state) {
+        case main_state_start:
+                /* ECHONETミドルウェアを起動 */
+                ret = ecn_sta_svc();
+                if (ret != E_OK) {
+                        syslog(LOG_ERROR, "ecn_sta_svc");
+                }
+
+                /* １秒後に人体検知センサを検索 */
+                main_state = main_state_search;
+                main_timer = 1000 * 1000;
+                break;
         case main_state_search:
                 /* 人体検知センサ再検索 */
@@ -700 +709 @@
         /* 人体検知センサ検索 */
         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;
@@ -707 +716 @@
         /* 電文送信 */
         ret = ecn_snd_esv(esv);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_snd_esv");
         }
@@ -730 +739 @@
 
         /* ボタン１の処理 */
-        if((btn1 != 0) && !main_btn1_state){
+        if ((btn1 != 0) && !main_btn1_state) {
                 main_btn1_count++;
-                if(main_btn1_count > 10){
+                if (main_btn1_count > 10) {
                         main_btn1_count = 0;
                         main_btn1_state = true;
@@ -739 +748 @@
                 }
         }
-        else if((btn1 == 0) && main_btn1_state){
+        else if ((btn1 == 0) && main_btn1_state) {
                 main_btn1_count++;
-                if(main_btn1_count > 10){
+                if (main_btn1_count > 10) {
                         main_btn1_count = 0;
                         main_btn1_state = false;
@@ -750 +759 @@
 
         /* ボタン２の処理 */
-        if((btn2 != 0) && !main_btn2_state){
+        if ((btn2 != 0) && !main_btn2_state) {
                 main_btn2_count++;
-                if(main_btn2_count > 10){
+                if (main_btn2_count > 10) {
                         main_btn2_count = 0;
                         main_btn2_state = true;
@@ -759 +768 @@
                 }
         }
-        else if((btn2 == 0) && main_btn2_state){
+        else if ((btn2 == 0) && main_btn2_state) {
                 main_btn2_count++;
-                if(main_btn2_count > 10){
+                if (main_btn2_count > 10) {
                         main_btn2_count = 0;
                         main_btn2_state = false;
@@ -770 +779 @@
 }
 
-enum lighting_mode_t{
+enum lighting_mode_t {
         lighting_mode_auto,             /* 自動の場合 */
         lighting_mode_normal,   /* 通常灯の場合 */
@@ -789 +798 @@
 
         /* 押されて戻った時に処理する */
-        if(push)
+        if (push)
                 return;
 
@@ -798 +807 @@
         /* プロパティ設定電文作成 */
         ret = ecn_esv_setc(&esv, GENERAL_LIGHTING_CLASS_EOBJ, 0x80, 1, p_edt);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_esv_setc");
                 return;
@@ -817 +826 @@
 
         /* 押されて戻った時に処理する */
-        if(push)
+        if (push)
                 return;
 
         /* 点灯モードの切り替え */
-        switch(main_mode){
+        switch (main_mode) {
         /* 自動の場合 */
         case lighting_mode_auto:
@@ -851 +860 @@
         /* プロパティ設定電文作成 */
         ret = ecn_esv_setc(&esv, GENERAL_LIGHTING_CLASS_EOBJ, 0xB6, 1, p_edt);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_esv_setc");
                 return;
@@ -867 +876 @@
 
         /* 照明がOFFで人体検出ありの場合 */
-        if(!main_on && state == 0x41){
+        if (!main_on && state == 0x41) {
                 /* 照明をON */
                 main_on = true;
         }
         /* 照明がOFFで人体検出ありの場合 */
-        else if(main_on && state == 0x42){
+        else if (main_on && state == 0x42) {
                 /* 照明をOFF */
                 main_on = false;
@@ -883 +892 @@
         /* プロパティ設定電文作成 */
         ret = ecn_esv_setc(&esv, GENERAL_LIGHTING_CLASS_EOBJ, 0x80, 1, p_edt);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_esv_setc");
                 return;

asp3_tinet_ecnl_arm/trunk/app2_light/src/main.c

@@ -79 +79 @@
 
 ID ws_api_mailboxid = MAIN_DATAQUEUE;
+#ifndef NOUSE_MPF_NET_BUF
 ID ws_mempoolid = MPF_NET_BUF_256;
+#endif
 
 #ifdef IF_ETHER_BTUSB
@@ -111 +113 @@
 static void main_timeout();
 
+extern int ntshell_exit;
+
 int uart_read(char *buf, int cnt, void *extobj)
 {
-        return serial_rea_dat(SIO_PORTID, (char *)buf, cnt);
+        struct main_t *obj = (struct main_t *)extobj;
+        int result;
+        ER ret;
+        int timer;
+
+        obj->prev = obj->now;
+
+        /* タイマー取得 */
+        timer = main_get_timer();
+
+        /* 待ち */
+        ret = serial_trea_dat(SIO_PORTID, buf, cnt, timer);
+        if ((ret < 0) && (ret != E_OK) && (ret != E_TMOUT)) {
+                syslog(LOG_NOTICE, "tslp_tsk ret: %s %d", itron_strerror(ret), timer);
+                ntshell_exit = 1;
+                return -1;
+        }
+        result = (int)ret;
+
+        ret = get_tim(&obj->now);
+        if (ret != E_OK) {
+                syslog(LOG_NOTICE, "get_tim ret: %s", itron_strerror(ret));
+                ntshell_exit = 1;
+                return -1;
+        }
+
+                        /* 時間経過 */
+        int elapse = obj->now - obj->prev;
+        main_progress(elapse);
+
+        /* タイムアウト処理 */
+        main_timeout();
+
+        return result;
 }
 
@@ -119 +156 @@
 {
         return serial_wri_dat(SIO_PORTID, buf, cnt);
-}
-
-unsigned char ntstdio_xi(struct ntstdio_t *handle)
-{
-        char buf[1];
-        if(serial_rea_dat(SIO_PORTID, buf, 1) != 1)
-                return -EIO;
-        return buf[0];
-}
-
-void ntstdio_xo(struct ntstdio_t *handle, unsigned char c)
-{
-        char buf[1];
-        buf[0] = c;
-        serial_wri_dat(SIO_PORTID, buf, 1);
 }
 
@@ -150 +172 @@
         main_initialize();
 
-        ntshell_init(&ntshell, uart_read, uart_write, cmd_execute, NULL);
+        ntshell_init(&ntshell, uart_read, uart_write, cmd_execute, &main_obj);
         ntshell_set_prompt(&ntshell, "NTShell>");
         ntshell_execute(&ntshell);
@@ -168 +190 @@
         ER ret;
 
-        ntshell_task_init();
+#ifdef TOPPERS_OMIT_TECS
+        serial_opn_por(SIO_PORTID);
+#endif
+        serial_ctl_por(SIO_PORTID, IOCTL_FCSND | IOCTL_FCRCV);
+
+        ntshell_task_init(uart_read, uart_write, &main_obj);
 
         main_obj.timer = TMO_FEVR;

asp3_tinet_ecnl_arm/trunk/app2_light/src/main.cfg

@@ -54 +54 @@
 INCLUDE("tinet/tinet_asp.cfg");
 INCLUDE("tinet_main.cfg");
-INCLUDE("netinet/ip_igmp.cfg");
 
 /* DHCP クライアント */

asp3_tinet_ecnl_arm/trunk/app3_human_detec/.cproject

@@ -22 +22 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -59 +59 @@
                                                         <option id="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack.2061453524" name="Warn if stack size exceeds the limit (-Wstack-usage) (H')" superClass="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack" useByScannerDiscovery="false" value="100" valueType="string"/>
                                                         <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.2110510466" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-                                                        <builder buildPath="${workspace_loc:/app3_human_detec}/Debug" id="com.renesas.cdt.managedbuild.gcc.rz.builder.2014365971" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="false" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
+                                                        <builder buildPath="${workspace_loc:/app3_human_detec}/Debug" id="com.renesas.cdt.managedbuild.gcc.rz.builder.2014365971" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
                                                         <tool id="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler.1586235718" name="Cross ARM GNU Assembler" superClass="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler">
                                                                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1315128639" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" useByScannerDiscovery="false" value="true" valueType="boolean"/>
@@ -127 +127 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -164 +164 @@
                                                         <option id="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack.1077866862" name="Warn if stack size exceeds the limit (-Wstack-usage) (H')" superClass="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack" useByScannerDiscovery="false" value="100" valueType="string"/>
                                                         <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.22147358" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-                                                        <builder buildPath="${workspace_loc:/app3_human_detec}/DebugEther" id="com.renesas.cdt.managedbuild.gcc.rz.builder.1165377046" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="false" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
+                                                        <builder buildPath="${workspace_loc:/app3_human_detec}/DebugEther" id="com.renesas.cdt.managedbuild.gcc.rz.builder.1165377046" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
                                                         <tool id="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler.154532541" name="Cross ARM GNU Assembler" superClass="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler">
                                                                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1431457153" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" useByScannerDiscovery="false" value="true" valueType="boolean"/>

asp3_tinet_ecnl_arm/trunk/app3_human_detec/Debug/Makefile

@@ -173 +173 @@
         CDEFS := -DTOPPERS_OMIT_TECS $(CDEFS)
 endif
-CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DECHONET_USE_MALLOC -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
+CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DNOUSE_MPF_NET_BUF -DECHONET_USE_MALLOC -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
 INCLUDES := -I. -I$(SRCDIR)/include -I$(SRCDIR) \
         -I$(SRCDIR)/../btstack/include \
@@ -181 +181 @@
         -I$(SRCDIR)/../usbhost/src \
         $(INCLUDES)
-LDFLAGS := $(LDFLAGS) -Wl,-Map=$(OBJNAME).map,--cref -L.
+LDFLAGS := $(LDFLAGS) -L.
 LIBS := $(LIBS) $(CXXLIBS)
 CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES)
@@ -215 +215 @@
 endif
 
-
-#
-#  ネットワークサービスの定義
-#
-NO_USE_TINET_LIBRARY = true
-
-#  ネットワークインタフェースの選択、何れか一つ選択する。
-NET_IF = ether
-
-#  イーサネット・ディバイスドライバの選択
-NET_DEV = if_btusb
-
-#  ネットワーク層の選択
-#SUPPORT_INET6 = true
-SUPPORT_INET4 = true
-
-#  API に組込む機能の選択
-#API_CFG_IP4MAPPED_ADDR = true
-
-#  トランスポート層の選択
-SUPPORT_TCP = true
-SUPPORT_UDP = true
-
-# IGMPを有効に設定
-SUPPORT_IGMP = true
-
-#
-#  ネットワークサービスの Makefile のインクルード
-#
-include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+ifdef TINETDIR
+        #
+        #  ネットワークサービスの定義
+        #
+        NO_USE_TINET_LIBRARY = true
+
+        #  ネットワークインタフェースの選択、何れか一つ選択する。
+        NET_IF = ether
+
+        #  イーサネット・ディバイスドライバの選択
+        NET_DEV = if_btusb
+
+        #  ネットワーク層の選択
+        #SUPPORT_INET6 = true
+        SUPPORT_INET4 = true
+
+        #  API に組込む機能の選択
+        #API_CFG_IP4MAPPED_ADDR = true
+
+        #  トランスポート層の選択
+        SUPPORT_TCP = true
+        SUPPORT_UDP = true
+
+        # IGMPを有効に設定
+        SUPPORT_IGMP = true
+
+        #
+        #  ネットワークサービスの Makefile のインクルード
+        #
+        include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+endif
 
 #
@@ -277 +278 @@
 #  コンフィギュレータに関する定義
 #
-CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
-CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
+ifndef TINETDIR
+  CFG_TRB := -T $(TARGETDIR)/target_kernel.trb
+  CFG_TABS := --api-table $(SRCDIR)/kernel/kernel_api.def \
+                        --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+else
+  CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
+  CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
                         --api-table ../../ntshell/echonet/echonet_api.def:echonet \
                         --api-table $(SRCDIR)/kernel/kernel_api.def:kernel \
@@ -284 +290 @@
                         --symval-table ../../ntshell/echonet/echonet_sym.def \
                         --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+endif
 CFG_ASMOBJS := $(CFG_ASMOBJS)
 CFG_COBJS := kernel_cfg.o echonet_cfg.o $(CFG_COBJS)
@@ -429 +436 @@
 
 #
+#  並列makeのための依存関係の定義
+#
+$(APPL_OBJS) $(filter-out $(CFG_DMY), $(SYSSVC_OBJS)): | kernel_cfg.timestamp
+$(APPL_ASMOBJS) $(filter-out $(CFG_DMY), $(SYSSVC_ASMOBJS)) $(KERNEL_ASMOBJS) $(CFG_ASMOBJS): \
+                                                                                                                | offset.timestamp
+
+#
 #  特別な依存関係の定義
 #
@@ -437 +451 @@
 #
 $(OBJFILE): $(ALL_OBJS) $(LIBS_DEP)
-        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) \
+        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) -Wl,-Map=$(OBJNAME).map,--cref \
                         $(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \
                         -Wl,--start-group $(ALL_LIBS) -Wl,--end-group $(END_OBJS)

asp3_tinet_ecnl_arm/trunk/app3_human_detec/DebugEther/Makefile

@@ -171 +171 @@
         CDEFS := -DTOPPERS_OMIT_TECS $(CDEFS)
 endif
-CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DECHONET_USE_MALLOC -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
+CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DNOUSE_MPF_NET_BUF -DECHONET_USE_MALLOC -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
 INCLUDES := -I. -I$(SRCDIR)/include -I$(SRCDIR) \
         -I$(SRCDIR)/../btstack/include \
@@ -179 +179 @@
         -I$(SRCDIR)/../usbhost/src \
         $(INCLUDES)
-LDFLAGS := $(LDFLAGS) -Wl,-Map=$(OBJNAME).map,--cref -L.
+LDFLAGS := $(LDFLAGS) -L.
 LIBS := $(LIBS) $(CXXLIBS)
 CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES)
@@ -213 +213 @@
 endif
 
-
-#
-#  ネットワークサービスの定義
-#
-NO_USE_TINET_LIBRARY = true
-
-#  ネットワークインタフェースの選択、何れか一つ選択する。
-NET_IF = ether
-
-#  イーサネット・ディバイスドライバの選択
+ifdef TINETDIR
+        #
+        #  ネットワークサービスの定義
+        #
+        NO_USE_TINET_LIBRARY = true
+
+        #  ネットワークインタフェースの選択、何れか一つ選択する。
+        NET_IF = ether
+
+        #  イーサネット・ディバイスドライバの選択
         NET_DEV = if_mbed
 
-#  ネットワーク層の選択
-#SUPPORT_INET6 = true
-SUPPORT_INET4 = true
-
-#  API に組込む機能の選択
-#API_CFG_IP4MAPPED_ADDR = true
-
-#  トランスポート層の選択
-SUPPORT_TCP = true
-SUPPORT_UDP = true
-
-# IGMPを有効に設定
-SUPPORT_IGMP = true
-
-#
-#  ネットワークサービスの Makefile のインクルード
-#
-include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+        #  ネットワーク層の選択
+        #SUPPORT_INET6 = true
+        SUPPORT_INET4 = true
+
+        #  API に組込む機能の選択
+        #API_CFG_IP4MAPPED_ADDR = true
+
+        #  トランスポート層の選択
+        SUPPORT_TCP = true
+        SUPPORT_UDP = true
+
+        # IGMPを有効に設定
+        SUPPORT_IGMP = true
+
+        #
+        #  ネットワークサービスの Makefile のインクルード
+        #
+        include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+endif
 
 #
@@ -275 +276 @@
 #  コンフィギュレータに関する定義
 #
-CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
-CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
+ifndef TINETDIR
+  CFG_TRB := -T $(TARGETDIR)/target_kernel.trb
+  CFG_TABS := --api-table $(SRCDIR)/kernel/kernel_api.def \
+                        --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+else
+  CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
+  CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
                         --api-table ../../ntshell/echonet/echonet_api.def:echonet \
                         --api-table $(SRCDIR)/kernel/kernel_api.def:kernel \
@@ -282 +288 @@
                         --symval-table ../../ntshell/echonet/echonet_sym.def \
                         --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+endif
 CFG_ASMOBJS := $(CFG_ASMOBJS)
 CFG_COBJS := kernel_cfg.o echonet_cfg.o $(CFG_COBJS)
@@ -427 +434 @@
 
 #
+#  並列makeのための依存関係の定義
+#
+$(APPL_OBJS) $(filter-out $(CFG_DMY), $(SYSSVC_OBJS)): | kernel_cfg.timestamp
+$(APPL_ASMOBJS) $(filter-out $(CFG_DMY), $(SYSSVC_ASMOBJS)) $(KERNEL_ASMOBJS) $(CFG_ASMOBJS): \
+                                                                                                                | offset.timestamp
+
+#
 #  特別な依存関係の定義
 #
@@ -435 +449 @@
 #
 $(OBJFILE): $(ALL_OBJS) $(LIBS_DEP)
-        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) \
+        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) -Wl,-Map=$(OBJNAME).map,--cref \
                         $(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \
                         -Wl,--start-group $(ALL_LIBS) -Wl,--end-group $(END_OBJS)

asp3_tinet_ecnl_arm/trunk/app3_human_detec/src/echonet_main.c

@@ -1 +1 @@
 /*
  *  TOPPERS ECHONET Lite Communication Middleware
- * 
+ *
  *  Copyright (C) 2014-2018 Cores Co., Ltd. Japan
- * 
+ *
  *  上記著作権者は，以下の(1)～(4)の条件を満たす場合に限り，本ソフトウェ
  *  ア（本ソフトウェアを改変したものを含む．以下同じ）を使用・複製・改
@@ -26 +26 @@
  *      由に基づく請求からも，上記著作権者およびTOPPERSプロジェクトを
  *      免責すること．
- * 
+ *
  *  本ソフトウェアは，無保証で提供されているものである．上記著作権者お
  *  よびTOPPERSプロジェクトは，本ソフトウェアに関して，特定の使用目的
@@ -32 +32 @@
  *  アの利用により直接的または間接的に生じたいかなる損害に関しても，そ
  *  の責任を負わない．
- * 
+ *
  *  @(#) $Id$
  */
 
-/* 
+/*
  *  サンプルプログラム(1)の本体
  */
@@ -94 +94 @@
 {
         /* サイズが１以外は受け付けない */
-        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:
@@ -126 +126 @@
 {
         /* サイズが１以外は受け付けない */
-        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:
@@ -152 +152 @@
 {
         /* サイズが1以外は受け付けない */
-        if(size != 1)
-                return 0;
-
-        if((*(uint8_t *)src >= 0x31) && (*(uint8_t *)src <= 0x38)){
+        if (size != 1)
+                return 0;
+
+        if ((*(uint8_t *)src >= 0x31) && (*(uint8_t *)src <= 0x38)) {
                 *((uint8_t *)item->exinf) = *((uint8_t *)src);
         }
         /* 上記以外は受け付けない */
-        else{
+        else {
                 return 0;
         }
@@ -180 +180 @@
 
         /* サイズが1以外は受け付けない */
-        if(size != 1)
+        if (size != 1)
                 return 0;
 
         *anno = false;
 
-        if((*(uint8_t *)src >= 0x31) && (*(uint8_t *)src <= 0x38)){
+        if ((*(uint8_t *)src >= 0x31) && (*(uint8_t *)src <= 0x38)) {
                 /* 以前の検知レベルを保存 */
                 prev_state = eobj->state;
@@ -197 +197 @@
 
                 /* 人体検知状態に変化があった場合 */
-                if((prev_state < eobj->threshold) != (eobj->state < eobj->threshold))
-                {
+                if ((prev_state < eobj->threshold) != (eobj->state < eobj->threshold)) {
                         /* プロパティ通知 */
                         *anno = true;
@@ -204 +203 @@
         }
         /* 上記以外は受け付けない */
-        else{
+        else {
                 return 0;
         }
@@ -211 +210 @@
 }
 
-/* 
+/*
  * 人体検知状態取得関数
  */
@@ -219 +218 @@
 
         /* 閾値より検知レベルが低い場合 */
-        if(eobj->state < eobj->threshold){
+        if (eobj->state < eobj->threshold) {
                 /* 人体検知なし */
                 ((uint8_t *)dst)[0] = 0x42;
         }
         /* 閾値より検知レベルが高い場合 */
-        else{
+        else {
                 /* 人体検知あり */
                 ((uint8_t *)dst)[0] = 0x41;
@@ -255 +254 @@
 
         ret2 = get_tim(&now);
-        if (ret2 != E_OK){
+        if (ret2 != E_OK) {
                 syslog(LOG_ERROR, "get_tim");
                 return;
         }
 
-        for(;;){
+        for (;;) {
                 prev = now;
 
@@ -268 +267 @@
                 /* 応答電文待ち */
                 ret = ecn_trcv_esv(&esv, timer);
-                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");
                         break;
@@ -274 +273 @@
 
                 ret2 = get_tim(&now);
-                if (ret2 != E_OK){
+                if (ret2 != E_OK) {
                         syslog(LOG_ERROR, "get_tim");
                         break;
@@ -289 +288 @@
                         /* 領域解放 */
                         ret = ecn_rel_esv(esv);
-                        if (ret != E_OK){
+                        if (ret != E_OK) {
                                 syslog(LOG_ERROR, "ecn_rel_esv");
                                 break;
@@ -298 +297 @@
                         /* 応答電文待ちの割り込みデータ取得 */
                         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");
                                 break;
@@ -308 +307 @@
                         /* 領域解放 */
                         ret = ecn_rel_esv(esv);
-                        if (ret != E_OK){
+                        if (ret != E_OK) {
                                 syslog(LOG_ERROR, "ecn_rel_esv");
                                 break;
@@ -319 +318 @@
 }
 
-bool_t started = false;
-
 void echonet_change_netif_link(uint8_t link_up, uint8_t up)
 {
@@ -328 +325 @@
                 return;
 
-        if (up && !started) {
-                started = true;
-
-                /* ECHONETミドルウェアを起動 */
-                ret = ecn_sta_svc();
-                if (ret != E_OK)
-                        return;
-
-                /* ECHONETミドルウェアを起動するのを待つ */
-                dly_tsk(100);
+        if (up) {
+                /* インスタンスリスト通知の送信 */
+                ret = ecn_ntf_inl();
+                if (ret != E_OK) {
+                        syslog(LOG_ERROR, "ecn_ntf_inl");
+                }
         }
 
@@ -351 +344 @@
 }
 
-enum main_state_t{
+enum main_state_t {
+        main_state_start,
         main_state_idle,
 };
 
 int main_timer = TMO_FEVR;
-enum main_state_t main_state = main_state_idle;
+enum main_state_t main_state = main_state_start;
 bool_t main_btn1_state;
 int main_btn1_count = 0;
@@ -386 +380 @@
         gpio_write(&led_red, 0);
 
-        /* 10ms後にボタン状態を確認 */
-        main_timer = 10 * 1000;
+        /* ECHONETミドルウェアを起動するのを待つ */
+        main_state = main_state_start;
+        main_timer = 1000 * 1000;
 
         /* アナログ入力の初期化 */
@@ -398 +393 @@
         main_btn2_state = btn2 != 0;
 
+        /* メインタスクを起動 */
         ER ret = act_tsk(MAIN_TASK);
         if (ret != E_OK) {
@@ -417 +413 @@
 static void main_progress(int interval)
 {
-        if(main_timer == TMO_FEVR)
+        if (main_timer == TMO_FEVR)
                 return;
 
         main_timer -= interval;
-        if(main_timer < 0){
+        if (main_timer < 0) {
                 main_timer = 0;
         }
@@ -438 +434 @@
 
         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:
@@ -452 +448 @@
                         }
                 }
-                if(ret != E_BOVR){
+                if (ret != E_BOVR) {
                         syslog(LOG_ERROR, "ecn_itr_nxt");
                         break;
                 }
-                if(enm.is_eof)
+                if (enm.is_eof)
                         break;
         }
@@ -466 +462 @@
 static void main_break_wait(uint8_t *brkdat, int32_t len)
 {
-        switch(main_state){
+        switch (main_state) {
         case main_state_idle:
                 break;
@@ -488 +484 @@
 static void main_timeout()
 {
+        ER ret;
         uint8_t btn1, btn2;
         uint16_t ad_value;
         uint8_t ad_level;
 
-        if(main_timer != 0)
-                return;
-
-        switch(main_state){
+        if (main_timer != 0)
+                return;
+
+        switch (main_state) {
+        case main_state_start:
+                /* ECHONETミドルウェアを起動 */
+                ret = ecn_sta_svc();
+                if (ret != E_OK) {
+                        syslog(LOG_ERROR, "ecn_sta_svc");
+                }
+
+                /* 10ms後にボタン状態を確認 */
+                main_state = main_state_idle;
+                main_timer = 10 * 1000;
+                break;
         case main_state_idle:
                 /* 10ms後にボタン状態を確認 */
@@ -507 +515 @@
 
                 main_ad_pos++;
-                if(main_ad_pos >= main_ad_table_count){
+                if (main_ad_pos >= main_ad_table_count) {
                         main_ad_pos = 0;
                 }
 
-                ad_level = (((main_ad_avelage / main_ad_table_count) >> 9) & 0x7) + 1;
-                if(main_ad_level != ad_level){
+                ad_level = 8 - (((main_ad_avelage / main_ad_table_count) >> 9) & 0x7);
+                if (main_ad_level != ad_level) {
                         /* １秒変化が続いたら */
-                        if(main_count < 100){
+                        if (main_count < 100) {
                                 main_count++;
                         }
-                        else{
+                        else {
                                 main_ad_level = ad_level;
 
@@ -524 +532 @@
                         }
                 }
-                else{
+                else {
                         main_count = 0;
                 }
@@ -533 +541 @@
 
                 /* ボタン１の処理 */
-                if((btn1 != 0) && !main_btn1_state){
+                if ((btn1 != 0) && !main_btn1_state) {
                         main_btn1_count++;
-                        if(main_btn1_count > 10){
+                        if (main_btn1_count > 10) {
                                 main_btn1_count = 0;
                                 main_btn1_state = true;
@@ -542 +550 @@
                         }
                 }
-                else if((btn1 == 0) && main_btn1_state){
+                else if ((btn1 == 0) && main_btn1_state) {
                         main_btn1_count++;
-                        if(main_btn1_count > 10){
+                        if (main_btn1_count > 10) {
                                 main_btn1_count = 0;
                                 main_btn1_state = false;
@@ -553 +561 @@
 
                 /* ボタン２の処理 */
-                if((btn2 != 0) && !main_btn2_state){
+                if ((btn2 != 0) && !main_btn2_state) {
                         main_btn2_count++;
-                        if(main_btn2_count > 10){
+                        if (main_btn2_count > 10) {
                                 main_btn2_count = 0;
                                 main_btn2_state = true;
@@ -562 +570 @@
                         }
                 }
-                else if((btn2 == 0) && main_btn2_state){
+                else if ((btn2 == 0) && main_btn2_state) {
                         main_btn2_count++;
-                        if(main_btn2_count > 10){
+                        if (main_btn2_count > 10) {
                                 main_btn2_count = 0;
                                 main_btn2_state = false;
@@ -588 +596 @@
         /* プロパティ設定電文作成 */
         ret = ecn_esv_setc(&esv, HUMAN_DETECTION_SENSOR_EOBJ, 0xB1, 1, p_edt);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_esv_setc");
                 return;
@@ -610 +618 @@
 
         /* 押されて戻った時に処理する */
-        if(push)
+        if (push)
                 return;
 
         /* 人体検知状態 */
-        if(!main_rev){
+        if (!main_rev) {
                 main_level--;
-                if(main_level < 1){
+                if (main_level < 1) {
                         main_level = 1;
                         main_rev = true;
                 }
         }
-        else{
+        else {
                 main_level++;
-                if(main_level > 8){
+                if (main_level > 8) {
                         main_level = 8;
                         main_rev = false;
@@ -633 +641 @@
         /* プロパティ設定電文作成 */
         ret = ecn_esv_setc(&esv, HUMAN_DETECTION_SENSOR_EOBJ, 0xB1, 1, p_edt);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_esv_setc");
                 return;
@@ -652 +660 @@
 
         /* 押されて戻った時に処理する */
-        if(push)
+        if (push)
                 return;
 
         /* 人体検知状態 */
-        if(!main_rev){
+        if (!main_rev) {
                 main_level++;
-                if(main_level > 8){
+                if (main_level > 8) {
                         main_level = 8;
                         main_rev = false;
                 }
         }
-        else{
+        else {
                 main_level--;
-                if(main_level < 1){
+                if (main_level < 1) {
                         main_level = 1;
                         main_rev = true;
@@ -675 +683 @@
         /* プロパティ設定電文作成 */
         ret = ecn_esv_setc(&esv, HUMAN_DETECTION_SENSOR_EOBJ, 0xB1, 1, p_edt);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_esv_setc");
                 return;

asp3_tinet_ecnl_arm/trunk/app3_human_detec/src/main.c

@@ -79 +79 @@
 
 ID ws_api_mailboxid = MAIN_DATAQUEUE;
+#ifndef NOUSE_MPF_NET_BUF
 ID ws_mempoolid = MPF_NET_BUF_256;
+#endif
 
 #ifdef IF_ETHER_BTUSB
@@ -111 +113 @@
 static void main_timeout();
 
+extern int ntshell_exit;
+
 int uart_read(char *buf, int cnt, void *extobj)
 {
-        return serial_rea_dat(SIO_PORTID, (char *)buf, cnt);
+        struct main_t *obj = (struct main_t *)extobj;
+        int result;
+        ER ret;
+        int timer;
+
+        obj->prev = obj->now;
+
+        /* タイマー取得 */
+        timer = main_get_timer();
+
+        /* 待ち */
+        ret = serial_trea_dat(SIO_PORTID, buf, cnt, timer);
+        if ((ret < 0) && (ret != E_OK) && (ret != E_TMOUT)) {
+                syslog(LOG_NOTICE, "tslp_tsk ret: %s %d", itron_strerror(ret), timer);
+                ntshell_exit = 1;
+                return -1;
+        }
+        result = (int)ret;
+
+        ret = get_tim(&obj->now);
+        if (ret != E_OK) {
+                syslog(LOG_NOTICE, "get_tim ret: %s", itron_strerror(ret));
+                ntshell_exit = 1;
+                return -1;
+        }
+
+                        /* 時間経過 */
+        int elapse = obj->now - obj->prev;
+        main_progress(elapse);
+
+        /* タイムアウト処理 */
+        main_timeout();
+
+        return result;
 }
 
@@ -119 +156 @@
 {
         return serial_wri_dat(SIO_PORTID, buf, cnt);
-}
-
-unsigned char ntstdio_xi(struct ntstdio_t *handle)
-{
-        char buf[1];
-        if(serial_rea_dat(SIO_PORTID, buf, 1) != 1)
-                return -EIO;
-        return buf[0];
-}
-
-void ntstdio_xo(struct ntstdio_t *handle, unsigned char c)
-{
-        char buf[1];
-        buf[0] = c;
-        serial_wri_dat(SIO_PORTID, buf, 1);
 }
 
@@ -150 +172 @@
         main_initialize();
 
-        ntshell_init(&ntshell, uart_read, uart_write, cmd_execute, NULL);
+        ntshell_init(&ntshell, uart_read, uart_write, cmd_execute, &main_obj);
         ntshell_set_prompt(&ntshell, "NTShell>");
         ntshell_execute(&ntshell);
@@ -168 +190 @@
         ER ret;
 
-        ntshell_task_init();
+#ifdef TOPPERS_OMIT_TECS
+        serial_opn_por(SIO_PORTID);
+#endif
+        serial_ctl_por(SIO_PORTID, IOCTL_FCSND | IOCTL_FCRCV);
+
+        ntshell_task_init(uart_read, uart_write, &main_obj);
 
         main_obj.timer = TMO_FEVR;

asp3_tinet_ecnl_arm/trunk/app3_human_detec/src/main.cfg

@@ -54 +54 @@
 INCLUDE("tinet/tinet_asp.cfg");
 INCLUDE("tinet_main.cfg");
-INCLUDE("netinet/ip_igmp.cfg");
 
 /* DHCP クライアント */

asp3_tinet_ecnl_arm/trunk/app4_aircon/.cproject

@@ -22 +22 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -59 +59 @@
                                                         <option id="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack.1501102219" name="Warn if stack size exceeds the limit (-Wstack-usage) (H')" superClass="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack" useByScannerDiscovery="false" value="100" valueType="string"/>
                                                         <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.1085912920" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-                                                        <builder buildPath="${workspace_loc:/app4_aircon}/Debug" id="com.renesas.cdt.managedbuild.gcc.rz.builder.1132488688" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="false" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
+                                                        <builder buildPath="${workspace_loc:/app4_aircon}/Debug" id="com.renesas.cdt.managedbuild.gcc.rz.builder.1132488688" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
                                                         <tool id="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler.1278248884" name="Cross ARM GNU Assembler" superClass="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler">
                                                                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1219404387" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" useByScannerDiscovery="false" value="true" valueType="boolean"/>
@@ -127 +127 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -164 +164 @@
                                                         <option id="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack.956370110" name="Warn if stack size exceeds the limit (-Wstack-usage) (H')" superClass="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack" useByScannerDiscovery="false" value="100" valueType="string"/>
                                                         <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.1652770796" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-                                                        <builder buildPath="${workspace_loc:/app4_aircon}/DebugEther" id="com.renesas.cdt.managedbuild.gcc.rz.builder.994484673" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="false" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
+                                                        <builder buildPath="${workspace_loc:/app4_aircon}/DebugEther" id="com.renesas.cdt.managedbuild.gcc.rz.builder.994484673" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
                                                         <tool id="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler.1242790859" name="Cross ARM GNU Assembler" superClass="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler">
                                                                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1960328126" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" useByScannerDiscovery="false" value="true" valueType="boolean"/>

asp3_tinet_ecnl_arm/trunk/app4_aircon/Debug/Makefile

@@ -179 +179 @@
         CDEFS := -DTOPPERS_OMIT_TECS $(CDEFS)
 endif
-CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DECHONET_USE_MALLOC -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
+CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DNOUSE_MPF_NET_BUF -DECHONET_USE_MALLOC -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
 INCLUDES := -I. -I$(SRCDIR)/include -I$(SRCDIR) \
         -I$(SRCDIR)/../btstack/include \
@@ -187 +187 @@
         -I$(SRCDIR)/../usbhost/src \
         $(INCLUDES)
-LDFLAGS := $(LDFLAGS) -Wl,-Map=$(OBJNAME).map,--cref -L.
+LDFLAGS := $(LDFLAGS) -L.
 LIBS := $(LIBS) $(CXXLIBS)
 CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES)
@@ -198 +198 @@
 APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o sdfs.o ccsbcs.o ntshell.o text_editor.o text_history.o usrcmd.o vtrecv.o vtsend.o ntlibc.o ntstdio.o ntopt.o syscall.o tlsf.o
 APPLDIRS := $(APPLDIRS) ../../ntshell/lcd
-APPL_COBJS := $(APPL_COBJS) draw_font.o misaki_font.o
+APPL_COBJS := $(APPL_COBJS) draw_font.o shnm12_font.o
+APPL_CFLAGS := $(APPL_CFLAGS) -DSHNM12_FONT
 
 #
@@ -223 +224 @@
 endif
 
-
-#
-#  ネットワークサービスの定義
-#
-NO_USE_TINET_LIBRARY = true
-
-#  ネットワークインタフェースの選択、何れか一つ選択する。
-NET_IF = ether
-
-#  イーサネット・ディバイスドライバの選択
-NET_DEV = if_btusb
-
-#  ネットワーク層の選択
-#SUPPORT_INET6 = true
-SUPPORT_INET4 = true
-
-#  API に組込む機能の選択
-#API_CFG_IP4MAPPED_ADDR = true
-
-#  トランスポート層の選択
-SUPPORT_TCP = true
-SUPPORT_UDP = true
-
-# IGMPを有効に設定
-SUPPORT_IGMP = true
-
-#
-#  ネットワークサービスの Makefile のインクルード
-#
-include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+ifdef TINETDIR
+        #
+        #  ネットワークサービスの定義
+        #
+        NO_USE_TINET_LIBRARY = true
+
+        #  ネットワークインタフェースの選択、何れか一つ選択する。
+        NET_IF = ether
+
+        #  イーサネット・ディバイスドライバの選択
+        NET_DEV = if_btusb
+
+        #  ネットワーク層の選択
+        #SUPPORT_INET6 = true
+        SUPPORT_INET4 = true
+
+        #  API に組込む機能の選択
+        #API_CFG_IP4MAPPED_ADDR = true
+
+        #  トランスポート層の選択
+        SUPPORT_TCP = true
+        SUPPORT_UDP = true
+
+        # IGMPを有効に設定
+        SUPPORT_IGMP = true
+
+        #
+        #  ネットワークサービスの Makefile のインクルード
+        #
+        include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+endif
 
 #
@@ -285 +287 @@
 #  コンフィギュレータに関する定義
 #
-CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
-CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
+ifndef TINETDIR
+  CFG_TRB := -T $(TARGETDIR)/target_kernel.trb
+  CFG_TABS := --api-table $(SRCDIR)/kernel/kernel_api.def \
+                        --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+else
+  CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
+  CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
                         --api-table ../../ntshell/echonet/echonet_api.def:echonet \
                         --api-table $(SRCDIR)/kernel/kernel_api.def:kernel \
@@ -292 +299 @@
                         --symval-table ../../ntshell/echonet/echonet_sym.def \
                         --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+endif
 CFG_ASMOBJS := $(CFG_ASMOBJS)
 CFG_COBJS := kernel_cfg.o echonet_cfg.o $(CFG_COBJS)
@@ -437 +445 @@
 
 #
+#  並列makeのための依存関係の定義
+#
+$(APPL_OBJS) $(filter-out $(CFG_DMY), $(SYSSVC_OBJS)): | kernel_cfg.timestamp
+$(APPL_ASMOBJS) $(filter-out $(CFG_DMY), $(SYSSVC_ASMOBJS)) $(KERNEL_ASMOBJS) $(CFG_ASMOBJS): \
+                                                                                                                | offset.timestamp
+
+#
 #  特別な依存関係の定義
 #
@@ -445 +460 @@
 #
 $(OBJFILE): $(ALL_OBJS) $(LIBS_DEP)
-        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) \
+        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) -Wl,-Map=$(OBJNAME).map,--cref \
                         $(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \
                         -Wl,--start-group $(ALL_LIBS) -Wl,--end-group $(END_OBJS)

asp3_tinet_ecnl_arm/trunk/app4_aircon/DebugEther/Makefile

@@ -177 +177 @@
         CDEFS := -DTOPPERS_OMIT_TECS $(CDEFS)
 endif
-CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DECHONET_USE_MALLOC -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
+CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DNOUSE_MPF_NET_BUF -DECHONET_USE_MALLOC -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
 INCLUDES := -I. -I$(SRCDIR)/include -I$(SRCDIR) \
         -I$(SRCDIR)/../btstack/include \
@@ -185 +185 @@
         -I$(SRCDIR)/../usbhost/src \
         $(INCLUDES)
-LDFLAGS := $(LDFLAGS) -Wl,-Map=$(OBJNAME).map,--cref -L.
+LDFLAGS := $(LDFLAGS) -L.
 LIBS := $(LIBS) $(CXXLIBS)
 CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES)
@@ -196 +196 @@
 APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o sdfs.o ccsbcs.o ntshell.o text_editor.o text_history.o usrcmd.o vtrecv.o vtsend.o ntlibc.o ntstdio.o ntopt.o syscall.o tlsf.o
 APPLDIRS := $(APPLDIRS) ../../ntshell/lcd
-APPL_COBJS := $(APPL_COBJS) draw_font.o misaki_font.o
+APPL_COBJS := $(APPL_COBJS) draw_font.o shnm12_font.o
+APPL_CFLAGS := $(APPL_CFLAGS) -DSHNM12_FONT
 
 #
@@ -221 +222 @@
 endif
 
-
-#
-#  ネットワークサービスの定義
-#
-NO_USE_TINET_LIBRARY = true
-
-#  ネットワークインタフェースの選択、何れか一つ選択する。
-NET_IF = ether
-
-#  イーサネット・ディバイスドライバの選択
+ifdef TINETDIR
+        #
+        #  ネットワークサービスの定義
+        #
+        NO_USE_TINET_LIBRARY = true
+
+        #  ネットワークインタフェースの選択、何れか一つ選択する。
+        NET_IF = ether
+
+        #  イーサネット・ディバイスドライバの選択
         NET_DEV = if_mbed
 
-#  ネットワーク層の選択
-#SUPPORT_INET6 = true
-SUPPORT_INET4 = true
-
-#  API に組込む機能の選択
-#API_CFG_IP4MAPPED_ADDR = true
-
-#  トランスポート層の選択
-SUPPORT_TCP = true
-SUPPORT_UDP = true
-
-# IGMPを有効に設定
-SUPPORT_IGMP = true
-
-#
-#  ネットワークサービスの Makefile のインクルード
-#
-include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+        #  ネットワーク層の選択
+        #SUPPORT_INET6 = true
+        SUPPORT_INET4 = true
+
+        #  API に組込む機能の選択
+        #API_CFG_IP4MAPPED_ADDR = true
+
+        #  トランスポート層の選択
+        SUPPORT_TCP = true
+        SUPPORT_UDP = true
+
+        # IGMPを有効に設定
+        SUPPORT_IGMP = true
+
+        #
+        #  ネットワークサービスの Makefile のインクルード
+        #
+        include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+endif
 
 #
@@ -283 +285 @@
 #  コンフィギュレータに関する定義
 #
-CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
-CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
+ifndef TINETDIR
+  CFG_TRB := -T $(TARGETDIR)/target_kernel.trb
+  CFG_TABS := --api-table $(SRCDIR)/kernel/kernel_api.def \
+                        --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+else
+  CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
+  CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
                         --api-table ../../ntshell/echonet/echonet_api.def:echonet \
                         --api-table $(SRCDIR)/kernel/kernel_api.def:kernel \
@@ -290 +297 @@
                         --symval-table ../../ntshell/echonet/echonet_sym.def \
                         --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+endif
 CFG_ASMOBJS := $(CFG_ASMOBJS)
 CFG_COBJS := kernel_cfg.o echonet_cfg.o $(CFG_COBJS)
@@ -435 +443 @@
 
 #
+#  並列makeのための依存関係の定義
+#
+$(APPL_OBJS) $(filter-out $(CFG_DMY), $(SYSSVC_OBJS)): | kernel_cfg.timestamp
+$(APPL_ASMOBJS) $(filter-out $(CFG_DMY), $(SYSSVC_ASMOBJS)) $(KERNEL_ASMOBJS) $(CFG_ASMOBJS): \
+                                                                                                                | offset.timestamp
+
+#
 #  特別な依存関係の定義
 #
@@ -443 +458 @@
 #
 $(OBJFILE): $(ALL_OBJS) $(LIBS_DEP)
-        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) \
+        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) -Wl,-Map=$(OBJNAME).map,--cref \
                         $(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \
                         -Wl,--start-group $(ALL_LIBS) -Wl,--end-group $(END_OBJS)

asp3_tinet_ecnl_arm/trunk/app4_aircon/src/echonet_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)の本体
  */
@@ -55 +55 @@
 #include "adafruit_st7735.h"
 #include "draw_font.h"
+#include <tinet_defs.h>
+#include <tinet_config.h>
+#include <netinet/in.h>
+#include <netinet/in_var.h>
+#include <net/ethernet.h>
+#include <net/if_var.h>
+
+extern uint8_t mac_addr[6];
 
 /* TODO: メーカーコードを設定 */
@@ -184 +192 @@
 
         /* サイズが１以外は受け付けない */
-        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:
@@ -198 +206 @@
                 data[0] = 0x80;
                 ret = ecn_brk_wai(data, sizeof(data));
-                if(ret != E_OK){
+                if (ret != E_OK) {
                         syslog(LOG_ERROR, "ecn_brk_wai");
                         return 2;
@@ -217 +225 @@
 {
         /* サイズが１以外は受け付けない */
-        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:
@@ -246 +254 @@
 
         /* サイズが1以外は受け付けない */
-        if(size != 1)
+        if (size != 1)
                 return 0;
 
-        switch(*(uint8_t *)src){
+        switch (*(uint8_t *)src) {
         /* 自動の場合 */
         case 0x41:
@@ -266 +274 @@
                 data[0] = 0xB0;
                 ret = ecn_brk_wai(data, sizeof(data));
-                if(ret != E_OK){
+                if (ret != E_OK) {
                         syslog(LOG_ERROR, "ecn_brk_wai");
                         return 2;
@@ -288 +296 @@
 
         /* サイズが1以外は受け付けない */
-        if(size != 1)
+        if (size != 1)
                 return 0;
 
         /* 0℃～50℃ */
-        if((*(uint8_t *)src >= 0x00) && (*(uint8_t *)src <= 0x32)){
+        if ((*(uint8_t *)src >= 0x00) && (*(uint8_t *)src <= 0x32)) {
                 *((uint8_t *)item->exinf) = *((uint8_t *)src);
                 /* メインタスクに通知 */
                 data[0] = 0xB3;
                 ret = ecn_brk_wai(data, sizeof(data));
-                if(ret != E_OK){
+                if (ret != E_OK) {
                         syslog(LOG_ERROR, "ecn_brk_wai");
                         return 2;
@@ -303 +311 @@
         }
         /* 上記以外は受け付けない */
-        else{
+        else {
                 return 0;
         }
@@ -333 +341 @@
 
         ret2 = get_tim(&now);
-        if (ret2 != E_OK){
+        if (ret2 != E_OK) {
                 syslog(LOG_ERROR, "get_tim");
                 return;
         }
 
-        for(;;){
+        for (;;) {
                 prev = now;
 
@@ -346 +354 @@
                 /* 応答電文待ち */
                 ret = ecn_trcv_esv(&esv, timer);
-                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");
                         break;
@@ -352 +360 @@
 
                 ret2 = get_tim(&now);
-                if (ret2 != E_OK){
+                if (ret2 != E_OK) {
                         syslog(LOG_ERROR, "get_tim");
                         break;
@@ -367 +375 @@
                         /* 領域解放 */
                         ret = ecn_rel_esv(esv);
-                        if (ret != E_OK){
+                        if (ret != E_OK) {
                                 syslog(LOG_ERROR, "ecn_rel_esv");
                                 break;
@@ -376 +384 @@
                         /* 応答電文待ちの割り込みデータ取得 */
                         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");
                                 break;
@@ -386 +394 @@
                         /* 領域解放 */
                         ret = ecn_rel_esv(esv);
-                        if (ret != E_OK){
+                        if (ret != E_OK) {
                                 syslog(LOG_ERROR, "ecn_rel_esv");
                                 break;
@@ -397 +405 @@
 }
 
-bool_t started = false;
-
 void echonet_change_netif_link(uint8_t link_up, uint8_t up)
 {
@@ -406 +412 @@
                 return;
 
-        if (up && !started) {
-                started = true;
-
-                /* ECHONETミドルウェアを起動 */
-                ret = ecn_sta_svc();
-                if (ret != E_OK)
-                        return;
-
-                /* ECHONETミドルウェアを起動するのを待つ */
-                dly_tsk(100);
+        if (up) {
+                /* インスタンスリスト通知の送信 */
+                ret = ecn_ntf_inl();
+                if (ret != E_OK) {
+                        syslog(LOG_ERROR, "ecn_ntf_inl");
+                }
         }
 
@@ -421 +423 @@
         uint8_t data[2];
         data[0] = 0x01;
-        data[1] = up ? 0x01 : 0x02;
+        data[1] = (up ? 0x01 : 0x02) | (link_up ? 0x10 : 0x20);
         ret = ecn_brk_wai(data, sizeof(data));
         if (ret != E_OK) {
@@ -429 +431 @@
 }
 
-enum main_state_t{
+enum main_state_t {
+        main_state_start,
         main_state_idle,
         main_state_search,
@@ -440 +443 @@
 
 int main_timer = TMO_FEVR;
-enum main_state_t main_state = main_state_idle;
+enum main_state_t main_state = main_state_start;
 int16_t main_ave_templ;
 bool_t main_tmp_fan_on;
@@ -470 +473 @@
 LCD_DrawProp_t drawProp;
 
-enum main_rly_state_t{
+enum main_rly_state_t {
         main_rly_state_off,
         main_rly_state_on
@@ -486 +489 @@
         uint8_t btn;
 
-        /* １秒後に温度センサーを探す */
+        /* ECHONETミドルウェアを起動するのを待つ */
+        main_state = main_state_start;
         main_timer = 1000 * 1000;
 
@@ -505 +509 @@
         spi_init(&lcd.hspi, P10_14, P10_15, P10_12, NC);
         spi_format(&lcd.hspi, 8, 0, 0);
-        spi_frequency(&lcd.hspi, 1000000);
+        spi_frequency(&lcd.hspi, 4000000);
 
         gpio_init_out(&lcd.cs_pin, P10_13);
@@ -524 +528 @@
         main_lcd_timer = 1000 * 1000;
 
+        /* メインタスクを起動 */
         ER ret = act_tsk(MAIN_TASK);
         if (ret != E_OK) {
@@ -537 +542 @@
         int result = main_timer;
 
-        if((result == TMO_FEVR)
-                || ((main_btn_timer != TMO_FEVR) && (main_btn_timer < result))){
+        if ((result == TMO_FEVR)
+                || ((main_btn_timer != TMO_FEVR) && (main_btn_timer < result))) {
                 result = main_btn_timer;
         }
 
-        if((result == TMO_FEVR)
-                || ((main_lcd_timer != TMO_FEVR) && (main_lcd_timer < result))){
+        if ((result == TMO_FEVR)
+                || ((main_lcd_timer != TMO_FEVR) && (main_lcd_timer < result))) {
                 result = main_lcd_timer;
         }
 
-        if((result == TMO_FEVR)
-                || ((main_rly_timer != TMO_FEVR) && (main_rly_timer < result))){
+        if ((result == TMO_FEVR)
+                || ((main_rly_timer != TMO_FEVR) && (main_rly_timer < result))) {
                 result = main_rly_timer;
         }
@@ -560 +565 @@
 static void main_progress(int interval)
 {
-        if(main_timer != TMO_FEVR){
+        if (main_timer != TMO_FEVR) {
                 main_timer -= interval;
-                if(main_timer < 0){
+                if (main_timer < 0) {
                         main_timer = 0;
                 }
         }
 
-        if(main_btn_timer != TMO_FEVR){
+        if (main_btn_timer != TMO_FEVR) {
                 main_btn_timer -= interval;
-                if(main_btn_timer < 0){
+                if (main_btn_timer < 0) {
                         main_btn_timer = 0;
                 }
         }
 
-        if(main_lcd_timer != TMO_FEVR){
+        if (main_lcd_timer != TMO_FEVR) {
                 main_lcd_timer -= interval;
-                if(main_lcd_timer < 0){
+                if (main_lcd_timer < 0) {
                         main_lcd_timer = 0;
                 }
         }
 
-        if(main_rly_timer != TMO_FEVR){
+        if (main_rly_timer != TMO_FEVR) {
                 main_rly_timer -= interval;
-                if(main_rly_timer < 0){
+                if (main_rly_timer < 0) {
                         main_rly_timer = 0;
                 }
@@ -605 +610 @@
 
         eobjid = ecn_get_eobj(esv);
-        if(eobjid == EOBJ_NULL){
+        if (eobjid == EOBJ_NULL) {
                 syslog(LOG_ERROR, "ecn_get_eobj");
         }
 
         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 0xD6:
-                                switch(main_state){
+                                switch (main_state) {
                                 case main_state_idle:
                                 case main_state_search:
@@ -630 +635 @@
                                 break;
                         case 0xE0:
-                                switch(main_state){
+                                switch (main_state) {
                                 case main_state_survey_01:
                                         /* 温度センサー２温度監視 */
@@ -660 +665 @@
                         }
                 }
-                if(ret != E_BOVR){
+                if (ret != E_BOVR) {
                         syslog(LOG_ERROR, "ecn_itr_nxt");
                         break;
                 }
-                if(enm.is_eof)
+                if (enm.is_eof)
                         break;
         }
@@ -685 +690 @@
         /* 温度センサー動作状態取得電文作成 */
         ret = ecn_esv_get(&esv, senserids[no - 1], 0x80);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_esv_get");
                 return;
@@ -692 +697 @@
         /* 温度計測値取得追加 */
         ret = ecn_add_epc(esv, 0xE0);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_add_epc");
 
                 ret = ecn_rel_esv(esv);
-                if(ret != E_OK){
+                if (ret != E_OK) {
                         syslog(LOG_ERROR, "ecn_rel_esv");
                 }
@@ -704 +709 @@
         /* 電文送信 */
         ret = ecn_snd_esv(esv);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_snd_esv");
         }
@@ -717 +722 @@
         int templ = 0;
 
-        if(temp_sensor_01_data.property80 == 0x30){
+        if (temp_sensor_01_data.property80 == 0x30) {
                 templ += ((((uint16_t)temp_sensor_01_data.propertyE0) & 0xFF) << 8)
                         | ((((uint16_t)temp_sensor_01_data.propertyE0) & 0xFF00) >> 8);
                 count++;
         }
-        if(temp_sensor_02_data.property80 == 0x30){
+        if (temp_sensor_02_data.property80 == 0x30) {
                 templ += ((((uint16_t)temp_sensor_02_data.propertyE0) & 0xFF) << 8)
                         | ((((uint16_t)temp_sensor_02_data.propertyE0) & 0xFF00) >> 8);
                 count++;
         }
-        if(temp_sensor_03_data.property80 == 0x30){
+        if (temp_sensor_03_data.property80 == 0x30) {
                 templ += ((((uint16_t)temp_sensor_03_data.propertyE0) & 0xFF) << 8)
                         | ((((uint16_t)temp_sensor_03_data.propertyE0) & 0xFF00) >> 8);
                 count++;
         }
-        if(temp_sensor_04_data.property80 == 0x30){
+        if (temp_sensor_04_data.property80 == 0x30) {
                 templ += ((((uint16_t)temp_sensor_04_data.propertyE0) & 0xFF) << 8)
                         | ((((uint16_t)temp_sensor_04_data.propertyE0) & 0xFF00) >> 8);
@@ -738 +743 @@
         }
 
-        if(count > 0){
+        if (count > 0) {
                 templ = templ / count;
-                if(templ < -2732)
+                if (templ < -2732)
                         main_ave_templ = 0x8000;
-                else if(templ > 32766)
+                else if (templ > 32766)
                         main_ave_templ = 0x7FFF;
                 else
@@ -748 +753 @@
 
                 /* FANが停止中の場合 */
-                if(!main_tmp_fan_on){
-                        if(main_ave_templ > (10 * home_air_conditioner_data.propertyB3 + 5)){
+                if (!main_tmp_fan_on) {
+                        if (main_ave_templ > (10 * home_air_conditioner_data.propertyB3 + 5)) {
                                 main_tmp_fan_on = true;
 
@@ -758 +763 @@
                 }
                 /* FANが稼働中の場合 */
-                else{
-                        if(main_ave_templ < (10 * home_air_conditioner_data.propertyB3 - 5)){
+                else {
+                        if (main_ave_templ < (10 * home_air_conditioner_data.propertyB3 - 5)) {
                                 main_tmp_fan_on = false;
 
@@ -777 +782 @@
 static void main_break_wait(uint8_t *brkdat, int32_t len)
 {
+        char mac_text[30] = "mac: ";
+        char ipaddr_text[30] = "ipadr: ";
+        const T_IN4_ADDR *ip4_addr;
+        int pos;
+        bool_t prev;
+
         switch (brkdat[0]) {
         case 0x01:
-                // Link up/down
+                switch (brkdat[1] >> 4) {
+                case 1:
+                        break;
+                case 2:
+                        break;
+                }
+
+                pos = str_macaddr(&mac_text[4], sizeof(mac_text) - 4, mac_addr, 0);
+                mac_text[pos + 4] = '\0';
+                lcd_drawString(&lcd, mac_text, X_LINE_TO_PIX(&lcd, 0), Y_ROW_TO_PIX(&lcd, 11), ST7735_BLACK, ST7735_WHITE);
+
+                ip4_addr = in4_get_ifaddr(0);
+                pos = str_ipv4addr(&ipaddr_text[6], sizeof(ipaddr_text) - 6, ip4_addr, 0);
+                ipaddr_text[pos + 6] = '\0';
+                lcd_drawString(&lcd, ipaddr_text, X_LINE_TO_PIX(&lcd, 0), Y_ROW_TO_PIX(&lcd, 12), ST7735_BLACK, ST7735_WHITE);
                 break;
         }
 
         /* 運転モードが送風の場合、温度によらずFANをON */
-        if (*brkdat == 0xB0) {
-                bool_t prev = main_ctl_fan_on;
+        switch (*brkdat) {
+        case 0x80:
+                if (main_ctl_fan_on) {
+                        /* リレー出力をON/OFF */
+                        main_rly_onoff(home_air_conditioner_data.property80 == 0x30);
+                }
+                break;
+        case 0xB0:
+                prev = main_ctl_fan_on;
                 main_ctl_fan_on = home_air_conditioner_data.propertyB0 == 0x45;
 
                 if (prev != main_ctl_fan_on) {
                         if (main_ctl_fan_on) {
-                                /* リレー出力をON */
-                                if (!main_tmp_fan_on)
-                                        main_rly_onoff(true);
+                                /* リレー出力をON/OFF */
+                                main_rly_onoff(home_air_conditioner_data.property80 == 0x30);
                         }
                         else {
-                                /* リレー出力をOFF */
-                                if (!main_tmp_fan_on)
-                                        main_rly_onoff(false);
+                                /* リレー出力をON/OFF */
+                                main_rly_onoff(main_tmp_fan_on);
                         }
                 }
@@ -813 +843 @@
 static void main_timeout()
 {
-        if(main_timer == 0){
+        if (main_timer == 0) {
                 main_ontimer();
         }
 
-        if(main_btn_timer == 0){
+        if (main_btn_timer == 0) {
                 main_btn_ontimer();
         }
 
-        if(main_lcd_timer == 0){
+        if (main_lcd_timer == 0) {
                 main_lcd_ontimer();
         }
 
-        if(main_rly_timer == 0){
+        if (main_rly_timer == 0) {
                 main_rly_ontimer();
         }
@@ -834 +864 @@
 static void main_ontimer()
 {
-        switch(main_state){
+        ER ret;
+
+        switch (main_state) {
+        case main_state_start:
+                /* ECHONETミドルウェアを起動 */
+                ret = ecn_sta_svc();
+                if (ret != E_OK) {
+                        syslog(LOG_ERROR, "ecn_sta_svc");
+                }
+
+                /* １秒後に温度センサーを探す */
+                main_state = main_state_idle;
+                main_timer = 1000 * 1000;
+                break;
         case main_state_idle:
         case main_state_search:
@@ -891 +934 @@
         /* 温度センサー検索 */
         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;
@@ -898 +941 @@
         /* 電文送信 */
         ret = ecn_snd_esv(esv);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_snd_esv");
         }
@@ -919 +962 @@
         if ((btn == BUTTON_LEFT) && !main_btn1_state) {
                 main_btn1_count++;
-                if(main_btn1_count > 10){
+                if (main_btn1_count > 10) {
                         main_btn1_count = 0;
                         main_btn1_state = true;
@@ -928 +971 @@
         else if ((btn != BUTTON_LEFT) && main_btn1_state) {
                 main_btn1_count++;
-                if(main_btn1_count > 10){
+                if (main_btn1_count > 10) {
                         main_btn1_count = 0;
                         main_btn1_state = false;
@@ -939 +982 @@
         if ((btn == BUTTON_RIGHT) && !main_btn2_state) {
                 main_btn2_count++;
-                if(main_btn2_count > 10){
+                if (main_btn2_count > 10) {
                         main_btn2_count = 0;
                         main_btn2_state = true;
@@ -948 +991 @@
         else if ((btn != BUTTON_RIGHT) && main_btn2_state) {
                 main_btn2_count++;
-                if(main_btn2_count > 10){
+                if (main_btn2_count > 10) {
                         main_btn2_count = 0;
                         main_btn2_state = false;
@@ -963 +1006 @@
         char temp2[] = "測定温度：+00.0℃";
         char mode[] = "運転モード：自動  ";
-        char *mode_texts[] = { "自動  ", "冷房  ", "暖房  ", "除湿  ", "送風  ", "その他" };
+        char *mode_texts[] = { "その他", "自動  ", "冷房  ", "暖房  ", "除湿  ", "送風  " };
         char *btn_texts[] = { "none  ", "down  ", "left  ", "select", "up    ", "right " };
         int temp, btn;
@@ -979 +1022 @@
                         power[11] = 'f';
                 }
-                lcd_drawString(&lcd, &power[9], X_LINE_HALF_TO_PIX(&lcd, 6) + 10, Y_ROW_TO_PIX(&lcd, main_lcd_state + 4) + 10, ST7735_BLACK, ST7735_WHITE);
+                lcd_drawString(&lcd, &power[9], X_LINE_HALF_TO_PIX(&lcd, 6), Y_ROW_TO_PIX(&lcd, main_lcd_state + 2), ST7735_BLACK, ST7735_WHITE);
                 main_lcd_state++;
                 break;
@@ -992 +1035 @@
                         temp = -temp;
                 temp1[17] = '0' + temp;
-                lcd_drawString(&lcd, &temp1[15], X_LINE_HALF_TO_PIX(&lcd, 10) + 10, Y_ROW_TO_PIX(&lcd, main_lcd_state + 4) + 10, ST7735_BLACK, ST7735_WHITE);
+                lcd_drawString(&lcd, &temp1[15], X_LINE_HALF_TO_PIX(&lcd, 10), Y_ROW_TO_PIX(&lcd, main_lcd_state + 2), ST7735_BLACK, ST7735_WHITE);
                 main_lcd_state++;
                 break;
@@ -1009 +1052 @@
                         temp = -temp;
                 temp2[19] = '0' + temp;
-                lcd_drawString(&lcd, &temp2[15], X_LINE_HALF_TO_PIX(&lcd, 10) + 10, Y_ROW_TO_PIX(&lcd, main_lcd_state + 4) + 10, ST7735_BLACK, ST7735_WHITE);
+                lcd_drawString(&lcd, &temp2[15], X_LINE_HALF_TO_PIX(&lcd, 10), Y_ROW_TO_PIX(&lcd, main_lcd_state + 2), ST7735_BLACK, ST7735_WHITE);
                 main_lcd_state++;
                 break;
         case 3:
                 temp = home_air_conditioner_data.propertyB0 - 0x40;
-                lcd_drawString(&lcd, mode_texts[temp], X_LINE_HALF_TO_PIX(&lcd, 12) + 10, Y_ROW_TO_PIX(&lcd, main_lcd_state + 4) + 10, ST7735_BLACK, ST7735_WHITE);
+                lcd_drawString(&lcd, mode_texts[temp], X_LINE_HALF_TO_PIX(&lcd, 12), Y_ROW_TO_PIX(&lcd, main_lcd_state + 2), ST7735_BLACK, ST7735_WHITE);
                 main_lcd_state++;
                 break;
@@ -1023 +1066 @@
         case 6:
                 btn = main_read_button(&joystick);
-                lcd_drawString(&lcd, btn_texts[btn], X_LINE_TO_PIX(&lcd, 0) + 10, Y_ROW_TO_PIX(&lcd, 10) + 10, ST7735_BLACK, ST7735_WHITE);
+                lcd_drawString(&lcd, btn_texts[btn], X_LINE_TO_PIX(&lcd, 0), Y_ROW_TO_PIX(&lcd, 9), ST7735_BLACK, ST7735_WHITE);
                 main_lcd_state++;
                 break;
@@ -1030 +1073 @@
                 break;
         case 10:
-                lcd_drawString(&lcd, "エアコン", X_LINE_TO_PIX(&lcd, 9) + 10, Y_ROW_TO_PIX(&lcd, 0) + 10, ST7735_BLACK, ST7735_WHITE);
-                lcd_drawString(&lcd, power, X_LINE_TO_PIX(&lcd, 0) + 10, Y_ROW_TO_PIX(&lcd, 0 + 4) + 10, ST7735_BLACK, ST7735_WHITE);
-                lcd_drawString(&lcd, temp1, X_LINE_TO_PIX(&lcd, 0) + 10, Y_ROW_TO_PIX(&lcd, 1 + 4) + 10, ST7735_BLACK, ST7735_WHITE);
-                lcd_drawString(&lcd, temp2, X_LINE_TO_PIX(&lcd, 0) + 10, Y_ROW_TO_PIX(&lcd, 2 + 4) + 10, ST7735_BLACK, ST7735_WHITE);
-                lcd_drawString(&lcd, mode, X_LINE_TO_PIX(&lcd, 0) + 10, Y_ROW_TO_PIX(&lcd, 3 + 4) + 10, ST7735_BLACK, ST7735_WHITE);
+                lcd_drawString(&lcd, "エアコン", X_LINE_TO_PIX(&lcd, 6), Y_ROW_TO_PIX(&lcd, 0), ST7735_BLACK, ST7735_WHITE);
+                lcd_drawString(&lcd, power, X_LINE_TO_PIX(&lcd, 0), Y_ROW_TO_PIX(&lcd, 0 + 2), ST7735_BLACK, ST7735_WHITE);
+                lcd_drawString(&lcd, temp1, X_LINE_TO_PIX(&lcd, 0), Y_ROW_TO_PIX(&lcd, 1 + 2), ST7735_BLACK, ST7735_WHITE);
+                lcd_drawString(&lcd, temp2, X_LINE_TO_PIX(&lcd, 0), Y_ROW_TO_PIX(&lcd, 2 + 2), ST7735_BLACK, ST7735_WHITE);
+                lcd_drawString(&lcd, mode, X_LINE_TO_PIX(&lcd, 0), Y_ROW_TO_PIX(&lcd, 3 + 2), ST7735_BLACK, ST7735_WHITE);
                 main_lcd_state = 0;
                 break;
@@ -1079 +1122 @@
 
         /* 押されて戻った時に処理する */
-        if(push)
+        if (push)
                 return;
 
         /* 設定温度 */
-        if(main_templ > 0)
+        if (main_templ > 0)
                 main_templ--;   /* - 1℃ */
 
@@ -1090 +1133 @@
         /* プロパティ設定電文作成 */
         ret = ecn_esv_seti(&esv, HOME_AIR_CONDITIONER_EOBJ, 0xB3, 1, p_edt);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_esv_seti");
                 return;
@@ -1096 +1139 @@
 
         /* 電文送信 */
-        ecn_snd_esv(esv);
-        if(ret != E_OK){
+        ret = ecn_snd_esv(esv);
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_snd_esv");
         }
@@ -1112 +1155 @@
 
         /* 押されて戻った時に処理する */
-        if(push)
+        if (push)
                 return;
 
         /* 設定温度 */
-        if(main_templ < 50)
+        if (main_templ < 50)
                 main_templ++;   /* + 1.0℃ */
 
@@ -1123 +1166 @@
         /* プロパティ設定電文作成 */
         ret = ecn_esv_seti(&esv, HOME_AIR_CONDITIONER_EOBJ, 0xB3, 1, p_edt);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_esv_seti");
                 return;
@@ -1129 +1172 @@
 
         /* 電文送信 */
-        ecn_snd_esv(esv);
-        if(ret != E_OK){
+        ret = ecn_snd_esv(esv);
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_snd_esv");
         }
@@ -1137 +1180 @@
 static void main_rly_onoff(bool_t onoff)
 {
-        if(onoff){
+        if (onoff) {
                 /* リレー出力をON */
                 gpio_write(&relay_sw, 1);
         }
-        else{
+        else {
                 /* リレー出力をOFF */
                 gpio_write(&relay_sw, 0);
@@ -1159 +1202 @@
         /* 500msパルス出力 */
         main_rly_state = main_rly_state_on;
-        main_rly_timer = 500;
+        main_rly_timer = 500 * 1000;
 }
 
@@ -1167 +1210 @@
 static void main_rly_ontimer()
 {
-        switch(main_rly_state)
-        {
+        switch (main_rly_state) {
         case main_rly_state_off:
                 main_rly_timer = TMO_FEVR;

asp3_tinet_ecnl_arm/trunk/app4_aircon/src/main.c

@@ -79 +79 @@
 
 ID ws_api_mailboxid = MAIN_DATAQUEUE;
+#ifndef NOUSE_MPF_NET_BUF
 ID ws_mempoolid = MPF_NET_BUF_256;
+#endif
 
 #ifdef IF_ETHER_BTUSB
@@ -111 +113 @@
 static void main_timeout();
 
+extern int ntshell_exit;
+
 int uart_read(char *buf, int cnt, void *extobj)
 {
-        return serial_rea_dat(SIO_PORTID, (char *)buf, cnt);
+        struct main_t *obj = (struct main_t *)extobj;
+        int result;
+        ER ret;
+        int timer;
+
+        obj->prev = obj->now;
+
+        /* タイマー取得 */
+        timer = main_get_timer();
+
+        /* 待ち */
+        ret = serial_trea_dat(SIO_PORTID, buf, cnt, timer);
+        if ((ret < 0) && (ret != E_OK) && (ret != E_TMOUT)) {
+                syslog(LOG_NOTICE, "tslp_tsk ret: %s %d", itron_strerror(ret), timer);
+                ntshell_exit = 1;
+                return -1;
+        }
+        result = (int)ret;
+
+        ret = get_tim(&obj->now);
+        if (ret != E_OK) {
+                syslog(LOG_NOTICE, "get_tim ret: %s", itron_strerror(ret));
+                ntshell_exit = 1;
+                return -1;
+        }
+
+                        /* 時間経過 */
+        int elapse = obj->now - obj->prev;
+        main_progress(elapse);
+
+        /* タイムアウト処理 */
+        main_timeout();
+
+        return result;
 }
 
@@ -119 +156 @@
 {
         return serial_wri_dat(SIO_PORTID, buf, cnt);
-}
-
-unsigned char ntstdio_xi(struct ntstdio_t *handle)
-{
-        char buf[1];
-        if(serial_rea_dat(SIO_PORTID, buf, 1) != 1)
-                return -EIO;
-        return buf[0];
-}
-
-void ntstdio_xo(struct ntstdio_t *handle, unsigned char c)
-{
-        char buf[1];
-        buf[0] = c;
-        serial_wri_dat(SIO_PORTID, buf, 1);
 }
 
@@ -150 +172 @@
         main_initialize();
 
-        ntshell_init(&ntshell, uart_read, uart_write, cmd_execute, NULL);
+        ntshell_init(&ntshell, uart_read, uart_write, cmd_execute, &main_obj);
         ntshell_set_prompt(&ntshell, "NTShell>");
         ntshell_execute(&ntshell);
@@ -168 +190 @@
         ER ret;
 
-        ntshell_task_init();
+#ifdef TOPPERS_OMIT_TECS
+        serial_opn_por(SIO_PORTID);
+#endif
+        serial_ctl_por(SIO_PORTID, IOCTL_FCSND | IOCTL_FCRCV);
+
+        ntshell_task_init(uart_read, uart_write, &main_obj);
 
         main_obj.timer = TMO_FEVR;

asp3_tinet_ecnl_arm/trunk/app4_aircon/src/main.cfg

@@ -54 +54 @@
 INCLUDE("tinet/tinet_asp.cfg");
 INCLUDE("tinet_main.cfg");
-INCLUDE("netinet/ip_igmp.cfg");
 
 /* DHCP クライアント */

asp3_tinet_ecnl_arm/trunk/app5_temp_sensor/.cproject

@@ -22 +22 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -59 +59 @@
                                                         <option id="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack.1852970779" name="Warn if stack size exceeds the limit (-Wstack-usage) (H')" superClass="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack" useByScannerDiscovery="false" value="100" valueType="string"/>
                                                         <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.852559143" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-                                                        <builder buildPath="${workspace_loc:/app5_temp_sensor}/Debug" id="com.renesas.cdt.managedbuild.gcc.rz.builder.394642308" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="false" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
+                                                        <builder buildPath="${workspace_loc:/app5_temp_sensor}/Debug" id="com.renesas.cdt.managedbuild.gcc.rz.builder.394642308" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
                                                         <tool id="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler.589273516" name="Cross ARM GNU Assembler" superClass="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler">
                                                                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.462582981" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" useByScannerDiscovery="false" value="true" valueType="boolean"/>
@@ -127 +127 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -164 +164 @@
                                                         <option id="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack.512694190" name="Warn if stack size exceeds the limit (-Wstack-usage) (H')" superClass="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack" useByScannerDiscovery="false" value="100" valueType="string"/>
                                                         <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.1203540506" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-                                                        <builder buildPath="${workspace_loc:/app5_temp_sensor}/DebugEther" id="com.renesas.cdt.managedbuild.gcc.rz.builder.730173267" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="false" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
+                                                        <builder buildPath="${workspace_loc:/app5_temp_sensor}/DebugEther" id="com.renesas.cdt.managedbuild.gcc.rz.builder.730173267" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
                                                         <tool id="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler.1443620921" name="Cross ARM GNU Assembler" superClass="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler">
                                                                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1975708208" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" useByScannerDiscovery="false" value="true" valueType="boolean"/>

asp3_tinet_ecnl_arm/trunk/app5_temp_sensor/Debug/Makefile

@@ -179 +179 @@
         CDEFS := -DTOPPERS_OMIT_TECS $(CDEFS)
 endif
-CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DECHONET_USE_MALLOC -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
+CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DNOUSE_MPF_NET_BUF -DECHONET_USE_MALLOC -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
 INCLUDES := -I. -I$(SRCDIR)/include -I$(SRCDIR) \
         -I$(SRCDIR)/../btstack/include \
@@ -187 +187 @@
         -I$(SRCDIR)/../usbhost/src \
         $(INCLUDES)
-LDFLAGS := $(LDFLAGS) -Wl,-Map=$(OBJNAME).map,--cref -L.
+LDFLAGS := $(LDFLAGS) -L.
 LIBS := $(LIBS) $(CXXLIBS)
 CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES)
@@ -198 +198 @@
 APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o sdfs.o ccsbcs.o ntshell.o text_editor.o text_history.o usrcmd.o vtrecv.o vtsend.o ntlibc.o ntstdio.o ntopt.o syscall.o tlsf.o
 APPLDIRS := $(APPLDIRS) ../../ntshell/lcd
-APPL_COBJS := $(APPL_COBJS) draw_font.o misaki_font.o
+APPL_COBJS := $(APPL_COBJS) draw_font.o shnm12_font.o
+APPL_CFLAGS := $(APPL_CFLAGS) -DSHNM12_FONT
 
 #
@@ -223 +224 @@
 endif
 
-
-#
-#  ネットワークサービスの定義
-#
-NO_USE_TINET_LIBRARY = true
-
-#  ネットワークインタフェースの選択、何れか一つ選択する。
-NET_IF = ether
-
-#  イーサネット・ディバイスドライバの選択
-NET_DEV = if_btusb
-
-#  ネットワーク層の選択
-#SUPPORT_INET6 = true
-SUPPORT_INET4 = true
-
-#  API に組込む機能の選択
-#API_CFG_IP4MAPPED_ADDR = true
-
-#  トランスポート層の選択
-SUPPORT_TCP = true
-SUPPORT_UDP = true
-
-# IGMPを有効に設定
-SUPPORT_IGMP = true
-
-#
-#  ネットワークサービスの Makefile のインクルード
-#
-include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+ifdef TINETDIR
+        #
+        #  ネットワークサービスの定義
+        #
+        NO_USE_TINET_LIBRARY = true
+
+        #  ネットワークインタフェースの選択、何れか一つ選択する。
+        NET_IF = ether
+
+        #  イーサネット・ディバイスドライバの選択
+        NET_DEV = if_btusb
+
+        #  ネットワーク層の選択
+        #SUPPORT_INET6 = true
+        SUPPORT_INET4 = true
+
+        #  API に組込む機能の選択
+        #API_CFG_IP4MAPPED_ADDR = true
+
+        #  トランスポート層の選択
+        SUPPORT_TCP = true
+        SUPPORT_UDP = true
+
+        # IGMPを有効に設定
+        SUPPORT_IGMP = true
+
+        #
+        #  ネットワークサービスの Makefile のインクルード
+        #
+        include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+endif
 
 #
@@ -285 +287 @@
 #  コンフィギュレータに関する定義
 #
-CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
-CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
+ifndef TINETDIR
+  CFG_TRB := -T $(TARGETDIR)/target_kernel.trb
+  CFG_TABS := --api-table $(SRCDIR)/kernel/kernel_api.def \
+                        --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+else
+  CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
+  CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
                         --api-table ../../ntshell/echonet/echonet_api.def:echonet \
                         --api-table $(SRCDIR)/kernel/kernel_api.def:kernel \
@@ -292 +299 @@
                         --symval-table ../../ntshell/echonet/echonet_sym.def \
                         --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+endif
 CFG_ASMOBJS := $(CFG_ASMOBJS)
 CFG_COBJS := kernel_cfg.o echonet_cfg.o $(CFG_COBJS)
@@ -437 +445 @@
 
 #
+#  並列makeのための依存関係の定義
+#
+$(APPL_OBJS) $(filter-out $(CFG_DMY), $(SYSSVC_OBJS)): | kernel_cfg.timestamp
+$(APPL_ASMOBJS) $(filter-out $(CFG_DMY), $(SYSSVC_ASMOBJS)) $(KERNEL_ASMOBJS) $(CFG_ASMOBJS): \
+                                                                                                                | offset.timestamp
+
+#
 #  特別な依存関係の定義
 #
@@ -445 +460 @@
 #
 $(OBJFILE): $(ALL_OBJS) $(LIBS_DEP)
-        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) \
+        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) -Wl,-Map=$(OBJNAME).map,--cref \
                         $(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \
                         -Wl,--start-group $(ALL_LIBS) -Wl,--end-group $(END_OBJS)

asp3_tinet_ecnl_arm/trunk/app5_temp_sensor/DebugEther/Makefile

@@ -177 +177 @@
         CDEFS := -DTOPPERS_OMIT_TECS $(CDEFS)
 endif
-CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DECHONET_USE_MALLOC -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
+CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DNOUSE_MPF_NET_BUF -DECHONET_USE_MALLOC -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
 INCLUDES := -I. -I$(SRCDIR)/include -I$(SRCDIR) \
         -I$(SRCDIR)/../btstack/include \
@@ -185 +185 @@
         -I$(SRCDIR)/../usbhost/src \
         $(INCLUDES)
-LDFLAGS := $(LDFLAGS) -Wl,-Map=$(OBJNAME).map,--cref -L.
+LDFLAGS := $(LDFLAGS) -L.
 LIBS := $(LIBS) $(CXXLIBS)
 CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES)
@@ -196 +196 @@
 APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o sdfs.o ccsbcs.o ntshell.o text_editor.o text_history.o usrcmd.o vtrecv.o vtsend.o ntlibc.o ntstdio.o ntopt.o syscall.o tlsf.o
 APPLDIRS := $(APPLDIRS) ../../ntshell/lcd
-APPL_COBJS := $(APPL_COBJS) draw_font.o misaki_font.o
+APPL_COBJS := $(APPL_COBJS) draw_font.o shnm12_font.o
+APPL_CFLAGS := $(APPL_CFLAGS) -DSHNM12_FONT
 
 #
@@ -221 +222 @@
 endif
 
-
-#
-#  ネットワークサービスの定義
-#
-NO_USE_TINET_LIBRARY = true
-
-#  ネットワークインタフェースの選択、何れか一つ選択する。
-NET_IF = ether
-
-#  イーサネット・ディバイスドライバの選択
+ifdef TINETDIR
+        #
+        #  ネットワークサービスの定義
+        #
+        NO_USE_TINET_LIBRARY = true
+
+        #  ネットワークインタフェースの選択、何れか一つ選択する。
+        NET_IF = ether
+
+        #  イーサネット・ディバイスドライバの選択
         NET_DEV = if_mbed
 
-#  ネットワーク層の選択
-#SUPPORT_INET6 = true
-SUPPORT_INET4 = true
-
-#  API に組込む機能の選択
-#API_CFG_IP4MAPPED_ADDR = true
-
-#  トランスポート層の選択
-SUPPORT_TCP = true
-SUPPORT_UDP = true
-
-# IGMPを有効に設定
-SUPPORT_IGMP = true
-
-#
-#  ネットワークサービスの Makefile のインクルード
-#
-include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+        #  ネットワーク層の選択
+        #SUPPORT_INET6 = true
+        SUPPORT_INET4 = true
+
+        #  API に組込む機能の選択
+        #API_CFG_IP4MAPPED_ADDR = true
+
+        #  トランスポート層の選択
+        SUPPORT_TCP = true
+        SUPPORT_UDP = true
+
+        # IGMPを有効に設定
+        SUPPORT_IGMP = true
+
+        #
+        #  ネットワークサービスの Makefile のインクルード
+        #
+        include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+endif
 
 #
@@ -283 +285 @@
 #  コンフィギュレータに関する定義
 #
-CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
-CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
+ifndef TINETDIR
+  CFG_TRB := -T $(TARGETDIR)/target_kernel.trb
+  CFG_TABS := --api-table $(SRCDIR)/kernel/kernel_api.def \
+                        --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+else
+  CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
+  CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
                         --api-table ../../ntshell/echonet/echonet_api.def:echonet \
                         --api-table $(SRCDIR)/kernel/kernel_api.def:kernel \
@@ -290 +297 @@
                         --symval-table ../../ntshell/echonet/echonet_sym.def \
                         --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+endif
 CFG_ASMOBJS := $(CFG_ASMOBJS)
 CFG_COBJS := kernel_cfg.o echonet_cfg.o $(CFG_COBJS)
@@ -435 +443 @@
 
 #
+#  並列makeのための依存関係の定義
+#
+$(APPL_OBJS) $(filter-out $(CFG_DMY), $(SYSSVC_OBJS)): | kernel_cfg.timestamp
+$(APPL_ASMOBJS) $(filter-out $(CFG_DMY), $(SYSSVC_ASMOBJS)) $(KERNEL_ASMOBJS) $(CFG_ASMOBJS): \
+                                                                                                                | offset.timestamp
+
+#
 #  特別な依存関係の定義
 #
@@ -443 +458 @@
 #
 $(OBJFILE): $(ALL_OBJS) $(LIBS_DEP)
-        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) \
+        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) -Wl,-Map=$(OBJNAME).map,--cref \
                         $(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \
                         -Wl,--start-group $(ALL_LIBS) -Wl,--end-group $(END_OBJS)

asp3_tinet_ecnl_arm/trunk/app5_temp_sensor/src/echonet_main.c

@@ -1 +1 @@
 /*
  *  TOPPERS ECHONET Lite Communication Middleware
- * 
+ *
  *  Copyright (C) 2014-2018 Cores Co., Ltd. Japan
- * 
+ *
  *  上記著作権者は，以下の(1)～(4)の条件を満たす場合に限り，本ソフトウェ
  *  ア（本ソフトウェアを改変したものを含む．以下同じ）を使用・複製・改
@@ -26 +26 @@
  *      由に基づく請求からも，上記著作権者およびTOPPERSプロジェクトを
  *      免責すること．
- * 
+ *
  *  本ソフトウェアは，無保証で提供されているものである．上記著作権者お
  *  よびTOPPERSプロジェクトは，本ソフトウェアに関して，特定の使用目的
@@ -32 +32 @@
  *  アの利用により直接的または間接的に生じたいかなる損害に関しても，そ
  *  の責任を負わない．
- * 
+ *
  *  @(#) $Id$
  */
 
-/* 
+/*
  *  サンプルプログラム(1)の本体
  */
@@ -55 +55 @@
 #include "adafruit_st7735.h"
 #include "draw_font.h"
+#include <tinet_defs.h>
+#include <tinet_config.h>
+#include <netinet/in.h>
+#include <netinet/in_var.h>
+#include <net/ethernet.h>
+#include <net/if_var.h>
+
+extern uint8_t mac_addr[6];
 
 /* TODO: メーカーコードを設定 */
@@ -111 +119 @@
 
         /* サイズが１以外は受け付けない */
-        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:
@@ -126 +134 @@
                 data[1] = *(uint8_t *)src;
                 ret = ecn_brk_wai(data, sizeof(data));
-                if(ret != E_OK){
+                if (ret != E_OK) {
                         syslog(LOG_ERROR, "ecn_brk_wai");
                         return 1;
@@ -145 +153 @@
 {
         /* サイズが１以外は受け付けない */
-        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:
@@ -176 +184 @@
 
         /* サイズが2以外は受け付けない */
-        if(size != 2)
+        if (size != 2)
                 return 0;
 
         value = (((uint8_t *)src)[0] << 8) | (((uint8_t *)src)[1] & 0xFF);
 
-        if((value >= -2732) && (value <= 32766)){
+        if ((value >= -2732) && (value <= 32766)) {
                 eobj->propertyE0 = value;
                 /* メインタスクに通知 */
                 data[0] = 0xE0;
                 ret = ecn_brk_wai(data, sizeof(data));
-                if(ret != E_OK){
+                if (ret != E_OK) {
                         syslog(LOG_ERROR, "ecn_brk_wai");
                         return 2;
@@ -192 +200 @@
         }
         /* 上記以外は受け付けない */
-        else{
+        else {
                 return 0;
         }
@@ -199 +207 @@
 }
 
-/* 
+/*
  * 温度計測値取得関数
  */
@@ -208 +216 @@
 
         /* サイズが2以外は受け付けない */
-        if(size != 2)
+        if (size != 2)
                 return 0;
 
@@ -240 +248 @@
 
         ret2 = get_tim(&now);
-        if (ret2 != E_OK){
+        if (ret2 != E_OK) {
                 syslog(LOG_ERROR, "get_tim");
                 return;
         }
 
-        for(;;){
+        for (;;) {
                 prev = now;
 
@@ -253 +261 @@
                 /* 応答電文待ち */
                 ret = ecn_trcv_esv(&esv, timer);
-                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");
                         break;
@@ -259 +267 @@
 
                 ret2 = get_tim(&now);
-                if (ret2 != E_OK){
+                if (ret2 != E_OK) {
                         syslog(LOG_ERROR, "get_tim");
                         break;
@@ -274 +282 @@
                         /* 領域解放 */
                         ret = ecn_rel_esv(esv);
-                        if (ret != E_OK){
+                        if (ret != E_OK) {
                                 syslog(LOG_ERROR, "ecn_rel_esv");
                                 break;
@@ -283 +291 @@
                         /* 応答電文待ちの割り込みデータ取得 */
                         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");
                                 break;
@@ -293 +301 @@
                         /* 領域解放 */
                         ret = ecn_rel_esv(esv);
-                        if (ret != E_OK){
+                        if (ret != E_OK) {
                                 syslog(LOG_ERROR, "ecn_rel_esv");
                                 break;
@@ -304 +312 @@
 }
 
-bool_t started = false;
-
 void echonet_change_netif_link(uint8_t link_up, uint8_t up)
 {
@@ -313 +319 @@
                 return;
 
-        if (up && !started) {
-                started = true;
-
-                /* ECHONETミドルウェアを起動 */
-                ret = ecn_sta_svc();
-                if (ret != E_OK)
-                        return;
-
-                /* ECHONETミドルウェアを起動するのを待つ */
-                dly_tsk(100);
+        if (up) {
+                /* インスタンスリスト通知の送信 */
+                ret = ecn_ntf_inl();
+                if (ret != E_OK) {
+                        syslog(LOG_ERROR, "ecn_ntf_inl");
+                }
         }
 
@@ -328 +330 @@
         uint8_t data[2];
         data[0] = 0x01;
-        data[1] = up ? 0x01 : 0x02;
+        data[1] = (up ? 0x01 : 0x02) | (link_up ? 0x10 : 0x20);
         ret = ecn_brk_wai(data, sizeof(data));
         if (ret != E_OK) {
@@ -336 +338 @@
 }
 
-enum main_state_t{
+enum main_state_t {
+        main_state_start,
         main_state_idle,
 };
 
 int main_timer = TMO_FEVR;
-enum main_state_t main_state = main_state_idle;
+enum main_state_t main_state = main_state_start;
 
 int main_lcd_timer = TMO_FEVR;
@@ -386 +389 @@
         analogin_init(&joystick, P1_12);
 
-        /* 10ms後にボタン状態を確認 */
-        main_timer = 10 * 1000;
+        /* ECHONETミドルウェアを起動するのを待つ */
+        main_state = main_state_start;
+        main_timer = 1000 * 1000;
 
         /* ボタン状態読み込み */
@@ -397 +401 @@
         spi_init(&lcd.hspi, P10_14, P10_15, P10_12, NC);
         spi_format(&lcd.hspi, 8, 0, 0);
-        spi_frequency(&lcd.hspi, 1000000);
+        spi_frequency(&lcd.hspi, 4000000);
 
         gpio_init_out(&lcd.cs_pin, P10_13);
@@ -416 +420 @@
         main_lcd_timer = 1000 * 1000;
 
+        /* メインタスクを起動 */
         ER ret = act_tsk(MAIN_TASK);
         if (ret != E_OK) {
@@ -429 +434 @@
         int result = main_timer;
 
-        if((result == TMO_FEVR)
-                || ((main_lcd_timer != TMO_FEVR) && (main_lcd_timer < result))){
+        if ((result == TMO_FEVR)
+                || ((main_lcd_timer != TMO_FEVR) && (main_lcd_timer < result))) {
                 result = main_lcd_timer;
         }
@@ -442 +447 @@
 static void main_progress(int interval)
 {
-        if(main_timer != TMO_FEVR){
+        if (main_timer != TMO_FEVR) {
                 main_timer -= interval;
-                if(main_timer < 0){
+                if (main_timer < 0) {
                         main_timer = 0;
                 }
         }
 
-        if(main_lcd_timer != TMO_FEVR){
+        if (main_lcd_timer != TMO_FEVR) {
                 main_lcd_timer -= interval;
-                if(main_lcd_timer < 0){
+                if (main_lcd_timer < 0) {
                         main_lcd_timer = 0;
                 }
@@ -472 +477 @@
 
         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 0xE0:
-                                if(in_get && (esv->hdr.edata.esv == ESV_SET_GET_RES)){
+                                if (in_get && (esv->hdr.edata.esv == ESV_SET_GET_RES)) {
                                         check_response(pdc, p_edt);
                                 }
@@ -487 +492 @@
                         }
                 }
-                if(ret != E_BOVR){
+                if (ret != E_BOVR) {
                         syslog(LOG_ERROR, "ecn_itr_nxt");
                         break;
                 }
-                if(enm.is_eof)
+                if (enm.is_eof)
                         break;
 
@@ -504 +509 @@
 static void main_break_wait(uint8_t *brkdat, int32_t len)
 {
+        char mac_text[30] = "mac: ";
+        char ipaddr_text[30] = "ipadr: ";
+        const T_IN4_ADDR *ip4_addr;
+        int pos;
+
         if (brkdat[0] == 0x01) {
-                // Link up/down
+                pos = str_macaddr(&mac_text[4], sizeof(mac_text) - 4, mac_addr, 0);
+                mac_text[pos + 4] = '\0';
+                lcd_drawString(&lcd, mac_text, X_LINE_TO_PIX(&lcd, 0), Y_ROW_TO_PIX(&lcd, 11), ST7735_BLACK, ST7735_WHITE);
+
+                ip4_addr = in4_get_ifaddr(0);
+                pos = str_ipv4addr(&ipaddr_text[6], sizeof(ipaddr_text) - 6, ip4_addr, 0);
+                ipaddr_text[pos + 6] = '\0';
+                lcd_drawString(&lcd, ipaddr_text, X_LINE_TO_PIX(&lcd, 0), Y_ROW_TO_PIX(&lcd, 12), ST7735_BLACK, ST7735_WHITE);
                 return;
         }
 
         if ((len == 2) && (brkdat[0] == 0x80)) {
-                switch(brkdat[1]){
+                switch (brkdat[1]) {
                 /* ONの場合 */
                 case 0x30:
@@ -533 +550 @@
 static void main_timeout()
 {
-        if(main_timer == 0){
+        if (main_timer == 0) {
                 main_ontimer();
         }
 
-        if(main_lcd_timer == 0){
+        if (main_lcd_timer == 0) {
                 main_lcd_ontimer();
         }
@@ -543 +560 @@
 
 #define main_ad_count 3
+#define main_ad_table_count 64
 static int16_t main_ad_tempr[main_ad_count] = { 200, 200, 200 };
-static uint16_t main_ad_table[64];
-#define main_ad_table_count (sizeof(main_ad_table) / sizeof(main_ad_table[0]))
+static uint16_t main_ad_table[main_ad_count][main_ad_table_count];
 static int main_ad_pos = 0;
 static uint32_t main_ad_avelage[main_ad_count];
@@ -556 +573 @@
 static void main_ontimer()
 {
+        ER ret;
         uint8_t btn;
         uint16_t ad_value;
         int16_t ad_tempr;
 
-        switch(main_state){
+        switch (main_state) {
+        case main_state_start:
+                /* ECHONETミドルウェアを起動 */
+                ret = ecn_sta_svc();
+                if (ret != E_OK) {
+                        syslog(LOG_ERROR, "ecn_sta_svc");
+                }
+
+                /* 10ms後にボタン状態を確認 */
+                main_state = main_state_idle;
+                main_timer = 10 * 1000;
+                break;
         case main_state_idle:
                 /* 10ms後にボタン状態を確認 */
@@ -567 +596 @@
                 /* ADCの変換結果取得 */
                 for (int i = 0; i < main_ad_count; i++) {
-                        main_ad_avelage[i] -= main_ad_table[main_ad_pos];
+                        main_ad_avelage[i] -= main_ad_table[i][main_ad_pos];
                         ad_value = analogin_read_u16(&analogin[i]) >> 4;        // 16bit値取得->12bit
-                        main_ad_table[main_ad_pos] = ad_value;
+                        main_ad_table[i][main_ad_pos] = ad_value;
                         main_ad_avelage[i] += ad_value;
                 }
 
                 main_ad_pos++;
-                if(main_ad_pos >= main_ad_table_count){
+                if (main_ad_pos >= main_ad_table_count) {
                         main_ad_pos = 0;
                 }
@@ -586 +615 @@
                                 }
                                 else {
+                                        main_count[i] = 0;
                                         main_ad_tempr[i] = ad_tempr;
 
@@ -601 +631 @@
 
                 /* ボタン１の処理 */
-                if((btn == BUTTON_LEFT) && !main_btn1_state){
+                if ((btn == BUTTON_LEFT) && !main_btn1_state) {
                         main_btn1_count++;
-                        if(main_btn1_count > 10){
+                        if (main_btn1_count > 10) {
                                 main_btn1_count = 0;
                                 main_btn1_state = true;
@@ -610 +640 @@
                         }
                 }
-                else if((btn != BUTTON_LEFT) && main_btn1_state){
+                else if ((btn != BUTTON_LEFT) && main_btn1_state) {
                         main_btn1_count++;
-                        if(main_btn1_count > 10){
+                        if (main_btn1_count > 10) {
                                 main_btn1_count = 0;
                                 main_btn1_state = false;
@@ -621 +651 @@
 
                 /* ボタン２の処理 */
-                if((btn == BUTTON_RIGHT) && !main_btn2_state){
+                if ((btn == BUTTON_RIGHT) && !main_btn2_state) {
                         main_btn2_count++;
-                        if(main_btn2_count > 10){
+                        if (main_btn2_count > 10) {
                                 main_btn2_count = 0;
                                 main_btn2_state = true;
@@ -630 +660 @@
                         }
                 }
-                else if((btn != BUTTON_RIGHT) && main_btn2_state){
+                else if ((btn != BUTTON_RIGHT) && main_btn2_state) {
                         main_btn2_count++;
-                        if(main_btn2_count > 10){
+                        if (main_btn2_count > 10) {
                                 main_btn2_count = 0;
                                 main_btn2_state = false;
@@ -645 +675 @@
 static void main_lcd_ontimer()
 {
-        char temp1[] = "温度1：+00.0℃";
-        char temp2[] = "温度2：+00.0℃";
-        char humid[] = "湿度 ：+00.0％";
+        char temp1[] = "温度1：+000.0℃";
+        char temp2[] = "温度2：+000.0℃";
+        char humid[] = "湿度 ：+000.0％";
         char *btn_texts[] = { "none  ", "down  ", "left  ", "select", "up    ", "right " };
         int temp, btn;
@@ -653 +683 @@
         switch (main_lcd_state) {
         case 0:
-                temp1[9] = (temperature_sensor1_data.propertyE0 >= 0) ? ' ' : '-';
+                temp1[10] = (temperature_sensor1_data.propertyE0 >= 0) ? ' ' : '-';
                 temp = (temperature_sensor1_data.propertyE0 / 1000) % 10;
                 if (temp < 0)
                         temp = -temp;
-                temp1[10] = '0' + temp;
+                temp1[11] = '0' + temp;
                 temp = (temperature_sensor1_data.propertyE0 / 100) % 10;
                 if (temp < 0)
                         temp = -temp;
-                temp1[11] = '0' + temp;
+                temp1[12] = '0' + temp;
                 temp = (temperature_sensor1_data.propertyE0 / 10) % 10;
                 if (temp < 0)
                         temp = -temp;
                 temp1[13] = '0' + temp;
-                lcd_drawString(&lcd, &temp1[9], X_LINE_HALF_TO_PIX(&lcd, 8) + 10, Y_ROW_TO_PIX(&lcd, main_lcd_state + 4) + 10, ST7735_BLACK, ST7735_WHITE);
+                temp = (temperature_sensor1_data.propertyE0 / 1) % 10;
+                if (temp < 0)
+                        temp = -temp;
+                temp1[15] = '0' + temp;
+                lcd_drawString(&lcd, &temp1[10], X_LINE_HALF_TO_PIX(&lcd, 7), Y_ROW_TO_PIX(&lcd, main_lcd_state + 2), ST7735_BLACK, ST7735_WHITE);
                 main_lcd_state++;
                 break;
         case 1:
-                temp2[9] = (temperature_sensor2_data.propertyE0 >= 0) ? ' ' : '-';
+                temp2[10] = (temperature_sensor2_data.propertyE0 >= 0) ? ' ' : '-';
                 temp = (temperature_sensor2_data.propertyE0 / 1000) % 10;
                 if (temp < 0)
                         temp = -temp;
-                temp2[10] = '0' + temp;
+                temp2[11] = '0' + temp;
                 temp = (temperature_sensor2_data.propertyE0 / 100) % 10;
                 if (temp < 0)
                         temp = -temp;
-                temp2[11] = '0' + temp;
+                temp2[12] = '0' + temp;
                 temp = (temperature_sensor2_data.propertyE0 / 10) % 10;
                 if (temp < 0)
                         temp = -temp;
                 temp2[13] = '0' + temp;
-                lcd_drawString(&lcd, &temp2[9], X_LINE_HALF_TO_PIX(&lcd, 8) + 10, Y_ROW_TO_PIX(&lcd, main_lcd_state + 4) + 10, ST7735_BLACK, ST7735_WHITE);
+                temp = (temperature_sensor2_data.propertyE0 / 1) % 10;
+                if (temp < 0)
+                        temp = -temp;
+                temp2[15] = '0' + temp;
+                lcd_drawString(&lcd, &temp2[10], X_LINE_HALF_TO_PIX(&lcd, 7), Y_ROW_TO_PIX(&lcd, main_lcd_state + 2), ST7735_BLACK, ST7735_WHITE);
                 main_lcd_state++;
                 break;
         case 2:
-                humid[9] = ' ';
-                temp = (humidity_sensor_data.propertyE0 / 1000) % 10;
-                humid[10] = '0' + temp;
+                humid[10] = ' ';
+                humid[11] = ' ';
                 temp = (humidity_sensor_data.propertyE0 / 100) % 10;
-                humid[11] = '0' + temp;
+                humid[12] = '0' + temp;
                 temp = (humidity_sensor_data.propertyE0 / 10) % 10;
                 humid[13] = '0' + temp;
-                lcd_drawString(&lcd, &humid[9], X_LINE_HALF_TO_PIX(&lcd, 8) + 10, Y_ROW_TO_PIX(&lcd, main_lcd_state + 4) + 10, ST7735_BLACK, ST7735_WHITE);
+                temp = (humidity_sensor_data.propertyE0 / 1) % 10;
+                humid[15] = '0' + temp;
+                lcd_drawString(&lcd, &humid[10], X_LINE_HALF_TO_PIX(&lcd, 7), Y_ROW_TO_PIX(&lcd, main_lcd_state + 2), ST7735_BLACK, ST7735_WHITE);
                 main_lcd_state++;
                 break;
@@ -704 +743 @@
         case 6:
                 btn = main_read_button(&joystick);
-                lcd_drawString(&lcd, btn_texts[btn], X_LINE_TO_PIX(&lcd, 0) + 10, Y_ROW_TO_PIX(&lcd, 10) + 10, ST7735_BLACK, ST7735_WHITE);
+                lcd_drawString(&lcd, btn_texts[btn], X_LINE_TO_PIX(&lcd, 0), Y_ROW_TO_PIX(&lcd, 9), ST7735_BLACK, ST7735_WHITE);
                 main_lcd_state++;
                 break;
@@ -711 +750 @@
                 break;
         case 10:
-                lcd_drawString(&lcd, "温度湿度計", X_LINE_TO_PIX(&lcd, 9) + 10, Y_ROW_TO_PIX(&lcd, 0) + 10, ST7735_BLACK, ST7735_WHITE);
-                lcd_drawString(&lcd, temp1, X_LINE_TO_PIX(&lcd, 0) + 10, Y_ROW_TO_PIX(&lcd, 0 + 4) + 10, ST7735_BLACK, ST7735_WHITE);
-                lcd_drawString(&lcd, temp2, X_LINE_TO_PIX(&lcd, 0) + 10, Y_ROW_TO_PIX(&lcd, 1 + 4) + 10, ST7735_BLACK, ST7735_WHITE);
-                lcd_drawString(&lcd, humid, X_LINE_TO_PIX(&lcd, 0) + 10, Y_ROW_TO_PIX(&lcd, 2 + 4) + 10, ST7735_BLACK, ST7735_WHITE);
+                lcd_drawString(&lcd, "温度湿度計", X_LINE_TO_PIX(&lcd, 5), Y_ROW_TO_PIX(&lcd, 0), ST7735_BLACK, ST7735_WHITE);
+                lcd_drawString(&lcd, temp1, X_LINE_TO_PIX(&lcd, 0), Y_ROW_TO_PIX(&lcd, 0 + 2), ST7735_BLACK, ST7735_WHITE);
+                lcd_drawString(&lcd, temp2, X_LINE_TO_PIX(&lcd, 0), Y_ROW_TO_PIX(&lcd, 1 + 2), ST7735_BLACK, ST7735_WHITE);
+                lcd_drawString(&lcd, humid, X_LINE_TO_PIX(&lcd, 0), Y_ROW_TO_PIX(&lcd, 2 + 2), ST7735_BLACK, ST7735_WHITE);
                 main_lcd_state = 0;
                 break;
@@ -755 +794 @@
         /* プロパティ設定電文作成 */
         ret = ecn_esv_setc(&esv, eobj, 0xE0, 2, p_edt);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_esv_setc");
                 return;
@@ -761 +800 @@
 
         /* 電文送信 */
-        ecn_snd_esv(esv);
+        ret = ecn_snd_esv(esv);
+        if (ret != E_OK) {
+                syslog(LOG_ERROR, "ecn_snd_esv");
+        }
 }
 
@@ -798 +840 @@
 
         /* 押されて戻った時に処理する */
-        if(push)
+        if (push)
                 return;
 
         /* 温度計測値 */
         main_tmpr -= 10;        /* - 1.0℃ */
-        if(main_tmpr < -100)    /* -10.0℃までとする */
+        if (main_tmpr < -100)   /* -10.0℃までとする */
                 main_tmpr = -100;
 
@@ -811 +853 @@
         /* プロパティ値書き込み・読み出し要求電文作成 */
         ret = ecn_esv_set_get(&esv, TEMP_SENSOR_02_EOBJ, 0xE0, 2, p_edt);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_esv_setc");
                 return;
@@ -820 +862 @@
         /* 書き込みプロパティ追加 */
         ret = ecn_add_edt(esv, 0x80, 1, p_edt);
-        if(ret) {
+        if (ret) {
                 syslog(LOG_ERROR, "ecn_add_edt");
                 goto error;
@@ -827 +869 @@
         /* プロパティ値書き込み・読み出し要求電文作成：折り返し指定 */
         ret = ecn_trn_set_get(esv, &trn_pos);
-        if(ret) {
+        if (ret) {
                 syslog(LOG_ERROR, "ecn_trn_set_get");
                 goto error;
@@ -834 +876 @@
         /* 読み出しプロパティ追加 */
         ret = ecn_add_epc(esv, 0xE0);
-        if(ret) {
+        if (ret) {
                 syslog(LOG_ERROR, "ecn_add_epc");
                 goto error;
@@ -841 +883 @@
         /* プロパティ値書き込み・読み出し要求電文作成：終了指定 */
         ret = ecn_end_set_get(esv, trn_pos);
-        if(ret) {
+        if (ret) {
                 syslog(LOG_ERROR, "ecn_end_set_get");
                 goto error;
@@ -848 +890 @@
         /* 電文送信 */
         ret = ecn_snd_esv(esv);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_snd_esv");
         }
@@ -855 +897 @@
         /* 領域解放 */
         ret = ecn_rel_esv(esv);
-        if (ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_rel_esv");
         }
@@ -871 +913 @@
 
         /* 押されて戻った時に処理する */
-        if(push)
+        if (push)
                 return;
 
         /* 温度計測値 */
         main_tmpr += 10;        /* + 1.0℃ */
-        if(main_tmpr > 400)     /* +40.0℃までとする */
+        if (main_tmpr > 400)    /* +40.0℃までとする */
                 main_tmpr = 400;
 
@@ -884 +926 @@
         /* プロパティ値書き込み・読み出し要求電文作成 */
         ret = ecn_esv_set_get(&esv, TEMP_SENSOR_02_EOBJ, 0xE0, 2, p_edt);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_esv_setc");
                 return;
@@ -893 +935 @@
         /* 書き込みプロパティ追加 */
         ret = ecn_add_edt(esv, 0x80, 1, p_edt);
-        if(ret) {
+        if (ret) {
                 syslog(LOG_ERROR, "ecn_add_edt");
                 goto error;
@@ -900 +942 @@
         /* プロパティ値書き込み・読み出し要求電文作成：折り返し指定 */
         ret = ecn_trn_set_get(esv, &trn_pos);
-        if(ret) {
+        if (ret) {
                 syslog(LOG_ERROR, "ecn_trn_set_get");
                 goto error;
@@ -907 +949 @@
         /* 読み出しプロパティ追加 */
         ret = ecn_add_epc(esv, 0xE0);
-        if(ret) {
+        if (ret) {
                 syslog(LOG_ERROR, "ecn_add_epc");
                 goto error;
@@ -914 +956 @@
         /* プロパティ値書き込み・読み出し要求電文作成：終了指定 */
         ret = ecn_end_set_get(esv, trn_pos);
-        if(ret) {
+        if (ret) {
                 syslog(LOG_ERROR, "ecn_end_set_get");
                 goto error;
@@ -921 +963 @@
         /* 電文送信 */
         ret = ecn_snd_esv(esv);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_snd_esv");
         }
@@ -928 +970 @@
         /* 領域解放 */
         ret = ecn_rel_esv(esv);
-        if (ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_rel_esv");
         }
@@ -938 +980 @@
 static bool_t check_response(uint8_t pdc, uint8_t *p_edt)
 {
-        if((pdc != 2)
+        if ((pdc != 2)
                 || (p_edt[0] != ((uint16_t)main_tmpr) >> 8)
-                || (p_edt[1] != ((uint16_t)main_tmpr) & 0xFF))
-        {
+                || (p_edt[1] != ((uint16_t)main_tmpr) & 0xFF)) {
                 syslog(LOG_WARNING, "epc_set_get response NG");
                 return false;

asp3_tinet_ecnl_arm/trunk/app5_temp_sensor/src/main.c

@@ -79 +79 @@
 
 ID ws_api_mailboxid = MAIN_DATAQUEUE;
+#ifndef NOUSE_MPF_NET_BUF
 ID ws_mempoolid = MPF_NET_BUF_256;
+#endif
 
 #ifdef IF_ETHER_BTUSB
@@ -111 +113 @@
 static void main_timeout();
 
+extern int ntshell_exit;
+
 int uart_read(char *buf, int cnt, void *extobj)
 {
-        return serial_rea_dat(SIO_PORTID, (char *)buf, cnt);
+        struct main_t *obj = (struct main_t *)extobj;
+        int result;
+        ER ret;
+        int timer;
+
+        obj->prev = obj->now;
+
+        /* タイマー取得 */
+        timer = main_get_timer();
+
+        /* 待ち */
+        ret = serial_trea_dat(SIO_PORTID, buf, cnt, timer);
+        if ((ret < 0) && (ret != E_OK) && (ret != E_TMOUT)) {
+                syslog(LOG_NOTICE, "tslp_tsk ret: %s %d", itron_strerror(ret), timer);
+                ntshell_exit = 1;
+                return -1;
+        }
+        result = (int)ret;
+
+        ret = get_tim(&obj->now);
+        if (ret != E_OK) {
+                syslog(LOG_NOTICE, "get_tim ret: %s", itron_strerror(ret));
+                ntshell_exit = 1;
+                return -1;
+        }
+
+                        /* 時間経過 */
+        int elapse = obj->now - obj->prev;
+        main_progress(elapse);
+
+        /* タイムアウト処理 */
+        main_timeout();
+
+        return result;
 }
 
@@ -119 +156 @@
 {
         return serial_wri_dat(SIO_PORTID, buf, cnt);
-}
-
-unsigned char ntstdio_xi(struct ntstdio_t *handle)
-{
-        char buf[1];
-        if(serial_rea_dat(SIO_PORTID, buf, 1) != 1)
-                return -EIO;
-        return buf[0];
-}
-
-void ntstdio_xo(struct ntstdio_t *handle, unsigned char c)
-{
-        char buf[1];
-        buf[0] = c;
-        serial_wri_dat(SIO_PORTID, buf, 1);
 }
 
@@ -150 +172 @@
         main_initialize();
 
-        ntshell_init(&ntshell, uart_read, uart_write, cmd_execute, NULL);
+        ntshell_init(&ntshell, uart_read, uart_write, cmd_execute, &main_obj);
         ntshell_set_prompt(&ntshell, "NTShell>");
         ntshell_execute(&ntshell);
@@ -168 +190 @@
         ER ret;
 
-        ntshell_task_init();
+#ifdef TOPPERS_OMIT_TECS
+        serial_opn_por(SIO_PORTID);
+#endif
+        serial_ctl_por(SIO_PORTID, IOCTL_FCSND | IOCTL_FCRCV);
+
+        ntshell_task_init(uart_read, uart_write, &main_obj);
 
         main_obj.timer = TMO_FEVR;

asp3_tinet_ecnl_arm/trunk/app5_temp_sensor/src/main.cfg

@@ -54 +54 @@
 INCLUDE("tinet/tinet_asp.cfg");
 INCLUDE("tinet_main.cfg");
-INCLUDE("netinet/ip_igmp.cfg");
 
 /* DHCP クライアント */

asp3_tinet_ecnl_arm/trunk/app6_hot_water_pot/.cproject

@@ -22 +22 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -127 +127 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">

asp3_tinet_ecnl_arm/trunk/app6_hot_water_pot/Debug/Makefile

@@ -173 +173 @@
         CDEFS := -DTOPPERS_OMIT_TECS $(CDEFS)
 endif
-CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DECHONET_USE_MALLOC -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
+CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DNOUSE_MPF_NET_BUF -DECHONET_USE_MALLOC -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
 INCLUDES := -I. -I$(SRCDIR)/include -I$(SRCDIR) \
         -I$(SRCDIR)/../btstack/include \
@@ -181 +181 @@
         -I$(SRCDIR)/../usbhost/src \
         $(INCLUDES)
-LDFLAGS := $(LDFLAGS) -Wl,-Map=$(OBJNAME).map,--cref -L.
+LDFLAGS := $(LDFLAGS) -L.
 LIBS := $(LIBS) $(CXXLIBS)
 CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES)
@@ -215 +215 @@
 endif
 
-
-#
-#  ネットワークサービスの定義
-#
-NO_USE_TINET_LIBRARY = true
-
-#  ネットワークインタフェースの選択、何れか一つ選択する。
-NET_IF = ether
-
-#  イーサネット・ディバイスドライバの選択
-NET_DEV = if_btusb
-
-#  ネットワーク層の選択
-#SUPPORT_INET6 = true
-SUPPORT_INET4 = true
-
-#  API に組込む機能の選択
-#API_CFG_IP4MAPPED_ADDR = true
-
-#  トランスポート層の選択
-SUPPORT_TCP = true
-SUPPORT_UDP = true
-
-# IGMPを有効に設定
-SUPPORT_IGMP = true
-
-#
-#  ネットワークサービスの Makefile のインクルード
-#
-include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+ifdef TINETDIR
+        #
+        #  ネットワークサービスの定義
+        #
+        NO_USE_TINET_LIBRARY = true
+
+        #  ネットワークインタフェースの選択、何れか一つ選択する。
+        NET_IF = ether
+
+        #  イーサネット・ディバイスドライバの選択
+        NET_DEV = if_btusb
+
+        #  ネットワーク層の選択
+        #SUPPORT_INET6 = true
+        SUPPORT_INET4 = true
+
+        #  API に組込む機能の選択
+        #API_CFG_IP4MAPPED_ADDR = true
+
+        #  トランスポート層の選択
+        SUPPORT_TCP = true
+        SUPPORT_UDP = true
+
+        # IGMPを有効に設定
+        SUPPORT_IGMP = true
+
+        #
+        #  ネットワークサービスの Makefile のインクルード
+        #
+        include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+endif
 
 #
@@ -277 +278 @@
 #  コンフィギュレータに関する定義
 #
-CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
-CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
+ifndef TINETDIR
+  CFG_TRB := -T $(TARGETDIR)/target_kernel.trb
+  CFG_TABS := --api-table $(SRCDIR)/kernel/kernel_api.def \
+                        --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+else
+  CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
+  CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
                         --api-table ../../ntshell/echonet/echonet_api.def:echonet \
                         --api-table $(SRCDIR)/kernel/kernel_api.def:kernel \
@@ -284 +290 @@
                         --symval-table ../../ntshell/echonet/echonet_sym.def \
                         --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+endif
 CFG_ASMOBJS := $(CFG_ASMOBJS)
 CFG_COBJS := kernel_cfg.o echonet_cfg.o $(CFG_COBJS)
@@ -429 +436 @@
 
 #
+#  並列makeのための依存関係の定義
+#
+$(APPL_OBJS) $(filter-out $(CFG_DMY), $(SYSSVC_OBJS)): | kernel_cfg.timestamp
+$(APPL_ASMOBJS) $(filter-out $(CFG_DMY), $(SYSSVC_ASMOBJS)) $(KERNEL_ASMOBJS) $(CFG_ASMOBJS): \
+                                                                                                                | offset.timestamp
+
+#
 #  特別な依存関係の定義
 #
@@ -437 +451 @@
 #
 $(OBJFILE): $(ALL_OBJS) $(LIBS_DEP)
-        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) \
+        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) -Wl,-Map=$(OBJNAME).map,--cref \
                         $(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \
                         -Wl,--start-group $(ALL_LIBS) -Wl,--end-group $(END_OBJS)

asp3_tinet_ecnl_arm/trunk/app6_hot_water_pot/DebugEther/Makefile

@@ -171 +171 @@
         CDEFS := -DTOPPERS_OMIT_TECS $(CDEFS)
 endif
-CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DECHONET_USE_MALLOC -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
+CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DNOUSE_MPF_NET_BUF -DECHONET_USE_MALLOC -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
 INCLUDES := -I. -I$(SRCDIR)/include -I$(SRCDIR) \
         -I$(SRCDIR)/../btstack/include \
@@ -179 +179 @@
         -I$(SRCDIR)/../usbhost/src \
         $(INCLUDES)
-LDFLAGS := $(LDFLAGS) -Wl,-Map=$(OBJNAME).map,--cref -L.
+LDFLAGS := $(LDFLAGS) -L.
 LIBS := $(LIBS) $(CXXLIBS)
 CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES)
@@ -213 +213 @@
 endif
 
-
-#
-#  ネットワークサービスの定義
-#
-NO_USE_TINET_LIBRARY = true
-
-#  ネットワークインタフェースの選択、何れか一つ選択する。
-NET_IF = ether
-
-#  イーサネット・ディバイスドライバの選択
+ifdef TINETDIR
+        #
+        #  ネットワークサービスの定義
+        #
+        NO_USE_TINET_LIBRARY = true
+
+        #  ネットワークインタフェースの選択、何れか一つ選択する。
+        NET_IF = ether
+
+        #  イーサネット・ディバイスドライバの選択
         NET_DEV = if_mbed
 
-#  ネットワーク層の選択
-#SUPPORT_INET6 = true
-SUPPORT_INET4 = true
-
-#  API に組込む機能の選択
-#API_CFG_IP4MAPPED_ADDR = true
-
-#  トランスポート層の選択
-SUPPORT_TCP = true
-SUPPORT_UDP = true
-
-# IGMPを有効に設定
-SUPPORT_IGMP = true
-
-#
-#  ネットワークサービスの Makefile のインクルード
-#
-include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+        #  ネットワーク層の選択
+        #SUPPORT_INET6 = true
+        SUPPORT_INET4 = true
+
+        #  API に組込む機能の選択
+        #API_CFG_IP4MAPPED_ADDR = true
+
+        #  トランスポート層の選択
+        SUPPORT_TCP = true
+        SUPPORT_UDP = true
+
+        # IGMPを有効に設定
+        SUPPORT_IGMP = true
+
+        #
+        #  ネットワークサービスの Makefile のインクルード
+        #
+        include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+endif
 
 #
@@ -275 +276 @@
 #  コンフィギュレータに関する定義
 #
-CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
-CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
+ifndef TINETDIR
+  CFG_TRB := -T $(TARGETDIR)/target_kernel.trb
+  CFG_TABS := --api-table $(SRCDIR)/kernel/kernel_api.def \
+                        --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+else
+  CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
+  CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
                         --api-table ../../ntshell/echonet/echonet_api.def:echonet \
                         --api-table $(SRCDIR)/kernel/kernel_api.def:kernel \
@@ -282 +288 @@
                         --symval-table ../../ntshell/echonet/echonet_sym.def \
                         --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+endif
 CFG_ASMOBJS := $(CFG_ASMOBJS)
 CFG_COBJS := kernel_cfg.o echonet_cfg.o $(CFG_COBJS)
@@ -427 +434 @@
 
 #
+#  並列makeのための依存関係の定義
+#
+$(APPL_OBJS) $(filter-out $(CFG_DMY), $(SYSSVC_OBJS)): | kernel_cfg.timestamp
+$(APPL_ASMOBJS) $(filter-out $(CFG_DMY), $(SYSSVC_ASMOBJS)) $(KERNEL_ASMOBJS) $(CFG_ASMOBJS): \
+                                                                                                                | offset.timestamp
+
+#
 #  特別な依存関係の定義
 #
@@ -435 +449 @@
 #
 $(OBJFILE): $(ALL_OBJS) $(LIBS_DEP)
-        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) \
+        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) -Wl,-Map=$(OBJNAME).map,--cref \
                         $(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \
                         -Wl,--start-group $(ALL_LIBS) -Wl,--end-group $(END_OBJS)

asp3_tinet_ecnl_arm/trunk/app6_hot_water_pot/src/echonet_main.c

@@ -1 +1 @@
 /*
  *  TOPPERS ECHONET Lite Communication Middleware
- * 
+ *
  *  Copyright (C) 2014-2018 Cores Co., Ltd. Japan
- * 
+ *
  *  上記著作権者は，以下の(1)～(4)の条件を満たす場合に限り，本ソフトウェ
  *  ア（本ソフトウェアを改変したものを含む．以下同じ）を使用・複製・改
@@ -26 +26 @@
  *      由に基づく請求からも，上記著作権者およびTOPPERSプロジェクトを
  *      免責すること．
- * 
+ *
  *  本ソフトウェアは，無保証で提供されているものである．上記著作権者お
  *  よびTOPPERSプロジェクトは，本ソフトウェアに関して，特定の使用目的
@@ -32 +32 @@
  *  アの利用により直接的または間接的に生じたいかなる損害に関しても，そ
  *  の責任を負わない．
- * 
+ *
  *  @(#) $Id$
  */
 
-/* 
+/*
  *  サンプルプログラム(1)の本体
  */
@@ -113 +113 @@
 {
         /* サイズが１以外は受け付けない */
-        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:
@@ -145 +145 @@
 {
         /* サイズが１以外は受け付けない */
-        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:
@@ -174 +174 @@
 
         /* サイズが１以外は受け付けない */
-        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 0x40:
@@ -200 +200 @@
         data[0] = 0xB1;
         ret = ecn_brk_wai(data, sizeof(data));
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_brk_wai");
         }
@@ -213 +213 @@
 {
         /* サイズが１以外は受け付けない */
-        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:
@@ -262 +262 @@
 
         ret2 = get_tim(&now);
-        if (ret2 != E_OK){
+        if (ret2 != E_OK) {
                 syslog(LOG_ERROR, "get_tim");
                 return;
         }
 
-        for(;;){
+        for (;;) {
                 prev = now;
 
@@ -275 +275 @@
                 /* 応答電文待ち */
                 ret = ecn_trcv_esv(&esv, timer);
-                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");
                         break;
@@ -281 +281 @@
 
                 ret2 = get_tim(&now);
-                if (ret2 != E_OK){
+                if (ret2 != E_OK) {
                         syslog(LOG_ERROR, "get_tim");
                         break;
@@ -296 +296 @@
                         /* 領域解放 */
                         ret = ecn_rel_esv(esv);
-                        if (ret != E_OK){
+                        if (ret != E_OK) {
                                 syslog(LOG_ERROR, "ecn_rel_esv");
                                 break;
@@ -305 +305 @@
                         /* 応答電文待ちの割り込みデータ取得 */
                         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");
                                 break;
@@ -315 +315 @@
                         /* 領域解放 */
                         ret = ecn_rel_esv(esv);
-                        if (ret != E_OK){
+                        if (ret != E_OK) {
                                 syslog(LOG_ERROR, "ecn_rel_esv");
                                 break;
@@ -326 +326 @@
 }
 
-bool_t started = false;
-
 void echonet_change_netif_link(uint8_t link_up, uint8_t up)
 {
@@ -335 +333 @@
                 return;
 
-        if (up && !started) {
-                started = true;
-
-                /* ECHONETミドルウェアを起動 */
-                ret = ecn_sta_svc();
-                if (ret != E_OK)
-                        return;
-
-                /* ECHONETミドルウェアを起動するのを待つ */
-                dly_tsk(100);
+        if (up) {
+                /* インスタンスリスト通知の送信 */
+                ret = ecn_ntf_inl();
+                if (ret != E_OK) {
+                        syslog(LOG_ERROR, "ecn_ntf_inl");
+                }
         }
 
@@ -358 +352 @@
 }
 
-enum main_state_t{
+enum main_state_t {
+        main_state_start,
         main_state_idle,
         main_state_search,
@@ -365 +360 @@
 
 int main_timer = TMO_FEVR;
-enum main_state_t main_state = main_state_idle;
+enum main_state_t main_state = main_state_start;
 int main_retry;
 
@@ -397 +392 @@
         gpio_write(&led_red, 0);
 
-        /* １秒後にブザーを検索 */
-        main_state = main_state_search;
+
+        /* ECHONETミドルウェアを起動するのを待つ */
+        main_state = main_state_start;
         main_timer = 1000 * 1000;
 
@@ -410 +406 @@
         main_btn2_state = btn2 != 0;
 
+        /* メインタスクを起動 */
         ER ret = act_tsk(MAIN_TASK);
         if (ret != E_OK) {
@@ -423 +420 @@
         int result = main_timer;
 
-        if((result == TMO_FEVR)
-                || ((main_btn_timer != TMO_FEVR) && (main_btn_timer < result))){
+        if ((result == TMO_FEVR)
+                || ((main_btn_timer != TMO_FEVR) && (main_btn_timer < result))) {
                 result = main_btn_timer;
         }
@@ -436 +433 @@
 static void main_progress(int interval)
 {
-        if(main_timer != TMO_FEVR){
+        if (main_timer != TMO_FEVR) {
                 main_timer -= interval;
-                if(main_timer < 0){
+                if (main_timer < 0) {
                         main_timer = 0;
                 }
         }
 
-        if(main_btn_timer != TMO_FEVR){
+        if (main_btn_timer != TMO_FEVR) {
                 main_btn_timer -= interval;
-                if(main_btn_timer < 0){
+                if (main_btn_timer < 0) {
                         main_btn_timer = 0;
                 }
@@ -464 +461 @@
 
         eobjid = ecn_get_eobj(esv);
-        if(eobjid == EOBJ_NULL){
+        if (eobjid == EOBJ_NULL) {
                 syslog(LOG_ERROR, "ecn_get_eobj");
                 return;
@@ -470 +467 @@
 
         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 0xB1:
-                                switch(main_state){
+                                switch (main_state) {
                                 /* プロパティ通知応答待ちの場合 */
                                 case main_state_wait_res:
                                         /* プロパティ通知応答のみ処理 */
-                                        if((esv->hdr.edata.esv == ESV_INFC_RES) && (eobjid == BUZZER_NODE_EOBJ)){
+                                        if ((esv->hdr.edata.esv == ESV_INFC_RES) && (eobjid == BUZZER_NODE_EOBJ)) {
                                                 /* 応答受信 */
                                                 main_state = main_state_idle;
@@ -492 +489 @@
                                 break;
                         case 0xD6:
-                                switch(main_state){
+                                switch (main_state) {
                                 case main_state_search:
                                         if (eobjid == BUZZER_NODE_EOBJ) {
@@ -504 +501 @@
                         }
                 }
-                if(ret != E_BOVR){
+                if (ret != E_BOVR) {
                         syslog(LOG_ERROR, "ecn_itr_nxt");
                         break;
                 }
-                if(enm.is_eof)
+                if (enm.is_eof)
                         break;
         }
@@ -526 +523 @@
         }
 
-        switch(main_state){
+        switch (main_state) {
         case main_state_idle:
         case main_state_wait_res:
-                if((len >= 1) && (*brkdat == 0xB1)){
+                if ((len >= 1) && (*brkdat == 0xB1)) {
                         /* ブザーに湯切れ警告状態通知 */
                         ret = ecn_esv_infc(&esv, BUZZER_NODE_EOBJ, ELECTRIC_HOT_WATER_POT_EOBJ, 0xB1);
-                        if(ret != E_OK){
+                        if (ret != E_OK) {
                                 syslog(LOG_ERROR, "ecn_esv_infc");
                                 return;
@@ -539 +536 @@
                         /* 電文送信 */
                         ret = ecn_snd_esv(esv);
-                        if(ret != E_OK){
+                        if (ret != E_OK) {
                                 syslog(LOG_ERROR, "ecn_snd_esv");
                         }
@@ -560 +557 @@
 static void main_timeout()
 {
-        if(main_timer == 0){
+        if (main_timer == 0) {
                 main_ontimer();
         }
 
-        if(main_btn_timer == 0){
+        if (main_btn_timer == 0) {
                 main_btn_ontimer();
         }
@@ -576 +573 @@
         T_EDATA *esv;
 
-        switch(main_state){
+        switch (main_state) {
+        case main_state_start:
+                /* ECHONETミドルウェアを起動 */
+                ret = ecn_sta_svc();
+                if (ret != E_OK) {
+                        syslog(LOG_ERROR, "ecn_sta_svc");
+                }
+
+                /* １秒後にブザーを検索 */
+                main_state = main_state_search;
+                main_timer = 1000 * 1000;
+                break;
         case main_state_idle:
                 syslog(LOG_ERROR, "timeout faild on main_state_idle");
@@ -589 +597 @@
         case main_state_wait_res:
                 /* リトライアウトの場合 */
-                if(main_retry == 0){
+                if (main_retry == 0) {
                         /* あきらめる */
                         main_state = main_state_idle;
@@ -598 +606 @@
                 /* ブザーに湯切れ警告状態通知を再送 */
                 ret = ecn_esv_infc(&esv, BUZZER_NODE_EOBJ, ELECTRIC_HOT_WATER_POT_EOBJ, 0xB1);
-                if(ret != E_OK){
+                if (ret != E_OK) {
                         syslog(LOG_ERROR, "ecn_esv_infc");
                         main_state = main_state_idle;
@@ -607 +615 @@
                 /* 電文送信 */
                 ret = ecn_snd_esv(esv);
-                if(ret != E_OK){
+                if (ret != E_OK) {
                         syslog(LOG_ERROR, "ecn_snd_esv");
                         main_state = main_state_idle;
@@ -629 +637 @@
         /* ブザー検索 */
         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;
@@ -636 +644 @@
         /* 電文送信 */
         ret = ecn_snd_esv(esv);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_snd_esv");
         }
@@ -656 +664 @@
 
         /* ボタン１の処理 */
-        if((btn1 != 0) && !main_btn1_state){
+        if ((btn1 != 0) && !main_btn1_state) {
                 main_btn1_count++;
-                if(main_btn1_count > 10){
+                if (main_btn1_count > 10) {
                         main_btn1_count = 0;
                         main_btn1_state = true;
@@ -665 +673 @@
                 }
         }
-        else if((btn1 == 0) && main_btn1_state){
+        else if ((btn1 == 0) && main_btn1_state) {
                 main_btn1_count++;
-                if(main_btn1_count > 10){
+                if (main_btn1_count > 10) {
                         main_btn1_count = 0;
                         main_btn1_state = false;
@@ -676 +684 @@
 
         /* ボタン２の処理 */
-        if((btn2 != 0) && !main_btn2_state){
+        if ((btn2 != 0) && !main_btn2_state) {
                 main_btn2_count++;
-                if(main_btn2_count > 10){
+                if (main_btn2_count > 10) {
                         main_btn2_count = 0;
                         main_btn2_state = true;
@@ -685 +693 @@
                 }
         }
-        else if((btn2 == 0) && main_btn2_state){
+        else if ((btn2 == 0) && main_btn2_state) {
                 main_btn2_count++;
-                if(main_btn2_count > 10){
+                if (main_btn2_count > 10) {
                         main_btn2_count = 0;
                         main_btn2_state = false;
@@ -708 +716 @@
 
         /* 押されて戻った時に処理する */
-        if(push)
+        if (push)
                 return;
 
@@ -718 +726 @@
         /* プロパティ設定電文作成 */
         ret = ecn_esv_seti(&esv, ELECTRIC_HOT_WATER_POT_EOBJ, 0xB1, 1, p_edt);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_esv_seti");
                 return;
@@ -725 +733 @@
         /* 電文送信 */
         ecn_snd_esv(esv);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_snd_esv");
         }
@@ -744 +752 @@
         /* プロパティ設定電文作成 */
         ret = ecn_esv_seti(&esv, ELECTRIC_HOT_WATER_POT_EOBJ, 0xE2, 1, p_edt);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_esv_seti");
                 return;
@@ -751 +759 @@
         /* 電文送信 */
         ecn_snd_esv(esv);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_snd_esv");
         }

asp3_tinet_ecnl_arm/trunk/app6_hot_water_pot/src/main.c

@@ -79 +79 @@
 
 ID ws_api_mailboxid = MAIN_DATAQUEUE;
+#ifndef NOUSE_MPF_NET_BUF
 ID ws_mempoolid = MPF_NET_BUF_256;
+#endif
 
 #ifdef IF_ETHER_BTUSB
@@ -111 +113 @@
 static void main_timeout();
 
+extern int ntshell_exit;
+
 int uart_read(char *buf, int cnt, void *extobj)
 {
-        return serial_rea_dat(SIO_PORTID, (char *)buf, cnt);
+        struct main_t *obj = (struct main_t *)extobj;
+        int result;
+        ER ret;
+        int timer;
+
+        obj->prev = obj->now;
+
+        /* タイマー取得 */
+        timer = main_get_timer();
+
+        /* 待ち */
+        ret = serial_trea_dat(SIO_PORTID, buf, cnt, timer);
+        if ((ret < 0) && (ret != E_OK) && (ret != E_TMOUT)) {
+                syslog(LOG_NOTICE, "tslp_tsk ret: %s %d", itron_strerror(ret), timer);
+                ntshell_exit = 1;
+                return -1;
+        }
+        result = (int)ret;
+
+        ret = get_tim(&obj->now);
+        if (ret != E_OK) {
+                syslog(LOG_NOTICE, "get_tim ret: %s", itron_strerror(ret));
+                ntshell_exit = 1;
+                return -1;
+        }
+
+                        /* 時間経過 */
+        int elapse = obj->now - obj->prev;
+        main_progress(elapse);
+
+        /* タイムアウト処理 */
+        main_timeout();
+
+        return result;
 }
 
@@ -119 +156 @@
 {
         return serial_wri_dat(SIO_PORTID, buf, cnt);
-}
-
-unsigned char ntstdio_xi(struct ntstdio_t *handle)
-{
-        char buf[1];
-        if(serial_rea_dat(SIO_PORTID, buf, 1) != 1)
-                return -EIO;
-        return buf[0];
-}
-
-void ntstdio_xo(struct ntstdio_t *handle, unsigned char c)
-{
-        char buf[1];
-        buf[0] = c;
-        serial_wri_dat(SIO_PORTID, buf, 1);
 }
 
@@ -150 +172 @@
         main_initialize();
 
-        ntshell_init(&ntshell, uart_read, uart_write, cmd_execute, NULL);
+        ntshell_init(&ntshell, uart_read, uart_write, cmd_execute, &main_obj);
         ntshell_set_prompt(&ntshell, "NTShell>");
         ntshell_execute(&ntshell);
@@ -168 +190 @@
         ER ret;
 
-        ntshell_task_init();
+#ifdef TOPPERS_OMIT_TECS
+        serial_opn_por(SIO_PORTID);
+#endif
+        serial_ctl_por(SIO_PORTID, IOCTL_FCSND | IOCTL_FCRCV);
+
+        ntshell_task_init(uart_read, uart_write, &main_obj);
 
         main_obj.timer = TMO_FEVR;

asp3_tinet_ecnl_arm/trunk/app6_hot_water_pot/src/main.cfg

@@ -54 +54 @@
 INCLUDE("tinet/tinet_asp.cfg");
 INCLUDE("tinet_main.cfg");
-INCLUDE("netinet/ip_igmp.cfg");
 
 /* DHCP クライアント */

asp3_tinet_ecnl_arm/trunk/app7_buzzer/.cproject

@@ -22 +22 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -59 +59 @@
                                                         <option id="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack.157741361" name="Warn if stack size exceeds the limit (-Wstack-usage) (H')" superClass="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack" useByScannerDiscovery="false" value="100" valueType="string"/>
                                                         <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.1697219582" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-                                                        <builder buildPath="${workspace_loc:/app7_buzzer}/Debug" id="com.renesas.cdt.managedbuild.gcc.rz.builder.314753602" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="false" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
+                                                        <builder buildPath="${workspace_loc:/app7_buzzer}/Debug" id="com.renesas.cdt.managedbuild.gcc.rz.builder.314753602" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
                                                         <tool id="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler.1983465188" name="Cross ARM GNU Assembler" superClass="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler">
                                                                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1082331522" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" useByScannerDiscovery="false" value="true" valueType="boolean"/>
@@ -127 +127 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -164 +164 @@
                                                         <option id="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack.1092918155" name="Warn if stack size exceeds the limit (-Wstack-usage) (H')" superClass="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack" useByScannerDiscovery="false" value="100" valueType="string"/>
                                                         <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.1370006715" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-                                                        <builder buildPath="${workspace_loc:/app7_buzzer}/DebugEther" id="com.renesas.cdt.managedbuild.gcc.rz.builder.2100247045" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="false" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
+                                                        <builder buildPath="${workspace_loc:/app7_buzzer}/DebugEther" id="com.renesas.cdt.managedbuild.gcc.rz.builder.2100247045" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
                                                         <tool id="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler.1932491155" name="Cross ARM GNU Assembler" superClass="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler">
                                                                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.158555834" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" useByScannerDiscovery="false" value="true" valueType="boolean"/>

asp3_tinet_ecnl_arm/trunk/app7_buzzer/Debug/Makefile

@@ -173 +173 @@
         CDEFS := -DTOPPERS_OMIT_TECS $(CDEFS)
 endif
-CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DECHONET_USE_MALLOC -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
+CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DNOUSE_MPF_NET_BUF -DECHONET_USE_MALLOC -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
 INCLUDES := -I. -I$(SRCDIR)/include -I$(SRCDIR) \
         -I$(SRCDIR)/../btstack/include \
@@ -181 +181 @@
         -I$(SRCDIR)/../usbhost/src \
         $(INCLUDES)
-LDFLAGS := $(LDFLAGS) -Wl,-Map=$(OBJNAME).map,--cref -L.
+LDFLAGS := $(LDFLAGS) -L.
 LIBS := $(LIBS) $(CXXLIBS)
 CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES)
@@ -215 +215 @@
 endif
 
-
-#
-#  ネットワークサービスの定義
-#
-NO_USE_TINET_LIBRARY = true
-
-#  ネットワークインタフェースの選択、何れか一つ選択する。
-NET_IF = ether
-
-#  イーサネット・ディバイスドライバの選択
-NET_DEV = if_btusb
-
-#  ネットワーク層の選択
-#SUPPORT_INET6 = true
-SUPPORT_INET4 = true
-
-#  API に組込む機能の選択
-#API_CFG_IP4MAPPED_ADDR = true
-
-#  トランスポート層の選択
-SUPPORT_TCP = true
-SUPPORT_UDP = true
-
-# IGMPを有効に設定
-SUPPORT_IGMP = true
-
-#
-#  ネットワークサービスの Makefile のインクルード
-#
-include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+ifdef TINETDIR
+        #
+        #  ネットワークサービスの定義
+        #
+        NO_USE_TINET_LIBRARY = true
+
+        #  ネットワークインタフェースの選択、何れか一つ選択する。
+        NET_IF = ether
+
+        #  イーサネット・ディバイスドライバの選択
+        NET_DEV = if_btusb
+
+        #  ネットワーク層の選択
+        #SUPPORT_INET6 = true
+        SUPPORT_INET4 = true
+
+        #  API に組込む機能の選択
+        #API_CFG_IP4MAPPED_ADDR = true
+
+        #  トランスポート層の選択
+        SUPPORT_TCP = true
+        SUPPORT_UDP = true
+
+        # IGMPを有効に設定
+        SUPPORT_IGMP = true
+
+        #
+        #  ネットワークサービスの Makefile のインクルード
+        #
+        include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+endif
 
 #
@@ -277 +278 @@
 #  コンフィギュレータに関する定義
 #
-CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
-CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
+ifndef TINETDIR
+  CFG_TRB := -T $(TARGETDIR)/target_kernel.trb
+  CFG_TABS := --api-table $(SRCDIR)/kernel/kernel_api.def \
+                        --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+else
+  CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
+  CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
                         --api-table ../../ntshell/echonet/echonet_api.def:echonet \
                         --api-table $(SRCDIR)/kernel/kernel_api.def:kernel \
@@ -284 +290 @@
                         --symval-table ../../ntshell/echonet/echonet_sym.def \
                         --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+endif
 CFG_ASMOBJS := $(CFG_ASMOBJS)
 CFG_COBJS := kernel_cfg.o echonet_cfg.o $(CFG_COBJS)
@@ -429 +436 @@
 
 #
+#  並列makeのための依存関係の定義
+#
+$(APPL_OBJS) $(filter-out $(CFG_DMY), $(SYSSVC_OBJS)): | kernel_cfg.timestamp
+$(APPL_ASMOBJS) $(filter-out $(CFG_DMY), $(SYSSVC_ASMOBJS)) $(KERNEL_ASMOBJS) $(CFG_ASMOBJS): \
+                                                                                                                | offset.timestamp
+
+#
 #  特別な依存関係の定義
 #
@@ -437 +451 @@
 #
 $(OBJFILE): $(ALL_OBJS) $(LIBS_DEP)
-        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) \
+        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) -Wl,-Map=$(OBJNAME).map,--cref \
                         $(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \
                         -Wl,--start-group $(ALL_LIBS) -Wl,--end-group $(END_OBJS)

asp3_tinet_ecnl_arm/trunk/app7_buzzer/DebugEther/Makefile

@@ -171 +171 @@
         CDEFS := -DTOPPERS_OMIT_TECS $(CDEFS)
 endif
-CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DECHONET_USE_MALLOC -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
+CDEFS := $(CDEFS) -DDHCP4_CLI_CFG -DUSE_PING -DUSE_RESOLVER -DUSE_NETAPP_SUBR -DNOUSE_MPF_NET_BUF -DECHONET_USE_MALLOC -DRamDisk=_binary_______ntshell_src_rom_fs_bin_start
 INCLUDES := -I. -I$(SRCDIR)/include -I$(SRCDIR) \
         -I$(SRCDIR)/../btstack/include \
@@ -179 +179 @@
         -I$(SRCDIR)/../usbhost/src \
         $(INCLUDES)
-LDFLAGS := $(LDFLAGS) -Wl,-Map=$(OBJNAME).map,--cref -L.
+LDFLAGS := $(LDFLAGS) -L.
 LIBS := $(LIBS) $(CXXLIBS)
 CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES)
@@ -213 +213 @@
 endif
 
-
-#
-#  ネットワークサービスの定義
-#
-NO_USE_TINET_LIBRARY = true
-
-#  ネットワークインタフェースの選択、何れか一つ選択する。
-NET_IF = ether
-
-#  イーサネット・ディバイスドライバの選択
+ifdef TINETDIR
+        #
+        #  ネットワークサービスの定義
+        #
+        NO_USE_TINET_LIBRARY = true
+
+        #  ネットワークインタフェースの選択、何れか一つ選択する。
+        NET_IF = ether
+
+        #  イーサネット・ディバイスドライバの選択
         NET_DEV = if_mbed
 
-#  ネットワーク層の選択
-#SUPPORT_INET6 = true
-SUPPORT_INET4 = true
-
-#  API に組込む機能の選択
-#API_CFG_IP4MAPPED_ADDR = true
-
-#  トランスポート層の選択
-SUPPORT_TCP = true
-SUPPORT_UDP = true
-
-# IGMPを有効に設定
-SUPPORT_IGMP = true
-
-#
-#  ネットワークサービスの Makefile のインクルード
-#
-include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+        #  ネットワーク層の選択
+        #SUPPORT_INET6 = true
+        SUPPORT_INET4 = true
+
+        #  API に組込む機能の選択
+        #API_CFG_IP4MAPPED_ADDR = true
+
+        #  トランスポート層の選択
+        SUPPORT_TCP = true
+        SUPPORT_UDP = true
+
+        # IGMPを有効に設定
+        SUPPORT_IGMP = true
+
+        #
+        #  ネットワークサービスの Makefile のインクルード
+        #
+        include $(SRCDIR)/$(TINETDIR)/Makefile.tinet
+endif
 
 #
@@ -275 +276 @@
 #  コンフィギュレータに関する定義
 #
-CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
-CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
+ifndef TINETDIR
+  CFG_TRB := -T $(TARGETDIR)/target_kernel.trb
+  CFG_TABS := --api-table $(SRCDIR)/kernel/kernel_api.def \
+                        --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+else
+  CFG_TRB := -T $(TINET_ROOT)/tinet.trb:tcpip -T ../../ntshell/echonet/echonet.trb:echonet -T $(TARGETDIR)/target_kernel.trb:kernel
+  CFG_TABS := --api-table $(TINET_ROOT)/tcpip_api.def:tcpip \
                         --api-table ../../ntshell/echonet/echonet_api.def:echonet \
                         --api-table $(SRCDIR)/kernel/kernel_api.def:kernel \
@@ -282 +288 @@
                         --symval-table ../../ntshell/echonet/echonet_sym.def \
                         --symval-table $(SRCDIR)/kernel/kernel_sym.def $(CFG_TABS)
+endif
 CFG_ASMOBJS := $(CFG_ASMOBJS)
 CFG_COBJS := kernel_cfg.o echonet_cfg.o $(CFG_COBJS)
@@ -427 +434 @@
 
 #
+#  並列makeのための依存関係の定義
+#
+$(APPL_OBJS) $(filter-out $(CFG_DMY), $(SYSSVC_OBJS)): | kernel_cfg.timestamp
+$(APPL_ASMOBJS) $(filter-out $(CFG_DMY), $(SYSSVC_ASMOBJS)) $(KERNEL_ASMOBJS) $(CFG_ASMOBJS): \
+                                                                                                                | offset.timestamp
+
+#
 #  特別な依存関係の定義
 #
@@ -435 +449 @@
 #
 $(OBJFILE): $(ALL_OBJS) $(LIBS_DEP)
-        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) \
+        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) -Wl,-Map=$(OBJNAME).map,--cref \
                         $(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \
                         -Wl,--start-group $(ALL_LIBS) -Wl,--end-group $(END_OBJS)

asp3_tinet_ecnl_arm/trunk/app7_buzzer/src/echonet_main.c

@@ -1 +1 @@
 /*
  *  TOPPERS ECHONET Lite Communication Middleware
- * 
+ *
  *  Copyright (C) 2014-2018 Cores Co., Ltd. Japan
- * 
+ *
  *  上記著作権者は，以下の(1)～(4)の条件を満たす場合に限り，本ソフトウェ
  *  ア（本ソフトウェアを改変したものを含む．以下同じ）を使用・複製・改
@@ -26 +26 @@
  *      由に基づく請求からも，上記著作権者およびTOPPERSプロジェクトを
  *      免責すること．
- * 
+ *
  *  本ソフトウェアは，無保証で提供されているものである．上記著作権者お
  *  よびTOPPERSプロジェクトは，本ソフトウェアに関して，特定の使用目的
@@ -32 +32 @@
  *  アの利用により直接的または間接的に生じたいかなる損害に関しても，そ
  *  の責任を負わない．
- * 
+ *
  *  @(#) $Id$
  */
 
-/* 
+/*
  *  サンプルプログラム(1)の本体
  */
@@ -112 +112 @@
 {
         /* サイズが１以外は受け付けない */
-        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:
@@ -144 +144 @@
 {
         /* サイズが１以外は受け付けない */
-        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:
@@ -170 +170 @@
 {
         /* サイズが1以外は受け付けない */
-        if(size != 1)
-                return 0;
-
-        switch(*(uint8_t *)src){
+        if (size != 1)
+                return 0;
+
+        switch (*(uint8_t *)src) {
         /* 音発生有の場合 */
         case 0x41:
@@ -203 +203 @@
 
         /* サイズが１以外は受け付けない */
-        if(size != 1)
+        if (size != 1)
                 return 0;
 
@@ -212 +212 @@
         data[1] = (*((uint8_t *)src) == 0x41) ? 0x01 : 0x00;
         ret = ecn_brk_wai(data, sizeof(data));
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_brk_wai");
         }
@@ -228 +228 @@
 
         /* サイズが１以外は受け付けない */
-        if(size != 1)
+        if (size != 1)
                 return 0;
 
@@ -237 +237 @@
         data[1] = (*((uint8_t *)src) == 0x41) ? 0x01 : 0x00;
         ret = ecn_brk_wai(data, sizeof(data));
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_brk_wai");
         }
@@ -267 +267 @@
 
         ret2 = get_tim(&now);
-        if (ret2 != E_OK){
+        if (ret2 != E_OK) {
                 syslog(LOG_ERROR, "get_tim");
                 return;
         }
 
-        for(;;){
+        for (;;) {
                 prev = now;
 
@@ -280 +280 @@
                 /* 応答電文待ち */
                 ret = ecn_trcv_esv(&esv, timer);
-                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");
                         break;
@@ -286 +286 @@
 
                 ret2 = get_tim(&now);
-                if (ret2 != E_OK){
+                if (ret2 != E_OK) {
                         syslog(LOG_ERROR, "get_tim");
                         break;
@@ -301 +301 @@
                         /* 領域解放 */
                         ret = ecn_rel_esv(esv);
-                        if (ret != E_OK){
+                        if (ret != E_OK) {
                                 syslog(LOG_ERROR, "ecn_rel_esv");
                                 break;
@@ -310 +310 @@
                         /* 応答電文待ちの割り込みデータ取得 */
                         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");
                                 break;
@@ -320 +320 @@
                         /* 領域解放 */
                         ret = ecn_rel_esv(esv);
-                        if (ret != E_OK){
+                        if (ret != E_OK) {
                                 syslog(LOG_ERROR, "ecn_rel_esv");
                                 break;
@@ -331 +331 @@
 }
 
-bool_t started = false;
-
 void echonet_change_netif_link(uint8_t link_up, uint8_t up)
 {
@@ -340 +338 @@
                 return;
 
-        if (up && !started) {
-                started = true;
-
-                /* ECHONETミドルウェアを起動 */
-                ret = ecn_sta_svc();
-                if (ret != E_OK)
-                        return;
-
-                /* ECHONETミドルウェアを起動するのを待つ */
-                dly_tsk(100);
+        if (up) {
+                /* インスタンスリスト通知の送信 */
+                ret = ecn_ntf_inl();
+                if (ret != E_OK) {
+                        syslog(LOG_ERROR, "ecn_ntf_inl");
+                }
         }
 
@@ -363 +357 @@
 }
 
-enum main_state_t{
+enum main_state_t {
+        main_state_start,
         main_state_idle,
         main_state_search,
@@ -370 +365 @@
 
 int main_timer = TMO_FEVR;
-enum main_state_t main_state = main_state_idle;
+enum main_state_t main_state = main_state_start;
 
 int main_nop_timer = TMO_FEVR;
@@ -390 +385 @@
         gpio_write(&led_red, 0);
 
-        /* １秒後にブザーを検索 */
-        main_state = main_state_search;
+        /* ECHONETミドルウェアを起動するのを待つ */
+        main_state = main_state_start;
         main_timer = 1000 * 1000;
 
+        /* メインタスクを起動 */
         ER ret = act_tsk(MAIN_TASK);
         if (ret != E_OK) {
@@ -407 +403 @@
         int result = main_timer;
 
-        if((result == TMO_FEVR)
-                || ((main_nop_timer != TMO_FEVR) && (main_nop_timer < result))){
+        if ((result == TMO_FEVR)
+                || ((main_nop_timer != TMO_FEVR) && (main_nop_timer < result))) {
                 result = main_nop_timer;
         }
@@ -420 +416 @@
 static void main_progress(int interval)
 {
-        if(main_timer != TMO_FEVR){
+        if (main_timer != TMO_FEVR) {
                 main_timer -= interval;
-                if(main_timer < 0){
+                if (main_timer < 0) {
                         main_timer = 0;
                 }
         }
 
-        if(main_nop_timer != TMO_FEVR){
+        if (main_nop_timer != TMO_FEVR) {
                 main_nop_timer -= interval;
-                if(main_nop_timer < 0){
+                if (main_nop_timer < 0) {
                         main_nop_timer = 0;
                 }
@@ -448 +444 @@
 
         eobjid = ecn_get_eobj(esv);
-        if(eobjid == EOBJ_NULL){
+        if (eobjid == EOBJ_NULL) {
                 syslog(LOG_ERROR, "ecn_get_eobj");
                 return;
@@ -454 +450 @@
 
         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 0xD6:
-                                switch(main_state){
+                                switch (main_state) {
                                 case main_state_search:
                                         if (eobjid == POT_NODE_EOBJ) {
@@ -475 +471 @@
                         }
                 }
-                if(ret != E_BOVR){
+                if (ret != E_BOVR) {
                         syslog(LOG_ERROR, "ecn_itr_nxt");
                         break;
                 }
-                if(enm.is_eof)
+                if (enm.is_eof)
                         break;
         }
@@ -490 +486 @@
         uint8_t p_edt[1];
 
-        switch(main_state){
+        switch (main_state) {
         case main_state_idle:
                 p_edt[0] = 0x41; /* 音発生有 */
@@ -496 +492 @@
                 /* プロパティ設定電文作成 */
                 ret = ecn_esv_seti(&esv, BUZZER_EOBJ, 0xB1, 1, p_edt);
-                if(ret != E_OK){
+                if (ret != E_OK) {
                         syslog(LOG_ERROR, "ecn_esv_seti");
                         break;
@@ -503 +499 @@
                 /* 電文送信 */
                 ecn_snd_esv(esv);
-                if(ret != E_OK){
+                if (ret != E_OK) {
                         syslog(LOG_ERROR, "ecn_snd_esv");
                         break;
@@ -523 +519 @@
         uint8_t p_edt[1];
 
-        switch(main_state){
+        switch (main_state) {
         case main_state_buzzer_on:
                 p_edt[0] = 0x42; /* 音発生無 */
@@ -529 +525 @@
                 /* プロパティ設定電文作成 */
                 ret = ecn_esv_seti(&esv, BUZZER_EOBJ, 0xB1, 1, p_edt);
-                if(ret != E_OK){
+                if (ret != E_OK) {
                         syslog(LOG_ERROR, "ecn_esv_seti");
                         break;
@@ -536 +532 @@
                 /* 電文送信 */
                 ecn_snd_esv(esv);
-                if(ret != E_OK){
+                if (ret != E_OK) {
                         syslog(LOG_ERROR, "ecn_snd_esv");
                         break;
@@ -557 +553 @@
         }
 
-        if(len < 2)
-                return;
-
-        switch(brkdat[0]){
+        if (len < 2)
+                return;
+
+        switch (brkdat[0]) {
         case 0x01:
-                if(brkdat[1] != 0)
+                if (brkdat[1] != 0)
                         main_buzzer_on();
                 else
@@ -568 +564 @@
                 break;
         case 0x02:
-                if(brkdat[1] == 0)
+                if (brkdat[1] == 0)
                         main_nop_timer = 5000 * 1000; /* ５秒後にブザーON */
                 break;
@@ -582 +578 @@
 static void main_timeout()
 {
-        if(main_timer == 0){
+        if (main_timer == 0) {
                 main_ontimer();
         }
 
-        if(main_nop_timer == 0){
+        if (main_nop_timer == 0) {
                 main_nop_timeout();
         }
@@ -595 +591 @@
 static void main_ontimer()
 {
-        switch (main_state)
-        {
+        ER ret;
+
+        switch (main_state) {
+        case main_state_start:
+                /* ECHONETミドルウェアを起動 */
+                ret = ecn_sta_svc();
+                if (ret != E_OK) {
+                        syslog(LOG_ERROR, "ecn_sta_svc");
+                }
+
+                /* １秒後にブザーを検索 */
+                main_state = main_state_search;
+                main_timer = 1000 * 1000;
+                break;
         case main_state_search:
                 /* 電気ポット再検索 */
@@ -620 +628 @@
         /* 電気ポット検索 */
         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;
@@ -627 +635 @@
         /* 電文送信 */
         ret = ecn_snd_esv(esv);
-        if(ret != E_OK){
+        if (ret != E_OK) {
                 syslog(LOG_ERROR, "ecn_snd_esv");
         }

asp3_tinet_ecnl_arm/trunk/app7_buzzer/src/main.c

@@ -79 +79 @@
 
 ID ws_api_mailboxid = MAIN_DATAQUEUE;
+#ifndef NOUSE_MPF_NET_BUF
 ID ws_mempoolid = MPF_NET_BUF_256;
+#endif
 
 #ifdef IF_ETHER_BTUSB
@@ -111 +113 @@
 static void main_timeout();
 
+extern int ntshell_exit;
+
 int uart_read(char *buf, int cnt, void *extobj)
 {
-        return serial_rea_dat(SIO_PORTID, (char *)buf, cnt);
+        struct main_t *obj = (struct main_t *)extobj;
+        int result;
+        ER ret;
+        int timer;
+
+        obj->prev = obj->now;
+
+        /* タイマー取得 */
+        timer = main_get_timer();
+
+        /* 待ち */
+        ret = serial_trea_dat(SIO_PORTID, buf, cnt, timer);
+        if ((ret < 0) && (ret != E_OK) && (ret != E_TMOUT)) {
+                syslog(LOG_NOTICE, "tslp_tsk ret: %s %d", itron_strerror(ret), timer);
+                ntshell_exit = 1;
+                return -1;
+        }
+        result = (int)ret;
+
+        ret = get_tim(&obj->now);
+        if (ret != E_OK) {
+                syslog(LOG_NOTICE, "get_tim ret: %s", itron_strerror(ret));
+                ntshell_exit = 1;
+                return -1;
+        }
+
+                        /* 時間経過 */
+        int elapse = obj->now - obj->prev;
+        main_progress(elapse);
+
+        /* タイムアウト処理 */
+        main_timeout();
+
+        return result;
 }
 
@@ -119 +156 @@
 {
         return serial_wri_dat(SIO_PORTID, buf, cnt);
-}
-
-unsigned char ntstdio_xi(struct ntstdio_t *handle)
-{
-        char buf[1];
-        if(serial_rea_dat(SIO_PORTID, buf, 1) != 1)
-                return -EIO;
-        return buf[0];
-}
-
-void ntstdio_xo(struct ntstdio_t *handle, unsigned char c)
-{
-        char buf[1];
-        buf[0] = c;
-        serial_wri_dat(SIO_PORTID, buf, 1);
 }
 
@@ -150 +172 @@
         main_initialize();
 
-        ntshell_init(&ntshell, uart_read, uart_write, cmd_execute, NULL);
+        ntshell_init(&ntshell, uart_read, uart_write, cmd_execute, &main_obj);
         ntshell_set_prompt(&ntshell, "NTShell>");
         ntshell_execute(&ntshell);
@@ -168 +190 @@
         ER ret;
 
-        ntshell_task_init();
+#ifdef TOPPERS_OMIT_TECS
+        serial_opn_por(SIO_PORTID);
+#endif
+        serial_ctl_por(SIO_PORTID, IOCTL_FCSND | IOCTL_FCRCV);
+
+        ntshell_task_init(uart_read, uart_write, &main_obj);
 
         main_obj.timer = TMO_FEVR;

asp3_tinet_ecnl_arm/trunk/app7_buzzer/src/main.cfg

@@ -54 +54 @@
 INCLUDE("tinet/tinet_asp.cfg");
 INCLUDE("tinet_main.cfg");
-INCLUDE("netinet/ip_igmp.cfg");
 
 /* DHCP クライアント */

asp3_tinet_ecnl_arm/trunk/asp3_dcre/.cproject

@@ -22 +22 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -59 +59 @@
                                                         <option id="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack.368389066" name="Warn if stack size exceeds the limit (-Wstack-usage) (H')" superClass="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack" useByScannerDiscovery="false" value="100" valueType="string"/>
                                                         <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.601068640" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-                                                        <builder buildPath="${workspace_loc:/asp3_dcre}/Debug" id="com.renesas.cdt.managedbuild.gcc.rz.builder.1149515652" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="false" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
+                                                        <builder buildPath="${workspace_loc:/asp3_dcre}/Debug" id="com.renesas.cdt.managedbuild.gcc.rz.builder.1149515652" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
                                                         <tool id="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler.519851149" name="Cross ARM GNU Assembler" superClass="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler">
                                                                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.279657327" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" useByScannerDiscovery="false" value="true" valueType="boolean"/>
@@ -127 +127 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">

asp3_tinet_ecnl_arm/trunk/asp3_dcre/Debug/Makefile

@@ -56 +56 @@
 SRCLANG = c
 ifeq ($(SRCLANG),c)
-        LIBS = -lmusl
+        LIBS = $(SRCDIR)/../musl-1.1.18/Debug/libmusl.a
 endif
 ifeq ($(SRCLANG),c++)
         USE_CXX = true
-        CXXLIBS = -lstdc++ -lmusl
+        CXXLIBS = -lstdc++ $(SRCDIR)/../musl-1.1.18/Debug/libmusl.a
         CXXRTS = cxxrt.o newlibrt.o
 endif
@@ -150 +150 @@
 endif
 
+TINETDIR = 
+
 #
 #  mbedサービスの定義
@@ -171 +173 @@
 CDEFS := $(CDEFS) 
 INCLUDES := -I. -I$(SRCDIR)/include $(INCLUDES) -I$(SRCDIR)
-LDFLAGS := $(LDFLAGS) -Wl,-Map=$(OBJNAME).map,--cref -L$(SRCDIR)/../musl-1.1.18/Debug
+LDFLAGS := $(LDFLAGS) -L.
 LIBS := $(LIBS) $(CXXLIBS)
 CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES)
@@ -192 +194 @@
 endif
 APPL_COBJS := $(APPL_COBJS) log_output.o vasyslog.o t_perror.o strerror.o time.o
-APPL_CFLAGS := $(APPL_CFLAGS)
+APPL_CFLAGS := $(APPL_CFLAGS) -nostdinc
 ifdef APPLDIRS
         INCLUDES := $(INCLUDES) $(foreach dir,$(APPLDIRS),-I$(dir))
 endif
 
-TINETDIR = 
 ifdef TINETDIR
         #
@@ -335 +336 @@
 vpath %.cfg $(APPL_DIRS)
 vpath %.cdl $(APPL_DIRS)
+vpath %.bin $(APPL_DIRS)
 
 #
@@ -341 +343 @@
 KERNEL_LIB_OBJS = $(KERNEL_ASMOBJS) $(KERNEL_COBJS) $(KERNEL_LCOBJS)
 SYSSVC_OBJS = $(SYSSVC_ASMOBJS) $(SYSSVC_COBJS) $(HIDDEN_OBJS)
-APPL_OBJS = $(APPL_ASMOBJS) $(APPL_COBJS) $(APPL_CXXOBJS)
+APPL_OBJS = $(APPL_ASMOBJS) $(APPL_COBJS) $(APPL_CXXOBJS) $(APPL_BINOBJS)
 ALL_OBJS = $(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \
                                                                                         $(END_OBJS) $(HIDDEN_OBJS)
@@ -387 +389 @@
 $(CFG1_OUT): $(START_OBJS) cfg1_out.o $(CFG_DMY) $(END_OBJS) $(HIDDEN_OBJS)
         $(LINK) $(CFLAGS) $(LDFLAGS) $(CFG1_OUT_LDFLAGS) -o $(CFG1_OUT) \
-                                                $(START_OBJS) cfg1_out.o $(CFG_DMY) $(END_OBJS)
+                                                $(START_OBJS) cfg1_out.o $(CFG_DMY) $(END_OBJS) $(HIDDEN_OBJS)
 
 cfg1_out.syms: $(CFG1_OUT)
@@ -416 +418 @@
 
 #
+#  並列makeのための依存関係の定義
+#
+$(APPL_OBJS) $(filter-out $(CFG_DMY), $(SYSSVC_OBJS)): | kernel_cfg.timestamp
+$(APPL_ASMOBJS) $(filter-out $(CFG_DMY), $(SYSSVC_ASMOBJS)) $(KERNEL_ASMOBJS) $(CFG_ASMOBJS): \
+                                                                                                                | offset.timestamp
+
+#
 #  特別な依存関係の定義
 #
@@ -424 +433 @@
 #
 $(OBJFILE): $(ALL_OBJS) $(LIBS_DEP)
-        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) \
+        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) -Wl,-Map=$(OBJNAME).map,--cref \
                         $(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \
-                        $(ALL_LIBS) $(END_OBJS)
+                        -Wl,--start-group $(ALL_LIBS) -Wl,--end-group $(END_OBJS)
 
 #
@@ -597 +606 @@
         $(CC) -c -MD -MP -MF $(DEPDIR)/$*.d $(CFLAGS) $(APPL_CFLAGS) $<
 
+$(APPL_BINOBJS): %.o: %.bin
+        $(OBJCOPY) -B arm -I binary -O elf32-littlearm --rename-section .data=.rodata $< $*.o
+
 #
 #  デフォルトコンパイルルールを上書き

asp3_tinet_ecnl_arm/trunk/asp3_dcre/gdic/adafruit_st7735/adafruit_st7735.c

@@ -354 +354 @@
 
 /*
+ *  LCDへのRGBデータ送信関数
+ */
+ER
+lcd_writedata4(LCD_Handler_t *hlcd, uint8_t *pbmp, uint16_t width, uint16_t height)
+{
+        ER  ercd = E_OK;
+        int index, i;
+
+        if(width == 0 || height == 0)
+                return ercd;
+        if(hlcd->spi_lock != 0){
+                if((ercd = wai_sem(hlcd->spi_lock)) != E_OK)
+                        return ercd;
+        }
+        rs_set(PORT_HIGH);
+        cs_set(PORT_LOW);
+        //dly_tsk(100/*us*/);
+        for(index=0; index < height; index++){
+                uint8_t *p = pbmp;
+                for (i = 0; i < width; i++){
+                        spi_master_write(&hlcd->hspi, *p++);
+                        spi_master_write(&hlcd->hspi, *p++);
+                }
+                pbmp -= width*2;
+        }
+        //dly_tsk(100/*us*/);
+        cs_set(PORT_HIGH);
+        if(hlcd->spi_lock != 0)
+                sig_sem(hlcd->spi_lock);
+        return ercd;
+}
+
+/*
  *  ST7735へのコマンドリスト送信
  */
@@ -590 +623 @@
         lcd_setAddrWindow(hlcd, x0, y0, x0+width-1, y0+height-1);
         lcd_writedata3(hlcd, pbmp, width, height);
+}
+
+void
+lcd_drawImage(LCD_Handler_t *hlcd, uint16_t x0, uint16_t y0, int16_t w, int16_t h, uint8_t *pbmp)
+{
+        lcd_setAddrWindow(hlcd, x0, y0, x0+w-1, y0+h-1);
+        pbmp += w * (h - 1) * 3;  
+        lcd_writedata3(hlcd, pbmp, w, h);
 }
 

asp3_tinet_ecnl_arm/trunk/asp3_dcre/gdic/adafruit_st7735/adafruit_st7735.h

@@ -59 +59 @@
 #endif
 
+#include <stdbool.h>
 #include "device.h"
 #include "pinmap.h"
@@ -145 +146 @@
 #ifndef TOPPERS_MACRO_ONLY
 
+typedef struct GFXfont GFXfont;
+
 /*
  *  LCDハンドラ構造体定義
@@ -153 +156 @@
         uint16_t                _width;         /* 幅ピクセル数 */
         uint16_t                                _height;        /* 高さピクセル数 */
+        int16_t cursor_x, cursor_y;
+        uint16_t textcolor, textbgcolor;
+        uint8_t textsize, rotation;
+        bool wrap;
+        GFXfont *gfxFont;
         uint8_t                 colstart;
         uint8_t                 rowstart;
@@ -188 +196 @@
 extern ER lcd_writedata2(LCD_Handler_t *hlcd, uint16_t c, int cnt);
 extern ER lcd_writedata3(LCD_Handler_t *hlcd, uint8_t *pbmp, uint16_t width, uint16_t height);
+extern ER lcd_writedata4(LCD_Handler_t *hlcd, uint8_t *pbmp, uint16_t width, uint16_t height);
 
 extern void lcd_initB(LCD_Handler_t *hlcd);
@@ -198 +207 @@
 extern void lcd_drawFastHLine(LCD_Handler_t *hlcd, int16_t x, int16_t y, int16_t w, uint16_t color);
 extern void lcd_drawBitmap(LCD_Handler_t *hlcd, uint16_t x0, uint16_t y0, uint8_t *pbmp);
+extern void lcd_drawImage(LCD_Handler_t *hlcd, uint16_t x0, uint16_t y0, int16_t w, int16_t h, uint8_t *pbmp);
 extern void lcd_invertDisplay(LCD_Handler_t *hlcd, bool_t i);
 

asp3_tinet_ecnl_arm/trunk/asp3_dcre/mbed/hal/spi_api.h

@@ -116 +116 @@
  */
 int  spi_master_write(spi_t *obj, int value);
+
+/** Write a block out in master mode and receive a value
+ *
+ *  The total number of bytes sent and received will be the maximum of
+ *  tx_length and rx_length. The bytes written will be padded with the
+ *  value 0xff.
+ *
+ * @param[in] obj        The SPI peripheral to use for sending
+ * @param[in] tx_buffer  Pointer to the byte-array of data to write to the device
+ * @param[in] tx_length  Number of bytes to write, may be zero
+ * @param[in] rx_buffer  Pointer to the byte-array of data to read from the device
+ * @param[in] rx_length  Number of bytes to read, may be zero
+ * @param[in] write_fill Default data transmitted while performing a read
+ * @returns
+ *      The number of bytes written and read from the device. This is
+ *      maximum of tx_length and rx_length.
+ */
+int spi_master_block_write(spi_t *obj, const char *tx_buffer, int tx_length, char *rx_buffer, int rx_length, char write_fill);
 
 /** Check if a value is available to read

asp3_tinet_ecnl_arm/trunk/asp3_dcre/mbed/platform/mbed_rtc_time.c

@@ -44 +44 @@
 time_t __time32(time_t *timer)
 #else
-time_t time(time_t *timer)
+time_t get_time(time_t *timer)
 #endif
 
@@ -78 +78 @@
 }
 
-clock_t clock() {
+clock_t get_clock() {
     //_mutex->lock();
     clock_t t = us_ticker_read();

asp3_tinet_ecnl_arm/trunk/asp3_dcre/mbed/targets/TARGET_RENESAS/TARGET_RZ_A1H/spi_api.c

@@ -259 +259 @@
     while(!spi_tend(obj));
     return spi_read(obj);
+}
+
+int spi_master_block_write(spi_t *obj, const char *tx_buffer, int tx_length,
+                           char *rx_buffer, int rx_length, char write_fill) {
+    int total = (tx_length > rx_length) ? tx_length : rx_length;
+
+    for (int i = 0; i < total; i++) {
+        char out = (i < tx_length) ? tx_buffer[i] : write_fill;
+        char in = spi_master_write(obj, out);
+        if (i < rx_length) {
+            rx_buffer[i] = in;
+        }
+    }
+
+    return total;
 }
 

asp3_tinet_ecnl_arm/trunk/asp3_dcre/sample/Makefile

@@ -417 +417 @@
 #
 $(OBJFILE): $(ALL_OBJS) $(LIBS_DEP)
-        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) \
+        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) -Wl,-Map=$(OBJNAME).map,--cref \
                         $(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \
                         $(ALL_LIBS) $(END_OBJS)

asp3_tinet_ecnl_arm/trunk/asp3_dcre/syssvc/serial.h

@@ -79 +79 @@
 extern ER               serial_opn_por(ID portid) throw();
 extern ER               serial_cls_por(ID portid) throw();
-extern ER_UINT  serial_rea_dat(ID portid, char *buf, uint_t len) throw();
+extern ER_UINT  serial_trea_dat(ID portid, char *buf, uint_t len, TMO tmout) throw();
 extern ER_UINT  serial_wri_dat(ID portid, const char *buf, uint_t len) throw();
 extern ER               serial_ctl_por(ID portid, uint_t ioctl) throw();
 extern ER               serial_ref_por(ID portid, T_SERIAL_RPOR *pk_rpor) throw();
+
+Inline ER_UINT  serial_rea_dat(ID portid, char *buf, uint_t len)
+{
+        return serial_trea_dat(portid, buf, len, TMO_FEVR);
+}
 
 /*

asp3_tinet_ecnl_arm/trunk/asp3_dcre/syssvc/tSerialAdapter.c

@@ -83 +83 @@
  */
 ER_UINT
-serial_rea_dat(ID portid, char *buf, uint_t len)
+serial_trea_dat(ID portid, char *buf, uint_t len, TMO tmout)
 {
         if (sns_dpn()) {                                /* コンテキストのチェック */
@@ -92 +92 @@
         }
 
-        return(cSerialPort_read(portid - 1, buf, len));
+        return(cSerialPort_read(portid - 1, buf, len, tmout));
 }
 

asp3_tinet_ecnl_arm/trunk/asp3_dcre/syssvc/tSerialPort.cdl

@@ -57 +57 @@
         ER              open(void);
         ER              close(void);
-        ER_UINT read([out,size_is(length)] char *buffer, [in] uint_t length);
+        ER_UINT read([out,size_is(length)] char *buffer, [in] uint_t length, [in] TMO tmout);
         ER_UINT write([in,size_is(length)] const char *buffer, [in] uint_t length);
         ER              control([in] uint_t ioControl);

asp3_tinet_ecnl_arm/trunk/asp3_dcre/syssvc/tSerialPortMain.c

@@ -397 +397 @@
  */
 ER_UINT
-eSerialPort_read(CELLIDX idx, char *buffer, uint_t length)
+eSerialPort_read(CELLIDX idx, char *buffer, uint_t length, TMO tmout)
 {
         CELLCB  *p_cellcb;
@@ -423 +423 @@
         while (reacnt < length) {
                 if (buffer_empty) {
-                        SVC(rercd = cReceiveSemaphore_wait(),
-                                                                                gen_ercd_wait(rercd, p_cellcb));
+                        rercd = cReceiveSemaphore_waitTimeout(tmout);
+                        if (rercd == E_TMOUT)
+                                return E_TMOUT;
+                        if (rercd < 0) {
+                                gen_ercd_wait(rercd, p_cellcb);
+                                ercd = rercd;
+                                goto error_exit;
+                        }
                 }
                 SVC(rercd = serialPort_readChar(p_cellcb, &c), rercd);

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/Makefile.tinet

@@ -93 +93 @@
                in_subr.o route_cfg.o
 TINET_CFG_COBJS := $(TINET_CFG_COBJS) tinet_cfg.o
+TINET_CFG2_OUT_SRCS := $(TINET_CFG2_OUT_SRCS) tinet_cfg.h tinet_cfg.c
 
 #  IPv6
@@ -328 +329 @@
 
         CFG_COBJS := $(CFG_COBJS) $(TINET_CFG_COBJS)
+        CFG2_OUT_SRCS := $(CFG2_OUT_SRCS) $(TINET_CFG2_OUT_SRCS)
 
         CLEAN_FILES := $(CLEAN_FILES) $(TINET_CFG_OUT) $(MAKE_TINET_LIB)

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/net/ethernet.h

@@ -98 +98 @@
 #endif  /* of #ifndef IF_ETHER_NIC_HDR_ALIGN */
 
-#if defined(__RX) || defined(_MSC_VER)
 #if defined(__RX)
 #pragma pack
-#else
+#elif defined(_MSC_VER)
 #pragma pack(push, 1)
 #endif
+
+#if defined(__RX) || defined(_MSC_VER)
+
 typedef struct t_ether_header {
 
@@ -116 +118 @@
         uint16_t        type;
         } T_ETHER_HDR;
-#if defined(__RX)
-#pragma packoption
-#else
-#pragma pack(pop)
-#endif
 
 #elif defined(TOPPERS_S810_CLG3_85)     /* of #if defined(__RX) */
@@ -166 +163 @@
         uint8_t         lladdr[ETHER_ADDR_LEN];
         } __attribute__((packed, aligned(2))) T_ETHER_ADDR;
+
+#if defined(__RX)
+#pragma packoption
+#elif defined(_MSC_VER)
+#pragma pack(pop)
+#endif
 
 /*

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/net/net_asp.cfg

@@ -41 +41 @@
 
 INCLUDE("net/net.cfg");
+
+#ifndef NOUSE_MPF_NET_BUF
 
 /*
@@ -169 +171 @@
                 });
 #endif  /* of #if defined(NUM_MPF_NET_BUF6_65536) && NUM_MPF_NET_BUF6_65536 > 0 */
+
+#endif

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/net/net_buf.c

@@ -68 +68 @@
 #include <netinet/tcp_var.h>
 
+#ifndef NOUSE_MPF_NET_BUF
+
 /*
  *  関数
@@ -226 +228 @@
 #endif  /* of #if defined(NUM_MPF_NET_BUF_128) && NUM_MPF_NET_BUF_128 > 0 */
 
-#if defined(_IP4_CFG)
+#if defined(_IP6_CFG)
+
+#if defined(NUM_MPF_NET_BUF_CSEG) && NUM_MPF_NET_BUF_CSEG > 0
+        {
+                MPF_NET_BUF_CSEG,
+                IF_HDR_SIZE + IP_HDR_SIZE + TCP_HDR_SIZE,
+
+#if NET_COUNT_ENABLE & PROTO_FLG_NET_BUF
+
+                NUM_MPF_NET_BUF_CSEG,
+
+#endif  /* of #if NET_COUNT_ENABLE & PROTO_FLG_NET_BUF */
+
+                },
+#endif  /* of #if defined(NUM_MPF_NET_BUF_CSEG) && NUM_MPF_NET_BUF_CSEG > 0 */
+
+#endif  /* of #if defined(_IP6_CFG) */
 
 #if defined(NUM_MPF_NET_BUF_64) && NUM_MPF_NET_BUF_64 > 0
@@ -242 +260 @@
 #endif  /* of #if defined(NUM_MPF_NET_BUF_64) && NUM_MPF_NET_BUF_64 > 0 */
 
-#endif  /* of #if defined(_IP4_CFG) */
+#if defined(_IP4_CFG) && !defined(_IP6_CFG)
 
 #if defined(NUM_MPF_NET_BUF_CSEG) && NUM_MPF_NET_BUF_CSEG > 0
@@ -257 +275 @@
                 },
 #endif  /* of #if defined(NUM_MPF_NET_BUF_CSEG) && NUM_MPF_NET_BUF_CSEG > 0 */
+
+#endif  /* of #if defined(_IP4_CFG) && !defined(_IP6_CFG) */
 
         };
@@ -307 +327 @@
 
         while (1) {
-                if ((error = tget_mpf((ID)net_buf_table[ix].index, (void*)buf, ix == 0 ? tmout : TMO_POL)) == E_OK) {
+                if ((error = tget_mpf((ID)net_buf_table[ix].index, (void **)buf, ix == 0 ? tmout : TMO_POL)) == E_OK) {
                         (*buf)->idix  = (uint8_t)ix;
                         (*buf)->len   = (uint16_t)minlen;
@@ -320 +340 @@
                         return error;
                         }
-                else if (ix == 0 || net_buf_table[ix].size > maxlen)
+                ix --;
+                if (ix < 0 || net_buf_table[ix].size > maxlen)
                         break;
-                ix --;
                 }
 
@@ -351 +371 @@
 
         while (1) {
-                if ((error = tget_mpf((ID)net_buf_table[ix].index, (void*)buf,
+                if ((error = tget_mpf((ID)net_buf_table[ix].index, (void **)buf,
                                       ix == sizeof(net_buf_table) / sizeof(T_NET_BUF_ENTRY) - 1 ? tmout : TMO_POL)) == E_OK) {
                         (*buf)->idix  = (uint8_t)ix;
@@ -359 +379 @@
                         (*buf)->conn_pos = 0;
 #endif
+
 #if NET_COUNT_ENABLE & PROTO_FLG_NET_BUF
                         NET_COUNT_NET_BUF(net_buf_table[ix].allocs, 1);
@@ -454 +475 @@
                 /* 固定メモリプールに返す。*/
 
-#if NET_COUNT_ENABLE & PROTO_FLG_NET_BUF
-                net_buf_table[buf->idix].busies --;
-#endif
-                if ((error = rel_mpf((ID)net_buf_table[buf->idix].index, buf)) != E_OK) {
-                        syslog(LOG_WARNING, "[NET BUF] %s, ID=%d.", itron_strerror(error), buf->idix);
+                int idix = buf->idix;
+#if NET_COUNT_ENABLE & PROTO_FLG_NET_BUF
+                net_buf_table[idix].busies --;
+#endif
+                if ((error = rel_mpf((ID)net_buf_table[idix].index, buf)) != E_OK) {
+                        syslog(LOG_WARNING, "[NET BUF] %s, ID=%d.", itron_strerror(error), idix);
                         }
                 }
@@ -509 +531 @@
         return (uint_t)net_buf_table[0].size;
         }
+
+#else
+#include <stdlib.h>
+
+/*
+ *  tget_net_buf_ex -- ネットワークバッファを獲得する（拡張機能）。
+ */
+
+ER
+tget_net_buf_ex (T_NET_BUF **buf, uint_t minlen, uint_t maxlen, ATR nbatr, TMO tmout)
+{
+        uint_t len = (minlen > maxlen) ? minlen : maxlen;
+        *buf = (T_NET_BUF *)malloc(sizeof(T_NET_BUF) - sizeof(((T_NET_BUF *)0)->buf) + len);
+        if (*buf == NULL)
+                return E_NOMEM;
+
+        (*buf)->idix = 0;
+        (*buf)->len = (uint16_t)len;
+        (*buf)->flags = 0;
+#ifdef IF_ETHER_MULTI_NIC
+        (*buf)->conn_pos = 0;
+#endif
+
+        return E_OK;
+        }
+
+/*
+ *  tget_net_buf -- ネットワークバッファを獲得する（互換）。
+ */
+
+ER
+tget_net_buf (T_NET_BUF **buf, uint_t len, TMO tmout)
+{
+        return tget_net_buf_ex(buf, len, len, NBA_SEARCH_ASCENT, tmout);
+        }
+
+
+/*
+ * rel_net_buf -- ネットワークバッファを返却する。
+ */
+
+ER
+rel_net_buf (T_NET_BUF *buf)
+{
+        free(buf);
+
+        return E_OK;
+        }
+
+
+/*
+ * net_buf_max_siz -- ネットワークバッファの最大サイズを返す。
+ */
+
+uint_t
+net_buf_max_siz (void)
+{
+        return (uint_t)IF_PDU_SIZE;
+        }
+
+#endif

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netapp/dbg_cons.c

@@ -666 +666 @@
                     "IX Expire State      MAC Address       IP Address\n");
 
-        /* expire の単位は [ms]。*/
+        /* expire の単位は [us]。*/
         get_tim(&now);
         cache = nd6_get_cache();
@@ -705 +705 @@
                     "IX Expire MAC Address       IP Address\n");
 
-        /* expire の単位は [ms]。*/
+        /* expire の単位は [us]。*/
         cache = arp_get_cache();
         for (ix = 0; ix < NUM_ARP_ENTRY; ix ++) {
@@ -753 +753 @@
         WAI_NET_CONS_PRINTF();
         get_tim(&now);
-        cons_printf(portid, "ネットワーク統計情報\t経過時間[ms]\t%lu\t", now);
+        cons_printf(portid, "ネットワーク統計情報\t経過時間[us]\t%lu\t", now);
         if (now > (1000 * 3600 * 24))
                 cons_printf(portid, "%3lu日 %2lu時間 %2lu分 %2lu秒\n",
@@ -938 +938 @@
                 }
 
-        cons_printf(portid, "\nネットワーク統計情報\t経過時間[ms]\t%lu\t", now);
+        cons_printf(portid, "\nネットワーク統計情報\t経過時間[us]\t%lu\t", now);
         if (now > (1000 * 3600 * 24))
                 cons_printf(portid, "%3lu日 %2lu時間 %2lu分 %2lu秒\n",
@@ -1065 +1065 @@
         WAI_NET_CONS_PRINTF();
         get_tim(&now);
-        cons_printf(portid, "ネットワークバッファ情報\t経過時間[ms]\t%u\n", now);
+        cons_printf(portid, "ネットワークバッファ情報\t経過時間[us]\t%u\n", now);
 
 #if NET_COUNT_ENABLE
@@ -1577 +1577 @@
         cons_printf(portid, " IP Address\n");
 
-        /* expire の単位は [ms]。*/
+        /* expire の単位は [us]。*/
         get_tim(&now);
         dr = nd6_get_drl(&count);
@@ -2298 +2298 @@
 
         cons_printf(portid, "ND:\n");
-        cons_printf(portid, "  TMO_ND6_RTR_SOL_DELAY:    %5d[ms]\n", TMO_ND6_RTR_SOL_DELAY);
-        cons_printf(portid, "  TMO_ND6_RTR_SOL_INTERVAL: %5d[ms]\n", TMO_ND6_RTR_SOL_INTERVAL);
+        cons_printf(portid, "  TMO_ND6_RTR_SOL_DELAY:    %5d[us]\n", TMO_ND6_RTR_SOL_DELAY);
+        cons_printf(portid, "  TMO_ND6_RTR_SOL_INTERVAL: %5d[us]\n", TMO_ND6_RTR_SOL_INTERVAL);
         cons_printf(portid, "  NUM_IP6_DAD_COUNT:        %5d\n",     NUM_IP6_DAD_COUNT);
         cons_printf(portid, "  NUM_ND6_CACHE_ENTRY:      %5d\n",     NUM_ND6_CACHE_ENTRY);

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netapp/dhcp4_cli.c

@@ -2031 +2031 @@
 
                         /* 休止する。*/
-                        if (error == E_OK)
-                                syslog(LOG_NOTICE, "[DHCP4C] lease released, go to sleep.");
+                        if (error == E_OK) {
+                                if (ct->fsm != DHCP4_FSM_SLEEP)
+                                        syslog(LOG_NOTICE, "[DHCP4C] lease released, go to sleep.");
+                        }
                         else {
                                 syslog(LOG_NOTICE, "[DHCP4C] server not available, go to sleep, error: %s.", itron_strerror(error));
@@ -2158 +2160 @@
 
                         /* 休止する。*/
-                        if (ct->error == E_OK)
-                                syslog(LOG_NOTICE, "[DHCP4C] lease released, go to sleep.");
+                        if (ct->error == E_OK) {
+                                if (ct->fsm != DHCP4_FSM_SLEEP)
+                                        syslog(LOG_NOTICE, "[DHCP4C] lease released, go to sleep.");
+                        }
                         else {
                                 syslog(LOG_NOTICE, "[DHCP4C] server not available, go to sleep, error: %s.", itron_strerror(ct->error));

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netapp/wwws.c

@@ -708 +708 @@
         len += put_str(cepid, srbuf, response);
         get_tim(&finish);
-        syslog(LOG_NOTICE, "[WWWn:%02u SND] send: index.html, len: %4u, time: %lu [ms]",
+        syslog(LOG_NOTICE, "[WWWn:%02u SND] send: index.html, len: %4u, time: %lu [us]",
                            cepid, len, (finish - start) * 1000 / SYSTIM_HZ);
         return E_OK;
@@ -1609 +1609 @@
 
         get_tim(&finish);
-        syslog(LOG_NOTICE, "[WWWn:%02u SND]send: stat.html,  len: %4u, time: %lu [ms]",
+        syslog(LOG_NOTICE, "[WWWn:%02u SND]send: stat.html,  len: %4u, time: %lu [us]",
                            cepid, len, (finish - start) * 1000 / SYSTIM_HZ);
         return E_OK;

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netinet/icmp6.h

@@ -291 +291 @@
 typedef struct t_router_advert_hdr {
         T_ICMP6_HDR     hdr;
-        uint32_t        reachable;              /* [ms] 到達可能時間  */
-        uint32_t        retransmit;             /* [ms] 近隣要請送信間隔        */
+        uint32_t        reachable;              /* [us] 到達可能時間  */
+        uint32_t        retransmit;             /* [us] 近隣要請送信間隔        */
         /* この後にオプションが続く */
         } __attribute__((packed, aligned(2))) T_ROUTER_ADVERT_HDR;

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netinet/in4_subr.c

@@ -287 +287 @@
 
         /* IP ヘッダを設定する。*/
-        if ((error = in4_set_header(*nbuf, len, dstaddr, srcaddr, proto, ttl)) != E_OK)
+        if ((error = in4_set_header(*nbuf, len, dstaddr, srcaddr, proto, ttl)) != E_OK) {
+                syscall(rel_net_buf(*nbuf));
+                *nbuf = NULL;
                 return error;
+                }
 
         /* 4 オクテット境界までパディングで埋める。*/

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netinet/in_itron.h

@@ -62 +62 @@
 #define TFN_TCP_ALL             (0)
 
-#define TEV_TCP_RCV_OOB         (-0x201)
+#define TEV_TCP_RCV_OOB         (0x201)
 
 /* UDP 関係 */
@@ -75 +75 @@
 #define TFN_UDP_ALL             (0)
 
-#define TEV_UDP_RCV_DAT         (-0x221)
+#define TEV_UDP_RCV_DAT         (0x221)
 
 /* 一般 */

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netinet/tcp_input.c

@@ -1364 +1364 @@
         NTOHS(tcph->dport);
 
+        /* SDU 長 より 緊急ポインタが大きい場合 */
+        if (tcph->urp > tcph->sum)
+                goto drop;
+
 find_cep:
 

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netinet/tcp_output.c

@@ -369 +369 @@
                 tcph->flags |= TCP_FLG_URG;
                 }
-        else
+        else {
+                tcph->urp = 0;
                 cep->snd_up  = cep->snd_una;
+                }
 
 #endif  /* of #ifdef TCP_CFG_EXTENTIONS */

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netinet/tcp_usrreq.c

@@ -897 +897 @@
 
         /* tcp_rcv_buf の割当て長をリセットする。*/
-        cep->rcv_buf_len = 0;
+        cep->rcv_buf_len -= len;
 
         /* 通信端点のロックを解除する。*/

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netinet/udp_var.h

@@ -101 +101 @@
 typedef ER      (*t_udp_callback)(ID cepid, FN fncd, void *p_parblk);
 
+typedef struct t_udp_rcv_dat_para {
+        uint_t          len;
+        T_NET_BUF       *input;
+        uint_t          off;
+        union {
+                T_IPV4EP rep4;
+                T_IPV6EP rep6;
+        };
+        } T_UDP_RCV_DAT_PARA;
+
 /*
  *  UDP 通信端点

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netinet/udpn_input.c

@@ -75 +75 @@
 {
         T_UDP_HDR       *udph;
-        uint_t          len;
+        T_UDP_RCV_DAT_PARA para;
 
         udph = (T_UDP_HDR *)(input->buf + off);
-        len  = (uint_t)(ntohs(udph->ulen) - UDP_HDR_SIZE);
+        para.len  = (uint_t)(ntohs(udph->ulen) - UDP_HDR_SIZE);
 
         if (cep->rcv_tskid != TA_NULL) {        /* 非ノンブロッキングコールでペンディング中 */
@@ -98 +98 @@
                 /* データをバッファに移す。*/
                 memcpy(cep->rcv_data, GET_UDP_SDU(input, off),
-                       (size_t)(len < cep->rcv_len ? len : cep->rcv_len));
+                       (size_t)(para.len < cep->rcv_len ? para.len : cep->rcv_len));
                 syscall(rel_net_buf(input));
 
@@ -104 +104 @@
 
 #ifdef TCP_CFG_NON_BLOCKING_COMPAT14
-                        (*cep->callback)(GET_UDP_CEPID(cep), TFN_UDP_RCV_DAT, (void*)(uint32_t)len);
+                        (*cep->callback)(GET_UDP_CEPID(cep), TFN_UDP_RCV_DAT, (void*)(uint32_t)para.len);
 #else
-                        (*cep->callback)(GET_UDP_CEPID(cep), TFN_UDP_RCV_DAT, (void*)&len);
+                        (*cep->callback)(GET_UDP_CEPID(cep), TFN_UDP_RCV_DAT, (void*)&para.len);
 #endif
                 else
@@ -121 +121 @@
 
 #ifdef TCP_CFG_NON_BLOCKING_COMPAT14
-                (*cep->callback)(GET_UDP_CEPID(cep), TEV_UDP_RCV_DAT, (void*)(uint32_t)len);
+                (*cep->callback)(GET_UDP_CEPID(cep), TEV_UDP_RCV_DAT, (void*)(uint32_t)para.len);
 #else
-                (*cep->callback)(GET_UDP_CEPID(cep), TEV_UDP_RCV_DAT, (void*)&len);
+                para.input = input;
+                para.off = off;
+#if API_PROTO == API_PROTO_IPV4
+                para.rep4.portno = ntohs(udph->sport);
+                IN_COPY_TO_HOST(&para.rep4.ipaddr, input);
+#else
+                para.rep6.portno = ntohs(udph->sport);
+                IN_COPY_TO_HOST(&para.rep6.ipaddr, input);
+#endif
+                (*cep->callback)(GET_UDP_CEPID(cep), TEV_UDP_RCV_DAT, (void*)&para.len);
 #endif
                 /*
@@ -129 +138 @@
                  *  データを読み出さなかったことになるので、捨てる。
                  */
-                if (cep->cb_netbuf != NULL)
-                        syscall(rel_net_buf(cep->cb_netbuf));
+                if (cep->cb_netbuf != NULL) {
+                        if ((input->flags & NB_FLG_NOREL_IFOUT) == 0)
+                                syscall(rel_net_buf(cep->cb_netbuf));
+                        cep->cb_netbuf = NULL;
+                        }
                 }
         else {

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netinet/udpn_usrreq.c

@@ -411 +411 @@
                 return E_NOEXS;
 #if defined(SUPPORT_INET6)
-#endif
-#if defined(SUPPORT_INET4) && defined(SUPPORT_IGMP) && TNUM_UDP4_CEPID > 0
+#elif defined(SUPPORT_INET4) && defined(SUPPORT_IGMP) && TNUM_UDP4_CEPID > 0
         switch (optname) {
         case IP_MULTICAST_LOOP:
@@ -488 +487 @@
                 return E_NOEXS;
 #if defined(SUPPORT_INET6)
-#endif
-#if defined(SUPPORT_INET4) && defined(SUPPORT_IGMP) && TNUM_UDP4_CEPID > 0
+#elif defined(SUPPORT_INET4) && defined(SUPPORT_IGMP) && TNUM_UDP4_CEPID > 0
         switch (optname) {
         case IP_MULTICAST_LOOP:

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netinet/udpn_usrreq_nblk.c

@@ -122 +122 @@
 
 #ifdef TCP_CFG_NON_BLOCKING_COMPAT14
-                        (*cep->callback)(GET_UDP_CEPID(cep), TFN_UDP_RCV_DAT, (void*)error);
+                        (*cep->callback)(GET_UDP_CEPID(cep), TFN_UDP_CAN_CEP, (void*)error);
 #else
-                        (*cep->callback)(GET_UDP_CEPID(cep), TFN_UDP_RCV_DAT, (void*)&error);
+                        (*cep->callback)(GET_UDP_CEPID(cep), TFN_UDP_CAN_CEP, (void*)&error);
 #endif
                 else

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netinet6/in6_subr.c

@@ -369 +369 @@
 
         /* IPv6 ヘッダを設定する。*/
-        if ((error = in6_set_header(*nbuf, len, dstaddr, srcaddr, next, hlim)) != E_OK)
+        if ((error = in6_set_header(*nbuf, len, dstaddr, srcaddr, next, hlim)) != E_OK) {
+                syscall(rel_net_buf(*nbuf));
+                *nbuf = NULL;
                 return error;
+                }
 
         /* 4 オクテット境界までパディングで埋める。*/
@@ -662 +665 @@
  *  in6_rtredirect -- ルーティング表にエントリを登録する。
  *
- *    注意: 引数 tmo の単位は [ms]。
+ *    注意: 引数 tmo の単位は [us]。
  */
 

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netinet6/in6_var.h

@@ -184 +184 @@
          * vltime と pltime は、追加/変更してからの相対時間
          */
-        uint32_t        vltime;         /* 有効時間 [ms]                    */
-        uint32_t        pltime;         /* 推奨有効時間 [ms]          */
+        uint32_t        vltime;         /* 有効時間 [us]                    */
+        uint32_t        pltime;         /* 推奨有効時間 [us]          */
         } __attribute__((packed, aligned(2)))T_IN6_ADDR_LIFETIME;
 

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netinet6/nd6.c

@@ -353 +353 @@
                         if (nd6_cache[mix].hold != NULL) {
                                 syscall(rel_net_buf(nd6_cache[mix].hold));
+                                nd6_cache[mix].hold = NULL;
                                 }
                         fix = mix;
@@ -562 +563 @@
                         if (ln->hold != NULL) {
                                 syscall(rel_net_buf(ln->hold));
+                                ln->hold = NULL;
                                 }
 

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netinet6/nd6.h

@@ -81 +81 @@
         T_NET_BUF       *hold;
         TMO             tmout;
-        SYSTIM          expire;         /* [ms] 有効時間が切れる時刻      */
+        SYSTIM          expire;         /* [us] 有効時間が切れる時刻      */
         T_IF_ADDR       ifaddr;
         uint8_t         state;
@@ -183 +183 @@
 typedef struct t_def_router {
         T_IN6_ADDR      addr;
-        SYSTIM          expire;         /* [ms] 有効時間が切れる時刻      */
-        uint32_t        lifetime;       /* [ms] 有効時間                    */
+        SYSTIM          expire;         /* [us] 有効時間が切れる時刻      */
+        uint32_t        lifetime;       /* [us] 有効時間                    */
         uint16_t        plistmap;       /* プレフィックスマップ           */
         uint8_t         flags;          /* ルータ通知のフラグ            */

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/tcpip_sym.def

@@ -15 +15 @@
 TMO_UDP_OUTPUT
 TMO_ICMP_OUTPUT
+TMO_IGMP_OUTPUT
 TMO_ND6_NS_OUTPUT
 TMO_ND6_NA_OUTPUT

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/tinet_asp.cfg

@@ -73 +73 @@
 INCLUDE("netinet/if_ether.cfg");
 INCLUDE("netinet/ip.cfg");
+INCLUDE("netinet/ip_igmp.cfg");
 INCLUDE("netinet/tcp.cfg");
 INCLUDE("netinet/udp.cfg");

asp3_tinet_ecnl_arm/trunk/bnep_bridge/.cproject

@@ -22 +22 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -59 +59 @@
                                                         <option id="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack.606825282" name="Warn if stack size exceeds the limit (-Wstack-usage) (H')" superClass="com.renesas.cdt.managedbuild.gcc.rz.option.warnStack" useByScannerDiscovery="false" value="100" valueType="string"/>
                                                         <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.1276126881" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-                                                        <builder buildPath="${workspace_loc:/bnep_bridge}/Debug" id="com.renesas.cdt.managedbuild.gcc.rz.builder.691118394" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="false" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
+                                                        <builder buildPath="${workspace_loc:/bnep_bridge}/Debug" id="com.renesas.cdt.managedbuild.gcc.rz.builder.691118394" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="GCC for Renesas Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.renesas.cdt.managedbuild.gcc.rz.builder"/>
                                                         <tool id="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler.1838763743" name="Cross ARM GNU Assembler" superClass="com.renesas.cdt.managedbuild.gcc.rz.tool.assembler">
                                                                 <option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1323004654" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" useByScannerDiscovery="false" value="true" valueType="boolean"/>
@@ -127 +127 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">

asp3_tinet_ecnl_arm/trunk/bnep_bridge/Debug/Makefile

@@ -153 +153 @@
 endif
 
+TINETDIR = 
+
 #
 #  mbedサービスの定義
@@ -180 +182 @@
         -I$(SRCDIR)/../usbhost/src \
         $(INCLUDES)
-LDFLAGS := $(LDFLAGS) -Wl,-Map=$(OBJNAME).map,--cref -L.
+LDFLAGS := $(LDFLAGS) -L.
 LIBS := $(LIBS) $(CXXLIBS)
 CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES)
 
-APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) ntshell_main.o fdtable.o io_stub.o ffarch.o diskio.o ff.o sdfs.o ccsbcs.o ntshell.o text_editor.o text_history.o usrcmd.o vtrecv.o vtsend.o ntlibc.o ntstdio.o ntopt.o syscall.o tlsf.o
-
 #
 #  アプリケーションプログラムに関する定義
 #
 APPLNAME = bnep_bridge
-APPLDIRS := $(APPLDIRS) ../src
+APPLDIRS = ../src ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src $(SRCDIR)/$(TINETDIR)/netapp
 APPL_CFG = main.cfg
 APPL_CDL = main.cdl
+
+APPL_COBJS := $(APPL_COBJS) ntshell_main.o fdtable.o io_stub.o ffarch.o diskio.o ff.o sdfs.o ccsbcs.o ntshell.o text_editor.o text_history.o usrcmd.o vtrecv.o vtsend.o ntlibc.o ntstdio.o ntopt.o syscall.o tlsf.o
 
 APPL_DIRS := $(APPLDIRS) $(SRCDIR)/library
@@ -210 +211 @@
 endif
 
-TINETDIR = 
 ifdef TINETDIR
         #
@@ -216 +216 @@
         #
         NO_USE_TINET_LIBRARY = true
-        
+
         #  ネットワークインタフェースの選択、何れか一つ選択する。
         NET_IF = ether
-        
+
         #  イーサネット・ディバイスドライバの選択
         NET_DEV = if_mbed
@@ -430 +430 @@
 
 #
+#  並列makeのための依存関係の定義
+#
+$(APPL_OBJS) $(filter-out $(CFG_DMY), $(SYSSVC_OBJS)): | kernel_cfg.timestamp
+$(APPL_ASMOBJS) $(filter-out $(CFG_DMY), $(SYSSVC_ASMOBJS)) $(KERNEL_ASMOBJS) $(CFG_ASMOBJS): \
+                                                                                                                | offset.timestamp
+
+#
 #  特別な依存関係の定義
 #
@@ -438 +445 @@
 #
 $(OBJFILE): $(ALL_OBJS) $(LIBS_DEP)
-        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) \
+        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) -Wl,-Map=$(OBJNAME).map,--cref \
                         $(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \
                         -Wl,--start-group $(ALL_LIBS) -Wl,--end-group $(END_OBJS)

asp3_tinet_ecnl_arm/trunk/bnep_bridge/src/main.c

@@ -118 +118 @@
 static void main_timeout();
 
+extern int ntshell_exit;
+
 int uart_read(char *buf, int cnt, void *extobj)
 {
-        return serial_rea_dat(SIO_PORTID, (char *)buf, cnt);
+        struct main_t *obj = (struct main_t *)extobj;
+        int result;
+        ER ret;
+        int timer;
+
+        obj->prev = obj->now;
+
+        /* タイマー取得 */
+        timer = main_get_timer();
+
+        /* 待ち */
+        ret = serial_trea_dat(SIO_PORTID, buf, cnt, timer);
+        if ((ret < 0) && (ret != E_OK) && (ret != E_TMOUT)) {
+                syslog(LOG_NOTICE, "tslp_tsk ret: %s %d", itron_strerror(ret), timer);
+                ntshell_exit = 1;
+                return -1;
+        }
+        result = (int)ret;
+
+        ret = get_tim(&obj->now);
+        if (ret != E_OK) {
+                syslog(LOG_NOTICE, "get_tim ret: %s", itron_strerror(ret));
+                ntshell_exit = 1;
+                return -1;
+        }
+
+                        /* 時間経過 */
+        int elapse = obj->now - obj->prev;
+        main_progress(elapse);
+
+        /* タイムアウト処理 */
+        main_timeout();
+
+        return result;
 }
 
@@ -126 +161 @@
 {
         return serial_wri_dat(SIO_PORTID, buf, cnt);
-}
-
-unsigned char ntstdio_xi(struct ntstdio_t *handle)
-{
-        char buf[1];
-        if(serial_rea_dat(SIO_PORTID, buf, 1) != 1)
-                return -EIO;
-        return buf[0];
-}
-
-void ntstdio_xo(struct ntstdio_t *handle, unsigned char c)
-{
-        char buf[1];
-        buf[0] = c;
-        serial_wri_dat(SIO_PORTID, buf, 1);
 }
 
@@ -155 +175 @@
         main_initialize();
 
-        ntshell_init(&ntshell, uart_read, uart_write, cmd_execute, NULL);
+        ntshell_init(&ntshell, uart_read, uart_write, cmd_execute, &main_obj);
         ntshell_set_prompt(&ntshell, "NTShell>");
         ntshell_execute(&ntshell);
@@ -173 +193 @@
         ER ret;
 
-        ntshell_task_init();
+#ifdef TOPPERS_OMIT_TECS
+        serial_opn_por(SIO_PORTID);
+#endif
+        serial_ctl_por(SIO_PORTID, IOCTL_FCSND | IOCTL_FCRCV);
+
+        ntshell_task_init(uart_read, uart_write, &main_obj);
 
         main_obj.timer = TMO_FEVR;

asp3_tinet_ecnl_arm/trunk/btstack/.cproject

@@ -22 +22 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -136 +136 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">

asp3_tinet_ecnl_arm/trunk/curl-7.57.0/.cproject

@@ -24 +24 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -80 +80 @@
                                                                         <listOptionValue builtIn="false" value="HAVE_CONFIG_H"/>
                                                                         <listOptionValue builtIn="false" value="BUILDING_LIBCURL"/>
+                                                                        <listOptionValue builtIn="false" value="WOLFSSL_USER_SETTINGS"/>
                                                                 </option>
+                                                                <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files.169831869" name="Include files (-include)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.files" useByScannerDiscovery="false" valueType="includeFiles"/>
                                                                 <inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.1041134774" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input"/>
                                                         </tool>
@@ -145 +147 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">

asp3_tinet_ecnl_arm/trunk/curl-7.57.0/lib/curl_config.h

@@ -4 +4 @@
 /* Location of default ca bundle */
 /* #undef CURL_CA_BUNDLE */
+#define CURL_CA_BUNDLE "0:/certs/ca-bundle.crt"
 
 /* define "1" to use built in CA store of SSL library */
@@ -573 +574 @@
 
 /* Define to 1 if you have the signal function. */
-#define HAVE_SIGNAL 1
+/* #undef HAVE_SIGNAL */
 
 /* Define to 1 if you have the <signal.h> header file. */
@@ -948 +949 @@
 
 /* If you want to build curl with the built-in manual */
-#define USE_MANUAL 1
+/* #undef USE_MANUAL */
 
 /* if mbedTLS is enabled */

asp3_tinet_ecnl_arm/trunk/curl-7.57.0/lib/mprintf.c

@@ -997 +997 @@
 {
         unsigned int r, i, j, w, f;
-        unsigned long v;
+        unsigned long long v;
         char s[16], c, d, *p;
 
@@ -1022 +1022 @@
                         w = w * 10 + c - '0';
                 if (c == 'l' || c == 'L') {     /* Prefix: Size is long int */
-                        f |= 4; c = *fmt++;
+                        c = *fmt++;
+                        if (c == 'l' || c == 'L') {     /* Prefix: Size is long int */
+                                f |= 32; c = *fmt++;
+                        }
+                        else {
+                                f |= 4;
+                        }
                 }
                 else if (c == 'h') {    /* Prefix: Size is short int */
@@ -1055 +1061 @@
 
                 /* Get an argument and put it in numeral */
-                v = (f & 4) ? va_arg(arp, long)
-                        : ((f & 16) ? ((d == 'D') ? (long)((short)va_arg(arp, int)) : (long)((unsigned short)va_arg(arp, unsigned int)))
-                                : ((d == 'D') ? (long)va_arg(arp, int) : (long)va_arg(arp, unsigned int)));
-                if (d == 'D' && (v & 0x80000000)) {
+                if (f & 4)
+                        v = (long long)va_arg(arp, long);
+                else if (f & 16)
+                        v = (d == 'D') ? (long long)((short)va_arg(arp, int)) : (long long)((unsigned short)va_arg(arp, unsigned int));
+                else if (f & 32)
+                        v = (d == 'D') ? (long long)(va_arg(arp, long long)) : (long long)(va_arg(arp, unsigned long long));
+                else
+                        v = (d == 'D') ? (long long)va_arg(arp, int) : (long long)va_arg(arp, unsigned int);
+                if (d == 'D' && (v & 0x8000000000000000ll)) {
                         v = 0 - v;
                         f |= 8;

asp3_tinet_ecnl_arm/trunk/musl-1.1.18/.cproject

@@ -24 +24 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -151 +151 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">

asp3_tinet_ecnl_arm/trunk/musl-1.1.18/arch/arm/syscall_arch.h

@@ -83 +83 @@
 long __syscall_ret(unsigned long), __syscall_nr(long nr, ...);
 
-#define __syscall(n, ...) n(__VA_ARGS__)
-#define __syscall_cp(n, ...) n(__VA_ARGS__)
-#define syscall(n, ...) __syscall_ret(__syscall(n, __VA_ARGS__))
-#define syscall_cp(n, ...) __syscall_ret(__syscall_cp(n, __VA_ARGS__))
+#define __syscall0(n) n()
+#define __syscall1(n,a) n(__scc(a))
+#define __syscall2(n,a,b) n(__scc(a),__scc(b))
+#define __syscall3(n,a,b,c) n(__scc(a),__scc(b),__scc(c))
+#define __syscall4(n,a,b,c,d) n(__scc(a),__scc(b),__scc(c),__scc(d))
+#define __syscall5(n,a,b,c,d,e) n(__scc(a),__scc(b),__scc(c),__scc(d),__scc(e))
+#define __syscall6(n,a,b,c,d,e,f) n(__scc(a),__scc(b),__scc(c),__scc(d),__scc(e),__scc(f))
+#define __syscall7(n,a,b,c,d,e,f,g) n(__scc(a),__scc(b),__scc(c),__scc(d),__scc(e),__scc(f),__scc(g))
 
-#define __syscall2(n, ...) n(__VA_ARGS__)
-#define __syscall3(n, ...) n(__VA_ARGS__)
-#define __syscall_cp2(n, ...) n(__VA_ARGS__)
-#define __syscall_cp3(n, ...) n(__VA_ARGS__)
+#define __syscall_cp0(n) n()
+#define __syscall_cp1(n,a) n(__scc(a))
+#define __syscall_cp2(n,a,b) n(__scc(a),__scc(b))
+#define __syscall_cp3(n,a,b,c) n(__scc(a),__scc(b),__scc(c))
+#define __syscall_cp4(n,a,b,c,d) n(__scc(a),__scc(b),__scc(c),__scc(d))
+#define __syscall_cp5(n,a,b,c,d,e) n(__scc(a),__scc(b),__scc(c),__scc(d),__scc(e))
+#define __syscall_cp6(n,a,b,c,d,e,f) n(__scc(a),__scc(b),__scc(c),__scc(d),__scc(e),__scc(f))
+#define __syscall_cp7(n,a,b,c,d,e,f,g) n(__scc(a),__scc(b),__scc(c),__scc(d),__scc(e),__scc(f),__scc(g))
+
+#define __SYSCALL_NARGS_X(a,b,c,d,e,f,g,h,n,...) n
+#define __SYSCALL_NARGS(...) __SYSCALL_NARGS_X(__VA_ARGS__,7,6,5,4,3,2,1,0,)
+#define __SYSCALL_CONCAT_X(a,b) a##b
+#define __SYSCALL_CONCAT(a,b) __SYSCALL_CONCAT_X(a,b)
+#define __SYSCALL_DISP(b,...) __SYSCALL_CONCAT(b,__SYSCALL_NARGS(__VA_ARGS__))(__VA_ARGS__)
 #endif

asp3_tinet_ecnl_arm/trunk/musl-1.1.18/src/internal/syscall.h

@@ -50 +50 @@
 #define __SYSCALL_CONCAT(a,b) __SYSCALL_CONCAT_X(a,b)
 #define __SYSCALL_DISP(b,...) __SYSCALL_CONCAT(b,__SYSCALL_NARGS(__VA_ARGS__))(__VA_ARGS__)
-#if 0
+
 #define __syscall(...) __SYSCALL_DISP(__syscall,__VA_ARGS__)
 #define syscall(...) __syscall_ret(__syscall(__VA_ARGS__))
-#endif
+
 #define socketcall __socketcall
 #define socketcall_cp __socketcall_cp
@@ -64 +64 @@
 #define __syscall_cp5(n,a,b,c,d,e) (__syscall_cp)(n,__scc(a),__scc(b),__scc(c),__scc(d),__scc(e),0)
 #define __syscall_cp6(n,a,b,c,d,e,f) (__syscall_cp)(n,__scc(a),__scc(b),__scc(c),__scc(d),__scc(e),__scc(f))
-
+#endif
 #define __syscall_cp(...) __SYSCALL_DISP(__syscall_cp,__VA_ARGS__)
 #define syscall_cp(...) __syscall_ret(__syscall_cp(__VA_ARGS__))
-#endif
 
 #ifndef SYSCALL_USE_SOCKETCALL

asp3_tinet_ecnl_arm/trunk/ntshell/echonet/echonet.c

@@ -56 +56 @@
 
 /*
+ * インスタンスリスト通知の送信
+ */
+ER ecn_ntf_inl()
+{
+        return _ecn_tsk_ntf_inl();
+}
+
+/*
  * ECHONETオブジェクト参照
  * 引数
@@ -393 +401 @@
                 return E_PAR;
 
-        a_ret = trcv_dtq(ecn_api_mailboxid, (intptr_t *)&p_msg, fa_tmout);
+        a_ret = trcv_dtq(ecn_api_dataqueueid, (intptr_t *)&p_msg, fa_tmout);
         if (a_ret != E_OK) {
                 *ppk_esv = NULL;
@@ -425 +433 @@
         a_ret = _ecn_fbs_del(a_fbs);
         return a_ret;
+}
+
+/*
+ * 応答電文の送信元ノードを取得する
+ */
+ID ecn_get_enod(T_EDATA *pk_esv)
+{
+        const EOBJCB    *p_snod;
+        const EOBJINIB  *p_sobj = NULL;
+
+        p_snod = _ecn_eno_fnd(((T_ECN_FST_BLK *)pk_esv)->hdr.sender.id);
+        if (p_snod != NULL) {
+                p_sobj = p_snod->profile;
+        }
+
+        if (p_sobj == NULL)
+                return EOBJ_NULL;
+#ifdef ECHONET_CONTROLLER_EXTENTION
+        if (p_sobj->eprpcnt == 0)
+                return ecn_agent_get_eobj(p_sobj);
+#endif
+        return 1 + (((intptr_t)p_sobj - (intptr_t)eobjinib_table) / sizeof(EOBJINIB));
 }
 

asp3_tinet_ecnl_arm/trunk/ntshell/echonet/echonet.h

@@ -67 +67 @@
 typedef enum _echonet_enod_id
 {
-        ENOD_NOT_MATCH_ID       = -1,
+        ENOD_NOT_MATCH_ID       = -1,                   /* アドレスID登録なし */
         ENOD_MULTICAST_ID       = 0,                    /* マルチキャストアドレスID */
         ENOD_LOCAL_ID           = 1,                    /* 自ノードアドレスID */
@@ -279 +279 @@
 extern const ID ecn_svc_taskid;
 extern const ID ecn_udp_taskid;
-extern const ID ecn_api_mailboxid;
-extern const ID ecn_svc_mailboxid;
-extern const ID ecn_udp_mailboxid;
+extern const ID ecn_api_dataqueueid;
+extern const ID ecn_svc_dataqueueid;
+extern const ID ecn_udp_dataqueueid;
 #ifndef ECHONET_USE_MALLOC
 extern const ID ecn_mempoolid;
@@ -309 +309 @@
 
 /*
+ * インスタンスリスト通知の送信
+ */
+ER ecn_ntf_inl();
+
+/*
  * ECHONETオブジェクト参照
  */
@@ -392 +397 @@
  */
 ER ecn_rel_esv(T_EDATA *pk_esv);
+
+/*
+ * 応答電文の送信元ノードを取得する
+ */
+ID ecn_get_enod(T_EDATA *pk_esv);
 
 /*

asp3_tinet_ecnl_arm/trunk/ntshell/echonet/echonet.trb

@@ -634 +634 @@
 const ID _echonet_ecn_svc_taskid = ECHONET_SVC_TASK;
 const ID _echonet_ecn_udp_taskid = ECHONET_UDP_TASK;
-const ID _echonet_ecn_api_mailboxid = ECHONET_API_MAILBOX;
-const ID _echonet_ecn_svc_mailboxid = ECHONET_SVC_MAILBOX;
-const ID _echonet_ecn_udp_mailboxid = ECHONET_UDP_MAILBOX;
+const ID _echonet_ecn_api_dataqueueid = ECHONET_API_DATAQUEUE;
+const ID _echonet_ecn_svc_dataqueueid = ECHONET_SVC_DATAQUEUE;
+const ID _echonet_ecn_udp_dataqueueid = ECHONET_UDP_DATAQUEUE;
 #ifndef ECHONET_USE_MALLOC
 const ID _echonet_ecn_mempoolid = ECHONET_MEMPOOL;

asp3_tinet_ecnl_arm/trunk/ntshell/echonet/echonet_asp.cfg

@@ -51 +51 @@
 
 /*
- * ECHONET Lite API用メールボックス
+ * ECHONET Lite API用データキュー
  */
-CRE_DTQ(ECHONET_API_MAILBOX, { TA_TFIFO, 1, NULL });
+CRE_DTQ(ECHONET_API_DATAQUEUE, { TA_TFIFO, ECHONET_API_DATAQUEUE_COUNT, NULL });
 
 /*
- * ECHONET Lite サービス処理タスク用メールボックス
+ * ECHONET Lite サービス処理タスク用データキュー
  */
-CRE_DTQ(ECHONET_SVC_MAILBOX, { TA_TFIFO, 1, NULL });
+CRE_DTQ(ECHONET_SVC_DATAQUEUE, { TA_TFIFO, ECHONET_SVC_DATAQUEUE_COUNT, NULL });
 
 /*
@@ -66 +66 @@
 
 /*
- * ECHONET Lite UDP通信処理用メールボックス
+ * ECHONET Lite UDP通信処理用データキュー
  */
-CRE_DTQ(ECHONET_UDP_MAILBOX, { TA_TFIFO, 1, NULL });
+CRE_DTQ(ECHONET_UDP_DATAQUEUE, { TA_TFIFO, ECHONET_UDP_DATAQUEUE_COUNT, NULL });
 
 /*

asp3_tinet_ecnl_arm/trunk/ntshell/echonet/echonet_rename.h

@@ -47 +47 @@
 #define ecn_svc_taskid          _echonet_ecn_svc_taskid
 #define ecn_udp_taskid          _echonet_ecn_udp_taskid
-#define ecn_api_mailboxid       _echonet_ecn_api_mailboxid
-#define ecn_svc_mailboxid       _echonet_ecn_svc_mailboxid
-#define ecn_udp_mailboxid       _echonet_ecn_udp_mailboxid
+#define ecn_api_dataqueueid     _echonet_ecn_api_dataqueueid
+#define ecn_svc_dataqueueid     _echonet_ecn_svc_dataqueueid
+#define ecn_udp_dataqueueid     _echonet_ecn_udp_dataqueueid
 #define ecn_mempoolid           _echonet_ecn_mempoolid
 #define ecn_udp_cepid           _echonet_ecn_udp_cepid

asp3_tinet_ecnl_arm/trunk/ntshell/echonet/echonet_task.c

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

asp3_tinet_ecnl_arm/trunk/ntshell/echonet/echonet_task.h

@@ -110 +110 @@
 } T_ECN_INTERNAL_MSG;
 
+/* 
+ * インスタンスリスト通知の送信
+ */
+ER _ecn_tsk_ntf_inl();
 /*
  * 要求電文作成

asp3_tinet_ecnl_arm/trunk/ntshell/echonet/echonet_udp6_task.c

@@ -151 +151 @@
 
         /* echonet_taskに送る */
-        a_ret = snd_dtq(ecn_svc_mailboxid, (intptr_t)a_fbs_id.ptr);
-        if (a_ret != E_OK) {
-                ECN_DBG_PUT_2("[UDP ECHO SRV] snd_dtq(ecn_svc_mailboxid) result = %d:%s", a_ret, itron_strerror(a_ret));
+        a_ret = snd_dtq(ecn_svc_dataqueueid, (intptr_t)a_fbs_id.ptr);
+        if (a_ret != E_OK) {
+                ECN_DBG_PUT_2("[UDP ECHO SRV] snd_dtq(ecn_svc_dataqueueid) result = %d:%s", a_ret, itron_strerror(a_ret));
                 goto lb_except;
         }
@@ -201 +201 @@
                 a_timer = ECHONET_UDP_TASK_GET_TIMER;
 
-                a_ret = trcv_dtq(ecn_udp_mailboxid, (intptr_t *)&a_mdt.p_msg, a_timer);
+                a_ret = trcv_dtq(ecn_udp_dataqueueid, (intptr_t *)&a_mdt.p_msg, a_timer);
                 if ((a_ret != E_OK) && (a_ret != E_TMOUT)) {
                         ECN_DBG_PUT_2("trcv_dtq() result = %d:%s", a_ret, itron_strerror(a_ret));
@@ -261 +261 @@
         req.ptr->hdr.type = ECN_MSG_INTERNAL;
         req.ptr->hdr.sender.dtqid = sender;
-        req.ptr->hdr.target.dtqid = ecn_udp_mailboxid;
+        req.ptr->hdr.target.dtqid = ecn_udp_dataqueueid;
         req.ptr->hdr.reply.dtqid = sender;
 
@@ -289 +289 @@
 
         res.ptr->hdr.type = ECN_MSG_INTERNAL;
-        res.ptr->hdr.sender.dtqid = ecn_udp_mailboxid;
+        res.ptr->hdr.sender.dtqid = ecn_udp_dataqueueid;
         res.ptr->hdr.target.dtqid = req.ptr->hdr.reply.dtqid;
-        res.ptr->hdr.reply.dtqid = ecn_udp_mailboxid;
+        res.ptr->hdr.reply.dtqid = ecn_udp_dataqueueid;
 
         *pk_res = res;
@@ -416 +416 @@
                 else if (memcmp(&a_dst.ipaddr, &locl, sizeof(a_dst.ipaddr)) == 0) {
                         /* 送信先が127.0.0.1 → dtqに転送 */
-                        ECN_DBG_PUT_1("redirect ecn_udp_mailboxid → ecn_svc_mailboxid (esv:0x%02X)",
+                        ECN_DBG_PUT_1("redirect ecn_udp_dataqueueid → ecn_svc_dataqueueid (esv:0x%02X)",
                                 ((T_EDATA *)fbs_id.ptr)->hdr.edata.esv);
 
@@ -462 +462 @@
 
         switch (fncd) {
-        case TFN_UDP_CRE_CEP:
+        case TEV_UDP_RCV_DAT:
         case TFN_UDP_RCV_DAT:
                 /* ECN_CAP_PUT("[UDP ECHO SRV] callback_nblk_udp() recv: %u", *(int *)p_parblk); */
@@ -488 +488 @@
                 return E_OK;
 
+        case TFN_UDP_CRE_CEP:
         case TFN_UDP_SND_DAT:
                 break;
         default:
                 ECN_CAP_PUT_2("[UDP ECHO SRV] fncd:0x%04X(%s)", -fncd,
+                        (fncd == TEV_UDP_RCV_DAT ? "TEV_UDP_RCV_DAT" :
                         (fncd == TFN_UDP_CRE_CEP ? "TFN_UDP_CRE_CEP" :
                         (fncd == TFN_UDP_RCV_DAT ? "TFN_UDP_RCV_DAT" :
-                        (fncd == TFN_UDP_SND_DAT ? "TFN_UDP_SND_DAT" : "undef"))));
+                        (fncd == TFN_UDP_SND_DAT ? "TFN_UDP_SND_DAT" : "undef")))));
 
                 error = E_PAR;

asp3_tinet_ecnl_arm/trunk/ntshell/echonet/echonet_udp6_task.h

@@ -71 +71 @@
 #endif /* ECHONET_UDP_TASK_STACK_SIZE */
 
-#ifndef NUM_ECHONET_UDP_MAILBOX
-#define NUM_ECHONET_UDP_MAILBOX 10
-#endif /* NUM_ECHONET_UDP_MAILBOX */
+#ifndef NUM_ECHONET_UDP_DATAQUEUE
+#define NUM_ECHONET_UDP_DATAQUEUE       10
+#endif /* NUM_ECHONET_UDP_DATAQUEUE */
 
 /*

asp3_tinet_ecnl_arm/trunk/ntshell/echonet/echonet_udp_task.c

@@ -146 +146 @@
 
         /* echonet_taskに送る */
-        a_ret = snd_dtq(ecn_svc_mailboxid, (intptr_t)a_fbs_id.ptr);
-        if (a_ret != E_OK) {
-                ECN_DBG_PUT_2("[UDP ECHO SRV] snd_dtq(ecn_svc_mailboxid) result = %d:%s", a_ret, itron_strerror(a_ret));
+        a_ret = snd_dtq(ecn_svc_dataqueueid, (intptr_t)a_fbs_id.ptr);
+        if (a_ret != E_OK) {
+                ECN_DBG_PUT_2("[UDP ECHO SRV] snd_dtq(ecn_svc_dataqueueid) result = %d:%s", a_ret, itron_strerror(a_ret));
                 goto lb_except;
         }
@@ -206 +206 @@
                 a_timer = ECHONET_UDP_TASK_GET_TIMER;
 
-                a_ret = trcv_dtq(ecn_udp_mailboxid, (intptr_t *)&a_mdt.p_msg, a_timer);
+                a_ret = trcv_dtq(ecn_udp_dataqueueid, (intptr_t *)&a_mdt.p_msg, a_timer);
                 if ((a_ret != E_OK) && (a_ret != E_TMOUT)) {
                         ECN_DBG_PUT_2("trcv_dtq() result = %d:%s", a_ret, itron_strerror(a_ret));
@@ -266 +266 @@
         req.ptr->hdr.type = ECN_MSG_INTERNAL;
         req.ptr->hdr.sender.dtqid = sender;
-        req.ptr->hdr.target.dtqid = ecn_udp_mailboxid;
+        req.ptr->hdr.target.dtqid = ecn_udp_dataqueueid;
         req.ptr->hdr.reply.dtqid = sender;
 
@@ -294 +294 @@
 
         res.ptr->hdr.type = ECN_MSG_INTERNAL;
-        res.ptr->hdr.sender.dtqid = ecn_udp_mailboxid;
+        res.ptr->hdr.sender.dtqid = ecn_udp_dataqueueid;
         res.ptr->hdr.target.dtqid = req.ptr->hdr.reply.dtqid;
-        res.ptr->hdr.reply.dtqid = ecn_udp_mailboxid;
+        res.ptr->hdr.reply.dtqid = ecn_udp_dataqueueid;
 
         *pk_res = res;
@@ -420 +420 @@
                 else if (a_dst.ipaddr == MAKE_IPV4_ADDR(127,0,0,1)) {
                         /* 送信先が127.0.0.1 → dtqに転送 */
-                        ECN_DBG_PUT_1("redirect ecn_udp_mailboxid → ecn_svc_mailboxid (esv:0x%02X)",
+                        ECN_DBG_PUT_1("redirect ecn_udp_dataqueueid → ecn_svc_dataqueueid (esv:0x%02X)",
                                 ((T_EDATA *)fbs_id.ptr)->hdr.edata.esv);
 
@@ -466 +466 @@
 
         switch (fncd) {
-        case TFN_UDP_CRE_CEP:
+        case TEV_UDP_RCV_DAT:
         case TFN_UDP_RCV_DAT:
                 /* ECN_CAP_PUT("[UDP ECHO SRV] callback_nblk_udp() recv: %u", *(int *)p_parblk); */
@@ -492 +492 @@
                 return E_OK;
 
+        case TFN_UDP_CRE_CEP:
         case TFN_UDP_SND_DAT:
                 break;
         default:
                 ECN_CAP_PUT_2("[UDP ECHO SRV] fncd:0x%04X(%s)", -fncd,
+                        (fncd == TEV_UDP_RCV_DAT ? "TEV_UDP_RCV_DAT" :
                         (fncd == TFN_UDP_CRE_CEP ? "TFN_UDP_CRE_CEP" :
                         (fncd == TFN_UDP_RCV_DAT ? "TFN_UDP_RCV_DAT" :
-                        (fncd == TFN_UDP_SND_DAT ? "TFN_UDP_SND_DAT" : "undef"))));
+                        (fncd == TFN_UDP_SND_DAT ? "TFN_UDP_SND_DAT" : "undef")))));
 
                 error = E_PAR;

asp3_tinet_ecnl_arm/trunk/ntshell/echonet/echonet_udp_task.h

@@ -71 +71 @@
 #endif /* ECHONET_UDP_TASK_STACK_SIZE */
 
-#ifndef NUM_ECHONET_UDP_MAILBOX
-#define NUM_ECHONET_UDP_MAILBOX 10
-#endif /* NUM_ECHONET_UDP_MAILBOX */
+#ifndef NUM_ECHONET_UDP_DATAQUEUE
+#define NUM_ECHONET_UDP_DATAQUEUE       10
+#endif /* NUM_ECHONET_UDP_DATAQUEUE */
 
 /*

asp3_tinet_ecnl_arm/trunk/ntshell/fatfs/ffarch.h

@@ -41 +41 @@
 #define FFARCH_STACK_SIZE               512
 
-void ffarch_init();
+void ffarch_init(void);
 void ffarch_task(intptr_t exinf);
-int ffarch_get_timer();
+int ffarch_get_timer(void);
 void ffarch_progress(int elapse);
-void ffarch_timeout();
+void ffarch_timeout(void);
 
 void sdfs_cychdr(intptr_t exinf);

asp3_tinet_ecnl_arm/trunk/ntshell/lcd/draw_font.c

@@ -1 +1 @@
 /*
  *  TOPPERS ECHONET Lite Communication Middleware
- * 
+ *
  *  Copyright (C) 2018 Cores Co., Ltd. Japan
- * 
+ *
  *  上記著作権者は，以下の(1)～(4)の条件を満たす場合に限り，本ソフトウェ
  *  ア（本ソフトウェアを改変したものを含む．以下同じ）を使用・複製・改
@@ -26 +26 @@
  *      由に基づく請求からも，上記著作権者およびTOPPERSプロジェクトを
  *      免責すること．
- * 
+ *
  *  本ソフトウェアは，無保証で提供されているものである．上記著作権者お
  *  よびTOPPERSプロジェクトは，本ソフトウェアに関して，特定の使用目的
@@ -32 +32 @@
  *  アの利用により直接的または間接的に生じたいかなる損害に関しても，そ
  *  の責任を負わない．
- * 
+ *
  *  @(#) $Id$
  */
@@ -41 +41 @@
 #include <string.h>
 #include <target_syssvc.h>
+#ifndef ADAFRUIT_SSD1306
 #include "adafruit_st7735.h"
+#else
+#include "adafruit_ssd1306.h"
+#endif
 #include "draw_font.h"
-#include "misaki_font.h"
-
-void get_bitmap_font(char *string, unsigned char *bitmap_data, unsigned long *use_chars)
-{
-        unsigned long len, code;
-        unsigned char i,j,k;
-        unsigned long totalj, totalk;
+
+void get_bitmap_font(const uint8_t *string, uint8_t *bitmap_data, uint32_t *use_chars)
+{
+        uint32_t len, code;
+        uint8_t i, j, k;
+        uint32_t totalj, totalk;
 
         *use_chars = 0;
         len = 0;
-        if      ((string[0] & 0x80) ==    0) { len = 1; }
+        if ((string[0] & 0x80) == 0) { len = 1; }
         else if ((string[0] & 0xE0) == 0xC0) { len = 2; }
         else if ((string[0] & 0xF0) == 0xE0) { len = 3; }
         else if ((string[0] & 0xF8) == 0xF0) { len = 4; }
-        else { return;  }
+        else { return; }
 
         j = k = totalj = totalk = 0;
 
-        if( len == 1 ) {
+        if (len == 1) {
                 code = string[0];
-                memcpy(bitmap_data, &UTF8_1B_CODE_BITMAP[code][0], 8 );
+                memcpy(bitmap_data, &UTF8_1B_CODE_BITMAP[code][0], FONT_WIDTH * FONT_HEIGHT / 8);
                 *use_chars = 1;
                 return;
         }
 
-        if( len == 2 ) {
+        if (len == 2) {
                 code = string[0];
                 // 1バイト目サーチ
-                for(i = 0; i < UTF8_CODE_2B_1_NUM; i++ ) {
-                        if ( Utf8CodeTable_2B_1st[i][0] == code ) {
+                for (i = 0; i < UTF8_CODE_2B_1_NUM; i++) {
+                        if (Utf8CodeTable_2B_1st[i][0] == code) {
                                 code = string[1];
-                                for( j = 0; j < Utf8CodeTable_2B_1st[i][1]; j++ ) {
-                                        if ( UTF8_2B_CODE_BITMAP[totalk].code == code ) {
-                                                memcpy(bitmap_data, UTF8_2B_CODE_BITMAP[totalk].bitmap, 8 );
+                                for (j = 0; j < Utf8CodeTable_2B_1st[i][1]; j++) {
+                                        if (UTF8_2B_CODE_BITMAP[totalk].code == code) {
+                                                memcpy(bitmap_data, UTF8_2B_CODE_BITMAP[totalk].bitmap, FONT_WIDTH * FONT_HEIGHT / 8);
                                                 *use_chars = 2;
                                                 return;
@@ -90 +93 @@
         }
 
-        if( len == 3 ) {
+        if (len == 3) {
                 code = string[0];
                 // 1バイト目サーチ
-                for(i = 0; i < UTF8_CODE_3B_1_NUM; i++ ) {
-                        if ( Utf8CodeTable_3B_1st[i][0] == code ) {
+                for (i = 0; i < UTF8_CODE_3B_1_NUM; i++) {
+                        if (Utf8CodeTable_3B_1st[i][0] == code) {
                                 code = string[1];
                                 // 2バイト目サーチ
-                                for( j = 0; j < Utf8CodeTable_3B_1st[i][1]; j++ ){
-                                        if ( Utf8CodeTable_3B_2nd[totalj][0] == code ) {
+                                for (j = 0; j < Utf8CodeTable_3B_1st[i][1]; j++) {
+                                        if (Utf8CodeTable_3B_2nd[totalj][0] == code) {
                                                 code = string[2];
                                                 // 3バイト目サーチ
-                                                for( k = 0; k < Utf8CodeTable_3B_2nd[totalj][1]; k++) {
+                                                for (k = 0; k < Utf8CodeTable_3B_2nd[totalj][1]; k++) {
                                                         if (UTF8_3B_CODE_BITMAP[totalk].code == code) {
-                                                                memcpy(bitmap_data, UTF8_3B_CODE_BITMAP[totalk].bitmap, 8 );
+                                                                memcpy(bitmap_data, UTF8_3B_CODE_BITMAP[totalk].bitmap, FONT_WIDTH * FONT_HEIGHT / 8);
                                                                 *use_chars = 3;
                                                                 return;
@@ -111 +114 @@
                                                 return;
                                         }
-                                        else{/*読み飛ばすbitmap個数を蓄積*/
+                                        else {/*読み飛ばすbitmap個数を蓄積*/
                                                 totalk += Utf8CodeTable_3B_2nd[totalj][1];
                                         }
@@ -118 +121 @@
                         }
                         else {/*読み飛ばすbitmap個数を蓄積*/
-                                for( j = 0; j < Utf8CodeTable_3B_1st[i][1]; j++ ) {
+                                for (j = 0; j < Utf8CodeTable_3B_1st[i][1]; j++) {
                                         totalk += Utf8CodeTable_3B_2nd[totalj][1];
                                         totalj++;
@@ -128 +131 @@
 }
 
-void lcd_drawFont(LCD_Handler_t *hlcd, unsigned char *bitmap_data, int x, int y, unsigned short color, unsigned short back_color)
-{
-        int i, j;
-
-        for(i = 0; i < 8; i++ ) {
-                for(j = 0; j < 8; j++ ) {
-                        if (((bitmap_data[i] >> j) & 0x01) == 1){
-                                lcd_drawPixel(hlcd, x - j, y + i, color);
+void lcd_drawFont(LCD_Handler_t *hlcd, uint8_t *bitmap_data, int x, int y, uint16_t color, uint16_t back_color)
+{
+        int i, j, b;
+        uint8_t *bitmap = bitmap_data;
+
+        b = 0x80;
+        for (i = 0; i < FONT_HEIGHT; i++) {
+                for (j = 0; j < FONT_WIDTH; j++) {
+                        if ((*bitmap & b) != 0) {
+                                lcd_drawPixel(hlcd, x + j, y + i, color);
                         }
                         else {
-                                lcd_drawPixel(hlcd, x - j, y + i, back_color);
-                        }
-                }
-        }
-}
-
-void lcd_drawFontHalf(LCD_Handler_t *hlcd, unsigned char *bitmap_data, int x, int y, unsigned short color, unsigned short back_color)
-{
-        int i, j;
-
-        for(i = 0; i < 8; i++ ) {
-                for(j = 4; j < 8; j++ ) {
-                        if (((bitmap_data[i] >> j) & 0x01) == 1){
-                                lcd_drawPixel(hlcd, x - j, y + i, color);
+                                lcd_drawPixel(hlcd, x + j, y + i, back_color);
+                        }
+                        b >>= 1;
+                        if (b == 0) {
+                                b = 0x80;
+                                bitmap++;
+                        }
+                }
+        }
+}
+
+void lcd_drawFontHalf(LCD_Handler_t *hlcd, uint8_t *bitmap_data, int x, int y, uint16_t color, uint16_t back_color)
+{
+        int i, j, b;
+        uint8_t *bitmap = bitmap_data;
+
+        b = 0x80;
+        for (i = 0; i < FONT_HEIGHT; i++) {
+                for (j = 0; j < FONT_HALF_WIDTH; j++) {
+                        if ((*bitmap & b) != 0) {
+                                lcd_drawPixel(hlcd, x + j, y + i, color);
                         }
                         else {
-                                lcd_drawPixel(hlcd, x - j, y + i, back_color);
-                        }
-                }
-        }
-}
-
-void lcd_drawString(LCD_Handler_t *hlcd, char *string, int x, int y, unsigned short color, unsigned short back_color )
-{
-        unsigned long current_top, use_chars, for_3B_hankaku_code;
-        unsigned char bitmap_data[8], ctrl_code;
-        int local_x, local_y;
+                                lcd_drawPixel(hlcd, x + j, y + i, back_color);
+                        }
+                        b >>= 1;
+                        if (b == 0) {
+                                b = 0x80;
+                                bitmap++;
+                        }
+                }
+        }
+}
+
+void lcd_drawString(LCD_Handler_t *hlcd, const char *string, int x, int y, uint16_t color, uint16_t back_color)
+{
+        uint32_t current_top, use_chars, for_3B_hankaku_code;
+        uint8_t bitmap_data[FONT_WIDTH * FONT_HEIGHT / 8], ctrl_code;
+        int local_x, local_y, len = strlen(string);
+        const uint8_t *code = (const uint8_t *)string;
 
         local_x = x;
@@ -170 +188 @@
 
         current_top = 0;
-        while( current_top < strlen(string) )
-        {
-                memset(bitmap_data,0x0,8);
-                ctrl_code = string[current_top];
-                get_bitmap_font(&string[current_top], bitmap_data, &use_chars);
-                if(use_chars == 0)
+        while (current_top < len) {
+                memset(bitmap_data, 0x0, FONT_WIDTH * FONT_HEIGHT / 8);
+                ctrl_code = code[current_top];
+                get_bitmap_font(&code[current_top], bitmap_data, &use_chars);
+                if (use_chars == 0)
                         return;
 
                 //3バイトコード半角文字用
-                if(use_chars == 3) {
+                if (use_chars == 3) {
                         for_3B_hankaku_code = 0;
-                        for_3B_hankaku_code = ( (string[current_top]   << 16) |
-                                                                    (string[current_top+1] <<  8) |
-                                                                    (string[current_top+2]      )   );
+                        for_3B_hankaku_code = ((code[current_top] << 16) |
+                                (code[current_top + 1] << 8) |
+                                (code[current_top + 2]));
                 }
 
@@ -189 +206 @@
 
                 //1バイトコード半角文字
-                if ( use_chars == 1 ) {
-                        if(ctrl_code == 0x0D) { // CR
+                if (use_chars == 1) {
+                        if (ctrl_code == 0x0D) { // CR
                                 local_x = X_LINE_TO_PIX(hlcd, 0);
                                 continue;
                         }
-                        if(ctrl_code == 0x0A) { // LF
-                                local_y = local_y + 8;
+                        if (ctrl_code == 0x0A) { // LF
+                                local_y = local_y + FONT_HEIGHT;
                                 continue;
                         }
 
-                        if ( local_x >= hlcd->_width + 4 ) {
+                        if (local_x + FONT_HALF_WIDTH > hlcd->_width) {
                                 local_x = X_LINE_HALF_TO_PIX(hlcd, 0);
-                                local_y = local_y + 8;
+                                local_y = local_y + FONT_HEIGHT;
                         }
                         lcd_drawFontHalf(hlcd, bitmap_data, local_x, local_y, color, back_color);
-                        local_x += 4;
+                        local_x += FONT_HALF_WIDTH;
                         continue;
                 }
 
                 //3バイトコード半角文字
-                if( use_chars == 3 ) {
-                        if (    ( (0xEFBDA1 <= for_3B_hankaku_code) && (for_3B_hankaku_code <= 0xEFBDBF) ) ||
-                                        ( (0xEFBE80 <= for_3B_hankaku_code) && (for_3B_hankaku_code <= 0xEFBE9F) )      ) {
+                if (use_chars == 3) {
+                        if (((0xEFBDA1 <= for_3B_hankaku_code) && (for_3B_hankaku_code <= 0xEFBDBF)) ||
+                                ((0xEFBE80 <= for_3B_hankaku_code) && (for_3B_hankaku_code <= 0xEFBE9F))) {
                                 //3バイトコード半角文字
-                                if ( local_x >= hlcd->_width + 4 ) {
+                                if (local_x + FONT_HALF_WIDTH > hlcd->_width) {
                                         local_x = X_LINE_HALF_TO_PIX(hlcd, 0);
-                                        local_y = local_y + 8;
+                                        local_y = local_y + FONT_HEIGHT;
                                 }
                                 lcd_drawFontHalf(hlcd, bitmap_data, local_x, local_y, color, back_color);
-                                local_x += 4;
+                                local_x += FONT_HALF_WIDTH;
                                 continue;
                         }
@@ -224 +241 @@
 
                 //全角文字
-                if ( local_x >= hlcd->_width + 8 ) {
+                if (local_x + FONT_WIDTH > hlcd->_width) {
                         local_x = X_LINE_TO_PIX(hlcd, 0);
-                        local_y = local_y + 8;
+                        local_y = local_y + FONT_HEIGHT;
                 }
                 lcd_drawFont(hlcd, bitmap_data, local_x, local_y, color, back_color);
-                local_x += 8;
-        }
-}
-
+                local_x += FONT_WIDTH;
+        }
+}
+

asp3_tinet_ecnl_arm/trunk/ntshell/lcd/draw_font.h

@@ -39 +39 @@
 #define DRAW_FONT_H
 
+#if defined(SHNM16_FONT)
+#include "shnm16_font.h"
+#elif defined(SHNM12_FONT)
+#include "shnm12_font.h"
+#else
+#include "misaki_font.h"
+#endif
+
 #define DISP_X_ADJ      0
 #define DISP_Y_ADJ      0
-#define X_ZENKAKU_CHARACTERS(hlcd)      ((hlcd)->_width / 8)
-#define X_HANKAKU_CHARACTERS(hlcd)      ((hlcd)->_width / 4)
-#define Y_CHARACTERS(hlcd)                      ((hlcd)->_height / 8)
-#define X_LINE_TO_PIX(hlcd, x)          ((8*(x))-DISP_X_ADJ)
-#define X_LINE_HALF_TO_PIX(hlcd, x)     ((4*(x))-DISP_X_ADJ)
-#define Y_ROW_TO_PIX(hlcd, y)           ((8*(y))-DISP_Y_ADJ)
+#define X_ZENKAKU_CHARACTERS(hlcd)      ((hlcd)->_width / FONT_WIDTH)
+#define X_HANKAKU_CHARACTERS(hlcd)      ((hlcd)->_width / FONT_HALF_WIDTH)
+#define Y_CHARACTERS(hlcd)                      ((hlcd)->_height / FONT_HEIGHT)
+#define X_LINE_TO_PIX(hlcd, x)          ((FONT_WIDTH*(x))-DISP_X_ADJ)
+#define X_LINE_HALF_TO_PIX(hlcd, x)     ((FONT_HALF_WIDTH*(x))-DISP_X_ADJ)
+#define Y_ROW_TO_PIX(hlcd, y)           ((FONT_HEIGHT*(y))-DISP_Y_ADJ)
 
 #ifdef __cplusplus
@@ -52 +60 @@
 #endif
 
-void get_bitmap_font(char *string, unsigned char *bitmap_data, unsigned long *use_chars);
-void lcd_drawFont(LCD_Handler_t *hlcd, unsigned char *bitmap_data, int x, int y, unsigned short color, unsigned short back_color);
-void lcd_drawFontHalf(LCD_Handler_t *hlcd, unsigned char *bitmap_data, int x, int y, unsigned short color, unsigned short back_color);
-void lcd_drawString(LCD_Handler_t *hlcd, char *string, int x, int y, unsigned short color, unsigned short back_color );
+void get_bitmap_font(const uint8_t *string, uint8_t *bitmap_data, uint32_t *use_chars);
+void lcd_drawFont(LCD_Handler_t *hlcd, uint8_t *bitmap_data, int x, int y, uint16_t color, uint16_t back_color);
+void lcd_drawFontHalf(LCD_Handler_t *hlcd, uint8_t *bitmap_data, int x, int y, uint16_t color, uint16_t back_color);
+void lcd_drawString(LCD_Handler_t *hlcd, const char *string, int x, int y, uint16_t color, uint16_t back_color );
 
 #ifdef __cplusplus

asp3_tinet_ecnl_arm/trunk/ntshell/lcd/misaki_font.c

@@ -46 +46 @@
 
 // 1バイトコード
-unsigned char UTF8_1B_CODE_BITMAP[UTF8_1B_CODE_BITMAP_NUM][8] = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x40, 0x40, 0x40, 0x40, 0x00, 0x40, 0x00, 0x00},
-        {0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0xA0, 0xE0, 0xA0, 0xA0, 0xE0, 0xA0, 0x00, 0x00},
-        {0x40, 0xE0, 0xC0, 0x60, 0xE0, 0x40, 0x00, 0x00},
-        {0x00, 0x80, 0x20, 0x40, 0x80, 0x20, 0x00, 0x00},
-        {0x40, 0xA0, 0x40, 0x60, 0xC0, 0xE0, 0x00, 0x00},
-        {0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x20, 0x40, 0x40, 0x40, 0x40, 0x40, 0x20, 0x00},
-        {0x80, 0x40, 0x40, 0x40, 0x40, 0x40, 0x80, 0x00},
-        {0x40, 0xE0, 0x40, 0xA0, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x40, 0x40, 0xE0, 0x40, 0x40, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x00},
-        {0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00},
-        {0x00, 0x00, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00},
-        {0x00, 0x40, 0xA0, 0xE0, 0xA0, 0x40, 0x00, 0x00},
-        {0x00, 0x40, 0xC0, 0x40, 0x40, 0xE0, 0x00, 0x00},
-        {0x00, 0xC0, 0x20, 0x40, 0x80, 0xE0, 0x00, 0x00},
-        {0x00, 0xC0, 0x20, 0x40, 0x20, 0xC0, 0x00, 0x00},
-        {0x00, 0x20, 0x60, 0xA0, 0xE0, 0x20, 0x00, 0x00},
-        {0x00, 0xE0, 0x80, 0xC0, 0x20, 0xC0, 0x00, 0x00},
-        {0x00, 0x60, 0x80, 0xC0, 0xA0, 0x40, 0x00, 0x00},
-        {0x00, 0xE0, 0x20, 0x40, 0x40, 0x40, 0x00, 0x00},
-        {0x00, 0x40, 0xA0, 0x40, 0xA0, 0x40, 0x00, 0x00},
-        {0x00, 0x40, 0xA0, 0x60, 0x20, 0xC0, 0x00, 0x00},
-        {0x00, 0x00, 0x40, 0x00, 0x00, 0x40, 0x00, 0x00},
-        {0x00, 0x00, 0x40, 0x00, 0x00, 0x40, 0x80, 0x00},
-        {0x00, 0x20, 0x40, 0x80, 0x40, 0x20, 0x00, 0x00},
-        {0x00, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00, 0x00},
-        {0x00, 0x80, 0x40, 0x20, 0x40, 0x80, 0x00, 0x00},
-        {0x40, 0xA0, 0x20, 0x40, 0x00, 0x40, 0x00, 0x00},
-        {0x40, 0xA0, 0x20, 0x60, 0xA0, 0x40, 0x00, 0x00},
-        {0x40, 0xA0, 0xA0, 0xE0, 0xA0, 0xA0, 0x00, 0x00},
-        {0xC0, 0xA0, 0xC0, 0xA0, 0xA0, 0xC0, 0x00, 0x00},
-        {0x60, 0x80, 0x80, 0x80, 0x80, 0x60, 0x00, 0x00},
-        {0xC0, 0xA0, 0xA0, 0xA0, 0xA0, 0xC0, 0x00, 0x00},
-        {0xE0, 0x80, 0xC0, 0x80, 0x80, 0xE0, 0x00, 0x00},
-        {0xE0, 0x80, 0xC0, 0x80, 0x80, 0x80, 0x00, 0x00},
-        {0x60, 0x80, 0x80, 0xA0, 0xA0, 0x60, 0x00, 0x00},
-        {0xA0, 0xA0, 0xA0, 0xE0, 0xA0, 0xA0, 0x00, 0x00},
-        {0xE0, 0x40, 0x40, 0x40, 0x40, 0xE0, 0x00, 0x00},
-        {0x20, 0x20, 0x20, 0x20, 0xA0, 0x40, 0x00, 0x00},
-        {0xA0, 0xA0, 0xC0, 0xA0, 0xA0, 0xA0, 0x00, 0x00},
-        {0x80, 0x80, 0x80, 0x80, 0x80, 0xE0, 0x00, 0x00},
-        {0xA0, 0xE0, 0xE0, 0xA0, 0xA0, 0xA0, 0x00, 0x00},
-        {0xC0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0x00, 0x00},
-        {0x40, 0xA0, 0xA0, 0xA0, 0xA0, 0x40, 0x00, 0x00},
-        {0xC0, 0xA0, 0xA0, 0xC0, 0x80, 0x80, 0x00, 0x00},
-        {0x40, 0xA0, 0xA0, 0xA0, 0xA0, 0x40, 0x20, 0x00},
-        {0xC0, 0xA0, 0xA0, 0xC0, 0xA0, 0xA0, 0x00, 0x00},
-        {0x60, 0x80, 0x40, 0x20, 0x20, 0xC0, 0x00, 0x00},
-        {0xE0, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00},
-        {0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xE0, 0x00, 0x00},
-        {0xA0, 0xA0, 0xA0, 0xA0, 0xC0, 0x80, 0x00, 0x00},
-        {0xA0, 0xA0, 0xA0, 0xE0, 0xE0, 0xA0, 0x00, 0x00},
-        {0xA0, 0xA0, 0x40, 0x40, 0xA0, 0xA0, 0x00, 0x00},
-        {0xA0, 0xA0, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00},
-        {0xE0, 0x20, 0x40, 0x40, 0x80, 0xE0, 0x00, 0x00},
-        {0x60, 0x40, 0x40, 0x40, 0x40, 0x40, 0x60, 0x00},
-        {0xA0, 0x40, 0xE0, 0x40, 0xE0, 0x40, 0x00, 0x00},
-        {0xC0, 0x40, 0x40, 0x40, 0x40, 0x40, 0xC0, 0x00},
-        {0x40, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00},
-        {0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x60, 0xA0, 0xA0, 0x60, 0x00, 0x00},
-        {0x80, 0x80, 0xC0, 0xA0, 0xA0, 0xC0, 0x00, 0x00},
-        {0x00, 0x00, 0x60, 0x80, 0x80, 0x60, 0x00, 0x00},
-        {0x20, 0x20, 0x60, 0xA0, 0xA0, 0x60, 0x00, 0x00},
-        {0x00, 0x00, 0x60, 0xE0, 0x80, 0x60, 0x00, 0x00},
-        {0x60, 0x40, 0xE0, 0x40, 0x40, 0x40, 0x00, 0x00},
-        {0x00, 0x00, 0x60, 0xA0, 0x60, 0x20, 0xC0, 0x00},
-        {0x80, 0x80, 0xC0, 0xA0, 0xA0, 0xA0, 0x00, 0x00},
-        {0x40, 0x00, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00},
-        {0x40, 0x00, 0x40, 0x40, 0x40, 0x40, 0x80, 0x00},
-        {0x80, 0x80, 0xA0, 0xC0, 0xA0, 0xA0, 0x00, 0x00},
-        {0xC0, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00},
-        {0x00, 0x00, 0xC0, 0xE0, 0xE0, 0xA0, 0x00, 0x00},
-        {0x00, 0x00, 0xC0, 0xA0, 0xA0, 0xA0, 0x00, 0x00},
-        {0x00, 0x00, 0x40, 0xA0, 0xA0, 0x40, 0x00, 0x00},
-        {0x00, 0x00, 0xC0, 0xA0, 0xA0, 0xC0, 0x80, 0x00},
-        {0x00, 0x00, 0x60, 0xA0, 0xA0, 0x60, 0x20, 0x00},
-        {0x00, 0x00, 0xA0, 0xC0, 0x80, 0x80, 0x00, 0x00},
-        {0x00, 0x00, 0x60, 0xC0, 0x60, 0xC0, 0x00, 0x00},
-        {0x00, 0x40, 0xE0, 0x40, 0x40, 0x60, 0x00, 0x00},
-        {0x00, 0x00, 0xA0, 0xA0, 0xA0, 0xE0, 0x00, 0x00},
-        {0x00, 0x00, 0xA0, 0xA0, 0xC0, 0x80, 0x00, 0x00},
-        {0x00, 0x00, 0xA0, 0xA0, 0xE0, 0xE0, 0x00, 0x00},
-        {0x00, 0x00, 0xA0, 0x40, 0x40, 0xA0, 0x00, 0x00},
-        {0x00, 0x00, 0xA0, 0xA0, 0x60, 0x20, 0xC0, 0x00},
-        {0x00, 0x00, 0xE0, 0x20, 0x40, 0xE0, 0x00, 0x00},
-        {0x20, 0x40, 0x40, 0x80, 0x40, 0x40, 0x20, 0x00},
-        {0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00},
-        {0x80, 0x40, 0x40, 0x20, 0x40, 0x40, 0x80, 0x00},
-        {0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
+const uint8_t UTF8_1B_CODE_BITMAP[UTF8_1B_CODE_BITMAP_NUM][FONT_HALF_WIDTH * FONT_HEIGHT / 8] = {
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00},
+        {0x44, 0x44, 0x04, 0x00},
+        {0xAA, 0x00, 0x00, 0x00},
+        {0xAE, 0xAA, 0xEA, 0x00},
+        {0x4E, 0xC6, 0xE4, 0x00},
+        {0x08, 0x24, 0x82, 0x00},
+        {0x4A, 0x46, 0xCE, 0x00},
+        {0x48, 0x00, 0x00, 0x00},
+        {0x24, 0x44, 0x44, 0x20},
+        {0x84, 0x44, 0x44, 0x80},
+        {0x4E, 0x4A, 0x00, 0x00},
+        {0x04, 0x4E, 0x44, 0x00},
+        {0x00, 0x00, 0x04, 0x80},
+        {0x00, 0x0E, 0x00, 0x00},
+        {0x00, 0x00, 0x04, 0x00},
+        {0x00, 0x24, 0x80, 0x00},
+        {0x04, 0xAE, 0xA4, 0x00},
+        {0x04, 0xC4, 0x4E, 0x00},
+        {0x0C, 0x24, 0x8E, 0x00},
+        {0x0C, 0x24, 0x2C, 0x00},
+        {0x02, 0x6A, 0xE2, 0x00},
+        {0x0E, 0x8C, 0x2C, 0x00},
+        {0x06, 0x8C, 0xA4, 0x00},
+        {0x0E, 0x24, 0x44, 0x00},
+        {0x04, 0xA4, 0xA4, 0x00},
+        {0x04, 0xA6, 0x2C, 0x00},
+        {0x00, 0x40, 0x04, 0x00},
+        {0x00, 0x40, 0x04, 0x80},
+        {0x02, 0x48, 0x42, 0x00},
+        {0x00, 0xE0, 0xE0, 0x00},
+        {0x08, 0x42, 0x48, 0x00},
+        {0x4A, 0x24, 0x04, 0x00},
+        {0x4A, 0x26, 0xA4, 0x00},
+        {0x4A, 0xAE, 0xAA, 0x00},
+        {0xCA, 0xCA, 0xAC, 0x00},
+        {0x68, 0x88, 0x86, 0x00},
+        {0xCA, 0xAA, 0xAC, 0x00},
+        {0xE8, 0xC8, 0x8E, 0x00},
+        {0xE8, 0xC8, 0x88, 0x00},
+        {0x68, 0x8A, 0xA6, 0x00},
+        {0xAA, 0xAE, 0xAA, 0x00},
+        {0xE4, 0x44, 0x4E, 0x00},
+        {0x22, 0x22, 0xA4, 0x00},
+        {0xAA, 0xCA, 0xAA, 0x00},
+        {0x88, 0x88, 0x8E, 0x00},
+        {0xAE, 0xEA, 0xAA, 0x00},
+        {0xCA, 0xAA, 0xAA, 0x00},
+        {0x4A, 0xAA, 0xA4, 0x00},
+        {0xCA, 0xAC, 0x88, 0x00},
+        {0x4A, 0xAA, 0xA4, 0x20},
+        {0xCA, 0xAC, 0xAA, 0x00},
+        {0x68, 0x42, 0x2C, 0x00},
+        {0xE4, 0x44, 0x44, 0x00},
+        {0xAA, 0xAA, 0xAE, 0x00},
+        {0xAA, 0xAA, 0xC8, 0x00},
+        {0xAA, 0xAE, 0xEA, 0x00},
+        {0xAA, 0x44, 0xAA, 0x00},
+        {0xAA, 0x44, 0x44, 0x00},
+        {0xE2, 0x44, 0x8E, 0x00},
+        {0x64, 0x44, 0x44, 0x60},
+        {0xA4, 0xE4, 0xE4, 0x00},
+        {0xC4, 0x44, 0x44, 0xC0},
+        {0x4A, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0xE0},
+        {0x42, 0x00, 0x00, 0x00},
+        {0x00, 0x6A, 0xA6, 0x00},
+        {0x88, 0xCA, 0xAC, 0x00},
+        {0x00, 0x68, 0x86, 0x00},
+        {0x22, 0x6A, 0xA6, 0x00},
+        {0x00, 0x6E, 0x86, 0x00},
+        {0x64, 0xE4, 0x44, 0x00},
+        {0x00, 0x6A, 0x62, 0xC0},
+        {0x88, 0xCA, 0xAA, 0x00},
+        {0x40, 0x44, 0x44, 0x00},
+        {0x40, 0x44, 0x44, 0x80},
+        {0x88, 0xAC, 0xAA, 0x00},
+        {0xC4, 0x44, 0x44, 0x00},
+        {0x00, 0xCE, 0xEA, 0x00},
+        {0x00, 0xCA, 0xAA, 0x00},
+        {0x00, 0x4A, 0xA4, 0x00},
+        {0x00, 0xCA, 0xAC, 0x80},
+        {0x00, 0x6A, 0xA6, 0x20},
+        {0x00, 0xAC, 0x88, 0x00},
+        {0x00, 0x6C, 0x6C, 0x00},
+        {0x04, 0xE4, 0x46, 0x00},
+        {0x00, 0xAA, 0xAE, 0x00},
+        {0x00, 0xAA, 0xC8, 0x00},
+        {0x00, 0xAA, 0xEE, 0x00},
+        {0x00, 0xA4, 0x4A, 0x00},
+        {0x00, 0xAA, 0x62, 0xC0},
+        {0x00, 0xE2, 0x4E, 0x00},
+        {0x24, 0x48, 0x44, 0x20},
+        {0x44, 0x44, 0x44, 0x40},
+        {0x84, 0x42, 0x44, 0x80},
+        {0xE0, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00}
 };
 
 // 2バイトコード　1バイト目
-unsigned char Utf8CodeTable_2B_1st[UTF8_CODE_2B_1_NUM][2] = {
+const uint8_t Utf8CodeTable_2B_1st[UTF8_CODE_2B_1_NUM][2] = {
         {0xC2,  0x06},
         {0xC3,  0x02},
@@ -187 +187 @@
 };
 // 2バイトコード 2バイト目 bitmapデータ
-struct utf8_code_bitmap UTF8_2B_CODE_BITMAP[UTF8_2B_CODE_BITMAP_NUM] = {
+const struct utf8_code_bitmap UTF8_2B_CODE_BITMAP[UTF8_2B_CODE_BITMAP_NUM] = {
         {0xA7,  {0x1C, 0x20, 0x18, 0x24, 0x18, 0x04, 0x38, 0x00}},
         {0xA8,  {0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
@@ -313 +313 @@
 
 // 3バイトコード 1バイト目
-unsigned char Utf8CodeTable_3B_1st[UTF8_CODE_3B_1_NUM][2] = {
+const uint8_t Utf8CodeTable_3B_1st[UTF8_CODE_3B_1_NUM][2] = {
         {0xE2,  0x0E},
         {0xE3,  0x04},
@@ -325 +325 @@
 };
 // 3バイトコード 2バイト目
-unsigned char Utf8CodeTable_3B_2nd[UTF8_CODE_3B_2_NUM][2] = {
+const uint8_t Utf8CodeTable_3B_2nd[UTF8_CODE_3B_2_NUM][2] = {
         {0x80,  0x0F},
         {0x84,  0x02},
@@ -673 +673 @@
 
 // 3バイトコード 3バイト目 bitmapデータ
-struct utf8_code_bitmap UTF8_3B_CODE_BITMAP[UTF8_3B_CODE_BITMAP_NUM] = {
+const struct utf8_code_bitmap UTF8_3B_CODE_BITMAP[UTF8_3B_CODE_BITMAP_NUM] = {
         { 0x90 ,{0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00}},
         { 0x95 ,{0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00}},

asp3_tinet_ecnl_arm/trunk/ntshell/lcd/misaki_font.h

@@ -39 +39 @@
 #define MISAKI_FONT_H
 
+#include <stdint.h>
+
+#define FONT_HALF_WIDTH                 4
+#define FONT_WIDTH                              8
+#define FONT_HEIGHT                             8
+
 struct utf8_code_bitmap {
-        unsigned char code;
-        unsigned char bitmap[8];
+        const uint8_t code;
+        const uint8_t bitmap[FONT_WIDTH * FONT_HEIGHT / 8];
 };
 
@@ -48 +54 @@
 #define UTF8_CODE_3B_2_NUM              (343+1)         /*半角追加2/2*/
 
-#define UTF8_CODE_BITMAP_NUM    6879                                                                                            /*トータル*/
 #define UTF8_1B_CODE_BITMAP_NUM 128
 #define UTF8_2B_CODE_BITMAP_NUM 122                                                                                                     /*"￢","＼","￠""￡"移動)*/
@@ -54 +59 @@
 
 // 1バイトコード
-extern unsigned char UTF8_1B_CODE_BITMAP[UTF8_1B_CODE_BITMAP_NUM][8];
+extern const uint8_t UTF8_1B_CODE_BITMAP[UTF8_1B_CODE_BITMAP_NUM][FONT_HALF_WIDTH * FONT_HEIGHT / 8];
 
 // 2バイトコード　1バイト目
-extern unsigned char Utf8CodeTable_2B_1st[UTF8_CODE_2B_1_NUM][2];
+extern const uint8_t Utf8CodeTable_2B_1st[UTF8_CODE_2B_1_NUM][2];
 // 2バイトコード 2バイト目 bitmapデータ
-extern struct utf8_code_bitmap UTF8_2B_CODE_BITMAP[UTF8_2B_CODE_BITMAP_NUM];
+extern const struct utf8_code_bitmap UTF8_2B_CODE_BITMAP[UTF8_2B_CODE_BITMAP_NUM];
 
 // 3バイトコード 1バイト目
-extern unsigned char Utf8CodeTable_3B_1st[UTF8_CODE_3B_1_NUM][2];
+extern const uint8_t Utf8CodeTable_3B_1st[UTF8_CODE_3B_1_NUM][2];
 // 3バイトコード 2バイト目
-extern unsigned char Utf8CodeTable_3B_2nd[UTF8_CODE_3B_2_NUM][2];
+extern const uint8_t Utf8CodeTable_3B_2nd[UTF8_CODE_3B_2_NUM][2];
 
 // 3バイトコード 3バイト目 bitmapデータ
-extern struct utf8_code_bitmap UTF8_3B_CODE_BITMAP[UTF8_3B_CODE_BITMAP_NUM];
+extern const struct utf8_code_bitmap UTF8_3B_CODE_BITMAP[UTF8_3B_CODE_BITMAP_NUM];
 
 #endif /* MISAKI_FONT_H */

asp3_tinet_ecnl_arm/trunk/ntshell/src/echonet_app_config.h

@@ -40 +40 @@
 
 #define ECHONET_TASK_STACK_SIZE 1024    /* ECNL UDPタスク用スタック領域のサイズ */
+
+#define ECHONET_API_DATAQUEUE_COUNT 5           /* ECHONET Lite API用データキュー */
+#define ECHONET_SVC_DATAQUEUE_COUNT 5           /* ECHONET Lite サービス処理タスク用データキュー */
+#define ECHONET_UDP_DATAQUEUE_COUNT 5           /* ECHONET Lite UDP通信処理用データキュー */
 
 /*

asp3_tinet_ecnl_arm/trunk/ntshell/src/fdtable.c

@@ -45 +45 @@
 #include "target_syssvc.h"
 #ifndef NTSHELL_NO_SOCKET
+#include <tinet_defs.h>
 #include <tinet_config.h>
+#include <net/net.h>
+#include <net/net_endian.h>
 #include <netinet/in.h>
 #include <netinet/in_itron.h>
@@ -55 +58 @@
 #include <net/net.h>
 #include <net/if_var.h>
+#include <netinet/udp.h>
 #include <netinet/udp_var.h>
 #include <netinet/tcp.h>
 #include <netinet/tcp_var.h>
+#include <net/net_buf.h>
 #endif
 #include "ff.h"
@@ -69 +74 @@
 #define IO_TYPE_DIR             3
 #define IO_TYPE_TCP             4
-#define IO_TYPE_UDP             5
+#define IO_TYPE_UDP     5
 
 static struct _IO_FILE fd_table[8 * sizeof(FLGPTN)] = {
@@ -85 +90 @@
                         continue;
 
+                memset(fp, 0, sizeof(struct _IO_FILE));
                 fp->fd = fd;
                 fp->type = type;
@@ -280 +286 @@
 #endif
 
+void memor(void *dst, void *src, size_t len)
+{
+        uint8_t *d = (uint8_t *)dst;
+        uint8_t *s = (uint8_t *)src;
+        uint8_t *e = &s[len];
+
+        while (s < e) {
+                *d++ |= *s++;
+        }
+}
+
 struct fd_events {
         int count;
@@ -304 +321 @@
         }
 
-        memcpy(&evts.readfds, rfds, sizeof(fd_set));
-        memcpy(&evts.writefds, wfds, sizeof(fd_set));
-        memcpy(&evts.errorfds, efds, sizeof(fd_set));
+        if (rfds != NULL)
+                memcpy(&evts.readfds, rfds, sizeof(fd_set));
+        else
+                memset(&evts.readfds, 0, sizeof(fd_set));
+        if (wfds != NULL)
+                memcpy(&evts.writefds, wfds, sizeof(fd_set));
+        else
+                memset(&evts.writefds, 0, sizeof(fd_set));
+        if (efds != NULL)
+                memcpy(&evts.errorfds, efds, sizeof(fd_set));
+        else
+                memset(&evts.errorfds, 0, sizeof(fd_set));
         evts.count = 0;
 
         ret = shell_get_evts(&evts, tmout);
+        if (rfds != NULL)
+                memset(rfds, 0, sizeof(fd_set));
+        if (wfds != NULL)
+                memset(wfds, 0, sizeof(fd_set));
+        if (efds != NULL)
+                memset(efds, 0, sizeof(fd_set));
         if (ret == E_OK) {
-                memcpy(rfds, &evts.readfds, sizeof(fd_set));
-                memcpy(wfds, &evts.writefds, sizeof(fd_set));
-                memcpy(efds, &evts.errorfds, sizeof(fd_set));
+                if (rfds != NULL)
+                        memor(rfds, &evts.readfds, sizeof(fd_set));
+                if (wfds != NULL)
+                        memor(wfds, &evts.writefds, sizeof(fd_set));
+                if (efds != NULL)
+                        memor(efds, &evts.errorfds, sizeof(fd_set));
                 return evts.count;
         }
         if (ret == E_TMOUT) {
-                memset(rfds, 0, sizeof(fd_set));
-                memset(wfds, 0, sizeof(fd_set));
-                memset(efds, 0, sizeof(fd_set));
                 return 0;
         }
@@ -441 +473 @@
         struct _IO_FILE *fp = tcpid_to_fd(cepid);
         FLGPTN flgptn = 0;
+        ER ret;
+        int len;
 
         if (fp == NULL)
@@ -449 +483 @@
 
         switch (fncd) {
+        case TFN_TCP_RCV_BUF:
+                len = *(int *)p_parblk;
+                if (len <= 0)
+                        return E_OK;
+
+                ret = wai_sem(SEM_FILEDESC);
+                if (ret < 0) {
+                        syslog(LOG_ERROR, "wai_sem => %d", ret);
+                }
+                fp->psock->len += len;
+                ret = sig_sem(SEM_FILEDESC);
+                if (ret < 0) {
+                        syslog(LOG_ERROR, "sig_sem => %d", ret);
+                }
+
+                if (fp->readevt_w == fp->readevt_r) fp->readevt_w++;
+
+                set_flg(FLG_SELECT_WAIT, flgptn);
+                return E_OK;
+
         case TFN_TCP_RCV_DAT:
+                len = *(int *)p_parblk;
+                if (len <= 0)
+                        return E_OK;
+
+                ret = wai_sem(SEM_FILEDESC);
+                if (ret < 0) {
+                        syslog(LOG_ERROR, "wai_sem => %d", ret);
+                }
+                fp->psock->len += len;
+                ret = sig_sem(SEM_FILEDESC);
+                if (ret < 0) {
+                        syslog(LOG_ERROR, "sig_sem => %d", ret);
+                }
+
                 if (fp->readevt_w == fp->readevt_r) fp->readevt_w++;
 
@@ -484 +552 @@
         struct _IO_FILE *fp = udpid_to_fd(cepid);
         FLGPTN flgptn = 0;
+        int len;
 
         if (fp == NULL)
@@ -492 +561 @@
 
         switch (fncd) {
+        case TEV_UDP_RCV_DAT:
+        {
+                T_UDP_RCV_DAT_PARA *udppara = (T_UDP_RCV_DAT_PARA *)p_parblk;
+                len = udppara->len;
+                if (len <= 0)
+                        return E_OK;
+
+                ER ret = wai_sem(SEM_FILEDESC);
+                if (ret < 0) {
+                        syslog(LOG_ERROR, "wai_sem => %d", ret);
+                }
+                fp->psock->len = len;
+                if (fp->psock->input != NULL) {
+                        ret = rel_net_buf(fp->psock->input);
+                        if (ret < 0) {
+                                syslog(LOG_ERROR, "rel_net_buf => %d", ret);
+                        }
+                }
+                fp->psock->input = udppara->input;
+                fp->psock->buf = GET_UDP_SDU(udppara->input, udppara->off);
+                memset(&fp->psock->raddr4, 0, sizeof(fp->psock->raddr4));
+                fp->psock->raddr4.sin_family = AF_INET;
+                fp->psock->raddr4.sin_port = htons(udppara->rep4.portno);
+                fp->psock->raddr4.sin_addr.s_addr = htonl(udppara->rep4.ipaddr);
+                udppara->input->flags |= NB_FLG_NOREL_IFOUT;
+                ret = sig_sem(SEM_FILEDESC);
+                if (ret < 0) {
+                        syslog(LOG_ERROR, "sig_sem => %d", ret);
+                }
+
+                if (fp->readevt_w == fp->readevt_r) fp->readevt_w++;
+
+                set_flg(FLG_SELECT_WAIT, flgptn);
+                return E_OK;
+        }
         case TFN_UDP_CRE_CEP:
+                return E_OK;
+
         case TFN_UDP_RCV_DAT:
+                len = *(int *)p_parblk;
+                if (len <= 0)
+                        return E_OK;
+
                 if (fp->readevt_w == fp->readevt_r) fp->readevt_w++;
 
@@ -524 +634 @@
 ER shell_get_evts(struct fd_events *evts, TMO tmout)
 {
-        ER ret;
-        FLGPTN waitptn, flgptn = 0, readfds = 0, writefds = 0;
-        struct _IO_FILE *fp = NULL;
         int count = 0;
-
-        stdio_update_evts();
+        SYSTIM prev, now;
+
+        get_tim(&prev);
+
+        for (;;) {
+                ER ret;
+                FLGPTN waitptn, flgptn, readfds = 0, writefds = 0;
+                struct _IO_FILE *fp = NULL;
+
+                stdio_update_evts();
 
 #ifndef NTSHELL_NO_SOCKET
-        waitptn = *((FLGPTN *)&evts->errorfds);
+                waitptn = *((FLGPTN *)&evts->errorfds);
 #else
-        waitptn = *((FLGPTN *)&evts->readfds) | *((FLGPTN *)&evts->errorfds);
+                waitptn = *((FLGPTN *)&evts->readfds) | *((FLGPTN *)&evts->errorfds);
 #endif
-        for (int fd = 0; fd < fd_table_count; fd++) {
-                fp = &fd_table[fd];
+                for (int fd = 0; fd < fd_table_count; fd++) {
+                        fp = &fd_table[fd];
 
 #ifndef NTSHELL_NO_SOCKET
-                if (FD_ISSET(fd, &evts->readfds)) {
-                        if ((fp->type == IO_TYPE_TCP)
-                                && (GET_TCP_CEP(fp->psock->cepid)->rwbuf_count > 0)) {
-                                FD_SET(fd, (fd_set *)&readfds);
-                                count++;
-                                if (fp->readevt_w == fp->readevt_r) fp->readevt_r--;
+                        if (FD_ISSET(fd, &evts->readfds)) {
+                                if ((fp->type == IO_TYPE_TCP) && (fp->psock->cepid != 0)) {
+                                        if (fp->psock->len == 0) {
+                                                ret = tcp_rcv_buf(fp->psock->cepid, &fp->psock->input, TMO_NBLK);
+                                                if ((ret != E_WBLK) && (ret != E_OBJ) && (ret < 0)) {
+                                                        syslog(LOG_ERROR, "tcp_rcv_buf => %d", ret);
+                                                        //return ret;
+                                                }
+                                                if (ret > 0) {
+                                                        ret = wai_sem(SEM_FILEDESC);
+                                                        if (ret < 0) {
+                                                                syslog(LOG_ERROR, "wai_sem => %d", ret);
+                                                        }
+                                                        fp->psock->len += ret;
+                                                        ret = sig_sem(SEM_FILEDESC);
+                                                        if (ret < 0) {
+                                                                syslog(LOG_ERROR, "sig_sem => %d", ret);
+                                                        }
+                                                }
+                                        }
+                                        else ret = 1;
+                                        if (ret > 0) {
+                                                FD_SET(fd, (fd_set *)&readfds);
+                                                count++;
+                                                if (fp->readevt_w == fp->readevt_r) fp->readevt_r--;
+                                        }
+                                }
+                                else if ((fp->type == IO_TYPE_UDP) && (fp->psock->cepid != 0)) {
+                                        if (fp->psock->input != NULL) {
+                                                FD_SET(fd, (fd_set *)&readfds);
+                                                count++;
+                                                if (fp->readevt_w == fp->readevt_r) fp->readevt_r--;
+                                        }
+                                }
+                                else {
+                                        FD_SET(fd, (fd_set *)&waitptn);
+                                }
                         }
-                        else {
-                                FD_SET(fd, (fd_set *)&waitptn);
+#endif
+                        if (FD_ISSET(fd, &evts->writefds)) {
+                                if (fp->writeevt_w == fp->writeevt_r) {
+                                        FD_SET(fd, (fd_set *)&writefds);
+                                        count++;
+                                        if (fp->writeevt_w == fp->writeevt_r) fp->writeevt_r--;
+                                }
+                                else {
+                                        FD_SET(fd, (fd_set *)&waitptn);
+                                }
                         }
                 }
-#endif
-                if (FD_ISSET(fd, &evts->writefds)) {
-                        if (fp->writable) {
-                                FD_SET(fd, (fd_set *)&writefds);
+                memset(evts, 0, sizeof(*evts));
+
+                if (waitptn == 0) {
+                        memcpy(&evts->readfds, &readfds, sizeof(evts->readfds));
+                        memcpy(&evts->writefds, &writefds, sizeof(evts->writefds));
+                        evts->count = count;
+                        return E_OK;
+                }
+                else if ((readfds | writefds) != 0) {
+                        set_flg(FLG_SELECT_WAIT, (readfds | writefds));
+                }
+
+                /* イベント待ち */
+                flgptn = 0;
+                ret = twai_flg(FLG_SELECT_WAIT, waitptn, TWF_ORW, &flgptn, tmout);
+                if (ret != E_OK) {
+                        if (ret != E_TMOUT) {
+                                syslog(LOG_ERROR, "twai_flg => %d", ret);
+                                return ret;
+                        }
+
+                        stdio_flgptn(&flgptn);
+
+                        if (flgptn == 0)
+                                return E_TMOUT;
+                }
+                flgptn &= waitptn;
+
+                /* 受け取ったフラグのみクリア */
+                ret = clr_flg(FLG_SELECT_WAIT, ~flgptn);
+                if (ret != E_OK) {
+                        syslog(LOG_ERROR, "clr_flg => %d", ret);
+                }
+
+                count = 0;
+                for (int fd = 0; fd < fd_table_count; fd++) {
+                        if (!FD_ISSET(fd, (fd_set *)&waitptn))
+                                continue;
+
+                        fp = &fd_table[fd];
+
+                        if (fp->readevt_w != fp->readevt_r) {
+                                fp->readevt_r++;
+                                FD_SET(fd, &evts->readfds);
                                 count++;
                         }
-                        else {
-                                FD_SET(fd, (fd_set *)&waitptn);
+                        if (fp->writeevt_w != fp->writeevt_r) {
+                                fp->writeevt_r++;
+                                fp->writable = 1;
                         }
-                }
-        }
-        memset(evts, 0, sizeof(*evts));
-
-        if (waitptn == 0) {
-                memcpy(&evts->readfds, &readfds, sizeof(evts->readfds));
-                memcpy(&evts->writefds, &writefds, sizeof(evts->writefds));
-                evts->count = count;
-                return E_OK;
-        }
-        else if ((readfds | writefds) != 0){
-                set_flg(FLG_SELECT_WAIT, (readfds | writefds));
-        }
-
-        /* イベント待ち */
-        ret = twai_flg(FLG_SELECT_WAIT, waitptn, TWF_ORW, &flgptn, tmout);
-        if (ret != E_OK) {
-                if (ret != E_TMOUT) {
-                        syslog(LOG_ERROR, "twai_flg => %d", ret);
-                        return ret;
-                }
-
-                stdio_flgptn(&flgptn);
-
-                if (flgptn == 0)
+                        if (fp->writable) {
+                                FD_SET(fd, &evts->writefds);
+                                count++;
+                        }
+                        if (fp->errorevt_w != fp->errorevt_r) {
+                                fp->errorevt_r++;
+                                FD_SET(fd, &evts->errorfds);
+                                count++;
+                        }
+                }
+
+                if (count > 0)
+                        break;
+
+                get_tim(&now);
+
+                SYSTIM elapse = now - prev;
+                if (elapse > tmout)
                         return E_TMOUT;
-        }
-        flgptn &= waitptn;
-
-        /* 受け取ったフラグのみクリア */
-        ret = clr_flg(FLG_SELECT_WAIT, ~flgptn);
-        if (ret != E_OK) {
-                syslog(LOG_ERROR, "clr_flg => %d", ret);
-        }
-
-        count = 0;
-        for (int fd = 0; fd < fd_table_count; fd++) {
-                if (!FD_ISSET(fd, (fd_set *)&waitptn))
-                        continue;
-
-                fp = &fd_table[fd];
-
-                if (fp->readevt_w != fp->readevt_r) {
-                        fp->readevt_r++;
-                        FD_SET(fd, &evts->readfds);
-                        count++;
-                }
-                if (fp->writeevt_w != fp->writeevt_r) {
-                        fp->writeevt_r++;
-                        fp->writable = 1;
-                }
-                if (fp->writable) {
-                        FD_SET(fd, &evts->writefds);
-                        count++;
-                }
-                if (fp->errorevt_w != fp->errorevt_r) {
-                        fp->errorevt_r++;
-                        FD_SET(fd, &evts->errorfds);
-                        count++;
-                }
-        }
+
+                prev = now;
+                tmout -= elapse;
+        }
+
         evts->count = count;
 
@@ -676 +834 @@
 }
 
-ssize_t shell_send(int fd, const void *buf, size_t len, int flags)
-{
-        return -ENOMEM;
-}
-
 ssize_t shell_sendto(int fd, const void *buf, size_t len, int flags, const struct sockaddr *addr, socklen_t alen)
 {
@@ -691 +844 @@
 }
 
-ssize_t shell_recv(int fd, void *buf, size_t len, int flags)
-{
-        return -ENOMEM;
-}
-
-ssize_t shell_recvfrom(int fd, void *buf, size_t len, int flags, struct sockaddr *__restrict addr, socklen_t *__restrict alen)
+ssize_t shell_recvfrom(int fd, void *__restrict buf, size_t len, int flags, struct sockaddr *__restrict addr, socklen_t *__restrict alen)
 {
         return -ENOMEM;

asp3_tinet_ecnl_arm/trunk/ntshell/src/net_misc.h

@@ -41 +41 @@
 /* スタックサイズ */
 
-#define NET_MISC_STACK_SIZE     1024            /* NTP クライアントタスク（IPv4）のスタックサイズ  */
+#define NET_MISC_STACK_SIZE     2048            /* NTP クライアントタスク（IPv4）のスタックサイズ  */
 
 /* 優先度 */

asp3_tinet_ecnl_arm/trunk/ntshell/src/netcmd.c

@@ -239 +239 @@
 int usrcmd_ping(int argc, char **argv)
 {
-        int     tmo, size;
-        char    apip = DEFAULT_API_PROTO;
+        int tmo = 3, size = 64;
+        char apip = DEFAULT_API_PROTO;
         char *line = argv[1];
 #if defined(SUPPORT_INET6)
@@ -262 +262 @@
 
 #if defined(SUPPORT_INET6) && defined(SUPPORT_INET4)
+        if (argc <= 2)
+                return 0;
+
         if ('0' <= *line && *line <= '9') {
                 if (*line == '6')
@@ -269 +272 @@
                 line++;
         }
+
+        line = argv[2];
+#else
+        if (argc <= 1)
+                return 0;
 #endif  /* of #if defined(SUPPORT_INET6) && defined(SUPPORT_INET4) */
 
@@ -276 +284 @@
         }
 
-        line = argv[2];
-        if ('0' <= *line && *line <= '9')
-                line = get_int(&tmo, line);
-        else
-                tmo = 3;
-
-        line = argv[3];
-        if ('0' <= *line && *line <= '9')
-                line = get_int(&size, line);
-        else
-                size = 64;
+        if (argc > 2) {
+                line = argv[2];
+                if ('0' <= *line && *line <= '9')
+                        line = get_int(&tmo, line);
+
+                if (argc > 3) {
+                        line = argv[3];
+                        if ('0' <= *line && *line <= '9')
+                                line = get_int(&size, line);
+                }
+        }
 
 #if defined(SUPPORT_INET6)
@@ -337 +345 @@
 {
         ER ret;
+
+        if (argc < 2)
+                return 0;
+
         if (ntlibc_strcmp(argv[1], "rel") == 0) {
                 ret = dhcp4c_rel_info();
@@ -348 +360 @@
                 dhcp4c_info();
         }
+
         return 0;
 }

asp3_tinet_ecnl_arm/trunk/ntshell/src/ntp_cli.c

@@ -265 +265 @@
 
         nc->buf[0] = '\0';
-#ifndef _MSC_VER
+#ifdef __NEED_struct_timespec
         if (ctime_r(&tp.tv_sec, nc->buf) != NULL)
 #else

asp3_tinet_ecnl_arm/trunk/ntshell/src/ntshell_main.c

@@ -69 +69 @@
 const struct utsname host_name = {
         "TOPPERS/ASP3",
-    TARGET_NAME,
-    "3.2.0",
-    "3.2.0",
-    TARGET_NAME,
-    "toppers.jp"
+        TARGET_NAME,
+        "3.2.0",
+        "3.2.0",
+        TARGET_NAME,
+        "toppers.jp"
 };
 
@@ -88 +88 @@
 jmp_buf process_exit;
 void sys_init(void);
-
-void ntshell_task_init()
-{
+NTSHELL_SERIAL_READ ntshell_serial_read = 0;
+NTSHELL_SERIAL_WRITE ntshell_serial_write = 0;
+void *ntshell_serial_extobj;
+
+unsigned char ntstdio_xi(struct ntstdio_t *handle)
+{
+        unsigned char buf[1];
+        ntshell_serial_read((char *)buf, 1, ntshell_serial_extobj);
+        return buf[0];
+}
+
+void ntstdio_xo(struct ntstdio_t *handle, unsigned char c)
+{
+        char buf[1];
+        buf[0] = c;
+        ntshell_serial_write(buf, 1, ntshell_serial_extobj);
+}
+
+void ntshell_task_init(NTSHELL_SERIAL_READ func_read,
+        NTSHELL_SERIAL_WRITE func_write, void *extobj)
+{
+        ntshell_serial_read = func_read;
+        ntshell_serial_write = func_write;
+        ntshell_serial_extobj = extobj;
+
         sys_init();
 
@@ -126 +148 @@
         int result = 0;
         int found = 0;
+
+        if (*args == 0)
+                return result;
 
         if (strcmp((const char *)args[1], "help") == 0) {
@@ -295 +320 @@
 int shell_clock_getres(clockid_t clk_id, struct timespec *res)
 {
-        if (clk_id != CLOCK_REALTIME)
+        if ((clk_id != CLOCK_REALTIME) && (clk_id != CLOCK_MONOTONIC))
                 return -EINVAL;
 
@@ -308 +333 @@
         SYSTIM now = 0;
 
-        if (clk_id != CLOCK_REALTIME)
+        if ((clk_id != CLOCK_REALTIME) && (clk_id != CLOCK_MONOTONIC))
                 return -EINVAL;
 
@@ -320 +345 @@
 int shell_clock_settime(clockid_t clk_id, const struct timespec *tp)
 {
-        if (clk_id != CLOCK_REALTIME)
+        if ((clk_id != CLOCK_REALTIME) && (clk_id != CLOCK_MONOTONIC))
                 return -EINVAL;
 
-        rtc_write(tp->tv_sec);
+        SYSTIM time;
+        ER ret;
+
+        time = (tp->tv_sec * 1000000ll) + (tp->tv_nsec / 1000ll);
+
+        ret = set_tim(time);
+        if (ret != E_OK) {
+                return -EPERM;
+        }
 
         return 0;
@@ -356 +389 @@
 }
 
-struct sigaction sigtable[6];
+struct sigaction sigtable[7];
 
 int shell_sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
@@ -381 +414 @@
                 sat = &sigtable[5];
                 break;
+        case SIGPIPE:
+                sat = &sigtable[6];
+                break;
         default:
                 return -EINVAL;

asp3_tinet_ecnl_arm/trunk/ntshell/src/ntshell_main.cfg

@@ -43 +43 @@
 CRE_TSK(NTSHELL_TASK, { TA_NULL, 0, ntshell_task, NTSHELL_PRIORITY, NTSHELL_STACK_SIZE, NULL });
 CRE_FLG(FLG_SELECT_WAIT, { TA_WMUL, 0x00 });
+CRE_SEM(SEM_FILEDESC, { TA_TPRI, 1, 1 });
 CRE_SEM(SEM_MALLOC, { TA_TPRI, 1, 1 });

asp3_tinet_ecnl_arm/trunk/ntshell/src/ntshell_main.h

@@ -49 +49 @@
 
 #include "usrcmd.h"
+#include "core/ntshell.h"
 
 /*
@@ -54 +55 @@
  */
 
-#define NTSHELL_PRIORITY        4               /* ntshellタスクの優先度 */
+#define NTSHELL_PRIORITY        8               /* ntshellタスクの優先度 */
 
 #define NTSHELL_STACK_SIZE      8192    /* ntshellタスクのスタック領域のサイズ */
@@ -75 +76 @@
 extern PRI main_task_priority;
 
-struct ntstdio_t;
-unsigned char ntstdio_xi(struct ntstdio_t *handle);
-void ntstdio_xo(struct ntstdio_t *handle, unsigned char c);
-
 /* ntshellタスク初期化 */
-void ntshell_task_init();
+void ntshell_task_init(NTSHELL_SERIAL_READ func_read,
+        NTSHELL_SERIAL_WRITE func_write, void *extobj);
 
 /* ntshellタスク */

asp3_tinet_ecnl_arm/trunk/ntshell/src/shellif.h

@@ -39 +39 @@
 
 #ifdef _MSC_VER
-#define _CRT_NO_TIME_T
-#define tm msc_tm
-#include <time.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#undef tm
 #undef NULL
 #endif
@@ -133 +126 @@
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 // time.h
 #define CLOCK_REALTIME 0
@@ -179 +176 @@
 int shell_access(const char *path, int mode);
 // signal.h
-int shell_sigprocmask(int how, const sigset_t *restrict set, sigset_t *restrict old);
-int shell_sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old);
+int shell_sigprocmask(int how, const sigset_t *__restrict set, sigset_t *__restrict old);
+int shell_sigaction(int sig, const struct sigaction *__restrict sa, struct sigaction *__restrict old);
 // socket.h
 int shell_socket(int, int, int);
 int shell_connect(int, const struct sockaddr *, socklen_t);
-ssize_t shell_send(int, const void *, size_t, int);
 ssize_t shell_sendto(int, const void *, size_t, int, const struct sockaddr *, socklen_t);
 ssize_t shell_sendmsg(int, const struct msghdr *, int);
@@ -190 +186 @@
 int shell_listen(int, int);
 int shell_accept(int, struct sockaddr *__restrict, socklen_t *__restrict);
-ssize_t shell_recv(int, void *, size_t, int);
 ssize_t shell_recvfrom(int, void *__restrict, size_t, int, struct sockaddr *__restrict, socklen_t *__restrict);
 ssize_t shell_recvmsg(int, struct msghdr *, int);
@@ -263 +258 @@
 int shell_pipe2(int [2], int);
 int shell_ppoll(struct pollfd *, nfds_t, const struct timespec *,const sigset_t *);
-int shell_pselect6(int, fd_set *restrict, fd_set *restrict,
-        fd_set *restrict, const struct timespec *restrict, const sigset_t *restrict);
+int shell_pselect6(int, fd_set *__restrict, fd_set *__restrict,
+        fd_set *__restrict, const struct timespec *__restrict, const sigset_t *__restrict);
 int shell_setpgid(pid_t, pid_t);
 int shell_setsid();
@@ -314 +309 @@
 void free(void *ptr);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* SHELLIF_H */

asp3_tinet_ecnl_arm/trunk/ntshell/src/socket_stub.c

@@ -42 +42 @@
 #include <sil.h>
 #include "syssvc/syslog.h"
+#include <tinet_defs.h>
 #include <tinet_config.h>
+#include <net/net.h>
+#include <net/net_endian.h>
 #include <netinet/in.h>
 #include <netinet/in_itron.h>
@@ -53 +56 @@
 #include <net/if_var.h>
 #include <netinet/udp_var.h>
+#include <net/net_buf.h>
 //#include <netinet/tcp_var.h>
 #include <netapp/resolver.h>
@@ -58 +62 @@
 #include "ff.h"
 #include "socket_stub.h"
+#include "kernel_cfg.h"
 
 #define SOCKET_TIMEOUT 2000000
@@ -181 +186 @@
                         fp->psock->buf_size = 512 + 512;
                         fp->psock->buf = malloc(fp->psock->buf_size);
+#ifdef _DEBUG
+                        memset(fp->psock->buf, 0, fp->psock->buf_size);
+#endif
                         T_TCP_CCEP ccep = { 0, fp->psock->buf, 512, &fp->psock->buf[512], 512, (FP)socket_tcp_callback };
                         ret = tcp_cre_cep(cepid, &ccep);
@@ -279 +287 @@
                         fp->psock->buf_size = 512 + 512;
                         fp->psock->buf = malloc(fp->psock->buf_size);
+#ifdef _DEBUG
+                        memset(fp->psock->buf, 0, fp->psock->buf_size);
+#endif
                         T_TCP_CCEP ccep = { 0, fp->psock->buf, 512, &fp->psock->buf[512], 512, (FP)socket_tcp_callback };
                         ret = tcp_cre_cep(cepid, &ccep);
@@ -298 +309 @@
                         return -EHOSTUNREACH;
                 }
-                fp->writable = 1;
                 break;
         }
@@ -322 +332 @@
         }
 
-        memcpy(&fp->psock, &lfp->psock, sizeof(fp->psock));
+        memcpy(fp->psock, lfp->psock, offsetof(socket_t, buf_size));
 
         ER ret;
@@ -335 +345 @@
                         fp->psock->buf_size = 512 + 512;
                         fp->psock->buf = malloc(fp->psock->buf_size);
+#ifdef _DEBUG
+                        memset(fp->psock->buf, 0, fp->psock->buf_size);
+#endif
                         T_TCP_CCEP ccep = { 0, fp->psock->buf, 512, &fp->psock->buf[512], 512, (FP)socket_tcp_callback };
                         ret = tcp_cre_cep(cepid, &ccep);
@@ -346 +359 @@
                 else {
                         cepid = lfp->psock->cepid;
+                        fp->handle = cepid;
                         lfp->handle = tmax_tcp_cepid + lfp->psock->repid;
                         lfp->psock->cepid = 0;
@@ -356 +370 @@
                         return -ENOMEM;
                 }
-                fp->writable = 1;
                 struct sockaddr_in *raddr = &fp->psock->raddr4;
                 memset(raddr, 0, sizeof(*raddr));
@@ -384 +397 @@
 }
 
-ssize_t shell_send(int fd, const void *buf, size_t len, int flags)
+ssize_t shell_sendto(int fd, const void *buf, size_t len, int flags, const struct sockaddr *addr, socklen_t alen)
 {
         SOCKET *fp = fd_to_fp(fd);
@@ -396 +409 @@
                 switch (fp->psock->type) {
                 case SOCK_STREAM: {
-                        fp->writable = 0;
+                        if ((addr != NULL) || (alen != 0)) {
+                                return -EISCONN;
+                        }
+
                         if (flags & MSG_OOB) {
                                 ret = tcp_snd_oob(fp->psock->cepid, (void *)buf, len, SOCKET_TIMEOUT);
@@ -404 +420 @@
                         }
                         else {
-                                ret = tcp_snd_dat(fp->psock->cepid, (void *)buf, len, SOCKET_TIMEOUT);
-                                if (ret < 0) {
-                                        return -ECOMM;
-                                }
-                        }
-                        break;
-                }
-                case SOCK_DGRAM: {
-                        return -EINVAL;
-                }
-                }
-                break;
-        }
-        case AF_INET6: {
-                return -EAFNOSUPPORT;
-        }
-        }
-
-        return ret;
-}
-
-ssize_t shell_sendto(int fd, const void *buf, size_t len, int flags, const struct sockaddr *addr, socklen_t alen)
-{
-        SOCKET *fp = fd_to_fp(fd);
-        if (fp == NULL) {
-                return -EBADF;
-        }
-
-        int ret = 0;
-        switch (fp->psock->family) {
-        case AF_INET: {
-                switch (fp->psock->type) {
-                case SOCK_STREAM: {
-                        if ((addr != NULL) && (alen != 0)) {
-                                return -EINVAL;
-                        }
-
-                        fp->writable = 0;
-                        if (flags & MSG_OOB) {
-                                ret = tcp_snd_oob(fp->psock->cepid, (void *)buf, len, SOCKET_TIMEOUT);
-                                if (ret < 0) {
-                                        return -ECOMM;
-                                }
-                        }
-                        else {
-                                ret = tcp_snd_dat(fp->psock->cepid, (void *)buf, len, SOCKET_TIMEOUT);
-                                if (ret < 0) {
-                                        return -ECOMM;
-                                }
+                                for (;;) {
+                                        ret = tcp_snd_dat(fp->psock->cepid, (void *)buf, len, SOCKET_TIMEOUT);
+                                        if (ret < 0) {
+                                                if (ret == E_TMOUT)
+                                                        return -ETIME;
+                                                return -ECOMM;
+                                        }
+                                        len -= ret;
+                                        if (len <= 0)
+                                                break;
+                                        buf = (const void *)&((uint8_t *)buf)[ret];
+                                } 
                         }
                         break;
@@ -458 +437 @@
                 case SOCK_DGRAM: {
                         int sz = alen;
-                        if (sz < 8) {
+                        if ((addr == NULL) || (sz < 8)) {
                                 return -EINVAL;
                         }
@@ -465 +444 @@
                         memcpy(raddr, addr, sz);
                         T_IPV4EP rep = { ntohl(raddr->sin_addr.s_addr), ntohs(raddr->sin_port) };
-                        fp->writable = 0;
                         ret = udp_snd_dat(fp->psock->cepid, &rep, (void *)buf, len,
-                                (fp->psock->flags & O_NONBLOCK) ? 0 : SOCKET_TIMEOUT);
+                                (fp->psock->flags & O_NONBLOCK) ? TMO_POL : SOCKET_TIMEOUT);
                         if (ret < 0) {
-                                return -ECOMM;
+                                return (ret == E_TMOUT) ? -ETIME : -ECOMM;
                         }
                         break;
@@ -490 +468 @@
 }
 
-ssize_t shell_recv(int fd, void *buf, size_t len, int flags)
+ssize_t shell_recvfrom(int fd, void *__restrict buf, size_t len, int flags, struct sockaddr *__restrict addr, socklen_t *__restrict alen)
 {
         SOCKET *fp = fd_to_fp(fd);
@@ -505 +483 @@
                                 ret = tcp_rcv_oob(fp->psock->cepid, buf, len);
                                 if (ret < 0) {
+                                        syslog(LOG_ERROR, "tcp_rcv_oob => %d", ret);
                                         return -ECOMM;
                                 }
                         }
                         else {
-                                ret = tcp_rcv_dat(fp->psock->cepid, buf, len, TMO_FEVR);
+                                int rsz, tmp;
+                                if (fp->psock->input == NULL) {
+                                        ret = wai_sem(SEM_FILEDESC);
+                                        if (ret < 0) {
+                                                syslog(LOG_ERROR, "wai_sem => %d", ret);
+                                        }
+                                        fp->psock->len = 0;
+                                        ret = sig_sem(SEM_FILEDESC);
+                                        if (ret < 0) {
+                                                syslog(LOG_ERROR, "sig_sem => %d", ret);
+                                        }
+                                        ret = tcp_rcv_buf(fp->psock->cepid, &fp->psock->input, TMO_FEVR);
+                                        if (ret < 0) {
+                                                syslog(LOG_ERROR, "tcp_rcv_buf => %d", ret);
+                                                return -ECOMM;
+                                        }
+                                        rsz = ret;
+                                }
+                                else
+                                        rsz = fp->psock->len;
+                                tmp = rsz;
+                                if (rsz > len)
+                                        rsz = len;
+                                if (rsz >= 0) {
+                                        memcpy(buf, fp->psock->input, rsz);
+                                        ret = wai_sem(SEM_FILEDESC);
+                                        if (ret < 0) {
+                                                syslog(LOG_ERROR, "wai_sem => %d", ret);
+                                        }
+                                        fp->psock->len = tmp - rsz;
+                                        ret = sig_sem(SEM_FILEDESC);
+                                        if (ret < 0) {
+                                                syslog(LOG_ERROR, "sig_sem => %d", ret);
+                                        }
+                                        if (tmp - rsz == 0) {
+                                                fp->psock->input = NULL;
+                                        }
+                                        else
+                                                fp->psock->input = (void *)&((uint8_t *)fp->psock->input)[rsz];
+                                        ret = tcp_rel_buf(fp->psock->cepid, rsz);
+                                        if ((ret != E_OBJ) && (ret < 0)) {
+                                                syslog(LOG_ERROR, "tcp_rel_buf => %d", ret);
+                                                //return -ECOMM;
+                                        }
+                                }
+                                ret = rsz;
+                        }
+                        break;
+                }
+                case SOCK_DGRAM: {
+                        struct sockaddr_in *raddr = &fp->psock->raddr4;
+                        int rsz;
+                        ret = wai_sem(SEM_FILEDESC);
+                        if (ret < 0) {
+                                syslog(LOG_ERROR, "wai_sem => %d", ret);
+                        }
+                        T_NET_BUF *input = fp->psock->input;
+                        if (input == NULL) {
+                                ret = sig_sem(SEM_FILEDESC);
                                 if (ret < 0) {
-                                        return -ECOMM;
-                                }
-                        }
-                        break;
-                }
-                case SOCK_DGRAM: {
-                        T_IPV4EP rep = { 0, 0 };
-                        ret = udp_rcv_dat(fp->psock->cepid, &rep, buf, len, (fp->psock->flags & O_NONBLOCK) ? 0 : TMO_FEVR);
-                        if (ret < 0) {
-                                return -ECOMM;
-                        }
-                }
-                }
-                break;
-        }
-        case AF_INET6: {
-                return -EAFNOSUPPORT;
-        }
-        }
-
-        return ret;
-}
-
-ssize_t shell_recvfrom(int fd, void *buf, size_t len, int flags, struct sockaddr *__restrict addr, socklen_t *__restrict alen)
-{
-        SOCKET *fp = fd_to_fp(fd);
-        if (fp == NULL) {
-                return -EBADF;
-        }
-
-        int ret = 0;
-        switch (fp->psock->family) {
-        case AF_INET: {
-                switch (fp->psock->type) {
-                case SOCK_STREAM: {
-                        if (flags & MSG_OOB) {
-                                ret = tcp_rcv_oob(fp->psock->cepid, buf, len);
+                                        syslog(LOG_ERROR, "sig_sem => %d", ret);
+                                }
+
+                                T_IPV4EP rep = { 0, 0 };
+                                ret = udp_rcv_dat(fp->psock->cepid, &rep, buf, len,
+                                        (fp->psock->flags & O_NONBLOCK) ? TMO_POL : SOCKET_TIMEOUT);
                                 if (ret < 0) {
-                                        return -ECOMM;
+                                        syslog(LOG_ERROR, "udp_rcv_buf => %d", ret);
+                                        return (ret == E_TMOUT) ? -ETIME : -ECOMM;
+                                }
+                                rsz = ret;
+                                if ((addr != NULL) && (alen != NULL)) {
+                                        ret = wai_sem(SEM_FILEDESC);
+                                        if (ret < 0) {
+                                                syslog(LOG_ERROR, "wai_sem => %d", ret);
+                                        }
+                                        int sz = *alen;
+                                        memset(raddr, 0, sizeof(fp->psock->raddr4));
+                                        raddr->sin_family = AF_INET;
+                                        raddr->sin_port = htons(rep.portno);
+                                        raddr->sin_addr.s_addr = htonl(rep.ipaddr);
+                                        if (sz > sizeof(fp->psock->raddr4))
+                                                sz = sizeof(fp->psock->raddr4);
+                                        memcpy(addr, raddr, sz);
+                                        *alen = sz;
+                                        ret = sig_sem(SEM_FILEDESC);
+                                        if (ret < 0) {
+                                                syslog(LOG_ERROR, "sig_sem => %d", ret);
+                                        }
                                 }
                         }
                         else {
-                                ret = tcp_rcv_dat(fp->psock->cepid, buf, len, TMO_FEVR);
+                                rsz = fp->psock->len;
+                                void *pbuf = fp->psock->buf;
+                                fp->psock->input = NULL;
+                                fp->psock->len = 0;
+                                fp->psock->buf = NULL;
+                                if ((addr != NULL) && (alen != NULL)) {
+                                        int sz = *alen;
+                                        if (sz > sizeof(fp->psock->raddr4))
+                                                sz = sizeof(fp->psock->raddr4);
+                                        memcpy(addr, raddr, sz);
+                                        *alen = sz;
+                                }
+                                ret = sig_sem(SEM_FILEDESC);
                                 if (ret < 0) {
-                                        return -ECOMM;
-                                }
-                        }
-                        break;
-                }
-                case SOCK_DGRAM: {
-                        T_IPV4EP rep = { 0, 0 };
-                        ret = udp_rcv_dat(fp->psock->cepid, &rep, buf, len, TMO_FEVR);
-                        if (ret < 0) {
-                                return -ECOMM;
-                        }
-                        int sz = *alen;
-                        struct sockaddr_in raddr;
-                        memset(&raddr, 0, sizeof(raddr));
-                        raddr.sin_family = AF_INET;
-                        raddr.sin_port = htons(rep.portno);
-                        raddr.sin_addr.s_addr = htonl(rep.ipaddr);
-                        if (sz > sizeof(raddr))
-                                sz = sizeof(raddr);
-                        memcpy(addr, &raddr, sz);
+                                        syslog(LOG_ERROR, "sig_sem => %d", ret);
+                                }
+                                if (rsz > len)
+                                        rsz = len;
+                                memcpy(buf, pbuf, rsz);
+                                ret = rel_net_buf(input);
+                                if (ret < 0) {
+                                        syslog(LOG_ERROR, "rel_net_buf => %d", ret);
+                                        //return -ECOMM;
+                                }
+                        }
+                        ret = rsz;
                 }
                 }
@@ -830 +861 @@
 int tcp_fd_close(struct _IO_FILE *fp)
 {
-        ER ret;
-
-        free(fp->psock->buf);
-        fp->psock->buf = NULL;
+        ER ret, ret2;
 
         switch (fp->psock->family) {
@@ -844 +872 @@
                         }
                         ret = tcp_cls_cep(cepid, (fp->psock->repid != 0) ? 0 : SOCKET_TIMEOUT);
-                        if (ret < 0) {
-                                //return -1;
-                        }
-                        ret = tcp_del_cep(cepid);
+                        ret2 = tcp_del_cep(cepid);
+                        free(fp->psock->buf);
+                        fp->psock->buf = NULL;
                         delete_tcp_fd(cepid);
                         delete_id(tcp_cepid_table, tcp_cepid_table_count, cepid);
-                        if (ret < 0) {
-                                return -EINVAL;
+                        if ((ret < 0) || (ret2 < 0)) {
+                                return (ret == E_TMOUT) ? -ETIME : -EINVAL;
                         }
                 }
@@ -857 +884 @@
                         ID repid = fp->psock->repid;
                         ret = tcp_del_rep(repid);
+                        free(fp->psock->buf);
+                        fp->psock->buf = NULL;
                         delete_tcp_fd(tmax_tcp_cepid + repid);
                         delete_id(tcp_repid_table, tcp_repid_table_count, repid);
@@ -864 +893 @@
                 }
                 else {
+                        free(fp->psock->buf);
+                        fp->psock->buf = NULL;
                         return -EINVAL;
                 }
@@ -878 +909 @@
 size_t tcp_fd_read(struct _IO_FILE *fp, unsigned char *dst, size_t dstsz)
 {
-        return shell_recv(fp->fd, dst, dstsz, 0);
+        return shell_recvfrom(fp->fd, dst, dstsz, 0, NULL, NULL);
 }
 
 size_t tcp_fd_write(struct _IO_FILE *fp, const unsigned char *src, size_t srcsz)
 {
-        return shell_send(fp->fd, src, srcsz, 0);
+        return shell_sendto(fp->fd, src, srcsz, 0, NULL, 0);
 }
 
@@ -901 +932 @@
         ID cepid;
 
-        free(fp->psock->buf);
-        fp->psock->buf = NULL;
-
         switch (fp->psock->family) {
         case AF_INET: {
                 cepid = fp->psock->cepid;
                 ret = udp_del_cep(cepid);
+                //free(fp->psock->buf);
+                //fp->psock->buf = NULL;
                 delete_udp_fd(cepid);
                 delete_id(udp_cepid_table, udp_cepid_table_count, cepid);
@@ -925 +955 @@
 size_t udp_fd_read(struct _IO_FILE *fp, unsigned char *dst, size_t dstsz)
 {
-        return shell_recv(fp->fd, dst, dstsz, 0);
+        return shell_recvfrom(fp->fd, dst, dstsz, 0, NULL, NULL);
 }
 
 size_t udp_fd_write(struct _IO_FILE *fp, const unsigned char *src, size_t srcsz)
 {
-        return shell_send(fp->fd, src, srcsz, 0);
+        return shell_sendto(fp->fd, src, srcsz, 0, NULL, 0);
 }
 

asp3_tinet_ecnl_arm/trunk/ntshell/src/socket_stub.h

@@ -99 +99 @@
         int buf_size;
         unsigned char *buf;
+        void *input;
+        int len;
 } socket_t;
 

asp3_tinet_ecnl_arm/trunk/ntshell/src/syscall.c

@@ -201 +201 @@
 
 long SYS_futex() {
+        int futex(int *uaddr, int op, int val, const struct timespec *timeout, int *uaddr2, int val3);
         return no_implement("futex\n");
 }
@@ -309 +310 @@
 
 long SYS_recv(long a, long b, long c, long d) {
-        return shell_recv((int)a, (void *)b, (size_t)c, (int)d);
+        return shell_recvfrom((int)a, (void *)b, (size_t)c, (int)d, NULL, NULL);
 }
 
 long SYS_recvfrom(long a, long b, long c, long d, long e, long f) {
-        if (a == 0)
-                return shell_recv(a, (void *)b, (size_t)c, (int)d);
-        else
-                return shell_recvfrom(a, (void *)b, (size_t)c, (int)d, (struct sockaddr *)e, (socklen_t *)f);
+        return shell_recvfrom(a, (void *)b, (size_t)c, (int)d, (struct sockaddr *)e, (socklen_t *)f);
 }
 
@@ -344 +342 @@
 
 long SYS_send(long a, long b, long c, long d) {
-        return shell_send((int)a, (const void *)b, (size_t)c, (int)d);
+        return shell_sendto((int)a, (const void *)b, (size_t)c, (int)d, NULL, 0);
 }
 
@@ -352 +350 @@
 
 long SYS_sendto(long a, long b, long c, long d, long e, long f) {
-        if (a == 0)
-                return shell_send(a, (const void *)b, (size_t)c, (int)d);
-        else
-                return shell_sendto(a, (const void *)b, (size_t)c, (int)d, (const struct sockaddr *)e, (socklen_t)f);
+        return shell_sendto(a, (const void *)b, (size_t)c, (int)d, (const struct sockaddr *)e, (socklen_t)f);
 }
 
@@ -422 +417 @@
 }
 
+long SYS_dup()
+{
+        return no_implement("dup\n");
+}
+
+long SYS_dup2()
+{
+        return no_implement("dup2\n");
+}
+
+long SYS_pipe()
+{
+        return no_implement("pipe\n");
+}
+
+long SYS_readlink()
+{
+        return no_implement("readlink\n");
+}
+
+long SYS_symlink()
+{
+        return no_implement("symlink\n");
+}
+
+long SYS_umask()
+{
+        return no_implement("umask\n");
+}
+
+long SYS_execve()
+{
+        return no_implement("execve\n");
+}
+
+long SYS_fork()
+{
+        return no_implement("fork\n");
+}
+
+long SYS_wait4()
+{
+        return no_implement("wait4\n");
+}
+
+long SYS_socketpair()
+{
+        return no_implement("socketpair\n");
+}
+
+long SYS_flock()
+{
+        return no_implement("flock\n");
+}
+
 long ARM_SYS_cacheflush() {
         flash_access_cache_control();

asp3_tinet_ecnl_arm/trunk/wolfssl-3.12.2/.cproject

@@ -24 +24 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -69 +69 @@
                                                                 <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.renesas.cdt.managedbuild.gcc.rz.option.compiler.include.75756997" name="Include paths (-I)" superClass="com.renesas.cdt.managedbuild.gcc.rz.option.compiler.include" useByScannerDiscovery="false" valueType="includePath">
                                                                         <listOptionValue builtIn="false" value="&quot;${workspace_loc:/musl-1.1.18/include}&quot;"/>
+                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/zlib-1.2.11/src}&quot;"/>
                                                                         <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
                                                                 </option>
@@ -76 +77 @@
                                                                         <listOptionValue builtIn="false" value="WOLFSSL_SHA512"/>
                                                                         <listOptionValue builtIn="false" value="HAVE_CONFIG_H"/>
+                                                                        <listOptionValue builtIn="false" value="WOLFSSL_USER_SETTINGS"/>
                                                                 </option>
                                                                 <inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.787222748" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input"/>
@@ -142 +144 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">

asp3_tinet_ecnl_arm/trunk/wolfssl-3.12.2/src/internal.c

@@ -16378 +16378 @@
             if (ret != 0)
                 return ret;
+
+            word32 tim = LowResTimer();
+            *((word32 *)(output + idx)) = (tim >> 24) | ((tim & 0xFF0000) >> 8)
+                | ((tim & 0xFF00) << 8)| (tim << 24);
 
             /* store random */

asp3_tinet_ecnl_arm/trunk/wolfssl-3.12.2/user_settings.h

@@ -1 +1 @@
 //#define DEBUG_WOLFSSL
 
+#define HAVE_LIBZ
 #define HAVE_ECC
+#define HAVE_AESGCM
 //#define HAVE_FIPS
+#define HAVE_SNI
+#define HAVE_TLS_EXTENSIONS
+#define HAVE_SUPPORTED_CURVES
 
 #define ECC_TIMING_RESISTANT

asp3_tinet_ecnl_arm/trunk/zlib-1.2.11/.cproject

@@ -24 +24 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -129 +129 @@
                         <storageModule moduleId="com.renesas.cdt.managedbuild.core.toolchainInfo">
                                 <option id="toolchain.id" value="gcc-arm-embedded"/>
-                                <option id="toolchain.version" value="5.4.1.20160919"/>
+                                <option id="toolchain.version" value="6.3.1.20170620"/>
                         </storageModule>
                         <storageModule moduleId="cdtBuildSystem" version="4.0.0">