Changeset 387 for asp3_tinet_ecnl_rx

Timestamp:

May 22, 2019, 4:09:18 PM (4 years ago)

Author:

coas-nagasima

Message:

ファイルディスクリプタ処理を更新

Location:

asp3_tinet_ecnl_rx/trunk

Files:

• app1_usb_watt_meter/Debug/Makefile (modified) (1 diff)
• app1_usb_watt_meter/DebugCitrus/Makefile (modified) (1 diff)
• app1_usb_watt_meter/DebugEther/Makefile (modified) (1 diff)
• app1_usb_watt_meter/src/main.c (modified) (1 diff)
• app1_usb_watt_meter/src/main.cdl (modified) (1 diff)
• app2_light/Debug/Makefile (modified) (1 diff)
• app2_light/DebugCitrus/Makefile (modified) (1 diff)
• app2_light/DebugEther/Makefile (modified) (1 diff)
• app2_light/src/main.c (modified) (1 diff)
• app2_light/src/main.cdl (modified) (1 diff)
• app3_human_detec/Debug/Makefile (modified) (1 diff)
• app3_human_detec/DebugCitrus/Makefile (modified) (1 diff)
• app3_human_detec/DebugEther/Makefile (modified) (1 diff)
• app3_human_detec/src/main.c (modified) (1 diff)
• app3_human_detec/src/main.cdl (modified) (1 diff)
• app4_aircon/Debug/Makefile (modified) (1 diff)
• app4_aircon/DebugCitrus/Makefile (modified) (1 diff)
• app4_aircon/DebugEther/Makefile (modified) (1 diff)
• app4_aircon/src/main.c (modified) (1 diff)
• app4_aircon/src/main.cdl (modified) (1 diff)
• app5_temp_sensor/Debug/Makefile (modified) (1 diff)
• app5_temp_sensor/DebugCitrus/Makefile (modified) (1 diff)
• app5_temp_sensor/DebugEther/Makefile (modified) (1 diff)
• app5_temp_sensor/src/main.c (modified) (1 diff)
• app5_temp_sensor/src/main.cdl (modified) (1 diff)
• app6_hot_water_pot/Debug/Makefile (modified) (1 diff)
• app6_hot_water_pot/DebugCitrus/Makefile (modified) (1 diff)
• app6_hot_water_pot/DebugEther/Makefile (modified) (1 diff)
• app6_hot_water_pot/src/main.c (modified) (1 diff)
• app6_hot_water_pot/src/main.cdl (modified) (1 diff)
• app7_buzzer/Debug/Makefile (modified) (1 diff)
• app7_buzzer/DebugCitrus/Makefile (modified) (1 diff)
• app7_buzzer/DebugEther/Makefile (modified) (1 diff)
• app7_buzzer/src/main.c (modified) (1 diff)
• app7_buzzer/src/main.cdl (modified) (1 diff)
• asp3_dcre/arch/rx630_gcc/prc_kernel_impl.c (modified) (1 diff)
• asp3_dcre/mbed/hal/spi_api.h (modified) (1 diff)
• asp3_dcre/mbed/target/mbed_api.c (modified) (3 diffs)
• asp3_dcre/syssvc/musl_adapter.c (added)
• asp3_dcre/syssvc/musl_adapter.cfg (added)
• asp3_dcre/syssvc/musl_adapter.h (added)
• asp3_dcre/syssvc/siofd.c (added)
• asp3_dcre/syssvc/siofd.h (added)
• asp3_dcre/syssvc/tPutLogSIOPort.c (added)
• asp3_dcre/syssvc/tPutLogSIOPort.cdl (added)
• asp3_dcre/syssvc/tlsf (moved) (moved from asp3_tinet_ecnl_rx/trunk/ntshell/tlsf )
• asp3_dcre/syssvc/tlsf/tlsf.c (modified) (6 diffs)
• asp3_dcre/target/gr_citrus_gcc/Makefile.target (modified) (1 diff)
• asp3_dcre/target/gr_citrus_gcc/target.cdl (modified) (2 diffs)
• asp3_dcre/target/gr_citrus_gcc/target_kernel.cfg (modified) (1 diff)
• asp3_dcre/target/gr_citrus_gcc/target_kernel_impl.c (modified) (2 diffs)
• asp3_dcre/target/gr_citrus_gcc/target_serial.c (modified) (5 diffs)
• asp3_dcre/target/gr_citrus_gcc/target_serial.cfg (modified) (1 diff)
• asp3_dcre/target/gr_citrus_gcc/target_serial.h (modified) (4 diffs)
• asp3_dcre/target/gr_citrus_gcc/target_syssvc.h (modified) (4 diffs)
• asp3_dcre/target/gr_citrus_gcc/target_timer.c (modified) (1 diff)
• asp3_dcre/target/gr_sakura_gcc/Makefile.target (modified) (1 diff)
• asp3_dcre/target/gr_sakura_gcc/target.cdl (modified) (2 diffs)
• asp3_dcre/target/gr_sakura_gcc/target_kernel.cfg (modified) (1 diff)
• asp3_dcre/target/gr_sakura_gcc/target_kernel_impl.c (modified) (2 diffs)
• asp3_dcre/target/gr_sakura_gcc/target_serial.c (modified) (5 diffs)
• asp3_dcre/target/gr_sakura_gcc/target_serial.cfg (modified) (1 diff)
• asp3_dcre/target/gr_sakura_gcc/target_serial.h (modified) (4 diffs)
• asp3_dcre/target/gr_sakura_gcc/target_syssvc.h (modified) (4 diffs)
• asp3_dcre/target/gr_sakura_gcc/target_timer.c (modified) (1 diff)
• asp3_dcre/tecsgen/tecslib/core/C_parser.tab.rb (modified) (2 diffs)
• asp3_dcre/tecsgen/tecslib/core/C_parser.y.rb (modified) (3 diffs)
• asp3_dcre/tinet/netinet/in_itron.h (modified) (2 diffs)
• asp3_dcre/tinet/netinet/tcp_input.c (modified) (2 diffs)
• asp3_dcre/tinet/netinet/tcpn_usrreq.c (modified) (1 diff)
• asp3_dcre/tinet/netinet/udp_output.c (modified) (2 diffs)
• asp3_dcre/tinet/netinet/udp_subr.c (modified) (2 diffs)
• asp3_dcre/tinet/netinet/udpn_usrreq.c (modified) (1 diff)
• bnep_bridge/Debug/Makefile (modified) (2 diffs)
• bnep_bridge/src/main.c (modified) (1 diff)
• bnep_bridge/src/main.cdl (modified) (1 diff)
• curl-7.57.0/lib/curl_config.h (modified) (1 diff)
• curl-7.57.0/lib/easy.c (modified) (1 diff)
• musl-1.1.18/include/bits/alltypes.h (modified) (1 diff)
• musl-1.1.18/include/math.h (modified) (1 diff)
• musl-1.1.18/include/stddef.h (modified) (1 diff)
• musl-1.1.18/src/locale/__lctrans.c (modified) (1 diff)
• musl-1.1.18/src/locale/__mo_lookup.c (modified) (1 diff)
• musl-1.1.18/src/locale/iconv.c (modified) (3 diffs)
• musl-1.1.18/src/locale/locale_map.c (modified) (1 diff)
• musl-1.1.18/src/malloc/memalign.c (modified) (1 diff)
• musl-1.1.18/src/math/fma.c (modified) (5 diffs)
• musl-1.1.18/src/network/lookup_name.c (modified) (4 diffs)
• musl-1.1.18/src/process/vfork.c (modified) (1 diff)
• musl-1.1.18/src/signal/sigaction.c (modified) (1 diff)
• musl-1.1.18/src/stdio/__stdio_write.c (modified) (1 diff)
• musl-1.1.18/src/stdlib/strtol.c (modified) (1 diff)
• musl-1.1.18/src/string/memrchr.c (modified) (1 diff)
• musl-1.1.18/src/string/strchrnul.c (modified) (1 diff)
• ntshell/fatfs/ffarch.c (modified) (8 diffs)
• ntshell/ntshell/util/ntstdio.c (modified) (4 diffs)
• ntshell/ntshell/util/ntstdio.h (modified) (1 diff)
• ntshell/src/fdtable.c (modified) (10 diffs)
• ntshell/src/fdtable.h (moved) (moved from asp3_tinet_ecnl_rx/trunk/ntshell/src/socket_stub.h ) (3 diffs)
• ntshell/src/io_stub.c (modified) (10 diffs)
• ntshell/src/net_misc.c (modified) (4 diffs)
• ntshell/src/ntp_cli.c (modified) (12 diffs)
• ntshell/src/ntshell.cdl (added)
• ntshell/src/ntshell_main.c (modified) (9 diffs)
• ntshell/src/ntshell_main.cfg (modified) (1 diff)
• ntshell/src/shellif.h (modified) (5 diffs)
• ntshell/src/socket_stub.c (modified) (49 diffs)
• ntshell/src/stdio_stub.c (added)
• ntshell/src/syscall.c (modified) (2 diffs)
• ntshell/src/tSIOPortNTShell.cdl (added)
• ntshell/src/tSIOPortNTShellMain.c (added)

asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/Debug/Makefile

@@ -198 +198 @@
 APPLDIRS := $(APPLDIRS) $(SRCDIR)/$(TINETDIR)/netapp
 APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
-APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
+APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o stdio_stub.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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
 
 #

asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/DebugCitrus/Makefile

@@ -198 +198 @@
 APPLDIRS := $(APPLDIRS) $(SRCDIR)/$(TINETDIR)/netapp
 APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
-APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
+APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o stdio_stub.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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
 
 #

asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/DebugEther/Makefile

@@ -198 +198 @@
 APPLDIRS := $(APPLDIRS) $(SRCDIR)/$(TINETDIR)/netapp
 APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
-APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
+APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o stdio_stub.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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
 
 #

asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/src/main.c

@@ -66 +66 @@
 #include "ffarch.h"
 #include "ff.h"
-#include "core/ntshell.h"
-#include "core/ntlibc.h"
 #include <stdio.h>
 #include "usrcmd.h"
-#include "util/ntopt.h"
-#include "socket_stub.h"
 #include "gpio_api.h"
 #include "usb_hbth.h"

asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/src/main.cdl

@@ -22 +22 @@
  *  ターゲット依存部の取り込み
  */
-import("target.cdl");
+import("ntshell.cdl");
 
 /*

asp3_tinet_ecnl_rx/trunk/app2_light/Debug/Makefile

@@ -189 +189 @@
 APPLDIRS := $(APPLDIRS) $(SRCDIR)/$(TINETDIR)/netapp
 APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
-APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
+APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o stdio_stub.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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
 
 #

asp3_tinet_ecnl_rx/trunk/app2_light/DebugCitrus/Makefile

@@ -189 +189 @@
 APPLDIRS := $(APPLDIRS) $(SRCDIR)/$(TINETDIR)/netapp
 APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
-APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
+APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o stdio_stub.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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
 
 #

asp3_tinet_ecnl_rx/trunk/app2_light/DebugEther/Makefile

@@ -187 +187 @@
 APPLDIRS := $(APPLDIRS) $(SRCDIR)/$(TINETDIR)/netapp
 APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
-APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
+APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o stdio_stub.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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
 
 #

asp3_tinet_ecnl_rx/trunk/app2_light/src/main.c

@@ -65 +65 @@
 #include "ffarch.h"
 #include "ff.h"
-#include "core/ntshell.h"
-#include "core/ntlibc.h"
 #include <stdio.h>
 #include "usrcmd.h"
-#include "util/ntopt.h"
-#include "socket_stub.h"
 #include "gpio_api.h"
 #include "usb_hbth.h"

asp3_tinet_ecnl_rx/trunk/app2_light/src/main.cdl

@@ -22 +22 @@
  *  ターゲット依存部の取り込み
  */
-import("target.cdl");
+import("ntshell.cdl");
 
 /*

asp3_tinet_ecnl_rx/trunk/app3_human_detec/Debug/Makefile

@@ -189 +189 @@
 APPLDIRS := $(APPLDIRS) $(SRCDIR)/$(TINETDIR)/netapp
 APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
-APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
+APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o stdio_stub.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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
 
 #

asp3_tinet_ecnl_rx/trunk/app3_human_detec/DebugCitrus/Makefile

@@ -189 +189 @@
 APPLDIRS := $(APPLDIRS) $(SRCDIR)/$(TINETDIR)/netapp
 APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
-APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
+APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o stdio_stub.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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
 
 #

asp3_tinet_ecnl_rx/trunk/app3_human_detec/DebugEther/Makefile

@@ -187 +187 @@
 APPLDIRS := $(APPLDIRS) $(SRCDIR)/$(TINETDIR)/netapp
 APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
-APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
+APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o stdio_stub.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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
 
 #

asp3_tinet_ecnl_rx/trunk/app3_human_detec/src/main.c

@@ -65 +65 @@
 #include "ffarch.h"
 #include "ff.h"
-#include "core/ntshell.h"
-#include "core/ntlibc.h"
 #include <stdio.h>
 #include "usrcmd.h"
-#include "util/ntopt.h"
-#include "socket_stub.h"
 #include "gpio_api.h"
 #include "usb_hbth.h"

asp3_tinet_ecnl_rx/trunk/app3_human_detec/src/main.cdl

@@ -22 +22 @@
  *  ターゲット依存部の取り込み
  */
-import("target.cdl");
+import("ntshell.cdl");
 
 /*

asp3_tinet_ecnl_rx/trunk/app4_aircon/Debug/Makefile

@@ -195 +195 @@
 APPLDIRS := $(APPLDIRS) $(SRCDIR)/$(TINETDIR)/netapp
 APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
-APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
+APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o stdio_stub.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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
 APPLDIRS := $(APPLDIRS) ../../ntshell/lcd
 APPL_COBJS := $(APPL_COBJS) draw_font.o shnm12_font.o

asp3_tinet_ecnl_rx/trunk/app4_aircon/DebugCitrus/Makefile

@@ -195 +195 @@
 APPLDIRS := $(APPLDIRS) $(SRCDIR)/$(TINETDIR)/netapp
 APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
-APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
+APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o stdio_stub.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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
 APPLDIRS := $(APPLDIRS) ../../ntshell/lcd
 APPL_COBJS := $(APPL_COBJS) draw_font.o shnm12_font.o

asp3_tinet_ecnl_rx/trunk/app4_aircon/DebugEther/Makefile

@@ -193 +193 @@
 APPLDIRS := $(APPLDIRS) $(SRCDIR)/$(TINETDIR)/netapp
 APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
-APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
+APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o stdio_stub.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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
 APPLDIRS := $(APPLDIRS) ../../ntshell/lcd
 APPL_COBJS := $(APPL_COBJS) draw_font.o shnm12_font.o

asp3_tinet_ecnl_rx/trunk/app4_aircon/src/main.c

@@ -65 +65 @@
 #include "ffarch.h"
 #include "ff.h"
-#include "core/ntshell.h"
-#include "core/ntlibc.h"
 #include <stdio.h>
 #include "usrcmd.h"
-#include "util/ntopt.h"
-#include "socket_stub.h"
 #include "gpio_api.h"
 #include "usb_hbth.h"

asp3_tinet_ecnl_rx/trunk/app4_aircon/src/main.cdl

@@ -22 +22 @@
  *  ターゲット依存部の取り込み
  */
-import("target.cdl");
+import("ntshell.cdl");
 
 /*

asp3_tinet_ecnl_rx/trunk/app5_temp_sensor/Debug/Makefile

@@ -195 +195 @@
 APPLDIRS := $(APPLDIRS) $(SRCDIR)/$(TINETDIR)/netapp
 APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
-APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
+APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o stdio_stub.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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
 APPLDIRS := $(APPLDIRS) ../../ntshell/lcd
 APPL_COBJS := $(APPL_COBJS) draw_font.o shnm12_font.o

asp3_tinet_ecnl_rx/trunk/app5_temp_sensor/DebugCitrus/Makefile

@@ -195 +195 @@
 APPLDIRS := $(APPLDIRS) $(SRCDIR)/$(TINETDIR)/netapp
 APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
-APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
+APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o stdio_stub.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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
 APPLDIRS := $(APPLDIRS) ../../ntshell/lcd
 APPL_COBJS := $(APPL_COBJS) draw_font.o shnm12_font.o

asp3_tinet_ecnl_rx/trunk/app5_temp_sensor/DebugEther/Makefile

@@ -193 +193 @@
 APPLDIRS := $(APPLDIRS) $(SRCDIR)/$(TINETDIR)/netapp
 APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
-APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
+APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o stdio_stub.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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
 APPLDIRS := $(APPLDIRS) ../../ntshell/lcd
 APPL_COBJS := $(APPL_COBJS) draw_font.o shnm12_font.o

asp3_tinet_ecnl_rx/trunk/app5_temp_sensor/src/main.c

@@ -65 +65 @@
 #include "ffarch.h"
 #include "ff.h"
-#include "core/ntshell.h"
-#include "core/ntlibc.h"
 #include <stdio.h>
 #include "usrcmd.h"
-#include "util/ntopt.h"
-#include "socket_stub.h"
 #include "gpio_api.h"
 #include "usb_hbth.h"

asp3_tinet_ecnl_rx/trunk/app5_temp_sensor/src/main.cdl

@@ -22 +22 @@
  *  ターゲット依存部の取り込み
  */
-import("target.cdl");
+import("ntshell.cdl");
 
 /*

asp3_tinet_ecnl_rx/trunk/app6_hot_water_pot/Debug/Makefile

@@ -189 +189 @@
 APPLDIRS := $(APPLDIRS) $(SRCDIR)/$(TINETDIR)/netapp
 APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
-APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
+APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o stdio_stub.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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
 
 #

asp3_tinet_ecnl_rx/trunk/app6_hot_water_pot/DebugCitrus/Makefile

@@ -189 +189 @@
 APPLDIRS := $(APPLDIRS) $(SRCDIR)/$(TINETDIR)/netapp
 APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
-APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
+APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o stdio_stub.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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
 
 #

asp3_tinet_ecnl_rx/trunk/app6_hot_water_pot/DebugEther/Makefile

@@ -187 +187 @@
 APPLDIRS := $(APPLDIRS) $(SRCDIR)/$(TINETDIR)/netapp
 APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
-APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
+APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o stdio_stub.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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
 
 #

asp3_tinet_ecnl_rx/trunk/app6_hot_water_pot/src/main.c

@@ -65 +65 @@
 #include "ffarch.h"
 #include "ff.h"
-#include "core/ntshell.h"
-#include "core/ntlibc.h"
 #include <stdio.h>
 #include "usrcmd.h"
-#include "util/ntopt.h"
-#include "socket_stub.h"
 #include "gpio_api.h"
 #include "usb_hbth.h"

asp3_tinet_ecnl_rx/trunk/app6_hot_water_pot/src/main.cdl

@@ -22 +22 @@
  *  ターゲット依存部の取り込み
  */
-import("target.cdl");
+import("ntshell.cdl");
 
 /*

asp3_tinet_ecnl_rx/trunk/app7_buzzer/Debug/Makefile

@@ -189 +189 @@
 APPLDIRS := $(APPLDIRS) $(SRCDIR)/$(TINETDIR)/netapp
 APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
-APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
+APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o stdio_stub.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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
 
 #

asp3_tinet_ecnl_rx/trunk/app7_buzzer/DebugCitrus/Makefile

@@ -189 +189 @@
 APPLDIRS := $(APPLDIRS) $(SRCDIR)/$(TINETDIR)/netapp
 APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
-APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
+APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o stdio_stub.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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
 
 #

asp3_tinet_ecnl_rx/trunk/app7_buzzer/DebugEther/Makefile

@@ -187 +187 @@
 APPLDIRS := $(APPLDIRS) $(SRCDIR)/$(TINETDIR)/netapp
 APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
-APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
+APPL_COBJS := $(APPL_COBJS) netcmd.o fdtable.o stdio_stub.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.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
 
 #

asp3_tinet_ecnl_rx/trunk/app7_buzzer/src/main.c

@@ -65 +65 @@
 #include "ffarch.h"
 #include "ff.h"
-#include "core/ntshell.h"
-#include "core/ntlibc.h"
 #include <stdio.h>
 #include "usrcmd.h"
-#include "util/ntopt.h"
-#include "socket_stub.h"
 #include "gpio_api.h"
 #include "usb_hbth.h"

asp3_tinet_ecnl_rx/trunk/app7_buzzer/src/main.cdl

@@ -22 +22 @@
  *  ターゲット依存部の取り込み
  */
-import("target.cdl");
+import("ntshell.cdl");
 
 /*

asp3_tinet_ecnl_rx/trunk/asp3_dcre/arch/rx630_gcc/prc_kernel_impl.c

@@ -236 +236 @@
 }
 #endif /* OMIT_DEFAULT_EXC_HANDLER */
-
-void _start_c(char * const*args);
-
-void
-_sta_ker()
-{
-        static const char *const args[] = {
-                (char *)1,
-                "asp3",
-                0,
-                // envp
-                "TZ=JST-9",
-                0,
-                // auxv
-                0
-        };
-        _start_c(args);
-}
-
-//#include <errno.h>
-#define ENOSYS          38
-
-__attribute__((weak))
-long SYS_poll()
-{
-        return -ENOSYS;
-}
-
-__attribute__((weak))
-long SYS_open()
-{
-        return -ENOSYS;
-}
-
-__attribute__((weak))
-long SYS_set_tid_address()
-{
-        return 0;//-ENOSYS;
-}
-
-__attribute__((weak))
-long SYS_gettid()
-{
-        return 0;//-ENOSYS;
-}
-
-__attribute__((weak))
-long SYS_rt_sigprocmask()
-{
-        return 0;//-ENOSYS;
-}
-
-__attribute__((weak))
-long SYS_mmap2()
-{
-        return 0;//-ENOSYS;
-}
-
-__attribute__((weak))
-long SYS_tkill()
-{
-        return 0;//-ENOSYS;
-}
-
-__attribute__((weak))
-void SYS_exit_group()
-{
-        ext_ker();
-}
-
-__attribute__((weak))
-void SYS_exit()
-{
-        ext_ker();
-}

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

@@ -34 +34 @@
 
 #define SPI_FILL_WORD         (0xFFFF)
+#define SPI_FILL_CHAR         (0xFF)
 
 #if DEVICE_SPI_ASYNCH

asp3_tinet_ecnl_rx/trunk/asp3_dcre/mbed/target/mbed_api.c

@@ -1349 +1349 @@
 {
         //return probe_int(obj->rxi_intno);
-        return (sil_reb_mem(SCI_SSR(obj->base_address)) & RIE) != 0U;
+        return true;
 }
 
@@ -1355 +1355 @@
 {
         //return probe_int(obj->tei_intno);
-        return (sil_reb_mem(SCI_SSR(obj->base_address)) & TEIE) != 0U;
+        return (sil_reb_mem(SCI_SSR(obj->base_address)) & TEND) != 0U;
 }
 
@@ -1394 +1394 @@
 {
         int no = SCI_NUM(obj->base_address);
+        bool_t lock = sense_lock();
+
+        if (!lock)
+                loc_cpu();
 
         sci_irq_info[no].handler = handler;
         sci_irq_info[no].id = id;
+
+        if (!lock)
+                unl_cpu();
 }
 

asp3_tinet_ecnl_rx/trunk/asp3_dcre/syssvc/tlsf/tlsf.c

@@ -6 +6 @@
 #include <string.h>
 #include <stdio.h>
+#include <t_syslog.h>
 
 #include "tlsf.h"
@@ -887 +888 @@
 {
         (void)user;
-        printf("\t%p %s size: %x (%p)\n", ptr, used ? "used" : "free", (unsigned int)size, block_from_ptr(ptr));
+        syslog(LOG_NOTICE, "\t%p %s size: %x (%p)", ptr, used ? "used" : "free", (unsigned int)size, block_from_ptr(ptr));
 }
 
@@ -976 +977 @@
         if (((ptrdiff_t)mem % ALIGN_SIZE) != 0)
         {
-                printf("tlsf_add_pool: Memory must be aligned by %u bytes.\n",
+                syslog(LOG_NOTICE, "tlsf_add_pool: Memory must be aligned by %u bytes.",
                         (unsigned int)ALIGN_SIZE);
                 return 0;
@@ -984 +985 @@
         {
 #if defined (TLSF_64BIT)
-                printf("tlsf_add_pool: Memory size must be between 0x%x and 0x%x00 bytes.\n", 
+                syslog(LOG_NOTICE, "tlsf_add_pool: Memory size must be between 0x%x and 0x%x00 bytes.", 
                         (unsigned int)(pool_overhead + block_size_min),
                         (unsigned int)((pool_overhead + block_size_max) / 256));
 #else
-                printf("tlsf_add_pool: Memory size must be between %u and %u bytes.\n", 
+                syslog(LOG_NOTICE, "tlsf_add_pool: Memory size must be between %u and %u bytes.", 
                         (unsigned int)(pool_overhead + block_size_min),
                         (unsigned int)(pool_overhead + block_size_max));
@@ -1056 +1057 @@
         if (rv)
         {
-                printf("test_ffs_fls: %x ffs/fls tests failed.\n", rv);
+                syslog(LOG_NOTICE, "test_ffs_fls: %x ffs/fls tests failed.", rv);
         }
         return rv;
@@ -1073 +1074 @@
         if (((tlsfptr_t)mem % ALIGN_SIZE) != 0)
         {
-                printf("tlsf_create: Memory must be aligned to %u bytes.\n",
+                syslog(LOG_NOTICE, "tlsf_create: Memory must be aligned to %u bytes.",
                         (unsigned int)ALIGN_SIZE);
                 return 0;

asp3_tinet_ecnl_rx/trunk/asp3_dcre/target/gr_citrus_gcc/Makefile.target

@@ -25 +25 @@
 #  システムサービスに関する定義
 #
-SYSSVC_DIRS := $(SYSSVC_DIRS) $(SRCDIR)/mbed
-SYSSVC_COBJS := $(SYSSVC_COBJS)
+SYSSVC_DIRS := $(SYSSVC_DIRS) $(SRCDIR)/mbed $(SRCDIR)/syssvc/tlsf
+SYSSVC_COBJS := $(SYSSVC_COBJS) musl_adapter.o tlsf.o
 
 #

asp3_tinet_ecnl_rx/trunk/asp3_dcre/target/gr_citrus_gcc/target.cdl

@@ -60 +60 @@
  *  ターゲット依存のセルタイプの定義
  */
-import("tPutLogGRCitrus.cdl");
+import("syssvc/tPutLogSIOPort.cdl");
 import("tSIOPortGRCitrus.cdl");
 
@@ -72 +72 @@
  *  低レベル出力の組み上げ記述
  */
-cell tPutLogGRCitrus PutLogTarget {
+cell tPutLogSIOPort PutLogTarget {
         /* SIOドライバとの結合 */
         cSIOPort = SIOPortTarget1.eSIOPort;

asp3_tinet_ecnl_rx/trunk/asp3_dcre/target/gr_citrus_gcc/target_kernel.cfg

@@ -5 +5 @@
  */
 INCLUDE("target_timer.cfg")
+INCLUDE("syssvc/musl_adapter.cfg")

asp3_tinet_ecnl_rx/trunk/asp3_dcre/target/gr_citrus_gcc/target_kernel_impl.c

@@ -54 +54 @@
 #ifdef TOPPERS_OMIT_TECS
 #include "serial_api.h"
+#include "target_syssvc.h"
 #endif
 
@@ -83 +84 @@
          *  シリアルポートの設定
          */
-        serial_init(&log_serial, P20, P21);
+        serial_init(&log_serial, STDIO_UART_TX, STDIO_UART_RX);
         serial_baud(&log_serial, UART_BAUDRATE);
         serial_format(&log_serial, 8, ParityNone, 1);

asp3_tinet_ecnl_rx/trunk/asp3_dcre/target/gr_citrus_gcc/target_serial.c

@@ -3 +3 @@
  *      Toyohashi Open Platform for Embedded Real-Time Systems/
  *      Advanced Standard Profile Kernel
- *
- *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
- *                              Toyohashi Univ. of Technology, JAPAN
- *  Copyright (C) 2003-2004 by Naoki Saito
- *             Nagoya Municipal Industrial Research Institute, JAPAN
- *  Copyright (C) 2003-2004 by Platform Development Center
- *                                          RICOH COMPANY,LTD. JAPAN
- *  Copyright (C) 2008-2010 by Witz Corporation, JAPAN
- *  Copyright (C) 2013      by Mitsuhiro Matsuura
- *
+ * 
+ *  Copyright (C) 2006-2018 by Embedded and Real-Time Systems Laboratory
+ *              Graduate School of Information Science, Nagoya Univ., JAPAN
+ * 
  *  上記著作権者は，以下の(1)～(4)の条件を満たす場合に限り，本ソフトウェ
  *  ア（本ソフトウェアを改変したものを含む．以下同じ）を使用・複製・改
@@ -35 +29 @@
  *      由に基づく請求からも，上記著作権者およびTOPPERSプロジェクトを
  *      免責すること．
- *
+ * 
  *  本ソフトウェアは，無保証で提供されているものである．上記著作権者お
  *  よびTOPPERSプロジェクトは，本ソフトウェアに関して，特定の使用目的
@@ -41 +35 @@
  *  アの利用により直接的または間接的に生じたいかなる損害に関しても，そ
  *  の責任を負わない．
- *
+ * 
  *  @(#) $Id$
  */
 
 /*
- *      RX630 UART用シリアルI/Oモジュール
- */
-#include "kernel_impl.h"
-#include <sil.h>
+ *              シリアルインタフェースドライバのターゲット依存部（GR-CITRUS用）
+ */
+
+#include "gr_citrus.h"
+#include <t_stddef.h>
+#include <t_syslog.h>
+#include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <termios.h>
 #include "target_serial.h"
-#include "hal/serial_api.h"
-#include "target_syssvc.h"
-#include "syssvc/serial.h"
-
-/*
- *  シリアルI/Oポート初期化ブロックの定義
+#include "syssvc/siofd.h"
+
+/*
+ *  SIOポート初期化ブロックの定義
  */
 typedef struct sio_port_initialization_block {
-        PinName tx;
-        PinName rx;
+        char            *path;                  /* ファイルのパス名 */
 } SIOPINIB;
 
 /*
- *  シリアルI/Oポート管理ブロックの定義
+ *  SIOポート管理ブロックの定義
  */
 struct sio_port_control_block {
-        const SIOPINIB *p_siopinib;
-        intptr_t exinf;
-        bool_t openflag;
-        serial_t serial;
+        const SIOPINIB *p_siopinib;     /* SIOポート初期化ブロック */
+        intptr_t        exinf;                  /* 拡張情報 */
+        bool_t          opened;         /* オープン済みフラグ */
+        struct termios saved_term;      /* 元の端末制御情報 */
+
+        int_t           read_fd;                /* 読出し用ファイルディスクリプタ */
+        bool_t          rcv_flag;               /* 受信文字バッファ有効フラグ */
+        char            rcv_buf;                /* 受信文字バッファ */
+        bool_t          rcv_rdy;                /* 受信通知コールバック許可フラグ */
+
+        int_t           write_fd;               /* 書込み用ファイルディスクリプタ */
+        bool_t          snd_flag;               /* 送信文字バッファ有効フラグ */
+        char            snd_buf;                /* 送信文字バッファ */
+        bool_t          snd_rdy;                /* 送信通知コールバック許可フラグ */
 };
 
 /*
- *  シリアルI/Oポート管理ブロックのエリア
- */
-SIOPCB siopcb_table[TNUM_PORT];
-
-static const SIOPINIB siopinib_table[TNUM_SIOP] =
-{
-        { P20, P21 },
-#if TNUM_SIOP > 1
-        { P50, P52 },
-#endif
-#if TNUM_SIOP > 2
-        { P32, P33 },
-#endif
-#if TNUM_SIOP > 3
-        { PC7, PC6 },
-#endif
-#if TNUM_SIOP > 4
-        { P26, P30 },
-#endif
-#if TNUM_SIOP > 5
-        { PB5, P25 },
-#endif
-#if TNUM_SIOP > 6
-        { PA0, PC2 },
-#endif
+ *  SIOポート初期化ブロック
+ */
+const SIOPINIB siopinib_table[TNUM_SIOP] = {
+        { NULL }
 };
 
 /*
- *  シリアルI/OポートIDから管理ブロックを取り出すためのマクロ
- */
-#define INDEX_SIOP(siopid)       ((uint_t)((siopid) - 1))
-#define get_siopcb(siopid)       (&(siopcb_table[INDEX_SIOP(siopid)]))
-#define get_siopinib(siopid) (&(siopinib_table[INDEX_SIOP(siopid)]))
-
-static void mbed_serial_irq_handler(uint32_t id, SerialIrq event);
+ *  SIOポート管理ブロックのエリア
+ */
+SIOPCB  siopcb_table[TNUM_SIOP];
+
+/*
+ *  SIOポートIDから管理ブロックを取り出すためのマクロ
+ */
+#define INDEX_SIOP(siopid)      ((uint_t)((siopid) - 1))
+#define get_siopcb(siopid)      (&(siopcb_table[INDEX_SIOP(siopid)]))
 
 /*
@@ -120 +108 @@
 
         /*
-         *  シリアルI/Oポート管理ブロックの初期化
+         *  SIOポート管理ブロックの初期化
          */
-        for (p_siopcb = siopcb_table, i = 0; i < TNUM_SIOP; p_siopcb++, i++) {
+        for (i = 0; i < TNUM_SIOP; i++) {
+                p_siopcb = &(siopcb_table[i]);
                 p_siopcb->p_siopinib = &(siopinib_table[i]);
-                p_siopcb->openflag = false;
-        }
-}
-
-/*
- *  シリアルI/Oポートのオープン
+                p_siopcb->opened = false;
+        }
+}
+
+/*
+ *  SIOドライバの終了処理
+ */
+void
+sio_terminate(intptr_t exinf)
+{
+        uint_t  i;
+
+        /*
+         *  オープンされているSIOポートのクローズ
+         */
+        for (i = 0; i < TNUM_SIOP; i++) {
+                sio_cls_por(&(siopcb_table[i]));
+        }
+}
+
+/*
+ *  SIOポートのオープン
  */
 SIOPCB *
 sio_opn_por(ID siopid, intptr_t exinf)
 {
-        SIOPCB  *p_siopcb = NULL;
-        ER      ercd;
-        serial_t *serial;
-
-        if ((siopid <= 0) || (siopid > (sizeof(siopcb_table) / sizeof(siopcb_table[0]))))
-                return NULL;
+        SIOPCB                  *p_siopcb;
+        const SIOPINIB  *p_siopinib;
+        int_t                   fd;
+        struct termios  term;
+
         p_siopcb = get_siopcb(siopid);
-
-        if (p_siopcb->openflag)
-                return NULL;
-        p_siopcb->openflag = true;
-        p_siopcb->exinf = exinf;
-
-        serial = &p_siopcb->serial;
-        serial_init(serial, p_siopcb->p_siopinib->tx, p_siopcb->p_siopinib->rx);
-        serial_baud(serial, UART_BAUDRATE);
-        serial_format(serial, 8, ParityNone, 1);
-
-        serial_irq_handler(serial, mbed_serial_irq_handler, siopid);
-
-        return p_siopcb;
-}
-
-/*
- *  シリアルI/Oポートのクローズ
+        p_siopinib = p_siopcb->p_siopinib;
+
+        if (!(p_siopcb->opened)) {
+                if (p_siopinib->path != NULL) {
+                        fd = siofd_open(p_siopinib->path, O_RDWR, 0777);
+                        assert(fd >= 0);
+                        p_siopcb->read_fd = fd;
+                        p_siopcb->write_fd = fd;
+                }
+                else {
+                        fd = STDIN_FILENO;                                      /* 標準入出力を使う */
+                        p_siopcb->read_fd = STDIN_FILENO;
+                        p_siopcb->write_fd = STDOUT_FILENO;
+                }
+                siofd_fcntl(fd, F_SETOWN, getpid());
+                siofd_fcntl(fd, F_SETFL, (O_NONBLOCK | O_ASYNC));
+
+                siofd_tcgetattr(fd, &(p_siopcb->saved_term));
+                term = p_siopcb->saved_term;
+                term.c_lflag &= ~(ECHO | ICANON);
+                siofd_tcsetattr(fd, TCSAFLUSH, &term);
+
+                p_siopcb->exinf = exinf;
+                p_siopcb->rcv_flag = false;
+                p_siopcb->rcv_rdy = false;
+                p_siopcb->snd_flag = false;
+                p_siopcb->snd_rdy = false;
+                p_siopcb->opened = true;
+        }
+        return(p_siopcb);
+}
+
+/*
+ *  SIOポートのクローズ
  */
 void
 sio_cls_por(SIOPCB *p_siopcb)
 {
-        ER        ercd;
-        serial_t *serial = &p_siopcb->serial;
-
-        /*
-         *  デバイス依存のクローズ処理．
-         */
-        serial_free(serial);
-        p_siopcb->openflag = false;
-}
-
-/*
- *  シリアルI/Oポートへの文字送信
+        int_t   fd;
+
+        if (p_siopcb->opened) {
+                fd = p_siopcb->read_fd;
+                siofd_tcsetattr(fd, TCSAFLUSH, &(p_siopcb->saved_term));
+                siofd_fcntl(fd, F_SETFL, 0);
+
+                if (p_siopcb->p_siopinib->path != NULL) {
+                        siofd_close(p_siopcb->read_fd);
+                }
+
+                p_siopcb->opened = false;
+        }
+}
+
+/*
+ *  SIOの割込みサービスルーチン
+ */
+bool_t
+sio_isr_snd(ID siopid)
+{
+        SIOPCB  *p_siopcb = get_siopcb(siopid);
+        int_t   n;
+
+        if (p_siopcb->snd_flag) {
+                if ((n = siofd_write(p_siopcb->write_fd, &(p_siopcb->snd_buf), 1)) > 0) {
+                        p_siopcb->snd_flag = false;
+                        if (p_siopcb->snd_rdy) {
+                                sio_irdy_snd(p_siopcb->exinf);
+                                return p_siopcb->snd_rdy;
+                        }
+                }
+        }
+
+        return false;
+}
+
+/*
+ *  SIOの割込みサービスルーチン
+ */
+bool_t
+sio_isr_rcv(ID siopid, char c)
+{
+        SIOPCB  *p_siopcb = get_siopcb(siopid);
+
+        if (!p_siopcb->rcv_flag) {
+                p_siopcb->rcv_buf = c;
+                p_siopcb->rcv_flag = true;
+                if (p_siopcb->rcv_rdy) {
+                        sio_irdy_rcv(p_siopcb->exinf);
+                        return p_siopcb->rcv_rdy;
+                }
+        }
+
+        return false;
+}
+
+/*
+ *  SIOポートへの文字送信
  */
 bool_t
 sio_snd_chr(SIOPCB *p_siopcb, char c)
 {
-        serial_t *serial = &p_siopcb->serial;
-        if (!serial_writable(serial))
-                return false;
-        serial_putc(serial, c);
-        return true;
-}
-
-/*
- *  シリアルI/Oポートからの文字受信
+        int_t   n;
+
+        if (!p_siopcb->snd_flag) {
+                if ((n = siofd_write(p_siopcb->write_fd, &c, 1)) > 0) {
+                        return(true);
+                }
+                else {
+                        assert(n < 0 && errno == EAGAIN);
+                        p_siopcb->snd_flag = true;
+                        p_siopcb->snd_buf = c;
+                        return(true);
+                }
+        }
+        else {
+                return(false);
+        }
+}
+
+/*
+ *  SIOポートからの文字受信
  */
 int_t
 sio_rcv_chr(SIOPCB *p_siopcb)
 {
-        serial_t *serial = &p_siopcb->serial;
-        if (!serial_readable(serial))
-                return -1;
-        return serial_getc(serial);
-}
-
-/*
- *  シリアルI/Oポートからのコールバックの許可
+        char    c;
+        int_t   n;
+
+        if (p_siopcb->rcv_flag) {
+                p_siopcb->rcv_flag = false;
+                return((int_t)(uint8_t)(p_siopcb->rcv_buf));
+        }
+        else if ((n = siofd_read(p_siopcb->read_fd, &c, 1)) > 0) {
+                return((int_t)(uint8_t) c);
+        }
+        else {
+                assert(n < 0 && errno == EAGAIN);
+                return(-1);
+        }
+}
+
+/*
+ *  SIOポートからのコールバックの許可
  */
 void
 sio_ena_cbr(SIOPCB *p_siopcb, uint_t cbrtn)
 {
-        serial_t *serial = &p_siopcb->serial;
         switch (cbrtn) {
         case SIO_RDY_SND:
-                serial_irq_set(serial, TxIrq, true);
+                p_siopcb->snd_rdy = true;
                 break;
         case SIO_RDY_RCV:
-                serial_irq_set(serial, RxIrq, true);
+                p_siopcb->rcv_rdy = true;
                 break;
         }
@@ -216 +303 @@
 
 /*
- *  シリアルI/Oポートからのコールバックの禁止
+ *  SIOポートからのコールバックの禁止
  */
 void
 sio_dis_cbr(SIOPCB *p_siopcb, uint_t cbrtn)
 {
-        serial_t *serial = &p_siopcb->serial;
         switch (cbrtn) {
         case SIO_RDY_SND:
-                serial_irq_set(serial, TxIrq, false);
+                p_siopcb->snd_rdy = false;
                 break;
         case SIO_RDY_RCV:
-                serial_irq_set(serial, RxIrq, false);
+                p_siopcb->rcv_rdy = false;
                 break;
         }
 }
-
-/*
- *  シリアルI/Oポートからの送信可能コールバック
- */
-void
-serial_irdy_snd(SIOPCB  *p_siopcb)
-{
-        /* 共通部（syssvc\serial.c）にあるsio_irdy_snd関数を呼び出し*/
-        sio_irdy_snd(p_siopcb->exinf);
-}
-
-/*
- *  シリアルI/Oポートからの受信通知コールバック
- */
-void
-serial_irdy_rcv(SIOPCB  *p_siopcb)
-{
-        /* 共通部（syssvc\serial.c）にあるsio_irdy_rcv関数を呼び出し*/
-        sio_irdy_rcv(p_siopcb->exinf);
-}
-
-/*
- *  SIOの割込みハンドラ
- */
-void
-mbed_serial_irq_handler(uint32_t siopid, SerialIrq event)
-{
-        SIOPCB  *p_siopcb;
-
-        if ((siopid <= 0) || (siopid > (sizeof(siopcb_table) / sizeof(siopcb_table[0]))))
-                return;
-        p_siopcb = get_siopcb(siopid);
-
-        if (!p_siopcb->openflag)
-                return;
-
-        switch (event) {
-        case TxIrq:
-                serial_irdy_snd(p_siopcb);
-                break;
-        case RxIrq:
-                serial_irdy_rcv(p_siopcb);
-                break;
-        }
-}

asp3_tinet_ecnl_rx/trunk/asp3_dcre/target/gr_citrus_gcc/target_serial.cfg

@@ -4 +4 @@
 
 #include <target_serial.h>
-
+//INCLUDE("unix_sigio.cfg");
 ATT_INI({ TA_NULL, 0, sio_initialize });
-
+ATT_TER({ TA_NULL, 0, sio_terminate });
+//CRE_ISR( ISR_SIO, { TA_NULL, 0, INTNO_SIGIO, sio_isr, ISRPRI_SIO });

asp3_tinet_ecnl_rx/trunk/asp3_dcre/target/gr_citrus_gcc/target_serial.h

@@ -4 +4 @@
  *      Advanced Standard Profile Kernel
  * 
- *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
- *                              Toyohashi Univ. of Technology, JAPAN
- *  Copyright (C) 2003-2004 by Naoki Saito
- *             Nagoya Municipal Industrial Research Institute, JAPAN
- *  Copyright (C) 2003-2004 by Platform Development Center
- *                                          RICOH COMPANY,LTD. JAPAN
- *  Copyright (C) 2008-2010 by Witz Corporation, JAPAN
- *  Copyright (C) 2013      by Mitsuhiro Matsuura
+ *  Copyright (C) 2006-2018 by Embedded and Real-Time Systems Laboratory
+ *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
  *  上記著作権者は，以下の(1)～(4)の条件を満たす場合に限り，本ソフトウェ
@@ -46 +40 @@
 
 /*
- *              シリアルI/Oデバイス（SIO）ドライバ（GR-CITRUS用）
+ *              シリアルインタフェースドライバのターゲット依存部（GR-CITRUS用）
  */
 
@@ -53 +47 @@
 
 #include "gr_citrus.h"
-#include "serial_api.h"
+#include <t_stddef.h>
 
-#define SIO_RDY_SND 1
-#define SIO_RDY_RCV 2
+/*
+ *  SIOポート数の定義
+ */
+//#define TNUM_SIOP             1               /* サポートするSIOポートの数 */
+
+/*
+ *  SIO割込みを登録するための定義
+ */
+#define ISRPRI_SIO              1               /* SIOの割込みサービスルーチンのISR優先度 */
 
 #ifndef TOPPERS_MACRO_ONLY
 
-typedef struct sio_port_control_block SIOPCB;
+/*
+ *  SIOポート管理ブロックの定義
+ */
+typedef struct sio_port_control_block   SIOPCB;
+
+/*
+ *  コールバックルーチンの識別番号
+ */
+#define SIO_RDY_SND             1U              /* 送信可能コールバック */
+#define SIO_RDY_RCV             2U              /* 受信通知コールバック */
 
 /*
@@ -68 +78 @@
 
 /*
- *  シリアルI/Oポートのオープン
+ *  SIOドライバの終了処理
+ */
+extern void             sio_terminate(intptr_t exinf);
+
+/*
+ *  SIOポートのオープン
  */
 extern SIOPCB   *sio_opn_por(ID siopid, intptr_t exinf);
 
 /*
- *  シリアルI/Oポートのクローズ
+ *  SIOポートのクローズ
  */
 extern void             sio_cls_por(SIOPCB *p_siopcb);
 
 /*
- *  シリアルI/Oポートへの文字送信
+ *  SIOの割込みサービスルーチン
+ */
+extern bool_t   sio_isr_snd(ID siopid);
+
+/*
+ *  SIOの割込みサービスルーチン
+ */
+extern bool_t   sio_isr_rcv(ID siopid, char c);
+
+/*
+ *  SIOポートへの文字送信
  */
 extern bool_t   sio_snd_chr(SIOPCB *siopcb, char c);
 
 /*
- *  シリアルI/Oポートからの文字受信
+ *  SIOポートからの文字受信
  */
 extern int_t    sio_rcv_chr(SIOPCB *siopcb);
 
 /*
- *  シリアルI/Oポートからのコールバックの許可
+ *  SIOポートからのコールバックの許可
  */
 extern void             sio_ena_cbr(SIOPCB *siopcb, uint_t cbrtn);
 
 /*
- *  シリアルI/Oポートからのコールバックの禁止
+ *  SIOポートからのコールバックの禁止
  */
 extern void             sio_dis_cbr(SIOPCB *siopcb, uint_t cbrtn);
 
 /*
- *  シリアルI/Oポートからの送信可能コールバック
+ *  SIOポートからの送信可能コールバック
  */
 extern void             sio_irdy_snd(intptr_t exinf);
 
 /*
- *  シリアルI/Oポートからの受信通知コールバック
+ *  SIOポートからの受信通知コールバック
  */
 extern void             sio_irdy_rcv(intptr_t exinf);
 
-
 #endif /* TOPPERS_MACRO_ONLY */
 #endif /* TOPPERS_TARGET_SERIAL_H */

asp3_tinet_ecnl_rx/trunk/asp3_dcre/target/gr_citrus_gcc/target_syssvc.h

@@ -80 +80 @@
 #define TARGET_NAME     "GR-CITRUS"
 
-
+#ifdef TOPPERS_OMIT_TECS
 /*
  *  システムログの低レベル出力のための文字出力
@@ -87 +87 @@
  */
 extern void     target_fput_log( char c );
-
+#endif
 
 /*
@@ -94 +94 @@
  */
 #ifdef PRC_COPYRIGHT
-#define TARGET_COPYRIGHT        PRC_COPYRIGHT
+#define TARGET_COPYRIGHT        PRC_COPYRIGHT
 #endif /* PRC_COPYRIGHT */
 
@@ -101 +101 @@
  *  シリアルポート数の定義
  */
-#define TNUM_PORT                       UINT_C( 2 )
+#define TNUM_PORT                       UINT_C( 2 )
 
 /*
  *  使用するシリアルポートID
  */
-#define SIO_PORTID                      UINT_C( 1 )
+#define SIO_PORTID                      UINT_C( 1 )
 
 #define LOGTASK_PORTID          SIO_PORTID

asp3_tinet_ecnl_rx/trunk/asp3_dcre/target/gr_citrus_gcc/target_timer.c

@@ -398 +398 @@
          */
         if (probe_int(INTNO_TIMER1)) {
-                if (local_cnt < 0x8000)
+                if(local_cnt < 0x8000)
                         local_eut += 1;
         }
 
         time = (((HRTCNT)local_eut * CMCOR_PERIOD) + (HRTCNT)local_cnt) / USEC_CONVERT_VALUE;
-
+#ifdef _MSC_VER
+        // シミュレーションではタイマーが戻らないよう調整
+        if (time < current_hrtcnt)
+                time = current_hrtcnt + ((HRTCNT)local_cnt / USEC_CONVERT_VALUE);
+#endif
         return time;
 }

asp3_tinet_ecnl_rx/trunk/asp3_dcre/target/gr_sakura_gcc/Makefile.target

@@ -25 +25 @@
 #  システムサービスに関する定義
 #
-SYSSVC_DIRS := $(SYSSVC_DIRS) $(SRCDIR)/mbed
-SYSSVC_COBJS := $(SYSSVC_COBJS)
+SYSSVC_DIRS := $(SYSSVC_DIRS) $(SRCDIR)/mbed $(SRCDIR)/syssvc/tlsf
+SYSSVC_COBJS := $(SYSSVC_COBJS) musl_adapter.o tlsf.o
 
 #

asp3_tinet_ecnl_rx/trunk/asp3_dcre/target/gr_sakura_gcc/target.cdl

@@ -60 +60 @@
  *  ターゲット依存のセルタイプの定義
  */
-import("tPutLogGRSakura.cdl");
+import("syssvc/tPutLogSIOPort.cdl");
 import("tSIOPortGRSakura.cdl");
 
@@ -72 +72 @@
  *  低レベル出力の組み上げ記述
  */
-cell tPutLogGRSakura PutLogTarget {
+cell tPutLogSIOPort PutLogTarget {
         /* SIOドライバとの結合 */
         cSIOPort = SIOPortTarget1.eSIOPort;

asp3_tinet_ecnl_rx/trunk/asp3_dcre/target/gr_sakura_gcc/target_kernel.cfg

@@ -5 +5 @@
  */
 INCLUDE("target_timer.cfg")
+INCLUDE("syssvc/musl_adapter.cfg")

asp3_tinet_ecnl_rx/trunk/asp3_dcre/target/gr_sakura_gcc/target_kernel_impl.c

@@ -54 +54 @@
 #ifdef TOPPERS_OMIT_TECS
 #include "serial_api.h"
+#include "target_syssvc.h"
 #endif
 
@@ -86 +87 @@
          *  シリアルポートの設定
          */
-        serial_init(&log_serial, P20, P21);
+        serial_init(&log_serial, STDIO_UART_TX, STDIO_UART_RX);
         serial_baud(&log_serial, UART_BAUDRATE);
         serial_format(&log_serial, 8, ParityNone, 1);

asp3_tinet_ecnl_rx/trunk/asp3_dcre/target/gr_sakura_gcc/target_serial.c

@@ -3 +3 @@
  *      Toyohashi Open Platform for Embedded Real-Time Systems/
  *      Advanced Standard Profile Kernel
- *
- *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
- *                              Toyohashi Univ. of Technology, JAPAN
- *  Copyright (C) 2003-2004 by Naoki Saito
- *             Nagoya Municipal Industrial Research Institute, JAPAN
- *  Copyright (C) 2003-2004 by Platform Development Center
- *                                          RICOH COMPANY,LTD. JAPAN
- *  Copyright (C) 2008-2010 by Witz Corporation, JAPAN
- *  Copyright (C) 2013      by Mitsuhiro Matsuura
- *
+ * 
+ *  Copyright (C) 2006-2018 by Embedded and Real-Time Systems Laboratory
+ *              Graduate School of Information Science, Nagoya Univ., JAPAN
+ * 
  *  上記著作権者は，以下の(1)～(4)の条件を満たす場合に限り，本ソフトウェ
  *  ア（本ソフトウェアを改変したものを含む．以下同じ）を使用・複製・改
@@ -35 +29 @@
  *      由に基づく請求からも，上記著作権者およびTOPPERSプロジェクトを
  *      免責すること．
- *
+ * 
  *  本ソフトウェアは，無保証で提供されているものである．上記著作権者お
  *  よびTOPPERSプロジェクトは，本ソフトウェアに関して，特定の使用目的
@@ -41 +35 @@
  *  アの利用により直接的または間接的に生じたいかなる損害に関しても，そ
  *  の責任を負わない．
- *
+ * 
  *  @(#) $Id$
  */
 
 /*
- *      RX630 UART用シリアルI/Oモジュール
- */
-#include "kernel_impl.h"
-#include <sil.h>
+ *              シリアルインタフェースドライバのターゲット依存部（GR-SAKURA用）
+ */
+
+#include "gr_sakura.h"
+#include <t_stddef.h>
+#include <t_syslog.h>
+#include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <termios.h>
 #include "target_serial.h"
-#include "hal/serial_api.h"
-#include "target_syssvc.h"
-#include "syssvc/serial.h"
-
-/*
- *  シリアルI/Oポート初期化ブロックの定義
+#include "syssvc/siofd.h"
+
+/*
+ *  SIOポート初期化ブロックの定義
  */
 typedef struct sio_port_initialization_block {
-        PinName tx;
-        PinName rx;
+        char            *path;                  /* ファイルのパス名 */
 } SIOPINIB;
 
 /*
- *  シリアルI/Oポート管理ブロックの定義
+ *  SIOポート管理ブロックの定義
  */
 struct sio_port_control_block {
-        const SIOPINIB *p_siopinib;
-        intptr_t exinf;
-        bool_t openflag;
-        serial_t serial;
+        const SIOPINIB *p_siopinib;     /* SIOポート初期化ブロック */
+        intptr_t        exinf;                  /* 拡張情報 */
+        bool_t          opened;         /* オープン済みフラグ */
+        struct termios saved_term;      /* 元の端末制御情報 */
+
+        int_t           read_fd;                /* 読出し用ファイルディスクリプタ */
+        bool_t          rcv_flag;               /* 受信文字バッファ有効フラグ */
+        char            rcv_buf;                /* 受信文字バッファ */
+        bool_t          rcv_rdy;                /* 受信通知コールバック許可フラグ */
+
+        int_t           write_fd;               /* 書込み用ファイルディスクリプタ */
+        bool_t          snd_flag;               /* 送信文字バッファ有効フラグ */
+        char            snd_buf;                /* 送信文字バッファ */
+        bool_t          snd_rdy;                /* 送信通知コールバック許可フラグ */
 };
 
 /*
- *  シリアルI/Oポート管理ブロックのエリア
- */
-SIOPCB siopcb_table[TNUM_PORT];
-
-static const SIOPINIB siopinib_table[TNUM_SIOP] =
-{
-        { P20, P21 },
-#if TNUM_SIOP > 1
-        { P32, P33 },
-#endif
-#if TNUM_SIOP > 2
-        { P50, P52 },
-#endif
-#if TNUM_SIOP > 3
-        { P23, P25 },
-#endif
-#if TNUM_SIOP > 4
-        { PC3, PC2 },
-#endif
-#if TNUM_SIOP > 5
-        { PC7, PC6 },
-#endif
-#if TNUM_SIOP > 6
-        { P26, P30 },
-#endif
+ *  SIOポート初期化ブロック
+ */
+const SIOPINIB siopinib_table[TNUM_SIOP] = {
+        { NULL }
 };
 
 /*
- *  シリアルI/OポートIDから管理ブロックを取り出すためのマクロ
- */
-#define INDEX_SIOP(siopid)       ((uint_t)((siopid) - 1))
-#define get_siopcb(siopid)       (&(siopcb_table[INDEX_SIOP(siopid)]))
-#define get_siopinib(siopid) (&(siopinib_table[INDEX_SIOP(siopid)]))
-
-static void mbed_serial_irq_handler(uint32_t id, SerialIrq event);
+ *  SIOポート管理ブロックのエリア
+ */
+SIOPCB  siopcb_table[TNUM_SIOP];
+
+/*
+ *  SIOポートIDから管理ブロックを取り出すためのマクロ
+ */
+#define INDEX_SIOP(siopid)      ((uint_t)((siopid) - 1))
+#define get_siopcb(siopid)      (&(siopcb_table[INDEX_SIOP(siopid)]))
 
 /*
@@ -120 +108 @@
 
         /*
-         *  シリアルI/Oポート管理ブロックの初期化
+         *  SIOポート管理ブロックの初期化
          */
-        for (p_siopcb = siopcb_table, i = 0; i < TNUM_SIOP; p_siopcb++, i++) {
+        for (i = 0; i < TNUM_SIOP; i++) {
+                p_siopcb = &(siopcb_table[i]);
                 p_siopcb->p_siopinib = &(siopinib_table[i]);
-                p_siopcb->openflag = false;
-        }
-}
-
-/*
- *  シリアルI/Oポートのオープン
+                p_siopcb->opened = false;
+        }
+}
+
+/*
+ *  SIOドライバの終了処理
+ */
+void
+sio_terminate(intptr_t exinf)
+{
+        uint_t  i;
+
+        /*
+         *  オープンされているSIOポートのクローズ
+         */
+        for (i = 0; i < TNUM_SIOP; i++) {
+                sio_cls_por(&(siopcb_table[i]));
+        }
+}
+
+/*
+ *  SIOポートのオープン
  */
 SIOPCB *
 sio_opn_por(ID siopid, intptr_t exinf)
 {
-        SIOPCB  *p_siopcb = NULL;
-        ER      ercd;
-        serial_t *serial;
-
-        if ((siopid <= 0) || (siopid > (sizeof(siopcb_table) / sizeof(siopcb_table[0]))))
-                return NULL;
+        SIOPCB                  *p_siopcb;
+        const SIOPINIB  *p_siopinib;
+        int_t                   fd;
+        struct termios  term;
+
         p_siopcb = get_siopcb(siopid);
-
-        if (p_siopcb->openflag)
-                return NULL;
-        p_siopcb->openflag = true;
-        p_siopcb->exinf = exinf;
-
-        serial = &p_siopcb->serial;
-        serial_init(serial, p_siopcb->p_siopinib->tx, p_siopcb->p_siopinib->rx);
-        serial_baud(serial, UART_BAUDRATE);
-        serial_format(serial, 8, ParityNone, 1);
-
-        serial_irq_handler(serial, mbed_serial_irq_handler, siopid);
-
-        return p_siopcb;
-}
-
-/*
- *  シリアルI/Oポートのクローズ
+        p_siopinib = p_siopcb->p_siopinib;
+
+        if (!(p_siopcb->opened)) {
+                if (p_siopinib->path != NULL) {
+                        fd = siofd_open(p_siopinib->path, O_RDWR, 0777);
+                        assert(fd >= 0);
+                        p_siopcb->read_fd = fd;
+                        p_siopcb->write_fd = fd;
+                }
+                else {
+                        fd = STDIN_FILENO;                                      /* 標準入出力を使う */
+                        p_siopcb->read_fd = STDIN_FILENO;
+                        p_siopcb->write_fd = STDOUT_FILENO;
+                }
+                siofd_fcntl(fd, F_SETOWN, getpid());
+                siofd_fcntl(fd, F_SETFL, (O_NONBLOCK | O_ASYNC));
+
+                siofd_tcgetattr(fd, &(p_siopcb->saved_term));
+                term = p_siopcb->saved_term;
+                term.c_lflag &= ~(ECHO | ICANON);
+                siofd_tcsetattr(fd, TCSAFLUSH, &term);
+
+                p_siopcb->exinf = exinf;
+                p_siopcb->rcv_flag = false;
+                p_siopcb->rcv_rdy = false;
+                p_siopcb->snd_flag = false;
+                p_siopcb->snd_rdy = false;
+                p_siopcb->opened = true;
+        }
+        return(p_siopcb);
+}
+
+/*
+ *  SIOポートのクローズ
  */
 void
 sio_cls_por(SIOPCB *p_siopcb)
 {
-        ER        ercd;
-        serial_t *serial = &p_siopcb->serial;
-
-        /*
-         *  デバイス依存のクローズ処理．
-         */
-        serial_free(serial);
-        p_siopcb->openflag = false;
-}
-
-/*
- *  シリアルI/Oポートへの文字送信
+        int_t   fd;
+
+        if (p_siopcb->opened) {
+                fd = p_siopcb->read_fd;
+                siofd_tcsetattr(fd, TCSAFLUSH, &(p_siopcb->saved_term));
+                siofd_fcntl(fd, F_SETFL, 0);
+
+                if (p_siopcb->p_siopinib->path != NULL) {
+                        siofd_close(p_siopcb->read_fd);
+                }
+
+                p_siopcb->opened = false;
+        }
+}
+
+/*
+ *  SIOの割込みサービスルーチン
+ */
+bool_t
+sio_isr_snd(ID siopid)
+{
+        SIOPCB  *p_siopcb = get_siopcb(siopid);
+        int_t   n;
+
+        if (p_siopcb->snd_flag) {
+                if ((n = siofd_write(p_siopcb->write_fd, &(p_siopcb->snd_buf), 1)) > 0) {
+                        p_siopcb->snd_flag = false;
+                        if (p_siopcb->snd_rdy) {
+                                sio_irdy_snd(p_siopcb->exinf);
+                                return p_siopcb->snd_rdy;
+                        }
+                }
+        }
+
+        return false;
+}
+
+/*
+ *  SIOの割込みサービスルーチン
+ */
+bool_t
+sio_isr_rcv(ID siopid, char c)
+{
+        SIOPCB  *p_siopcb = get_siopcb(siopid);
+
+        if (!p_siopcb->rcv_flag) {
+                p_siopcb->rcv_buf = c;
+                p_siopcb->rcv_flag = true;
+                if (p_siopcb->rcv_rdy) {
+                        sio_irdy_rcv(p_siopcb->exinf);
+                        return p_siopcb->rcv_rdy;
+                }
+        }
+
+        return false;
+}
+
+/*
+ *  SIOポートへの文字送信
  */
 bool_t
 sio_snd_chr(SIOPCB *p_siopcb, char c)
 {
-        serial_t *serial = &p_siopcb->serial;
-        if (!serial_writable(serial))
-                return false;
-        serial_putc(serial, c);
-        return true;
-}
-
-/*
- *  シリアルI/Oポートからの文字受信
+        int_t   n;
+
+        if (!p_siopcb->snd_flag) {
+                if ((n = siofd_write(p_siopcb->write_fd, &c, 1)) > 0) {
+                        return(true);
+                }
+                else {
+                        assert(n < 0 && errno == EAGAIN);
+                        p_siopcb->snd_flag = true;
+                        p_siopcb->snd_buf = c;
+                        return(true);
+                }
+        }
+        else {
+                return(false);
+        }
+}
+
+/*
+ *  SIOポートからの文字受信
  */
 int_t
 sio_rcv_chr(SIOPCB *p_siopcb)
 {
-        serial_t *serial = &p_siopcb->serial;
-        if (!serial_readable(serial))
-                return -1;
-        return serial_getc(serial);
-}
-
-/*
- *  シリアルI/Oポートからのコールバックの許可
+        char    c;
+        int_t   n;
+
+        if (p_siopcb->rcv_flag) {
+                p_siopcb->rcv_flag = false;
+                return((int_t)(uint8_t)(p_siopcb->rcv_buf));
+        }
+        else if ((n = siofd_read(p_siopcb->read_fd, &c, 1)) > 0) {
+                return((int_t)(uint8_t) c);
+        }
+        else {
+                assert(n < 0 && errno == EAGAIN);
+                return(-1);
+        }
+}
+
+/*
+ *  SIOポートからのコールバックの許可
  */
 void
 sio_ena_cbr(SIOPCB *p_siopcb, uint_t cbrtn)
 {
-        serial_t *serial = &p_siopcb->serial;
         switch (cbrtn) {
         case SIO_RDY_SND:
-                serial_irq_set(serial, TxIrq, true);
+                p_siopcb->snd_rdy = true;
                 break;
         case SIO_RDY_RCV:
-                serial_irq_set(serial, RxIrq, true);
+                p_siopcb->rcv_rdy = true;
                 break;
         }
@@ -216 +303 @@
 
 /*
- *  シリアルI/Oポートからのコールバックの禁止
+ *  SIOポートからのコールバックの禁止
  */
 void
 sio_dis_cbr(SIOPCB *p_siopcb, uint_t cbrtn)
 {
-        serial_t *serial = &p_siopcb->serial;
         switch (cbrtn) {
         case SIO_RDY_SND:
-                serial_irq_set(serial, TxIrq, false);
+                p_siopcb->snd_rdy = false;
                 break;
         case SIO_RDY_RCV:
-                serial_irq_set(serial, RxIrq, false);
+                p_siopcb->rcv_rdy = false;
                 break;
         }
 }
-
-/*
- *  シリアルI/Oポートからの送信可能コールバック
- */
-void
-serial_irdy_snd(SIOPCB  *p_siopcb)
-{
-        /* 共通部（syssvc\serial.c）にあるsio_irdy_snd関数を呼び出し*/
-        sio_irdy_snd(p_siopcb->exinf);
-}
-
-/*
- *  シリアルI/Oポートからの受信通知コールバック
- */
-void
-serial_irdy_rcv(SIOPCB  *p_siopcb)
-{
-        /* 共通部（syssvc\serial.c）にあるsio_irdy_rcv関数を呼び出し*/
-        sio_irdy_rcv(p_siopcb->exinf);
-}
-
-/*
- *  SIOの割込みハンドラ
- */
-void
-mbed_serial_irq_handler(uint32_t siopid, SerialIrq event)
-{
-        SIOPCB  *p_siopcb;
-
-        if ((siopid <= 0) || (siopid > (sizeof(siopcb_table) / sizeof(siopcb_table[0]))))
-                return;
-        p_siopcb = get_siopcb(siopid);
-
-        if (!p_siopcb->openflag)
-                return;
-
-        switch (event) {
-        case TxIrq:
-                serial_irdy_snd(p_siopcb);
-                break;
-        case RxIrq:
-                serial_irdy_rcv(p_siopcb);
-                break;
-        }
-}

asp3_tinet_ecnl_rx/trunk/asp3_dcre/target/gr_sakura_gcc/target_serial.cfg

@@ -4 +4 @@
 
 #include <target_serial.h>
-
+//INCLUDE("unix_sigio.cfg");
 ATT_INI({ TA_NULL, 0, sio_initialize });
-
+ATT_TER({ TA_NULL, 0, sio_terminate });
+//CRE_ISR( ISR_SIO, { TA_NULL, 0, INTNO_SIGIO, sio_isr, ISRPRI_SIO });

asp3_tinet_ecnl_rx/trunk/asp3_dcre/target/gr_sakura_gcc/target_serial.h

@@ -4 +4 @@
  *      Advanced Standard Profile Kernel
  * 
- *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
- *                              Toyohashi Univ. of Technology, JAPAN
- *  Copyright (C) 2003-2004 by Naoki Saito
- *             Nagoya Municipal Industrial Research Institute, JAPAN
- *  Copyright (C) 2003-2004 by Platform Development Center
- *                                          RICOH COMPANY,LTD. JAPAN
- *  Copyright (C) 2008-2010 by Witz Corporation, JAPAN
- *  Copyright (C) 2013      by Mitsuhiro Matsuura
+ *  Copyright (C) 2006-2018 by Embedded and Real-Time Systems Laboratory
+ *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
  *  上記著作権者は，以下の(1)～(4)の条件を満たす場合に限り，本ソフトウェ
@@ -46 +40 @@
 
 /*
- *              シリアルI/Oデバイス（SIO）ドライバ（GR-SAKURA用）
+ *              シリアルインタフェースドライバのターゲット依存部（GR-SAKURA用）
  */
 
@@ -53 +47 @@
 
 #include "gr_sakura.h"
-#include "serial_api.h"
+#include <t_stddef.h>
 
-#define SIO_RDY_SND 1
-#define SIO_RDY_RCV 2
+/*
+ *  SIOポート数の定義
+ */
+//#define TNUM_SIOP             1               /* サポートするSIOポートの数 */
+
+/*
+ *  SIO割込みを登録するための定義
+ */
+#define ISRPRI_SIO              1               /* SIOの割込みサービスルーチンのISR優先度 */
 
 #ifndef TOPPERS_MACRO_ONLY
 
-typedef struct sio_port_control_block SIOPCB;
+/*
+ *  SIOポート管理ブロックの定義
+ */
+typedef struct sio_port_control_block   SIOPCB;
+
+/*
+ *  コールバックルーチンの識別番号
+ */
+#define SIO_RDY_SND             1U              /* 送信可能コールバック */
+#define SIO_RDY_RCV             2U              /* 受信通知コールバック */
 
 /*
@@ -68 +78 @@
 
 /*
- *  シリアルI/Oポートのオープン
+ *  SIOドライバの終了処理
+ */
+extern void             sio_terminate(intptr_t exinf);
+
+/*
+ *  SIOポートのオープン
  */
 extern SIOPCB   *sio_opn_por(ID siopid, intptr_t exinf);
 
 /*
- *  シリアルI/Oポートのクローズ
+ *  SIOポートのクローズ
  */
 extern void             sio_cls_por(SIOPCB *p_siopcb);
 
 /*
- *  シリアルI/Oポートへの文字送信
+ *  SIOの割込みサービスルーチン
+ */
+extern bool_t   sio_isr_snd(ID siopid);
+
+/*
+ *  SIOの割込みサービスルーチン
+ */
+extern bool_t   sio_isr_rcv(ID siopid, char c);
+
+/*
+ *  SIOポートへの文字送信
  */
 extern bool_t   sio_snd_chr(SIOPCB *siopcb, char c);
 
 /*
- *  シリアルI/Oポートからの文字受信
+ *  SIOポートからの文字受信
  */
 extern int_t    sio_rcv_chr(SIOPCB *siopcb);
 
 /*
- *  シリアルI/Oポートからのコールバックの許可
+ *  SIOポートからのコールバックの許可
  */
 extern void             sio_ena_cbr(SIOPCB *siopcb, uint_t cbrtn);
 
 /*
- *  シリアルI/Oポートからのコールバックの禁止
+ *  SIOポートからのコールバックの禁止
  */
 extern void             sio_dis_cbr(SIOPCB *siopcb, uint_t cbrtn);
 
 /*
- *  シリアルI/Oポートからの送信可能コールバック
+ *  SIOポートからの送信可能コールバック
  */
 extern void             sio_irdy_snd(intptr_t exinf);
 
 /*
- *  シリアルI/Oポートからの受信通知コールバック
+ *  SIOポートからの受信通知コールバック
  */
 extern void             sio_irdy_rcv(intptr_t exinf);
 
-
 #endif /* TOPPERS_MACRO_ONLY */
 #endif /* TOPPERS_TARGET_SERIAL_H */

asp3_tinet_ecnl_rx/trunk/asp3_dcre/target/gr_sakura_gcc/target_syssvc.h

@@ -80 +80 @@
 #define TARGET_NAME     "GR-SAKURA"
 
-
+#ifdef TOPPERS_OMIT_TECS
 /*
  *  システムログの低レベル出力のための文字出力
@@ -87 +87 @@
  */
 extern void     target_fput_log( char c );
-
+#endif
 
 /*
@@ -94 +94 @@
  */
 #ifdef PRC_COPYRIGHT
-#define TARGET_COPYRIGHT        PRC_COPYRIGHT
+#define TARGET_COPYRIGHT        PRC_COPYRIGHT
 #endif /* PRC_COPYRIGHT */
 
@@ -101 +101 @@
  *  シリアルポート数の定義
  */
-#define TNUM_PORT                       UINT_C( 2 )
+#define TNUM_PORT                       UINT_C( 2 )
 
 /*
  *  使用するシリアルポートID
  */
-#define SIO_PORTID                      UINT_C( 1 )
+#define SIO_PORTID                      UINT_C( 1 )
 
 #define LOGTASK_PORTID          SIO_PORTID

asp3_tinet_ecnl_rx/trunk/asp3_dcre/target/gr_sakura_gcc/target_timer.c

@@ -403 +403 @@
 
         time = (((HRTCNT)local_eut * CMCOR_PERIOD) + (HRTCNT)local_cnt) / USEC_CONVERT_VALUE;
-
+#ifdef _MSC_VER
+        // シミュレーションではタイマーが戻らないよう調整
+        if (time < current_hrtcnt)
+                time = current_hrtcnt + ((HRTCNT)local_cnt / USEC_CONVERT_VALUE);
+#endif
         return time;
 }

asp3_tinet_ecnl_rx/trunk/asp3_dcre/tecsgen/tecslib/core/C_parser.tab.rb

@@ -277 +277 @@
                 @@n_warning += 1
                 locale = @@current_locale[ @@generator_nest ]
-                Console.puts "warning: #{locale[0]}: line #{locale[1]} #{msg}"
+                Console.puts "#{locale[0]}:#{locale[1]}: warning: #{msg}"
         end
 
@@ -284 +284 @@
                 @@n_info += 1
                 locale = @@current_locale[ @@generator_nest ]
-                Console.puts "info: #{locale[0]}: line #{locale[1]} #{msg}"
+                Console.puts "#{locale[0]}:#{locale[1]}: info: #{msg}"
         end
 

asp3_tinet_ecnl_rx/trunk/asp3_dcre/tecsgen/tecslib/core/C_parser.y.rb

@@ -1040 +1040 @@
 
                 if locale then
-                        Console.puts "error: #{locale[0]}: line #{locale[1]} #{msg}"
+                        Console.puts "#{locale[0]}:#{locale[1]}: error: #{msg}"
                 else
                         Console.puts "error: #{msg}"
@@ -1050 +1050 @@
                 @@n_warning += 1
                 locale = @@current_locale[ @@generator_nest ]
-                Console.puts "warning: #{locale[0]}: line #{locale[1]} #{msg}"
+                Console.puts "#{locale[0]}:#{locale[1]}: warning: #{msg}"
         end
 
@@ -1057 +1057 @@
                 @@n_info += 1
                 locale = @@current_locale[ @@generator_nest ]
-                Console.puts "info: #{locale[0]}: line #{locale[1]} #{msg}"
+                Console.puts "#{locale[0]}:#{locale[1]}: info: #{msg}"
         end
 

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

@@ -131 +131 @@
 extern ER_UINT  udp6_snd_dat (ID cepid, T_IPV6EP *p_dstaddr, void *data, int_t len, TMO tmout);
 extern ER_UINT  udp6_rcv_dat (ID cepid, T_IPV6EP *p_dstaddr, void *data, int_t len, TMO tmout);
+extern ER       udp6_can_cep(ID cepid, FN fncd);
 
 /* 【拡張機能】 */
@@ -139 +140 @@
 extern ER       udp_cre_cep (ID cepid, T_UDP_CCEP *pk_ccep);
 
+extern ER       udp6_del_cep(ID cepid);
+extern ER       udp6_set_opt(ID cepid, int_t optname, void *optval, int_t optlen);
+extern ER       udp6_get_opt(ID cepid, int_t optname, void *optval, int_t optlen);
 extern ER       udp6_cre_cep (ID cepid, T_UDP6_CCEP *pk_ccep);
 

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

@@ -521 +521 @@
 
                                 /* 相手のアドレスをコピーする。*/
+
+#if defined(_IP6_CFG) && defined(_IP4_CFG)
+
+                                if (cep->flags & TCP_CEP_FLG_IPV4) {
+                                        (*cep->p_dstaddr4).ipaddr = ntohl(cep->dstaddr.ipaddr.s6_addr32[3]);
+                                        (*cep->p_dstaddr4).portno = cep->dstaddr.portno;
+                                        }
+                                else
+                                        *cep->p_dstaddr = cep->dstaddr;
+
+#else   /* of #if defined(_IP6_CFG) && defined(_IP4_CFG) */
+
                                 *cep->p_dstaddr = cep->dstaddr;
+
+#endif  /* of #if defined(_IP6_CFG) && defined(_IP4_CFG) */
 
                                 if (IS_PTR_DEFINED(cep->callback)) {
@@ -847 +861 @@
 
                                 /* 相手のアドレスをコピーする。*/
+
+#if defined(_IP6_CFG) && defined(_IP4_CFG)
+
+                                if (cep->flags & TCP_CEP_FLG_IPV4) {
+                                        (*cep->p_dstaddr4).ipaddr = ntohl(cep->dstaddr.ipaddr.s6_addr32[3]);
+                                        (*cep->p_dstaddr4).portno = cep->dstaddr.portno;
+                                        }
+                                else
+                                        *cep->p_dstaddr = cep->dstaddr;
+
+#else   /* of #if defined(_IP6_CFG) && defined(_IP4_CFG) */
+
                                 *cep->p_dstaddr = cep->dstaddr;
+
+#endif  /* of #if defined(_IP6_CFG) && defined(_IP4_CFG) */
 
                                 if (IS_PTR_DEFINED(cep->callback)) {

asp3_tinet_ecnl_rx/trunk/asp3_dcre/tinet/netinet/tcpn_usrreq.c

@@ -671 +671 @@
                 cep->p_myaddr4    = p_myaddr;
                 cep->p_dstaddr    = NULL;
-                cep->p_myaddr     = NULL;
+                cep->p_myaddr     = NADR;
 
 #else   /* of #if API_PROTO == API_PROTO_IPV4 */
 
                 cep->p_dstaddr4   = NULL;
-                cep->p_myaddr4    = NULL;
+                cep->p_myaddr4    = NADR;
                 cep->p_dstaddr    = p_dstaddr;
                 cep->p_myaddr     = p_myaddr;

asp3_tinet_ecnl_rx/trunk/asp3_dcre/tinet/netinet/udp_output.c

@@ -182 +182 @@
 #if defined(_IP6_CFG) && TNUM_UDP6_CEPID > 0
 
-                for (ix = tmax_udp6_cepid; ix -- > 0; ) {
+                for (ix = TNUM_UDP6_CEPID - 1; ix -- > 0; ) {
 
                         if (udp6_cep[ix].flags & UDP_CEP_FLG_POST_OUTPUT) {
@@ -194 +194 @@
 #if defined(_IP4_CFG) && TNUM_UDP4_CEPID > 0
 
-                for (ix = tmax_udp4_cepid; ix -- > 0; ) {
+                for (ix = TNUM_UDP4_CEPID - 1; ix -- > 0; ) {
 
                         if (udp4_cep[ix].flags & UDP_CEP_FLG_POST_OUTPUT) {

asp3_tinet_ecnl_rx/trunk/asp3_dcre/tinet/netinet/udp_subr.c

@@ -146 +146 @@
 #define UDP_FIND_CEP            udp6_find_cep
 #define UDP_NOTIFY              udp6_notify
-#define TMAX_UDP_CEPID          tmax_udp6_cepid
+#define TMAX_UDP_CEPID          (TNUM_UDP6_CEPID - 1)
 #define UDP_CEP                 udp6_cep
 #define T_UDP_CEP               T_UDP6_CEP
@@ -183 +183 @@
 #define UDP_FIND_CEP            udp4_find_cep
 #define UDP_NOTIFY              udp4_notify
-#define TMAX_UDP_CEPID          tmax_udp4_cepid
+#define TMAX_UDP_CEPID          (TNUM_UDP4_CEPID - 1)
 #define T_UDP_CEP               T_UDP4_CEP
 #define UDP_CEP                 udp4_cep

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

@@ -308 +308 @@
                 else 
                         error = UDP_ALLOC_PORT(cep, pk_ccep->myaddr.portno);
-                
-                if (error == E_OK) {
-
-                        /* UDP 通信端点生成情報をコピーする。*/
-                        cep->cepatr        = pk_ccep->cepatr;                   /* 通信端点属性               */
-                        cep->myaddr.ipaddr = pk_ccep->myaddr.ipaddr;            /* 自分のアドレス      */
-                        cep->callback      = (void*)pk_ccep->callback;          /* コールバック               */
-
-                        /* UDP 通信端点を生成済みにする。*/
-                        cep->flags |= UDP_CEP_FLG_VALID;
-                        }
-                }
+
+                        if (error == E_OK) {
+                                /* UDP 通信端点生成情報をコピーする。*/
+                                cep->cepatr        = pk_ccep->cepatr;                   /* 通信端点属性               */
+                                cep->myaddr.ipaddr = pk_ccep->myaddr.ipaddr;            /* 自分のアドレス      */
+                                cep->callback      = (void*)pk_ccep->callback;          /* コールバック               */
+
+                                /* UDP 通信端点を生成済みにする。*/
+                                cep->flags |= UDP_CEP_FLG_VALID;
+                                }
+                        }
 
         /* 通信端点のロックを解除する。*/

asp3_tinet_ecnl_rx/trunk/bnep_bridge/Debug/Makefile

@@ -58 +58 @@
         LIBS = $(SRCDIR)/../musl-1.1.18/Debug/libmusl.a \
                 $(SRCDIR)/../btstack/Debug/libbtstack.a \
-                $(SRCDIR)/../usbhost/Debug/libusbhost.a
+                $(SRCDIR)/../usbhost/Debug/libusbhost.a \
+                $(SRCDIR)/../zlib-1.2.11/Debug/libzlib.a
 endif
 ifeq ($(SRCLANG),c++)
@@ -185 +186 @@
 CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES)
 
-APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
-APPL_COBJS := $(APPL_COBJS) ntshell_main.o fdtable.o io_stub.o ffarch.o diskio.o ff.o mmc_rspi.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/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
+APPL_COBJS := $(APPL_COBJS) ntshell_main.o fdtable.o stdio_stub.o io_stub.o ffarch.o diskio.o ff.o mmc_rspi.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
 
 #

asp3_tinet_ecnl_rx/trunk/bnep_bridge/src/main.c

@@ -54 +54 @@
 #include "ffarch.h"
 #include "ff.h"
-#include "core/ntshell.h"
-#include "core/ntlibc.h"
 #include <stdio.h>
 #include "usrcmd.h"
-#include "util/ntopt.h"
 #include "gpio_api.h"
 #include "usb_hbth.h"

asp3_tinet_ecnl_rx/trunk/bnep_bridge/src/main.cdl

@@ -22 +22 @@
  *  ターゲット依存部の取り込み
  */
-import("target.cdl");
+import("ntshell.cdl");
 
 /*

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

@@ -4 +4 @@
 /* Location of default ca bundle */
 /* #undef CURL_CA_BUNDLE */
+#define CURL_CA_BUNDLE "0:/certs/ca-bundle.crt"
 
 /* define "1" to use built in CA store of SSL library */

asp3_tinet_ecnl_rx/trunk/curl-7.57.0/lib/easy.c

@@ -166 +166 @@
 #endif
 
-#ifdef __c2__
-#define malloc musl_malloc
-#define free musl_free
-#define realloc musl_realloc
-#define calloc musl_calloc
-#endif
-
 #ifndef __SYMBIAN32__
 /*

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/include/bits/alltypes.h

@@ -1 @@
-#if defined(_MSC_VER) || defined(__c2__)
-#define asctime musl_asctime
-#define calloc musl_calloc
-#define clock musl_clock
-#define close musl_close
-#define execvp musl_execvp
-#define exit musl_exit
-#define fclose musl_fclose
-#define fdopen musl_fdopen
-#define fflush musl_fflush
-#define fma _musl_fma
-#define fgetc musl_fgetc
-#define fopen musl_fopen
-#define fprintf musl_fprintf
-#define fputc musl_fputc
-#define free musl_free
-#define fwrite musl_fwrite
-#define getcwd musl_getcwd
-#define localtime musl_localtime
-#define lseek musl_lseek
-#define malloc musl_malloc
-#define memmove musl_memmove
-#define open musl_open
-#define perror musl_perror
-#define printf musl_printf
-#define read musl_read
-#define realloc musl_realloc
-#define strftime musl_strftime
-#define strnlen musl_strnlen
-#define strtoul musl_strtoul
-#define time musl_time
-#define tzset musl_tzset
-#define unlink musl_unlink
-#define strncmp musl_strncmp
-#define strtol musl_strtol
-#define strchr musl_strchr
-#endif
 #ifdef _MSC_VER
 #define __builtin_va_list char *

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/include/math.h

@@ -15 +15 @@
 #define NAN       __builtin_nanf("")
 #define INFINITY  __builtin_inff()
-#elif !defined(_MSC_VER)
+#else
 #define NAN       (0.0f/0.0f)
 #define INFINITY  1e5000f
-#else
-#define _HUGE_ENUF  1e+300
-#define INFINITY   ((float)(_HUGE_ENUF * _HUGE_ENUF))
-#define NAN        ((float)(INFINITY * 0.0F))
 #endif
 

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/include/stddef.h

@@ -11 +11 @@
 #define __NEED_size_t
 #define __NEED_wchar_t
-#if __STDC_VERSION__ >= 201112L || __cplusplus >= 201103L
+#if __STDC_VERSION__ >= 201112L || (defined(__cplusplus) && __cplusplus >= 201103L)
 #define __NEED_max_align_t
 #endif

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/locale/__lctrans.c

@@ -8 +8 @@
 }
 
-#ifndef __c2__
 weak_alias(dummy, __lctrans_impl);
-#endif
 
 const char *__lctrans(const char *msg, const struct __locale_map *lm)

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/locale/__mo_lookup.c

@@ -4 +4 @@
 static inline uint32_t swapc(uint32_t x, int c)
 {
-        return c ? x>>24 | x>>8&0xff00 | x<<8&0xff0000 | x<<24 : x;
+        return c ? (x>>24) | (x>>8&0xff00) | (x<<8&0xff0000) | (x<<24) : x;
 }
 

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/locale/iconv.c

@@ -136 +136 @@
 {
         e &= 3;
-        return s[e]+0U<<24 | s[e^1]<<16 | s[e^2]<<8 | s[e^3];
+        return (s[e]+0U)<<24 | s[e^1]<<16 | s[e^2]<<8 | s[e^3];
 }
 
@@ -156 +156 @@
         unsigned x = c - 128 - map[-1];
         x = legacy_chars[ map[x*5/4]>>2*x%8 |
-                map[x*5/4+1]<<8-2*x%8 & 1023 ];
+                (map[x*5/4+1]<<(8-2*x%8) & 1023) ];
         return x ? x : c;
 }
@@ -348 +348 @@
                                 c += (0xa1-0x81);
                                 d += 0xa1;
-                                if (c >= 93 || c>=0xc6-0x81 && d>0x52)
+                                if (c >= 93 || (c>=0xc6-0x81 && d>0x52))
                                         goto ilseq;
                                 if (d-'A'<26) d = d-'A';

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/locale/locale_map.c

@@ -36 +36 @@
 
         if (!*val) {
-                (val = getenv("LC_ALL")) && *val ||
-                (val = getenv(envvars[cat])) && *val ||
-                (val = getenv("LANG")) && *val ||
+                ((val = getenv("LC_ALL")) && *val) ||
+                ((val = getenv(envvars[cat])) && *val) ||
+                ((val = getenv("LANG")) && *val) ||
                 (val = "C.UTF-8");
         }

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/malloc/memalign.c

@@ -46 +46 @@
         footer = ((size_t *)end)[-2];
 
-        ((size_t *)mem)[-1] = header&7 | new-mem;
-        ((size_t *)new)[-2] = footer&7 | new-mem;
-        ((size_t *)new)[-1] = header&7 | end-new;
-        ((size_t *)end)[-2] = footer&7 | end-new;
+        ((size_t *)mem)[-1] = (header&7) | new-mem;
+        ((size_t *)new)[-2] = (footer&7) | new-mem;
+        ((size_t *)new)[-1] = (header&7) | end-new;
+        ((size_t *)end)[-2] = (footer&7) | end-new;
 
         free(mem);

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/math/fma.c

@@ -70 +70 @@
                 if (d < 64) {
                         zlo = nz.m<<d;
-                        zhi = nz.m>>64-d;
+                        zhi = nz.m>>(64-d);
                 } else {
                         zlo = 0;
@@ -78 +78 @@
                         if (d == 0) {
                         } else if (d < 64) {
-                                rlo = rhi<<64-d | rlo>>d | !!(rlo<<64-d);
+                                rlo = rhi<<(64-d) | rlo>>d | !!(rlo<<(64-d));
                                 rhi = rhi>>d;
                         } else {
@@ -91 +91 @@
                         zlo = nz.m;
                 } else if (d < 64) {
-                        zlo = nz.m>>d | !!(nz.m<<64-d);
+                        zlo = nz.m>>d | !!(nz.m<<(64-d));
                 } else {
                         zlo = 1;
@@ -123 +123 @@
                 d = a_clz_64(rhi)-1;
                 /* note: d > 0 */
-                rhi = rhi<<d | rlo>>64-d | !!(rlo<<d);
+                rhi = rhi<<d | rlo>>(64-d) | !!(rlo<<d);
         } else if (rlo) {
                 d = a_clz_64(rlo)-1;
@@ -174 +174 @@
                         /* only round once when scaled */
                         d = 10;
-                        i = ( rhi>>d | !!(rhi<<64-d) ) << d;
+                        i = ( rhi>>d | !!(rhi<<(64-d)) ) << d;
                         if (sign)
                                 i = -i;

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/network/lookup_name.c

@@ -11 +11 @@
 #include <pthread.h>
 #include <errno.h>
+#include <resolv.h>
 #include "lookup.h"
 #include "stdio_impl.h"
@@ -185 +186 @@
         if (dots >= conf.ndots || name[l-1]=='.') *search = 0;
 
+        /* Strip final dot for canon, fail if multiple trailing dots. */
+        if (name[l-1]=='.') l--;
+        if (!l || name[l-1]=='.') return EAI_NONAME;
+
         /* This can never happen; the caller already checked length. */
         if (l >= 256) return EAI_NONAME;
@@ -311 +316 @@
         if (!cnt && !(flags & AI_NUMERICHOST)) {
                 cnt = name_from_hosts(buf, canon, name, family);
-                if (!cnt) cnt = name_from_dns_search(buf, canon, name, family);
+                if (cnt<=0) cnt = name_from_dns_search(buf, canon, name, family);
         }
         if (cnt<=0) return cnt ? cnt : EAI_NONAME;
@@ -352 +357 @@
          * So far the label/precedence table cannot be customized. */
         for (i=0; i<cnt; i++) {
+                int family = buf[i].family;
                 int key = 0;
-                struct sockaddr_in6 sa, da = {
+                struct sockaddr_in6 sa6 = { 0 }, da6 = {
                         .sin6_family = AF_INET6,
                         .sin6_scope_id = buf[i].scopeid,
                         .sin6_port = 65535
                 };
-                if (buf[i].family == AF_INET6) {
-                        memcpy(da.sin6_addr.s6_addr, buf[i].addr, 16);
+                struct sockaddr_in sa4 = { 0 }, da4 = {
+                        .sin_family = AF_INET,
+                        .sin_port = 65535
+                };
+                void *sa, *da;
+                socklen_t salen, dalen;
+                if (family == AF_INET6) {
+                        memcpy(da6.sin6_addr.s6_addr, buf[i].addr, 16);
+                        da = &da6; dalen = sizeof da6;
+                        sa = &sa6; salen = sizeof sa6;
                 } else {
-                        memcpy(da.sin6_addr.s6_addr,
+                        memcpy(sa6.sin6_addr.s6_addr,
                                 "\0\0\0\0\0\0\0\0\0\0\xff\xff", 12);
-                        memcpy(da.sin6_addr.s6_addr+12, buf[i].addr, 4);
-                }
-                const struct policy *dpolicy = policyof(&da.sin6_addr);
-                int dscope = scopeof(&da.sin6_addr);
+                        memcpy(da6.sin6_addr.s6_addr+12, buf[i].addr, 4);
+                        memcpy(da6.sin6_addr.s6_addr,
+                                "\0\0\0\0\0\0\0\0\0\0\xff\xff", 12);
+                        memcpy(da6.sin6_addr.s6_addr+12, buf[i].addr, 4);
+                        memcpy(&da4.sin_addr, buf[i].addr, 4);
+                        da = &da4; dalen = sizeof da4;
+                        sa = &sa4; salen = sizeof sa4;
+                }
+                const struct policy *dpolicy = policyof(&da6.sin6_addr);
+                int dscope = scopeof(&da6.sin6_addr);
                 int dlabel = dpolicy->label;
                 int dprec = dpolicy->prec;
                 int prefixlen = 0;
-                int fd = socket(AF_INET6, SOCK_DGRAM|SOCK_CLOEXEC, IPPROTO_UDP);
+                int fd = socket(family, SOCK_DGRAM|SOCK_CLOEXEC, IPPROTO_UDP);
                 if (fd >= 0) {
-                        if (!connect(fd, (void *)&da, sizeof da)) {
+                        if (!connect(fd, da, dalen)) {
                                 key |= DAS_USABLE;
-                                if (!getsockname(fd, (void *)&sa,
-                                    &(socklen_t){sizeof sa})) {
-                                        if (dscope == scopeof(&sa.sin6_addr))
+                                if (!getsockname(fd, sa, &salen)) {
+                                        if (family == AF_INET) memcpy(
+                                                sa6.sin6_addr.s6_addr+12,
+                                                &sa4.sin_addr, 4);
+                                        if (dscope == scopeof(&sa6.sin6_addr))
                                                 key |= DAS_MATCHINGSCOPE;
-                                        if (dlabel == labelof(&sa.sin6_addr))
+                                        if (dlabel == labelof(&sa6.sin6_addr))
                                                 key |= DAS_MATCHINGLABEL;
-                                        prefixlen = prefixmatch(&sa.sin6_addr,
-                                                &da.sin6_addr);
+                                        prefixlen = prefixmatch(&sa6.sin6_addr,
+                                                &da6.sin6_addr);
                                 }
                         }

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/process/vfork.c

@@ -15 +15 @@
 }
 
-#ifndef __c2__
 weak_alias(__vfork, vfork);
-#else
-pid_t vfork(void)
-{
-        return __vfork();
-}
-#endif

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/signal/sigaction.c

@@ -61 +61 @@
 }
 
-#ifndef __c2__
 weak_alias(__sigaction, sigaction);
-#else
-int sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
-{
-        return __sigaction(sig, sa, old);
-}
-#endif

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/stdio/__stdio_write.c

@@ -32 +32 @@
                 iov[0].iov_len -= cnt;
         }
+        return -1;
 }

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/stdlib/strtol.c

@@ -57 +57 @@
 }
 
-#if defined(_MSC_VER) || defined(__c2__)
-weak_alias(musl_strtol, __strtol_internal);
-weak_alias(musl_strtoul, __strtoul_internal);
-#else
 weak_alias(strtol, __strtol_internal);
 weak_alias(strtoul, __strtoul_internal);
-#endif
 weak_alias(strtoll, __strtoll_internal);
 weak_alias(strtoull, __strtoull_internal);

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/string/memrchr.c

@@ -10 +10 @@
 }
 
-#ifndef __c2__
 weak_alias(__memrchr, memrchr);
-#else
-void *memrchr(const void *m, int c, size_t n)
-{
-        return __memrchr(m, c, n);
-}
-#endif

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/string/strchrnul.c

@@ -24 +24 @@
 }
 
-#ifndef __c2__
 weak_alias(__strchrnul, strchrnul);
-#else
-char *strchrnul(const char *s, int c)
-{
-        return __strchrnul(s, c);
-}
-#endif

asp3_tinet_ecnl_rx/trunk/ntshell/fatfs/ffarch.c

@@ -84 +84 @@
         ret2 = get_tim(&now);
         if (ret2 != E_OK){
-                printf("[ffarch] get_tim error: %s",
+                syslog(LOG_NOTICE, "[ffarch] get_tim error: %s",
                         itron_strerror(ret2));
                 return;
@@ -98 +98 @@
                 ret = tslp_tsk(timer);
                 if ((ret != E_OK) && (ret != E_TMOUT)) {
-                        printf("[ffarch] tslp_tsk error: %s %d",
+                        syslog(LOG_NOTICE, "[ffarch] tslp_tsk error: %s %d",
                                 itron_strerror(ret), timer);
                         break;
@@ -105 +105 @@
                 ret2 = get_tim(&now);
                 if (ret2 != E_OK) {
-                        printf("[ffarch] get_tim error: %s",
+                        syslog(LOG_NOTICE, "[ffarch] get_tim error: %s",
                                 itron_strerror(ret2));
                         break;
@@ -150 +150 @@
 #endif
         if (romdisk_init()) {
-                printf("ROM disk (0:) OK!\n");
+                syslog(LOG_NOTICE, "ROM disk (0:) OK!");
         }
         else {
-                printf("ROM disk (0:) NG!\n");
+                syslog(LOG_NOTICE, "ROM disk (0:) NG!");
         }
 }
@@ -303 +303 @@
         case FFS_RETRY_WAIT:
                 if (ffarch_retry_count == 0) {
-                        printf("SD card (1:) initialize tired...\n");
+                        syslog(LOG_NOTICE, "SD card (1:) initialize tired...");
 
                         ffarch_state = FFS_IDLE;
@@ -315 +315 @@
                 /* SDカードが入れられた場合 */
                 if (((mmc_rspi_prev_status & STA_NODISK) != 0) && ((mmc_rspi_status() & STA_NODISK) == 0)) {
-                        printf("SD card initializing ...\n");
+                        syslog(LOG_NOTICE, "SD card initializing ...");
 
                         Sd.FatFs.fs_type = 0;
                         if (SD_begin()) {
-                                printf("SD card (1:) OK!\n");
+                                syslog(LOG_NOTICE, "SD card (1:) OK!");
 
                                 /* uploadディレクトリを作成しておく */
@@ -329 +329 @@
                         }
                         else {
-                                printf("SD card (1:) NG!\n");
+                                syslog(LOG_NOTICE, "SD card (1:) NG!");
                                 ffarch_state = FFS_RETRY_WAIT;
                                 ffarch_timer = 1000 * 1000;
@@ -336 +336 @@
                 /* SDカードが抜かれた場合 */
                 else if (((mmc_rspi_prev_status & STA_NODISK) == 0) && ((mmc_rspi_status() & STA_NODISK) != 0)) {
-                        printf("SD card unmount\n");
+                        syslog(LOG_NOTICE, "SD card unmount");
 
                         f_mount(&Sd.FatFs, "1:", 0);

asp3_tinet_ecnl_rx/trunk/ntshell/ntshell/util/ntstdio.c

@@ -224 +224 @@
         handle->xi = xi;
         handle->xo = xo;
-        handle->outptr = 0;
-        handle->len = 0;
         handle->pos = 0;
         handle->option = option;
@@ -232 +230 @@
 static void _putc(ntstdio_t *handle, char c)
 {
-        if (handle->outptr) {
-                if ((handle->pos + 1) >= handle->len)
-                        return;
-                handle->outptr[handle->pos] = (unsigned char)c;
-                handle->pos++;
-                return;
-        }
-
         if (handle->xo) {
                 handle->xo(handle, (unsigned char)c);
@@ -291 +281 @@
 }
 
+struct put_buf_t {
+        char *outptr;
+        int len;
+};
+
+static void put_buf(struct ntstdio_t *handle, unsigned char c)
+{
+        struct put_buf_t *put_buf = (struct put_buf_t *)handle->exinf;
+        if ((handle->pos + 1) >= put_buf->len)
+                return;
+        put_buf->outptr[handle->pos] = (char)c;
+        handle->pos++;
+}
+
 int ntstdio_snprintf(char *buf, int len, const char *fmt, ...)
 {
         int result;
         ntstdio_t handle;
+        struct put_buf_t exinf;
         va_list arp;
         /* Switch destination for memory */
+        handle.xo = put_buf;
         handle.option = 0;
-        handle.outptr = buf;
-        handle.len = len;
         handle.pos = 0;
+        handle.exinf = &exinf;
+        exinf.outptr = buf;
+        exinf.len = len;
+
         va_start(arp, fmt);
         result = xvprintf(&handle, fmt, arp);
@@ -306 +314 @@
 
         /* Terminate output string with a \0 */
-        handle.outptr[handle.pos] = '\0';
+        buf[handle.pos] = '\0';
         return result;
 }

asp3_tinet_ecnl_rx/trunk/ntshell/ntshell/util/ntstdio.h

@@ -74 +74 @@
         NTSTDIO_XI xi;
         NTSTDIO_XO xo;
-        char *outptr;
-        int len;
         int pos;
         unsigned int option;

asp3_tinet_ecnl_rx/trunk/ntshell/src/fdtable.c

@@ -44 +44 @@
 #include "syssvc/syslog.h"
 #include "target_syssvc.h"
-#ifndef NTSHELL_NO_SOCKET
-#include <tinet_defs.h>
-#include <tinet_config.h>
-#include <net/net.h>
-#include <net/net_endian.h>
-#include <netinet/in.h>
-#include <netinet/in_itron.h>
-#include <tinet_nic_defs.h>
-#include <tinet_cfg.h>
-#include <netinet/in_var.h>
-#include <net/ethernet.h>
-#include <net/if6_var.h>
-#include <net/net.h>
-#include <net/if_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_var.h>
-#include <net/net_buf.h>
-#endif
-#include "ff.h"
-#include "socket_stub.h"
+#include "fdtable.h"
 #include "kernel_cfg.h"
 #include <string.h>
@@ -71 +50 @@
 #include "hal/serial_api.h"
 
-static int stdio_close(struct SHELL_FILE *fp);
-static size_t stdio_read(struct SHELL_FILE *fp, unsigned char *data, size_t len);
-static size_t stdio_write(struct SHELL_FILE *fp, const unsigned char *data, size_t len);
-static size_t stdin_read(struct SHELL_FILE *fp, unsigned char *data, size_t len);
-static size_t stdout_write(struct SHELL_FILE *fp, const unsigned char *data, size_t len);
-static size_t stderr_write(struct SHELL_FILE *fp, const unsigned char *data, size_t len);
-static void stdio_delete(struct SHELL_FILE *fp);
-
-static int sio_close(struct SHELL_FILE *fp);
-static size_t sio_read(struct SHELL_FILE *fp, unsigned char *data, size_t len);
-static size_t sio_write(struct SHELL_FILE *fp, const unsigned char *data, size_t len);
-static off_t sio_seek(struct SHELL_FILE *fp, off_t ofs, int org);
-static int sio_ioctl(struct SHELL_FILE *fp, int req, void *arg);
-static bool_t sio_readable(struct SHELL_FILE *fp);
-static void sio_delete(struct SHELL_FILE *fp);
-
-IO_TYPE IO_TYPE_STDIN = { stdio_close, stdin_read, stdio_write, sio_seek, sio_ioctl, sio_readable, stdio_delete };
-IO_TYPE IO_TYPE_STDOUT = { stdio_close, stdio_read, stdout_write, sio_seek, sio_ioctl, sio_readable, stdio_delete };
-IO_TYPE IO_TYPE_STDERR = { stdio_close, stdio_read, stderr_write, sio_seek, sio_ioctl, sio_readable, stdio_delete };
-IO_TYPE IO_TYPE_SIO = { sio_close, sio_read, sio_write, sio_seek, sio_ioctl, sio_readable, sio_delete };
-ntstdio_t ntstdio;
+#ifdef _DEBUG
+static const char THIS_FILE[] = __FILE__;
+#endif
+
+extern IO_TYPE IO_TYPE_STDIN;
+extern IO_TYPE IO_TYPE_STDOUT;
+extern IO_TYPE IO_TYPE_STDERR;
 
 static struct SHELL_FILE fd_table[8 * sizeof(FLGPTN)] = {
-        { 0, &IO_TYPE_STDIN, 0, .exinf = &ntstdio },
-        { 1, &IO_TYPE_STDOUT, 0, .exinf = &ntstdio },
-        { 2, &IO_TYPE_STDERR, 0,.exinf = &ntstdio },
+        { STDIN_FILENO, &IO_TYPE_STDIN, 0 },
+        { STDOUT_FILENO, &IO_TYPE_STDOUT, 0 },
+        { STDERR_FILENO, &IO_TYPE_STDERR, 0 },
 };
 #define fd_table_count (sizeof(fd_table) / sizeof(fd_table[0]))
-
-extern ntstdio_t ntstdio;
-serial_t stdio_uart;
-
-unsigned char ntstdio_xi(struct ntstdio_t *handle)
-{
-        return serial_getc((serial_t *)handle->exinf);
-}
-
-void ntstdio_xo(struct ntstdio_t *handle, unsigned char c)
-{
-        serial_putc((serial_t *)handle->exinf, c);
-}
-
-void sys_init(intptr_t exinf)
-{
-        sys_tlsf_init();
-
-        serial_init(&stdio_uart, STDIO_UART_TX, STDIO_UART_RX);
-        serial_baud(&stdio_uart, UART_BAUDRATE);
-        serial_format(&stdio_uart, 8, ParityNone, 1);
-
-        ntstdio_init(&ntstdio, NTSTDIO_OPTION_LINE_ECHO | NTSTDIO_OPTION_CANON | NTSTDIO_OPTION_LF_CRLF | NTSTDIO_OPTION_LF_CR, ntstdio_xi, ntstdio_xo);
-        ntstdio.exinf = (void *)&stdio_uart;
-}
-
-int stdio_close(struct SHELL_FILE *fp)
-{
-        return -EPERM;
-}
-
-size_t stdio_read(struct SHELL_FILE *fp, unsigned char *data, size_t len)
-{
-        return -EPERM;
-}
-
-size_t stdio_write(struct SHELL_FILE *fp, const unsigned char *data, size_t len)
-{
-        return -EPERM;
-}
-
-size_t stdin_read(struct SHELL_FILE *fp, unsigned char *data, size_t len)
-{
-        int i = 0;
-        while (i < len) {
-                int c = ntstdio_getc((struct ntstdio_t *)fp->exinf);
-                data[i++] = c;
-                if ((c == EOF) || (c == '\n'))
-                        break;
-        }
-        return i;
-}
-
-size_t stdout_write(struct SHELL_FILE *fp, const unsigned char *data, size_t len)
-{
-        for (int i = 0; i < len; i++) {
-                ntstdio_putc((struct ntstdio_t *)fp->exinf, data[i]);
-        }
-        return len;
-}
-
-size_t stderr_write(struct SHELL_FILE *fp, const unsigned char *data, size_t len)
-{
-        for (int i = 0; i < len; i++) {
-                ntstdio_putc((struct ntstdio_t *)fp->exinf, data[i]);
-        }
-        return len;
-}
-
-void stdio_delete(struct SHELL_FILE *fp)
-{
-}
-
-int sio_close(struct SHELL_FILE *fp)
-{
-        return -EPERM;
-}
-
-size_t sio_read(struct SHELL_FILE *fp, unsigned char *data, size_t len)
-{
-        return -EPERM;
-}
-
-size_t sio_write(struct SHELL_FILE *fp, const unsigned char *data, size_t len)
-{
-        return -EPERM;
-}
-
-off_t sio_seek(struct SHELL_FILE *fp, off_t ofs, int org)
-{
-        return -EPERM;
-}
-
-int sio_ioctl(struct SHELL_FILE *fp, int request, void *arg)
-{
-        switch (request) {
-        case TIOCGWINSZ:
-                return 0;
-        case TCGETS:
-                return sio_tcgetattr(fp->fd, (struct termios *)arg);
-        case TCSETS + TCSANOW:
-        case TCSETS + TCSADRAIN:
-        case TCSETS + TCSAFLUSH:
-                return sio_tcsetattr(fp->fd, request - TCSETS, (const struct termios *)arg);
-        }
-
-        return -EINVAL;
-}
-
-bool_t sio_readable(struct SHELL_FILE *fp)
-{
-        return fp->readevt_w != fp->readevt_r;
-}
-
-void sio_delete(struct SHELL_FILE *fp)
-{
-        free((serial_t *)((struct ntstdio_t *)fp->exinf)->exinf);
-        ((struct ntstdio_t *)fp->exinf)->exinf = NULL;
-        free((struct ntstdio_t *)fp->exinf);
-        fp->exinf = NULL;
-}
 
 struct SHELL_FILE *new_fp(IO_TYPE *type, int id, int writable)
@@ -247 +91 @@
         if (ret < 0) {
                 syslog(LOG_ERROR, "sig_sem => %d", ret);
+        }
+
+        if (fp != NULL) {
+                FLGPTN flgptn = 0;
+
+                FD_SET(fp->fd, (fd_set *)&flgptn);
+
+                ret = clr_flg(FLG_SELECT_WAIT, ~flgptn);
+                if (ret != E_OK) {
+                        syslog(LOG_ERROR, "clr_flg => %d", ret);
+                }
         }
 
@@ -442 +297 @@
 }
 
-/* TODO:コールバック化したい */
-void stdio_update_evts()
-{
-        int fd = STDIN_FILENO;
-        struct SHELL_FILE *fp = &fd_table[fd];
-        FLGPTN flgptn = 0;
-
-        if (serial_readable((serial_t *)((struct ntstdio_t *)fp->exinf)->exinf)) {
-                if (fp->readevt_w == fp->readevt_r) fp->readevt_w++;
-
-                FD_SET(fd, (fd_set *)&flgptn);
-        }
-        if (serial_writable((serial_t *)((struct ntstdio_t *)fp->exinf)->exinf)) {
-                if (fp->writeevt_w == fp->writeevt_r) fp->writeevt_w++;
-
-                FD_SET(fd, (fd_set *)&flgptn);
-        }
-
-        if (flgptn != 0) {
-                set_flg(FLG_SELECT_WAIT, flgptn);
-        }
-}
-
-/* TODO:コールバック化したい */
-void stdio_flgptn(FLGPTN *flgptn)
-{
-        int fd = STDIN_FILENO;
-        struct SHELL_FILE *fp = &fd_table[fd];
-        *flgptn = 0;
-
-        if (serial_readable((serial_t *)((struct ntstdio_t *)fp->exinf)->exinf)) {
-                if (fp->readevt_w == fp->readevt_r) fp->readevt_w++;
-
-                FD_SET(fd, (fd_set *)flgptn);
-        }
-        if (serial_writable((serial_t *)((struct ntstdio_t *)fp->exinf)->exinf)) {
-                if (fp->writeevt_w == fp->writeevt_r) fp->writeevt_w++;
-
-                FD_SET(fd, (fd_set *)flgptn);
-        }
-}
-
 ER shell_get_evts(struct fd_events *evts, TMO tmout)
 {
         int count = 0;
         SYSTIM prev, now;
+        FLGPTN flgptn;
 
         get_tim(&prev);
@@ -493 +307 @@
         for (;;) {
                 ER ret;
-                FLGPTN waitptn, flgptn, readfds = 0, writefds = 0;
+                FLGPTN waitptn, readfds = 0, writefds = 0;
                 struct SHELL_FILE *fp = NULL;
-
-                stdio_update_evts();
 
 #ifndef NTSHELL_NO_SOCKET
@@ -506 +318 @@
                         fp = &fd_table[fd];
 
-#ifndef NTSHELL_NO_SOCKET
                         if (FD_ISSET(fd, &evts->readfds)) {
                                 if (fp->type->readable(fp)) {
@@ -517 +328 @@
                                 }
                         }
-#endif
+
                         if (FD_ISSET(fd, &evts->writefds)) {
-                                if (fp->writeevt_w == fp->writeevt_r) {
+                                if (fp->type->writable(fp)) {
                                         FD_SET(fd, (fd_set *)&writefds);
                                         count++;
@@ -549 +360 @@
                                 return ret;
                         }
-
-                        stdio_flgptn(&flgptn);
-
-                        if (flgptn == 0)
-                                return E_TMOUT;
-                }
-                flgptn &= waitptn;
-
-                /* 受け取ったフラグのみクリア */
-                ret = clr_flg(FLG_SELECT_WAIT, ~flgptn);
-                if (ret != E_OK) {
-                        syslog(LOG_ERROR, "clr_flg => %d", ret);
+                }
+
+                if (flgptn != 0) {
+                        flgptn &= waitptn;
+
+                        /* 受け取ったフラグのみクリア */
+                        ret = clr_flg(FLG_SELECT_WAIT, ~flgptn);
+                        if (ret != E_OK) {
+                                syslog(LOG_ERROR, "clr_flg => %d", ret);
+                        }
                 }
 
                 count = 0;
                 for (int fd = 0; fd < fd_table_count; fd++) {
-                        if (!FD_ISSET(fd, (fd_set *)&waitptn))
-                                continue;
-
                         fp = &fd_table[fd];
 
                         if (fp->readevt_w != fp->readevt_r) {
                                 fp->readevt_r++;
-                                FD_SET(fd, &evts->readfds);
+                                if (FD_ISSET(fd, (fd_set *)&waitptn))
+                                        FD_SET(fd, &evts->readfds);
                                 count++;
                         }
                         if (fp->writeevt_w != fp->writeevt_r) {
                                 fp->writeevt_r++;
-                                fp->writable = 1;
-                        }
-                        if (fp->writable) {
-                                FD_SET(fd, &evts->writefds);
+                                if (FD_ISSET(fd, (fd_set *)&waitptn))
+                                        FD_SET(fd, &evts->writefds);
                                 count++;
                         }
                         if (fp->errorevt_w != fp->errorevt_r) {
                                 fp->errorevt_r++;
-                                FD_SET(fd, &evts->errorfds);
+                                if (FD_ISSET(fd, (fd_set *)&waitptn))
+                                        FD_SET(fd, &evts->errorfds);
                                 count++;
                         }
                 }
 
-                if (count > 0)
+                if ((flgptn == 0) || (count > 0))
                         break;
 
@@ -596 +402 @@
 
                 SYSTIM elapse = now - prev;
-                if (elapse > tmout)
-                        return E_TMOUT;
+                if (elapse > tmout) {
+                        flgptn = 0;
+                        break;
+                }
 
                 prev = now;
@@ -605 +413 @@
         evts->count = count;
 
-        return E_OK;
+        return (flgptn == 0) ? E_TMOUT : E_OK;
 }
 

asp3_tinet_ecnl_rx/trunk/ntshell/src/fdtable.h

@@ -38 +38 @@
 #define SOCKET_STUB_H
 
-struct addrinfo {
-        int ai_flags;
-        int ai_family;
-        int ai_socktype;
-        int ai_protocol;
-        socklen_t ai_addrlen;
-        struct sockaddr *ai_addr;
-        char *ai_canonname;
-        struct addrinfo *ai_next;
-};
-
-typedef uint16_t in_port_t;
-typedef uint32_t in_addr_t;
-struct in_addr { in_addr_t s_addr; };
-
-struct sockaddr_in {
-        sa_family_t sin_family;
-        in_port_t sin_port;
-        struct in_addr sin_addr;
-        uint8_t sin_zero[8];
-};
-
-struct in6_addr
-{
-        union {
-                uint8_t __s6_addr[16];
-                uint16_t __s6_addr16[8];
-                uint32_t __s6_addr32[4];
-        } __in6_union;
-};
-//#define s6_addr __in6_union.__s6_addr
-//#define s6_addr16 __in6_union.__s6_addr16
-//#define s6_addr32 __in6_union.__s6_addr32
-
-struct sockaddr_in6
-{
-        sa_family_t     sin6_family;
-        in_port_t       sin6_port;
-        uint32_t        sin6_flowinfo;
-        struct in6_addr sin6_addr;
-        uint32_t        sin6_scope_id;
-};
-
-typedef struct socket_t {
-        int family;
-        int type;
-        int protocol;
-        int cepid;
-        int repid;
-        int backlog;
-        unsigned int flags;
-        union {
-                struct sockaddr_in laddr4;
-                struct sockaddr_in6 laddr6;
-        };
-        union {
-                struct sockaddr_in raddr4;
-                struct sockaddr_in6 raddr6;
-        };
-        int buf_size;
-        unsigned char *buf;
-        void *input;
-        int len;
-} socket_t;
-
-struct SHELL_DIR {
-        FATFS_DIR dir;
-        struct dirent dirent;
-};
-
 typedef const struct io_type_s IO_TYPE;
 
@@ -131 +61 @@
         int (*ioctl)(struct SHELL_FILE *, int, void *);
         bool_t (*readable)(struct SHELL_FILE *);
+        bool_t (*writable)(struct SHELL_FILE *);
         void (*delete)(struct SHELL_FILE *);
 };
@@ -152 +83 @@
 void clean_fd();
 
-void sys_tlsf_init(void);
-
 #endif // !SOCKET_STUB_H

asp3_tinet_ecnl_rx/trunk/ntshell/src/io_stub.c

@@ -45 +45 @@
 #include "syssvc/serial.h"
 #include "syssvc/syslog.h"
-#include "socket_stub.h"
+#include "fdtable.h"
 #include "util/ntstdio.h"
 #include "usrcmd.h"
@@ -51 +51 @@
 #include "kernel_cfg.h"
 #include "target_syssvc.h"
+
+struct SHELL_DIR {
+        FATFS_DIR dir;
+        struct dirent dirent;
+};
 
 int fresult2errno(FRESULT res)
@@ -85 +90 @@
 static int file_ioctl(struct SHELL_FILE *fp, int req, void *arg);
 static bool_t file_readable(struct SHELL_FILE *fp);
+static bool_t file_writable(struct SHELL_FILE *fp);
 static void file_delete(struct SHELL_FILE *fp);
 
@@ -93 +99 @@
 static int dir_ioctl(struct SHELL_FILE *fp, int req, void *arg);
 static bool_t dir_readable(struct SHELL_FILE *fp);
+static bool_t dir_writable(struct SHELL_FILE *fp);
 static void dir_delete(struct SHELL_FILE *fp);
 
-IO_TYPE IO_TYPE_FILE = { file_close, file_read, file_write, file_seek, file_ioctl, file_readable, file_delete };
-IO_TYPE IO_TYPE_DIR = { dir_close, dir_read, dir_write, dir_seek, dir_ioctl, dir_readable, dir_delete };
+IO_TYPE IO_TYPE_FILE = { file_close, file_read, file_write, file_seek, file_ioctl, file_readable, file_writable, file_delete };
+IO_TYPE IO_TYPE_DIR = { dir_close, dir_read, dir_write, dir_seek, dir_ioctl, dir_readable, dir_writable, dir_delete };
 
 int shell_open(const char *path, int flags, void *arg)
@@ -114 +121 @@
                 FRESULT res;
                 if ((res = f_opendir(dir, path)) != FR_OK) {
+                        delete_fp(fp);
                         return fresult2errno(res);
                 }
@@ -165 +173 @@
         }
 
+        delete_fp(fp);
         return fresult2errno(res);
 }
@@ -239 +248 @@
 }
 
+bool_t file_writable(struct SHELL_FILE *fp)
+{
+        return fp->writable && (fp->writeevt_w == fp->writeevt_r);
+}
+
 void file_delete(struct SHELL_FILE *fp)
 {
@@ -356 +370 @@
 {
         return shell_ioctl(fd, cmd, arg);
-}
-
-extern IO_TYPE IO_TYPE_SIO;
-
-int sio_tcgetattr(int fd, struct termios *termios)
-{
-        struct SHELL_FILE *fp = fd_to_fp(fd);
-        if ((fp == NULL) || (fp->type != &IO_TYPE_SIO))
-                return -EBADF;
-
-        ntstdio_t *ntstdio = (ntstdio_t *)fp->exinf;
-
-        memset(termios, 0, sizeof(*termios));
-
-        if (ntstdio->option & NTSTDIO_OPTION_LINE_ECHO) {
-                termios->c_lflag |= ECHO;
-        }
-        else {
-                termios->c_lflag &= ~ECHO;
-        }
-        if (ntstdio->option & NTSTDIO_OPTION_CANON) {
-                termios->c_lflag |= ICANON;
-        }
-        else {
-                termios->c_lflag &= ~ICANON;
-        }
-        if (ntstdio->option & NTSTDIO_OPTION_LF_CR) {
-                termios->c_iflag |= INLCR;
-        }
-        else {
-                termios->c_iflag &= ~INLCR;
-        }
-        if (ntstdio->option & NTSTDIO_OPTION_LF_CRLF) {
-                termios->c_oflag |= ONLCR;
-        }
-        else {
-                termios->c_oflag &= ~ONLCR;
-        }
-
-        return 0;
-}
-
-int sio_tcsetattr(int fd, int optional_actions, const struct termios *termios)
-{
-        struct SHELL_FILE *fp = fd_to_fp(fd);
-        if ((fp == NULL) || (fp->type != &IO_TYPE_SIO))
-                return -EBADF;
-
-        ntstdio_t *ntstdio = (ntstdio_t *)fp->exinf;
-
-        if (optional_actions == TCSANOW) {
-                if (termios->c_lflag & ECHO) {
-                        ntstdio->option |= NTSTDIO_OPTION_LINE_ECHO;
-                }
-                else {
-                        ntstdio->option &= ~NTSTDIO_OPTION_LINE_ECHO;
-                }
-                if (termios->c_lflag & ICANON) {
-                        ntstdio->option |= NTSTDIO_OPTION_CANON;
-                }
-                else {
-                        ntstdio->option &= ~NTSTDIO_OPTION_CANON;
-                }
-                if (termios->c_iflag & INLCR) {
-                        ntstdio->option |= NTSTDIO_OPTION_LF_CR;
-                }
-                else {
-                        ntstdio->option &= ~NTSTDIO_OPTION_LF_CR;
-                }
-                if (termios->c_oflag & ONLCR) {
-                        ntstdio->option |= NTSTDIO_OPTION_LF_CRLF;
-                }
-                else {
-                        ntstdio->option &= ~NTSTDIO_OPTION_LF_CRLF;
-                }
-                return 0;
-        }
-
-        shell_abort();
-        return 0;
 }
 
@@ -688 +622 @@
 }
 
+bool_t dir_writable(struct SHELL_FILE *fp)
+{
+        return false;
+}
+
 void dir_delete(struct SHELL_FILE *fp)
 {
@@ -710 +649 @@
         return 0;
 }
-
-#ifndef _MSC_VER
-extern uint32_t _HeapBase;
-extern uint32_t _HeapLimit;
-#else
-uint8_t _HeapBase[14 * 4096];
-#define _HeapLimit _HeapBase[sizeof(_HeapBase)]
-#endif
-
-void *shell_brk(void *addr)
-{
-        if (addr == 0) {
-                return (void *)(&_HeapBase);
-        }
-        if ((addr >= (void *)&_HeapBase) && (addr < (void *)&_HeapLimit)) {
-                return addr;
-        }
-        return (void *)-1;
-}
-
-void *shell_mmap2(void *start, size_t length, int prot, int flags, int fd, off_t pgoffset)
-{
-        if (fd != -1)
-                return (void *)-EINVAL;
-
-        if ((length >= 0) && (length <= sizeof(&_HeapBase))) {
-                return &_HeapBase;
-        }
-        return (void *)-1;
-}
-
-int shell_mprotect(void *addr, size_t len, int prot)
-{
-        //if ((addr >= (void *)&_HeapBase) && (addr + len < (void *)&_HeapLimit)) {
-        return 0;
-//}
-//return -1;
-}
-
-#include "tlsf.h"
-
-static tlsf_t sys_tlsf;
-static pool_t sys_pool;
-
-void sys_tlsf_init(void)
-{
-        sys_tlsf = tlsf_create(&_HeapBase);
-        if (sys_tlsf == NULL)
-                return;
-
-        sys_pool = tlsf_add_pool(sys_tlsf, ((uint8_t *)&_HeapBase) + tlsf_size(), ((intptr_t)&_HeapLimit - (intptr_t)&_HeapBase) - tlsf_size());
-}
-
-void sys_fini(void)
-{
-        tlsf_destroy(sys_tlsf);
-}
-
-void *malloc(size_t size)
-{
-        void *result;
-        wai_sem(SEM_MALLOC);
-        result = tlsf_malloc(sys_tlsf, size);
-        sig_sem(SEM_MALLOC);
-        if (result == NULL)
-                tlsf_check_pool(sys_pool);
-        return result;
-}
-
-void *calloc(size_t size, size_t count)
-{
-        void *result;
-        wai_sem(SEM_MALLOC);
-        result = tlsf_malloc(sys_tlsf, count * size);
-        sig_sem(SEM_MALLOC);
-        if (result != NULL)
-                memset(result, 0, count * size);
-        else
-                tlsf_check_pool(sys_pool);
-        return result;
-}
-
-void *realloc(void *ptr, size_t size)
-{
-        void *result;
-        wai_sem(SEM_MALLOC);
-        result = tlsf_realloc(sys_tlsf, ptr, size);
-        sig_sem(SEM_MALLOC);
-        if (result == NULL)
-                tlsf_check_pool(sys_pool);
-        return result;
-}
-
-void free(void *ptr)
-{
-        wai_sem(SEM_MALLOC);
-        tlsf_free(sys_tlsf, ptr);
-        sig_sem(SEM_MALLOC);
-}
-

asp3_tinet_ecnl_rx/trunk/ntshell/src/net_misc.c

@@ -95 +95 @@
 
         get_tid(&nc->tskid);
-        printf("[NET MISC:%d,%d] started.", nc->tskid, (ID)exinf);
+        syslog(LOG_NOTICE, "[NET MISC:%d,%d] started.", nc->tskid, (ID)exinf);
 
         /* 初期化 */
@@ -103 +103 @@
         ret = get_tim(&time);
         if (ret != E_OK) {
-                printf("[NET MISC,%d] get_tim error: %7lu,%s",
+                syslog(LOG_NOTICE, "[NET MISC,%d] get_tim error: %7lu,%s",
                         nc->cepid, time / SYSTIM_HZ, itron_strerror(ret));
                 return;
@@ -117 +117 @@
                 error = tslp_tsk(timer);
                 if ((error != E_OK) && (error != E_TMOUT)) {
-                        printf("[NET MISC,%d] tslp_tsk error: %s %d",
+                        syslog(LOG_NOTICE, "[NET MISC,%d] tslp_tsk error: %s %d",
                                 nc->cepid, itron_strerror(error), timer);
                         break;
@@ -124 +124 @@
                 ret = get_tim(&time);
                 if (ret != E_OK) {
-                        printf("[NET MISC,%d] get_tim error: %s",
+                        syslog(LOG_NOTICE, "[NET MISC,%d] get_tim error: %s",
                                 nc->cepid, itron_strerror(ret));
                         break;

asp3_tinet_ecnl_rx/trunk/ntshell/src/ntp_cli.c

@@ -277 +277 @@
         }
 
-        printf("[NTP CLI,%d] recv time: %s .%09u\n",
+        syslog(LOG_NOTICE, "[NTP CLI,%d] recv time: %s .%09u",
                 nc->cepid, nc->buf, tp.tv_nsec);
 }
@@ -309 +309 @@
                 line = lookup_ipaddr(&nc->ipaddr6, NTP_SRV_URL, API_PROTO_IPV4);
                 if (line == NULL || !in6_is_addr_ipv4mapped(&nc->ipaddr6)) {
-                        printf("[NTP CLI,%d] sleep %d.%03u[s], unknown host.",
+                        syslog(LOG_NOTICE, "[NTP CLI,%d] sleep %d.%03u[s], unknown host.",
                                 nc->cepid, SLP_ITV / SYSTIM_HZ, SLP_ITV % SYSTIM_HZ);
                         nc->timer = SLP_ITV;
@@ -317 +317 @@
 #else   /* of #if defined(SUPPORT_INET6) && defined(SUPPORT_INET4) */
                 if ((line = lookup_ipaddr(&nc->snd_rmt.ipaddr, NTP_SRV_URL, DEFAULT_API_PROTO)) == NULL) {
-                        printf("[NTP CLI,%d] sleep %d.%03u[s], unknown host.",
+                        syslog(LOG_NOTICE, "[NTP CLI,%d] sleep %d.%03u[s], unknown host.",
                                 nc->cepid, SLP_ITV / SYSTIM_HZ, SLP_ITV % SYSTIM_HZ);
                         nc->timer = SLP_ITV;
@@ -421 +421 @@
 
         if ((error = udp_snd_dat(nc->cepid, &nc->snd_rmt, ntp, len, TMO_NBLK)) != E_WBLK) {
-                printf("[NTP CLI,%d] udp_snd_dat error: %s",
+                syslog(LOG_NOTICE, "[NTP CLI,%d] udp_snd_dat error: %s",
                         nc->cepid, itron_strerror(error));
                 return error;
         }
         else
-                syslog(LOG_DEBUG, "[NTP CLI,%d] udp_snd_dat: to: %s.%d\n",
+                syslog(LOG_DEBUG, "[NTP CLI,%d] udp_snd_dat: to: %s.%d",
                         nc->cepid, ip2str(NULL, &nc->snd_rmt.ipaddr), nc->snd_rmt.portno);
 
@@ -439 +439 @@
         ret = get_tim(&time);
         if (ret != E_OK) {
-                printf("[NTP CLI,%d] get_tim error: %s",
+                syslog(LOG_NOTICE, "[NTP CLI,%d] get_tim error: %s",
                         nc->cepid, itron_strerror(ret));
                 tp->tv_sec = 0;
@@ -459 +459 @@
         ret = set_tim(time);
         if (ret != E_OK) {
-                printf("[NTP CLI,%d] set_tim error: %s",
+                syslog(LOG_NOTICE, "[NTP CLI,%d] set_tim error: %s",
                         nc->cepid, itron_strerror(ret));
         }
@@ -477 +477 @@
         if (len < 0 && len != E_RLWAI) {
                 /* E_RLWAI 以外で、0 以下の場合は、エラーを意味している。*/
-                printf("[NTP CLI,%d] callback error: %s, fncd: %s", nc->cepid,
+                syslog(LOG_NOTICE, "[NTP CLI,%d] callback error: %s, fncd: %s", nc->cepid,
                         itron_strerror(len), in_strtfn(fncd));
         }
@@ -484 +484 @@
                         if ((len = udp_rcv_dat(nc->cepid, &nc->rcv_rmt, &nc->ntp_msg, len, TMO_POL)) < 0)
                         {
-                                printf("[NTP CLI,%d] udp_rcv_dat error: %s", nc->cepid,
+                                syslog(LOG_NOTICE, "[NTP CLI,%d] udp_rcv_dat error: %s", nc->cepid,
                                         itron_strerror(len));
                         }
@@ -516 +516 @@
 
         get_tid(&nc->tskid);
-        printf("[NTP CLI:%d,%d] started.", nc->tskid, (ID)exinf);
+        syslog(LOG_NOTICE, "[NTP CLI:%d,%d] started.", nc->tskid, (ID)exinf);
 
         /* 初期化 */
@@ -523 +523 @@
         ret = get_tim(&time);
         if (ret != E_OK) {
-                printf("[NTP CLI,%d] get_tim error: %7lu,%s",
+                syslog(LOG_NOTICE, "[NTP CLI,%d] get_tim error: %7lu,%s",
                         nc->cepid, time / SYSTIM_HZ, itron_strerror(ret));
                 return;
@@ -537 +537 @@
                 error = tslp_tsk(timer);
                 if ((error != E_OK) && (error != E_TMOUT)) {
-                        printf("[NTP CLI,%d] tslp_tsk error: %s %d",
+                        syslog(LOG_NOTICE, "[NTP CLI,%d] tslp_tsk error: %s %d",
                                 nc->cepid, itron_strerror(error), timer);
                         break;
@@ -544 +544 @@
                 ret = get_tim(&time);
                 if (ret != E_OK) {
-                        printf("[NTP CLI,%d] get_tim error: %s",
+                        syslog(LOG_NOTICE, "[NTP CLI,%d] get_tim error: %s",
                                 nc->cepid, itron_strerror(ret));
                         break;

asp3_tinet_ecnl_rx/trunk/ntshell/src/ntshell_main.c

@@ -49 +49 @@
 #include "syssvc/syslog.h"
 #include "target_syssvc.h"
+#include "target_serial.h"
 #include "kernel_cfg.h"
 #include "ffarch.h"
@@ -58 +59 @@
 #include "util/ntopt.h"
 #include "ntshell_main.h"
-#include "socket_stub.h"
+#include "fdtable.h"
 
 char command[NTOPT_TEXT_MAXLEN];
@@ -78 +79 @@
 }
 
+void stdio_open(ID portid);
 static int usrcmd_ntopt_callback(long *args, void *extobj);
 
@@ -86 +88 @@
 void ntshell_task_init(ID portid)
 {
-        serial_ctl_por(portid, IOCTL_CRLF | IOCTL_FCSND | IOCTL_FCRCV);
+        stdio_open(portid);
 }
 
@@ -95 +97 @@
 {
         ntshell_state = 1;
-        ntshell_exit_code = ntopt_parse(command, usrcmd_ntopt_callback, NULL);
+
+        if (setjmp(process_exit) == 0) {
+                ntshell_exit_code = ntopt_parse(command, usrcmd_ntopt_callback, NULL);
+        }
+
+        fflush(stdout);
+        clean_fd();
+
         ntshell_state = 2;
 }
@@ -139 +148 @@
                 printf("Unknown command found.\n");
 
-        clean_fd();
-
         return result;
 }
@@ -285 +292 @@
 }
 
-struct sigaction sigtable[7];
-
-int shell_sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
-{
-        struct sigaction *sat;
+// musl-1.1.18\src\internal\ksigaction.h
+struct k_sigaction {
+        void(*handler)(int);
+        unsigned long flags;
+        void(*restorer)(void);
+        unsigned mask[2];
+};
+
+struct k_sigaction sigtable[7];
+
+int shell_sigaction(int sig, const struct k_sigaction *__restrict sa,
+        struct k_sigaction *__restrict old, size_t size)
+{
+        struct k_sigaction *sat;
 
         switch(sig){
@@ -318 +334 @@
 
         if (old != NULL)
-                memcpy(old, sat, sizeof(struct sigaction));
-
-        memcpy(sat, sa, sizeof(struct sigaction));
+                memcpy(old, sat, offsetof(struct k_sigaction, mask) + size);
+
+        memcpy(sat, sa, offsetof(struct k_sigaction, mask) + size);
 
         return 0;
@@ -368 +384 @@
 }
 
+int shell_nanosleep(const struct timespec *req, struct timespec *rem)
+{
+        ER ret;
+        TMO tmo;
+        SYSTIM prev, now, diff;
+
+        if ((req == NULL) || (req->tv_nsec < 0) || (req->tv_nsec >= 1000000000))
+                return -EINVAL;
+
+        get_tim(&prev);
+
+        tmo = req->tv_sec * 1000000 + req->tv_nsec / 1000;
+        ret = tslp_tsk(tmo);
+        if (ret == E_OK) {
+                if (rem != NULL) {
+                        get_tim(&now);
+                        diff = now - prev;
+                        rem->tv_sec = diff / 1000000ll;
+                        rem->tv_nsec = (diff - (rem->tv_sec * 1000000ll)) * 1000ll;
+                }
+                return 0;
+        }
+        else if (ret == E_TMOUT) {
+                if (rem != NULL) {
+                        rem->tv_sec = 0;
+                        rem->tv_nsec = 0;
+                }
+                return 0;
+        }
+
+        return -EFAULT;
+}

asp3_tinet_ecnl_rx/trunk/ntshell/src/ntshell_main.cfg

@@ -46 +46 @@
 CRE_FLG(FLG_SELECT_WAIT, { TA_WMUL, 0x00 });
 CRE_SEM(SEM_FILEDESC, { TA_TPRI, 1, 1 });
-CRE_SEM(SEM_MALLOC, { TA_TPRI, 1, 1 });

asp3_tinet_ecnl_rx/trunk/ntshell/src/shellif.h

@@ -74 +74 @@
 #define NCCS 32
 
-#include <bits/fcntl.h>
-#include <bits/termios.h>
-#include <bits/stat.h>
+#include <fcntl.h>
+#include <termios.h>
+#include <sys/stat.h>
 #include <sys/select.h>
 #include <time.h>
@@ -85 +85 @@
 #include <sys/utsname.h>
 #include <dirent.h>
-#include <bits/ioctl.h>
-#include <bits/errno.h>
+#include <sys/ioctl.h>
+#include <errno.h>
 #include <sys/socket.h>
 #else
@@ -132 +132 @@
 // time.h
 #define CLOCK_REALTIME 0
+int shell_nanosleep(const struct timespec *req, struct timespec *rem);
 
 // dirent.h
@@ -177 +178 @@
 // signal.h
 int shell_sigprocmask(int how, const sigset_t *__restrict set, sigset_t *__restrict old);
-int shell_sigaction(int sig, const struct sigaction *__restrict sa, struct sigaction *__restrict old);
+struct k_sigaction;
+int shell_sigaction(int sig, const struct k_sigaction *__restrict sa,
+        struct k_sigaction *__restrict old, size_t size);
 // socket.h
 int shell_socket(int, int, int);
@@ -197 +200 @@
 // syslog.h
 void vsyslog (int, const char *, va_list);
-// termios.h
-int sio_tcgetattr (int, struct termios *);
-int sio_tcsetattr(int, int, const struct termios *);
 // fcntl.h
 int shell_open(const char *, int, void *arg);

asp3_tinet_ecnl_rx/trunk/ntshell/src/socket_stub.c

@@ -62 +62 @@
 #include <netinet/tcp_var.h>
 #include <netapp/resolver.h>
-extern const ID tmax_tcp_cepid;
-#include "ff.h"
-#include "socket_stub.h"
+#include "fdtable.h"
 #include "kernel_cfg.h"
 
+#ifdef _DEBUG
+static const char THIS_FILE[] = __FILE__;
+#endif
+
 #define SOCKET_TIMEOUT 2000000
+
+struct addrinfo {
+        int ai_flags;
+        int ai_family;
+        int ai_socktype;
+        int ai_protocol;
+        socklen_t ai_addrlen;
+        struct sockaddr *ai_addr;
+        char *ai_canonname;
+        struct addrinfo *ai_next;
+};
+
+typedef uint16_t in_port_t;
+typedef uint32_t in_addr_t;
+struct in_addr { in_addr_t s_addr; };
+
+struct sockaddr_in {
+        sa_family_t sin_family;
+        in_port_t sin_port;
+        struct in_addr sin_addr;
+        uint8_t sin_zero[8];
+};
+
+struct in6_addr
+{
+        union {
+                uint8_t __s6_addr[16];
+                uint16_t __s6_addr16[8];
+                uint32_t __s6_addr32[4];
+        } __in6_union;
+};
+//#define s6_addr __in6_union.__s6_addr
+//#define s6_addr16 __in6_union.__s6_addr16
+//#define s6_addr32 __in6_union.__s6_addr32
+
+struct sockaddr_in6
+{
+        sa_family_t     sin6_family;
+        in_port_t       sin6_port;
+        uint32_t        sin6_flowinfo;
+        struct in6_addr sin6_addr;
+        uint32_t        sin6_scope_id;
+};
+
+typedef struct socket_t {
+        int family;
+        int type;
+        int protocol;
+        int cepid;
+        int repid;
+        int backlog;
+        unsigned int flags;
+        union {
+                struct sockaddr_in laddr4;
+                struct sockaddr_in6 laddr6;
+        };
+        union {
+                struct sockaddr_in raddr4;
+                struct sockaddr_in6 raddr6;
+        };
+        int buf_size;
+        unsigned char *buf;
+        void *input;
+        int len;
+} socket_t;
 
 #define tcp6_cre_cep tcp_cre_cep
@@ -82 +149 @@
 #define tcp6_set_opt tcp_set_opt
 
-#define udp6_del_cep udp_del_cep
-#define udp6_get_opt udp_get_opt
-#define udp6_set_opt udp_set_opt
-
 #ifndef SUPPORT_INET6
 
@@ -93 +156 @@
 
 ER      udp6_cre_cep (ID cepid, T_UDP6_CCEP *pk_ccep) { return E_SYS; }
+ER      udp6_del_cep (ID cepid) { return E_SYS; }
 ER_UINT udp6_snd_dat (ID cepid, T_IPV6EP *p_dstaddr, void *data, int_t len, TMO tmout) { return E_SYS; }
 ER_UINT udp6_rcv_dat (ID cepid, T_IPV6EP *p_dstaddr, void *data, int_t len, TMO tmout) { return E_SYS; }
+ER      udp6_set_opt (ID cepid, int_t optname, void *optval, int_t optlen) { return E_SYS; }
+ER      udp6_get_opt (ID cepid, int_t optname, void *optval, int_t optlen) { return E_SYS; }
 
 const T_IN6_ADDR *in6_get_ifaddr (int_t index) { return NULL; }
@@ -111 +177 @@
 static int tcp_fd_ioctl(struct SHELL_FILE *fp, int req, void *arg);
 static bool_t tcp_fd_readable(struct SHELL_FILE *fp);
+static bool_t tcp_fd_writable(struct SHELL_FILE *fp);
 static void tcp_fd_delete(struct SHELL_FILE *fp);
 
@@ -119 +186 @@
 static int udp_fd_ioctl(struct SHELL_FILE *fp, int req, void *arg);
 static bool_t udp_fd_readable(struct SHELL_FILE *fp);
+static bool_t udp_fd_writable(struct SHELL_FILE *fp);
 static void udp_fd_delete(struct SHELL_FILE *fp);
 
-IO_TYPE IO_TYPE_TCP = { tcp_fd_close, tcp_fd_read, tcp_fd_write, tcp_fd_seek, tcp_fd_ioctl, tcp_fd_readable, tcp_fd_delete };
-IO_TYPE IO_TYPE_UDP = { udp_fd_close, udp_fd_read, udp_fd_write, udp_fd_seek, udp_fd_ioctl, udp_fd_readable, udp_fd_delete };
+IO_TYPE IO_TYPE_TCP = { tcp_fd_close, tcp_fd_read, tcp_fd_write, tcp_fd_seek, tcp_fd_ioctl, tcp_fd_readable, tcp_fd_writable, tcp_fd_delete };
+IO_TYPE IO_TYPE_UDP = { udp_fd_close, udp_fd_read, udp_fd_write, udp_fd_seek, udp_fd_ioctl, udp_fd_readable, udp_fd_writable, udp_fd_delete };
 
 typedef struct id_table_t {
@@ -185 +253 @@
 
 #endif
+
+void addrcpy(void *_dst, const void *_src, int len)
+{
+#if _NET_CFG_BYTE_ORDER == _NET_CFG_BIG_ENDIAN
+        memcpy(_dst, _src, len);
+#else
+        uint8_t *dst = (uint8_t *)_dst, *src = &((uint8_t *)_src)[len];
+        while (src != _src)
+                *dst++ = *--src;
+#endif
+}
 
 ID new_id(id_table_t *table, int count)
@@ -347 +426 @@
                 }
                 case SOCK_DGRAM: {
-                        ID cepid = new_id(udp_cepid_table, udp_cepid_table_count);
+                        ID cepid = new_id(udp6_cepid_table, udp6_cepid_table_count);
                         if (cepid < 0)
                                 return -ENOMEM;
 
-                        T_UDP6_CCEP ccep = { 0, {ntohl(addr_in6->sin6_addr.__in6_union.__s6_addr), ntohs(addr_in6->sin6_port)}, (FP)socket_udp6_callback };
+                        T_UDP6_CCEP ccep = { 0, { { ntohl(addr_in6->sin6_addr.__in6_union.__s6_addr) }, ntohs(addr_in6->sin6_port)}, (FP)socket_udp6_callback };
                         ret = udp6_cre_cep(cepid, &ccep);
                         if (ret != E_OK) {
-                                delete_id(udp_cepid_table, udp_cepid_table_count, cepid);
+                                delete_id(udp6_cepid_table, udp6_cepid_table_count, cepid);
                                 return -ENOMEM;
                         }
@@ -407 +486 @@
 
                 struct sockaddr_in6 *laddr = &socket->laddr6;
-                T_TCP6_CREP crep = { 0, {ntohl(laddr->sin6_addr.__in6_union.__s6_addr), ntohs(laddr->sin6_port)} };
+                T_TCP6_CREP crep = { 0, { { ntohl(laddr->sin6_addr.__in6_union.__s6_addr) }, ntohs(laddr->sin6_port)} };
                 ret = tcp6_cre_rep(repid, &crep);
                 if (ret != E_OK) {
@@ -423 +502 @@
 }
 
-int shell_connect(int fd, const struct sockaddr *addr, socklen_t len)
+int shell_connect(int fd, const struct sockaddr *addr, socklen_t alen)
 {
         SOCKET *fp = fd_to_fp(fd);
@@ -435 +514 @@
         switch (socket->family) {
         case AF_INET: {
-                if (len < 8) {
+                if (alen < sizeof(struct sockaddr_in)) {
                         return -EINVAL;
                 }
@@ -455 +534 @@
                         }
                         fp->handle = cepid;
+                        fp->writable = 1;
                         socket->cepid = cepid;
                 }
                 struct sockaddr_in *laddr = &socket->laddr4;
                 struct sockaddr_in *raddr = &socket->raddr4;
-                memset(raddr, 0, sizeof(*raddr));
-                memcpy(raddr, addr, len);
+                memcpy(raddr, addr, sizeof(struct sockaddr_in));
                 T_IPV4EP lep = { ntohl(laddr->sin_addr.s_addr), ntohs(laddr->sin_port) };
                 T_IPV4EP rep = { ntohl(raddr->sin_addr.s_addr), ntohs(raddr->sin_port) };
                 ret = tcp_con_cep(socket->cepid, &lep, &rep, SOCKET_TIMEOUT);
-                if (ret < 0) {
+                if (ret == E_TMOUT) {
+                        return -ETIMEDOUT;
+                }
+                else if (ret < 0) {
                         return -EHOSTUNREACH;
                 }
@@ -470 +552 @@
         }
         case AF_INET6: {
-                if (len < 20) {
+                if (alen < sizeof(struct sockaddr_in6)) {
                         return -EINVAL;
                 }
@@ -490 +572 @@
                         }
                         fp->handle = cepid;
+                        fp->writable = 1;
                         socket->cepid = cepid;
                 }
                 struct sockaddr_in6 *laddr = &socket->laddr6;
                 struct sockaddr_in6 *raddr = &socket->raddr6;
-                memset(raddr, 0, sizeof(*raddr));
-                memcpy(raddr, addr, len);
-                T_IPV6EP lep = { ntohl(laddr->sin6_addr.__in6_union.__s6_addr), ntohs(laddr->sin6_port) };
-                T_IPV6EP rep = { ntohl(raddr->sin6_addr.__in6_union.__s6_addr), ntohs(raddr->sin6_port) };
+                memcpy(raddr, addr, sizeof(struct sockaddr_in6));
+                T_IPV6EP lep;
+                addrcpy(&lep.ipaddr, &laddr->sin6_addr, 16);
+                lep.portno = ntohs(laddr->sin6_port);
+                T_IPV6EP rep;
+                addrcpy(&rep.ipaddr, &raddr->sin6_addr, 16);
+                rep.portno = ntohs(raddr->sin6_port);
                 ret = tcp6_con_cep(socket->cepid, &lep, &rep, SOCKET_TIMEOUT);
-                if (ret < 0) {
+                if (ret == E_TMOUT) {
+                        return -ETIMEDOUT;
+                }
+                else if (ret < 0) {
                         return -EHOSTUNREACH;
                 }
@@ -508 +597 @@
         }
 
+        if (fp->writeevt_w != fp->writeevt_r) fp->writeevt_r++;
+
         return 0;
 }
 
-int shell_accept(int fd, struct sockaddr *__restrict addr, socklen_t *__restrict len)
+int shell_accept(int fd, struct sockaddr *__restrict addr, socklen_t *__restrict alen)
 {
         SOCKET *lfp = fd_to_fp(fd);
@@ -550 +641 @@
                         }
                         fp->handle = cepid;
+                        fp->writable = 1;
                         socket->cepid = cepid;
                 }
@@ -555 +647 @@
                         cepid = ((socket_t *)lfp->exinf)->cepid;
                         fp->handle = cepid;
+                        fp->writable = 1;
                         lfp->handle = tmax_tcp_cepid + ((socket_t *)lfp->exinf)->repid;
                         ((socket_t *)lfp->exinf)->cepid = 0;
@@ -566 +659 @@
                 }
                 struct sockaddr_in *raddr = &socket->raddr4;
-                memset(raddr, 0, sizeof(*raddr));
+                memset(raddr, 0, sizeof(struct sockaddr_in));
                 raddr->sin_family = AF_INET;
                 raddr->sin_port = htons(rep.portno);
                 raddr->sin_addr.s_addr = htonl(rep.ipaddr);
 
-                if (addr != NULL && len != NULL) {
-                        int sz = *len;
-                        if (sz < 8) {
+                if (addr != NULL && alen != NULL) {
+                        int sz = *alen;
+                        if (sz < sizeof(struct sockaddr_in)) {
                                 return -EINVAL;
                         }
                         struct sockaddr_in *raddr = &socket->raddr4;
-                        if (sz > sizeof(*raddr))
-                                sz = sizeof(*raddr);
+                        if (sz > sizeof(struct sockaddr_in))
+                                sz = sizeof(struct sockaddr_in);
                         memcpy(addr, raddr, sz);
-                        *len = sizeof(*raddr);
+                        *alen = sz;
                 }
                 break;
@@ -603 +696 @@
                         }
                         fp->handle = cepid;
+                        fp->writable = 1;
                         socket->cepid = cepid;
                 }
@@ -608 +702 @@
                         cepid = ((socket_t *)lfp->exinf)->cepid;
                         fp->handle = cepid;
+                        fp->writable = 1;
                         lfp->handle = tmax_tcp6_cepid + ((socket_t *)lfp->exinf)->repid;
                         ((socket_t *)lfp->exinf)->cepid = 0;
@@ -613 +708 @@
                         ((socket_t *)lfp->exinf)->buf = 0;
                 }
-                T_IPV6EP rep = { 0, 0 };
+                T_IPV6EP rep = { { 0 }, 0 };
                 ret = tcp6_acp_cep(socket->cepid, socket->repid, &rep, TMO_FEVR);
                 if (ret < 0) {
@@ -619 +714 @@
                 }
                 struct sockaddr_in6 *raddr = &socket->raddr6;
-                memset(raddr, 0, sizeof(*raddr));
+                memset(raddr, 0, sizeof(struct sockaddr_in6));
                 raddr->sin6_family = AF_INET;
                 raddr->sin6_port = htons(rep.portno);
-#if _NET_CFG_BYTE_ORDER == _NET_CFG_BIG_ENDIAN
-                memcpy(raddr->sin6_addr.__in6_union.__s6_addr, rep.ipaddr.__u6_addr.__u6_addr8, 16);
-#else
-                for (int i = 0; i < 16; i++)
-                        raddr->sin6_addr.__in6_union.__s6_addr[i] = rep.ipaddr.__u6_addr.__u6_addr8[i];
-#endif
-
-                if (addr != NULL && len != NULL) {
-                        int sz = *len;
-                        if (sz < 8) {
+                addrcpy(&raddr->sin6_addr, &rep.ipaddr, 16);
+
+                if (addr != NULL && alen != NULL) {
+                        int sz = *alen;
+                        if (sz < sizeof(struct sockaddr_in6)) {
                                 return -EINVAL;
                         }
                         struct sockaddr_in6 *raddr = &socket->raddr6;
-                        if (sz > sizeof(*raddr))
-                                sz = sizeof(*raddr);
+                        if (sz > sizeof(struct sockaddr_in6))
+                                sz = sizeof(struct sockaddr_in6);
                         memcpy(addr, raddr, sz);
-                        *len = sizeof(*raddr);
+                        *alen = sz;
                 }
                 break;
@@ -645 +735 @@
                 return -ENOPROTOOPT;
         }
+
+        if (fp->writeevt_w != fp->writeevt_r) fp->writeevt_r++;
 
         return fp->fd;
@@ -673 +765 @@
                         }
                         else {
+                                int temp = len;
                                 for (;;) {
                                         ret = tcp_snd_dat(socket->cepid, (void *)buf, len, SOCKET_TIMEOUT);
                                         if (ret < 0) {
-                                                if (ret == E_TMOUT)
-                                                        return -ETIME;
-                                                return -ECOMM;
+                                                return (ret == E_TMOUT) ? -EAGAIN : -ECOMM;
                                         }
                                         len -= ret;
@@ -685 +776 @@
                                         buf = (const void *)&((uint8_t *)buf)[ret];
                                 } 
+                                ret = temp;
                         }
                         break;
                 }
                 case SOCK_DGRAM: {
-                        int sz = alen;
-                        if ((addr == NULL) || (sz < 8)) {
+                        if ((addr == NULL) || (alen < sizeof(struct sockaddr_in))) {
                                 return -EINVAL;
                         }
                         struct sockaddr_in *raddr = &socket->raddr4;
-                        memset(raddr, 0, sizeof(*raddr));
-                        memcpy(raddr, addr, sz);
+                        memcpy(raddr, addr, sizeof(struct sockaddr_in));
                         T_IPV4EP rep = { ntohl(raddr->sin_addr.s_addr), ntohs(raddr->sin_port) };
                         ret = udp_snd_dat(socket->cepid, &rep, (void *)buf, len,
                                 (socket->flags & O_NONBLOCK) ? TMO_POL : SOCKET_TIMEOUT);
                         if (ret < 0) {
-                                return (ret == E_TMOUT) ? -ETIME : -ECOMM;
+                                return (ret == E_TMOUT) ? -EAGAIN : -ECOMM;
                         }
                         break;
@@ -721 +811 @@
                         }
                         else {
+                                int temp = len;
                                 for (;;) {
                                         ret = tcp6_snd_dat(socket->cepid, (void *)buf, len, SOCKET_TIMEOUT);
                                         if (ret < 0) {
-                                                if (ret == E_TMOUT)
-                                                        return -ETIME;
-                                                return -ECOMM;
+                                                return (ret == E_TMOUT) ? -EAGAIN : -ECOMM;
                                         }
                                         len -= ret;
@@ -732 +821 @@
                                                 break;
                                         buf = (const void *)&((uint8_t *)buf)[ret];
-                                } 
+                                }
+                                ret = temp;
                         }
                         break;
                 }
                 case SOCK_DGRAM: {
-                        int sz = alen;
-                        if ((addr == NULL) || (sz < 8)) {
+                        if ((addr == NULL) || (alen < sizeof(struct sockaddr_in6))) {
                                 return -EINVAL;
                         }
                         struct sockaddr_in6 *raddr = &socket->raddr6;
-                        memset(raddr, 0, sizeof(*raddr));
-                        memcpy(raddr, addr, sz);
-                        T_IPV6EP rep = { ntohl(raddr->sin6_addr.__in6_union.__s6_addr), ntohs(raddr->sin6_port) };
+                        memcpy(raddr, addr, sizeof(struct sockaddr_in6));
+                        T_IPV6EP rep;
+                        addrcpy(&rep.ipaddr, &raddr->sin6_addr, 16);
+                        rep.portno = ntohs(raddr->sin6_port);
                         ret = udp6_snd_dat(socket->cepid, &rep, (void *)buf, len,
                                 (socket->flags & O_NONBLOCK) ? TMO_POL : SOCKET_TIMEOUT);
                         if (ret < 0) {
-                                return (ret == E_TMOUT) ? -ETIME : -ECOMM;
+                                return (ret == E_TMOUT) ? -EAGAIN : -ECOMM;
                         }
                         break;
@@ -758 +848 @@
                 return -ENOPROTOOPT;
         }
+
+        if (fp->writeevt_w != fp->writeevt_r) fp->writeevt_r++;
 
         return ret;
@@ -800 +892 @@
                                                 syslog(LOG_ERROR, "sig_sem => %d", ret);
                                         }
-                                        ret = tcp_rcv_buf(socket->cepid, &socket->input, TMO_FEVR);
+                                        ret = tcp_rcv_buf(socket->cepid, &socket->input,
+                                                (socket->flags & O_NONBLOCK) ? TMO_POL : SOCKET_TIMEOUT);
                                         if (ret < 0) {
-                                                syslog(LOG_ERROR, "tcp_rcv_buf => %d", ret);
-                                                return -ECOMM;
+                                                if ((socket->flags & O_NONBLOCK) == 0)
+                                                        syslog(LOG_ERROR, "tcp_rcv_buf => %d", ret);
+                                                return (ret == E_TMOUT) ? -EAGAIN : -ECOMM;
                                         }
                                         rsz = ret;
@@ -858 +952 @@
                                         if ((socket->flags & O_NONBLOCK) == 0)
                                                 syslog(LOG_ERROR, "udp_rcv_buf => %d", ret);
-                                        return (ret == E_TMOUT) ? -ETIME : -ECOMM;
+                                        return (ret == E_TMOUT) ? -EAGAIN : -ECOMM;
                                 }
                                 rsz = ret;
@@ -867 +961 @@
                                         }
                                         int sz = *alen;
-                                        memset(raddr, 0, sizeof(socket->raddr4));
+                                        memset(raddr, 0, sizeof(struct sockaddr_in));
                                         raddr->sin_family = AF_INET;
                                         raddr->sin_port = htons(rep.portno);
                                         raddr->sin_addr.s_addr = htonl(rep.ipaddr);
-                                        if (sz > sizeof(socket->raddr4))
-                                                sz = sizeof(socket->raddr4);
+                                        if (sz > sizeof(struct sockaddr_in))
+                                                sz = sizeof(struct sockaddr_in);
                                         memcpy(addr, raddr, sz);
                                         *alen = sz;
@@ -889 +983 @@
                                 if ((addr != NULL) && (alen != NULL)) {
                                         int sz = *alen;
-                                        if (sz > sizeof(socket->raddr4))
-                                                sz = sizeof(socket->raddr4);
+                                        if (sz > sizeof(struct sockaddr_in))
+                                                sz = sizeof(struct sockaddr_in);
                                         memcpy(addr, raddr, sz);
                                         *alen = sz;
@@ -934 +1028 @@
                                                 syslog(LOG_ERROR, "sig_sem => %d", ret);
                                         }
-                                        ret = tcp6_rcv_buf(socket->cepid, &socket->input, TMO_FEVR);
+                                        ret = tcp6_rcv_buf(socket->cepid, &socket->input,
+                                                (socket->flags & O_NONBLOCK) ? TMO_POL : SOCKET_TIMEOUT);
                                         if (ret < 0) {
-                                                syslog(LOG_ERROR, "tcp6_rcv_buf => %d", ret);
-                                                return -ECOMM;
+                                                if ((socket->flags & O_NONBLOCK) == 0)
+                                                        syslog(LOG_ERROR, "tcp6_rcv_buf => %d", ret);
+                                                return (ret == E_TMOUT) ? -EAGAIN : -ECOMM;
                                         }
                                         rsz = ret;
@@ -986 +1082 @@
                                 }
 
-                                T_IPV6EP rep = { 0, 0 };
+                                T_IPV6EP rep = { { 0 }, 0 };
                                 ret = udp6_rcv_dat(socket->cepid, &rep, buf, len,
                                         (socket->flags & O_NONBLOCK) ? TMO_POL : SOCKET_TIMEOUT);
@@ -992 +1088 @@
                                         if ((socket->flags & O_NONBLOCK) == 0)
                                                 syslog(LOG_ERROR, "udp6_rcv_buf => %d", ret);
-                                        return (ret == E_TMOUT) ? -ETIME : -ECOMM;
+                                        return (ret == E_TMOUT) ? -EAGAIN : -ECOMM;
                                 }
                                 rsz = ret;
@@ -1001 +1097 @@
                                         }
                                         int sz = *alen;
-                                        memset(raddr, 0, sizeof(socket->raddr6));
+                                        memset(raddr, 0, sizeof(struct sockaddr_in6));
                                         raddr->sin6_family = AF_INET;
                                         raddr->sin6_port = htons(rep.portno);
-#if _NET_CFG_BYTE_ORDER == _NET_CFG_BIG_ENDIAN
-                                        memcpy(raddr->sin6_addr.__in6_union.__s6_addr, rep.ipaddr.__u6_addr.__u6_addr8, 16);
-#else
-                                        for (int i = 0; i < 16; i++)
-                                                raddr->sin6_addr.__in6_union.__s6_addr[i] = rep.ipaddr.__u6_addr.__u6_addr8[i];
-#endif
-                                        if (sz > sizeof(socket->raddr6))
-                                                sz = sizeof(socket->raddr6);
+                                        addrcpy(&raddr->sin6_addr, &rep.ipaddr, 16);
+                                        if (sz > sizeof(struct sockaddr_in6))
+                                                sz = sizeof(struct sockaddr_in6);
                                         memcpy(addr, raddr, sz);
                                         *alen = sz;
@@ -1028 +1119 @@
                                 if ((addr != NULL) && (alen != NULL)) {
                                         int sz = *alen;
-                                        if (sz > sizeof(socket->raddr6))
-                                                sz = sizeof(socket->raddr6);
+                                        if (sz > sizeof(struct sockaddr_in6))
+                                                sz = sizeof(struct sockaddr_in6);
                                         memcpy(addr, raddr, sz);
                                         *alen = sz;
@@ -1054 +1145 @@
                 return -ENOPROTOOPT;
         }
+
+        if (fp->readevt_w != fp->readevt_r) fp->readevt_r++;
 
         return ret;
@@ -1427 +1520 @@
                 struct sockaddr_in6 laddr;
                 laddr.sin6_family = AF_INET;
-#if _NET_CFG_BYTE_ORDER == _NET_CFG_BIG_ENDIAN
-                memcpy(laddr.sin6_addr.__in6_union.__s6_addr, laddr6->__u6_addr.__u6_addr8, 16);
-#else
-                for (int i = 0; i < 16; i++)
-                        laddr.sin6_addr.__in6_union.__s6_addr[i] = laddr6->__u6_addr.__u6_addr8[i];
-#endif
+                addrcpy(&laddr.sin6_addr, laddr6, 16);
                 laddr.sin6_port = socket->laddr6.sin6_port;
                 *len = sizeof(struct sockaddr_in6);
@@ -1465 +1553 @@
                         delete_id(tcp_cepid_table, tcp_cepid_table_count, cepid);
                         if ((ret < 0) || (ret2 < 0)) {
-                                return (ret == E_TMOUT) ? -ETIME : -EINVAL;
+                                return (ret == E_TMOUT) ? -ETIMEDOUT : -EIO;
                         }
                 }
@@ -1494 +1582 @@
                         delete_id(tcp6_cepid_table, tcp6_cepid_table_count, cepid);
                         if ((ret < 0) || (ret2 < 0)) {
-                                return (ret == E_TMOUT) ? -ETIME : -EINVAL;
+                                return (ret == E_TMOUT) ? -ETIMEDOUT : -EIO;
                         }
                 }
@@ -1535 +1623 @@
 int tcp_fd_ioctl(struct SHELL_FILE *fp, int req, void *arg)
 {
+        socket_t *socket = (socket_t *)fp->exinf;
+
+        switch (req) {
+        case F_GETFL:
+                return socket->flags;
+        case F_SETFL:
+                socket->flags = (unsigned int)arg;
+                return 0;
+        }
+
         return -EINVAL;
 }
@@ -1571 +1669 @@
 }
 
+bool_t tcp_fd_writable(struct SHELL_FILE *fp)
+{
+        //socket_t *socket = (socket_t *)fp->exinf;
+
+        return /*fp->writable &&*/ (fp->writeevt_w == fp->writeevt_r);
+}
+
 void tcp_fd_delete(struct SHELL_FILE *fp)
 {
@@ -1590 +1695 @@
                 return E_PAR;
 
+        socket_t *socket = (socket_t *)fp->exinf;
         int fd = fp->fd;
         FD_SET(fd, (fd_set *)&flgptn);
@@ -1603 +1709 @@
                         syslog(LOG_ERROR, "wai_sem => %d", ret);
                 }
-                socket_t *socket = (socket_t *)fp->exinf;
                 socket->len += len;
                 ret = sig_sem(SEM_FILEDESC);
@@ -1670 +1775 @@
                 return E_PAR;
 
+        socket_t *socket = (socket_t *)fp->exinf;
         int fd = fp->fd;
         FD_SET(fd, (fd_set *)&flgptn);
@@ -1683 +1789 @@
                         syslog(LOG_ERROR, "wai_sem => %d", ret);
                 }
-                socket_t *socket = (socket_t *)fp->exinf;
                 socket->len += len;
                 ret = sig_sem(SEM_FILEDESC);
@@ -1806 +1911 @@
 }
 
+bool_t udp_fd_writable(struct SHELL_FILE *fp)
+{
+        //socket_t *socket = (socket_t *)fp->exinf;
+
+        return fp->writable && (fp->writeevt_w == fp->writeevt_r);
+}
+
 void udp_fd_delete(struct SHELL_FILE *fp)
 {
@@ -1849 +1961 @@
                 socket->input = udppara->input;
                 socket->buf = GET_UDP_SDU(udppara->input, udppara->off);
-                memset(&socket->raddr4, 0, sizeof(socket->raddr4));
+                memset(&socket->raddr4, 0, sizeof(struct sockaddr_in));
                 socket->raddr4.sin_family = AF_INET;
                 socket->raddr4.sin_port = htons(udppara->rep4.portno);
@@ -1932 +2044 @@
                 socket->input = udppara->input;
                 socket->buf = GET_UDP_SDU(udppara->input, udppara->off);
-                memset(&socket->raddr6, 0, sizeof(socket->raddr6));
+                memset(&socket->raddr6, 0, sizeof(struct sockaddr_in6));
                 socket->raddr6.sin6_family = AF_INET;
                 socket->raddr6.sin6_port = htons(udppara->rep6.portno);
-#if _NET_CFG_BYTE_ORDER == _NET_CFG_BIG_ENDIAN
-                memcpy(socket->raddr6.sin6_addr.__in6_union.__s6_addr, udppara->rep6.ipaddr.__u6_addr.__u6_addr8, 16);
-#else
-                for (int i = 0; i < 16; i++)
-                        socket->raddr6.sin6_addr.__in6_union.__s6_addr[i] = udppara->rep6.ipaddr.__u6_addr.__u6_addr8[i];
-#endif
+                addrcpy(&socket->raddr6.sin6_addr, &udppara->rep6.ipaddr, 16);
                 udppara->input->flags |= NB_FLG_NOREL_IFOUT;
                 ret = sig_sem(SEM_FILEDESC);

asp3_tinet_ecnl_rx/trunk/ntshell/src/syscall.c

@@ -300 +300 @@
 }
 
-long SYS_rt_sigaction(long a, long b, long c) {
-        return shell_sigaction((int)a, (const struct sigaction *)b, (struct sigaction *)c);
+long SYS_rt_sigaction(long a, long b, long c, long d) {
+        return shell_sigaction((int)a, (const struct k_sigaction *)b, (struct k_sigaction *)c, (size_t)d);
 }
 
@@ -388 +388 @@
 }
 
+long SYS_nanosleep(long a, long b)
+{
+        return shell_nanosleep((const struct timespec *)a, (struct timespec *)b);
+}
+
 long SYS_dup()
 {