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);