Changeset 279 for EcnlProtoTool/trunk/prototool

Timestamp:

Apr 29, 2017, 4:33:37 PM (7 years ago)

Author:

coas-nagasima

Message:

ファイルを追加、更新。

Location:

EcnlProtoTool/trunk/prototool

Files:

• .Debuglinker (added)
• .cproject (added)
• .info (added)
• .project (added)
• Debug (deleted)
• build_newlib.bat (added)
• lib (added)
• lib/libout.a (added)
• lib/makefile.mrbc (added)
• src/apibreak.c (added)
• src/apibreak.h (added)
• src/apiprint.c (added)
• src/apiprint.h (added)
• src/arduino.c (modified) (8 diffs)
• src/arduino.h (modified) (4 diffs)
• src/cmdbreak.c (added)
• src/cmdmisc.c (added)
• src/cmdprint.c (added)
• src/cmdrun.c (added)
• src/echo_client.rb (added)
• src/echo_server.rb (added)
• src/libbb (added)
• src/libbb/autoconf.h (added)
• src/libbb/bb_strtonum.c (added)
• src/libbb/bb_time.c (added)
• src/libbb/compare_string_array.c (added)
• src/libbb/copyfd.c (added)
• src/libbb/default_error_retval.c (added)
• src/libbb/full_write.c (added)
• src/libbb/last_char_is.c (added)
• src/libbb/libbb.c (added)
• src/libbb/libbb.h (added)
• src/libbb/messages.c (added)
• src/libbb/perror_msg.c (added)
• src/libbb/platform.h (added)
• src/libbb/ptr_to_globals.c (added)
• src/libbb/read.c (added)
• src/libbb/read_key.c (added)
• src/libbb/safe_poll.c (added)
• src/libbb/safe_write.c (added)
• src/libbb/skip_whitespace.c (added)
• src/libbb/verror_msg.c (added)
• src/libbb/vi.c (added)
• src/libbb/xfunc_die.c (added)
• src/libbb/xfuncs.c (added)
• src/libbb/xfuncs_printf.c (added)
• src/main.c (modified) (15 diffs)
• src/main.cdl (deleted)
• src/main.cfg (deleted)
• src/main.h (deleted)
• src/main.rb (deleted)
• src/mirb.c (added)
• src/mrbc.c (added)
• src/mrdb.c (added)
• src/mrdb.h (added)
• src/mrdbconf.h (added)
• src/mrdberror.h (added)
• src/mruby.c (added)
• src/musl (added)
• src/musl/freeaddrinfo.c (added)
• src/musl/gai_strerror.c (added)
• src/musl/getaddrinfo.c (added)
• src/musl/inet_aton.c (added)
• src/musl/lookup.h (added)
• src/musl/lookup_ipliteral.c (added)
• src/musl/lookup_name.c (added)
• src/musl/lookup_serv.c (added)
• src/onitest.c (added)
• src/route_cfg.c (deleted)
• src/shellif.c (added)
• src/tinet_app_config.h (deleted)
• src/tinet_main.cfg (deleted)
• src/xprintf.c (added)

EcnlProtoTool/trunk/prototool/src/arduino.c

@@ -1 +1 @@
 #include <arduino.h>
 #include <mruby.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <fcntl.h>
 #include "../llbruby.h"
 
@@ -16 +19 @@
 i2c_t Wire5;
 
-FATFS RomDisk;
-SD Sd;
-
 char ExeFilename[64];
 
@@ -27 +27 @@
 void randomSeed(long seed)
 {
+        srand(seed);
 }
 
 long arduino_random(long min, long max)
 {
-        return min;
+        return (long)(((double)rand() / (double)RAND_MAX) / ((double)max - (double)min)) + min;
 }
 
@@ -223 +224 @@
 int EEP_fopen(FILEEEP *fp, const char *str, char mode)
 {
-        FRESULT ret;
-        BYTE fm;
+        int ret;
+        int fm;
 
         switch (mode){
         case 0:
-                fm = FA_READ;
+                fm = O_RDONLY;
                 break;
         case 1:
-                fm = FA_READ | FA_WRITE | FA_CREATE_NEW;
+                fm = O_RDWR | O_CREAT;
                 break;
         case 2:
-                fm = FA_READ | FA_WRITE;
+                fm = O_RDWR;
                 break;
         default:
@@ -240 +241 @@
         }
 
-        ret = f_open(&fp->fp, str, fm);
-
-        return (ret == FR_OK) ? 0 : -1;
+        ret = open(str, fm);
+        if (ret < 0) {
+                fp->fd = 0;
+                return -1;
+        }
+        fp->fd = ret;
+
+        return 0;
 }
 
 int EEP_fwrite(FILEEEP *fp, byte *data, int *len)
 {
-        FRESULT ret;
-
-        ret = f_write(&fp->fp, data, (UINT)*len, (UINT *)len);
-
-        return (ret == FR_OK) ? 1 : -1;
+        int ret;
+
+        ret = write(fp->fd, data, *len);
+        if (ret < 0) {
+                *len = 0;
+                return -1;
+        }
+        *len = ret;
+
+        return 0;
 }
 
 int EEP_fread(FILEEEP *fp)
 {
-        FRESULT ret;
+        int ret;
         char c;
-        UINT br;
-
-        ret = f_read(&fp->fp, &c, 1, &br);
-        if (ret != FR_OK)
+
+        ret = read(fp->fd, &c, 1);
+        if (ret < 0)
                 return -1;
 
@@ -269 +279 @@
 void EEP_fclose(FILEEEP *fp)
 {
-        f_close(&fp->fp);
+        close(fp->fd);
 }
 
 int EEP_fseek(FILEEEP *fp, int pos, int mode)
 {
-        FRESULT ret;
+        int ret;
 
         switch (mode){
         case EEP_SEEKTOP:
-                ret = f_lseek(&fp->fp, pos);
+                ret = lseek(fp->fd, pos, SEEK_SET);
                 break;
         case EEP_SEEKCUR:
-                ret = f_lseek(&fp->fp, fp->fp.fptr + pos);
+                ret = lseek(fp->fd, pos, SEEK_CUR);
                 break;
         case EEP_SEEKEND:
-                ret = f_lseek(&fp->fp, fp->fp.fsize - pos);
+                ret = lseek(fp->fd, pos, SEEK_END);
                 break;
         default:
-                ret = FR_INVALID_PARAMETER;
-                break;
-        }
-
-        if (ret != FR_OK)
-                f_lseek(&fp->fp, 0);
-
-        return fp->fp.fptr;
+                return -1;
+                break;
+        }
+
+        if (ret < 0)
+                return false;
+
+        return true;
 }
 
 int EEP_ffilesize(const char *str)
 {
-        FRESULT ret;
-        FILINFO fno;
-
-        ret = f_stat(str, &fno);
-        if (ret != FR_OK)
+        int ret;
+        struct stat fno;
+
+        ret = stat(str, &fno);
+        if (ret < 0)
                 return 0;
 
-        return fno.fsize;
+        return fno.st_size;
 }
 
 bool EEP_fEof(FILEEEP *fp)
 {
-        return f_tell(&fp->fp) == f_size(&fp->fp);
+        int ret, pos;
+        struct stat fno;
+
+        ret = fstat(fp->fd, &fno);
+        if (ret < 0)
+                return false;
+
+        pos = lseek(fp->fd, 0, SEEK_CUR);
+
+        return pos == fno.st_size;
 }
 
 bool EEP_fexist(const char *path)
 {
-        FRESULT ret;
-        FILINFO fno;
-
-        ret = f_stat(path, &fno);
-
-        return (ret == FR_OK);
+        int ret;
+        struct stat fno;
+
+        ret = stat(path, &fno);
+
+        return (ret == 0);
 }
 
 bool EEP_fcopy(const char *src, const char *dst)
 {
-        FIL fsrc, fdst;
-        BYTE buffer[512];
-        FRESULT res;
-        UINT br, bw;
-
-        res = f_open(&fsrc, src, FA_OPEN_EXISTING | FA_READ);
-        if (res != FR_OK)
-                return false;
-
-        res = f_open(&fdst, dst, FA_CREATE_ALWAYS | FA_WRITE);
-        if (res != FR_OK){
-                f_close(&fsrc);
+        int fsrc, fdst;
+        unsigned char buffer[512];
+        int res = true;
+        int br, bw;
+
+        fsrc = open(src, O_RDONLY);
+        if (fsrc < 0)
+                return false;
+
+        fdst = open(dst, O_RDWR | O_CREAT);
+        if (fdst < 0){
+                close(fsrc);
                 return false;
         }
 
         for (;;) {
-                res = f_read(&fsrc, buffer, sizeof(buffer), &br);
-                if ((res != FR_OK) || br == 0)
+                br = read(fsrc, buffer, sizeof(buffer));
+                if (br < 0) {
+                        res = false;
                         break;
-
-                res = f_write(&fdst, buffer, br, &bw);
-                if ((res != FR_OK) || bw < br)
+                }
+                if (br == 0)
                         break;
-        }
-
-        f_close(&fsrc);
-        f_close(&fdst);
-
-        return (res == FR_OK);
+
+                bw = write(fdst, buffer, br);
+                if ((bw < 0) || bw < br) {
+                        res = false;
+                        break;
+                }
+        }
+
+        close(fsrc);
+        close(fdst);
+
+        return res;
 }
 
 bool EEP_fdelete(const char *path)
 {
-        FRESULT res;
-
-        res = f_unlink(path);
-
-        return (res == FR_OK);
-}
-
-bool SD_begin()
-{
-        DSTATUS dst;
-        FRESULT res;
-        BYTE pdrv = 1, type;
-
-        if (Sd.FatFs.fs_type != 0)
-                return true;
-
-        if ((dst = disk_initialize(pdrv)) != RES_OK) {
-                return false;
-        }
-
-        if ((dst = disk_ioctl(pdrv, MMC_GET_TYPE, &type)) != RES_OK) {
-                Sd.dst = dst;
-                Sd.type = 0;
-        }
-        else {
-                Sd.dst = RES_OK;
-                Sd.type = type;
-        }
-
-        if ((res = f_mount(&Sd.FatFs, "1:", 1)) != FR_OK) {
-                return false;
-        }
-
+        int res;
+
+        res = unlink(path);
+
+        return (res == 0);
+}
+
+bool SD_open(File *file, const char *path, int mode)
+{
+        int ret;
+
+        if (!SD_begin())
+                return false;
+
+        ret = open(path, mode);
+        if (ret < 0) {
+                file->fd = 0;
+                return false;
+        }
+
+        file->fd = ret;
         return true;
 }
 
-bool SD_open(File *file, const char *path, int mode)
-{
-        FRESULT ret;
+bool SD_rmdir(const char *path)
+{
+        int ret;
 
         if (!SD_begin())
                 return false;
 
-        ret = f_open(&file->fp, path, mode);
-
-        return ret == FR_OK;
-}
-
-bool SD_rmdir(const char *path)
-{
-        FRESULT ret;
+        ret = rmdir(path);
+
+        return ret == 0;
+}
+
+bool SD_rename(const char *path1, const char *path2)
+{
+        int ret;
 
         if (!SD_begin())
                 return false;
 
-        ret = f_unlink(path);
-
-        return ret == FR_OK;
-}
-
-bool SD_rename(const char *path1, const char *path2)
-{
-        FRESULT ret;
+        ret = rename(path1, path2);
+        
+        return ret == 0;
+}
+
+bool SD_remove(const char *path)
+{
+        int ret;
 
         if (!SD_begin())
                 return false;
 
-        ret = f_rename(path1, path2);
-        
-        return ret == FR_OK;
-}
-
-bool SD_remove(const char *path)
-{
-        FRESULT ret;
+        ret = unlink(path);
+
+        return ret == 0;
+}
+
+bool SD_exists(const char *path)
+{
+        int ret;
+        struct stat fno;
 
         if (!SD_begin())
                 return false;
 
-        ret = f_unlink(path);
-
-        return ret == FR_OK;
-}
-
-bool SD_exists(const char *path)
-{
-        FRESULT ret;
-        FILINFO fno;
+        ret = stat(path, &fno);
+
+        return ret == 0;
+}
+
+bool SD_mkdir(const char *path)
+{
+        int ret;
 
         if (!SD_begin())
                 return false;
 
-        ret = f_stat(path, &fno);
-
-        return ret == FR_OK;
-}
-
-bool SD_mkdir(const char *path)
-{
-        FRESULT ret;
-
-        if (!SD_begin())
-                return false;
-
-        ret = f_mkdir(path);
-
-        return ret == FR_OK;
-}
-
-int file_write(File *fd, unsigned char *str, int len)
-{
-        FRESULT ret;
-        UINT bw;
-
-        ret = f_write(&fd->fp, str, len, &bw);
-        if (ret != FR_OK)
-                return -1;
-
-        return bw;
-}
-
-void file_close(File *fd)
-{
-        f_close(&fd->fp);
-}
-
-int file_size(File *fd)
-{
-        return f_size(&fd->fp);
-}
-
-int file_position(File *fd)
-{
-        return fd->fp.fptr;
-}
-
-void file_flush(File *fd)
-{
-        f_flush(&fd->fp);
-}
-
-bool file_seek(File *fd, int pos)
-{
-        FRESULT ret;
-
-        ret = f_lseek(&fd->fp, pos);
-
-        return ret != FR_OK;
-}
-
-int file_read(File *fd)
-{
-        FRESULT ret;
+        ret = mkdir(path, 0777);
+
+        return ret == 0;
+}
+
+int file_write(File *fp, unsigned char *str, int len)
+{
+        int ret;
+
+        ret = write(fp->fd, str, len);
+        if (ret < 0)
+                return -1;
+
+        return ret;
+}
+
+void file_close(File *fp)
+{
+        close(fp->fd);
+}
+
+int file_size(File *fp)
+{
+        int ret;
+        struct stat fno;
+
+        ret = fstat(fp->fd, &fno);
+        if (ret < 0)
+                return -1;
+
+        return fno.st_size;
+}
+
+int file_position(File *fp)
+{
+        int ret;
+        struct stat fno;
+
+        ret = lseek(fp->fd, 0, SEEK_CUR);
+        if (ret < 0)
+                return -1;
+
+        return ret;
+}
+
+void file_flush(File *fp)
+{
+        fsync(fp->fd);
+}
+
+bool file_seek(File *fp, int pos)
+{
+        int ret;
+
+        ret = lseek(fp->fd, pos, SEEK_SET);
+
+        return ret == 0;
+}
+
+int file_read(File *fp)
+{
+        int ret;
         char c;
-        UINT br;
-
-        ret = f_read(&fd->fp, &c, 1, &br);
-        if (ret != FR_OK)
+
+        ret = read(fp->fd, &c, 1);
+        if (ret < 0)
                 return -1;
 
@@ -524 +537 @@
 void system_reboot(int mode)
 {
-
+        exit(mode);
 }
 
@@ -531 +544 @@
         return 0;
 }
-
-DWORD get_fattime(void)
-{
-        time_t temp;
-        struct tm _tm;
-
-        time(&temp);
-        gmtime_r(&temp, &_tm);
-
-        return    ((DWORD)(_tm.tm_year - 1980) << 25)
-                | ((DWORD)_tm.tm_mon << 21)
-                | ((DWORD)_tm.tm_mday << 16)
-                | ((DWORD)_tm.tm_hour << 11)
-                | ((DWORD)_tm.tm_min << 5)
-                | ((DWORD)_tm.tm_sec >> 1);
-}
-
-void mrb_gr_peach_gem_init(mrb_state *mrb)
-{
-}
-
-void mrb_gr_peach_gem_final(mrb_state *mrb)
-{
-
-}

EcnlProtoTool/trunk/prototool/src/arduino.h

@@ -30 +30 @@
 #include <us_ticker_api.h>
 #include <wait_api.h>
-#include "diskio.h"
-#include "ff.h"
 
 #ifndef bool
@@ -116 +114 @@
 
 typedef struct File {
-        FIL fp;
+        int  fd;
 } File;
 
@@ -130 +128 @@
 int file_read(File *fd);
 
-typedef struct SD {
-        DSTATUS dst;
-        BYTE type;
-        FATFS FatFs;
-} SD;
-
-extern SD Sd;
-
 bool SD_begin();
 bool SD_open(File *file, const char *path, int mode);
@@ -147 +137 @@
 
 typedef struct FILEEEP {
-        FIL fp;
+        int fd;
 } FILEEEP;
 

EcnlProtoTool/trunk/prototool/src/main.c

@@ -1 +1 @@
 /*
  *  TOPPERS ECHONET Lite Communication Middleware
- * 
- *  Copyright (C) 2014-2017 Cores Co., Ltd. Japan
- * 
+ *
+ *  Copyright (C) 2014-2016 Cores Co., Ltd. Japan
+ *
  *  上記著作権è€
 は，以下の(1)～(4)ã®æ¡ä»¶ã‚’æº€ãŸã™å ´åˆã«é™ã‚Šï¼Œæœ¬ã‚½ãƒ•ãƒˆã‚¦ã‚§
@@ -40 +40 @@
  *      å
 è²¬ã™ã‚‹ã“と．
- * 
+ *
  *  本ソフトウェアは，無保証で提供されているものである．上記著作権è€
 お
@@ -47 +47 @@
  *  アの利用により直接的または間接的に生じたいかなる損害に関しても，そ
  *  ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
- * 
+ *
  *  @(#) $Id$
  */
 
-/* 
- *  サンプルプログラム(1)の本体
- */
-
-#include <kernel.h>
-#include <t_syslog.h>
-#include <t_stdlib.h>
-#include <sil.h>
-#include <stdlib.h>
+ /*
+  *  サンプルプログラム(1)の本体
+  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <arpa/inet.h>
+#include <fcntl.h>
+#include <netdb.h>
+#include <unistd.h>
+#include <setjmp.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/unistd.h>
+#include <errno.h>
+
 #include <string.h>
-#include "syssvc/serial.h"
-#include "syssvc/syslog.h"
-#include "kernel_cfg.h"
-#include "main.h"
-#include "rza1.h"
 #include <mruby.h>
 #include <mruby/compile.h>
@@ -74 +80 @@
 #include <mruby/dump.h>
 #include <mruby/string.h>
-#include <tinet_config.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_var.h>
-#include <ethernet_api.h>
-#include "../webserver/httpd.h"
-#include "../webserver/httpd-fs.h"
-#include "../webserver/http-strings.h"
-#include "../webserver/base64.h"
-#include "../webserver/sha1.h"
-#include "mruby_arduino.h"
-#include "gpio_api.h"
-#include "arduino.h"
-#include "ff.h"
-
-#ifndef _MSC_VER
-void strcpy_s(char *dst, int size, const char *src);
-void strcat_s(char *dst, int size, const char *src);
-#endif
-
-uint8_t mac_addr[6] = {0x00, 0x30, 0x13, 0x06, 0x62, 0xC0};
-
-SYSTIM main_time;
-struct httpd_state *uploding;
-
-static void netif_link_callback(T_IFNET *ether);
-static void execute_ruby();
-
-/*  TCP 送受信ウィンドバッファ  */
-uint8_t tcp_swbuf1[TCP_SWBUF_SIZE];
-uint8_t tcp_rwbuf1[TCP_RWBUF_SIZE];
-uint8_t tcp_swbuf2[TCP_SWBUF_SIZE];
-uint8_t tcp_rwbuf2[TCP_RWBUF_SIZE];
-
-#define ISO_nl      0x0a
-#define ISO_space   0x20
-#define ISO_bang    0x21
-#define ISO_percent 0x25
-#define ISO_period  0x2e
-#define ISO_slash   0x2f
-#define ISO_colon   0x3a
-
-ID ecn_api_mailboxid;
-ID WEBSOCKET_MBXID;
-
-struct httpd_state httpd_state[2] = {
-        {MAIN1_TASK, TCP_CEPID1},
-        {MAIN2_TASK, TCP_CEPID2},
-};
-
-/*
-*  ネットワーク層の選択
-*/
-
-#ifdef SUPPORT_INET6
-
-#define TCP_ACP_CEP(c,r,d,t)    tcp6_acp_cep(c,r,d,t)
-#define IP2STR(s,a)             ipv62str(s,a)
-
-#else   /* of #ifdef SUPPORT_INET6 */
-
-#ifdef SUPPORT_INET4
-
-#define TCP_ACP_CEP(c,r,d,t)    tcp_acp_cep(c,r,d,t)
-#define IP2STR(s,a)             ip2str(s,a)
-
-#endif  /* of #ifdef SUPPORT_INET4 */
-
-#endif  /* of #ifdef SUPPORT_INET6 */
-
-struct httpd_state *get_httpd(ID cepid)
-{
-        for (int i = 0; i < 2; i++) {
-                if (httpd_state[i].cepid != cepid)
-                        continue;
-
-                return &httpd_state[i];
-        }
-        return NULL;
-}
-
-struct websocket *websocket_getws(ID wbsid)
-{
-        for (int i = 0; i < 2; i++) {
-                if (httpd_state[i].websocket.wbsid != wbsid)
-                        continue;
-
-                return &httpd_state[i].websocket;
-        }
-        return NULL;
-}
-
-void send_file(struct httpd_state *s)
-{
-        char *buf;
-        int len, slen;
-
-        while (s->file.len > 0) {
-                slen = tcp_get_buf(s->cepid, (void **)&buf, TMO_FEVR);
-                if (slen < 0) {
-                        syslog(LOG_ERROR, "send_file#tcp_get_buf(%s.%d) => %d", s->addr, ((T_IPV4EP *)s->dst)->portno, slen);
-                        s->state = STATE_CLOSING;
-                        break;
-                }
-                if (slen == 0)
-                        return;
-
-                len = s->file.len;
-                if (len > slen)
-                        len = slen;
-
-                len = httpd_fs_read(&s->file, buf, len);
-                if (len <= 0) {
-                        syslog(LOG_ERROR, "send_file#httpd_fs_read(%s.%d) => %d", s->addr, ((T_IPV4EP *)s->dst)->portno, len);
-                        break;
-                }
-
-                s->file.len -= len;
-                s->file.pos += len;
-
-                if ((slen = tcp_snd_buf(s->cepid, len)) != E_OK) {
-                        syslog(LOG_ERROR, "send_file#tcp_snd_buf(%s.%d) => %d", s->addr, ((T_IPV4EP *)s->dst)->portno, slen);
-                        s->state = STATE_CLOSING;
-                        break;
-                }
-        }
-
-        syslog(LOG_NOTICE, "close:     %s.%d %s", s->addr, ((T_IPV4EP *)s->dst)->portno, s->filename);
-        httpd_fs_close(&s->file);
-        s->file.len = 0;
-        s->file.pos = 0;
-
-        s->out.state = OUT_STATE_SEND_END;
-}
-
-void send_data(struct httpd_state *s)
-{
-        char *buf;
-        int len, slen;
-
-        while (s->response_len > 0) {
-                slen = tcp_get_buf(s->cepid, (void **)&buf, TMO_FEVR);
-                if (slen < 0) {
-                        syslog(LOG_ERROR, "send_data#tcp_get_buf(%s.%d) => %d", s->addr, ((T_IPV4EP *)s->dst)->portno, slen);
-                        s->state = STATE_CLOSING;
-                        break;
-                }
-                if (slen == 0)
-                        return;
-
-                len = s->response_len;
-                if (len > slen)
-                        len = slen;
-
-                memcpy(buf, &s->response_body[s->response_pos], len);
-
-                s->response_len -= len;
-                s->response_pos += len;
-
-                if ((slen = tcp_snd_buf(s->cepid, len)) != E_OK) {
-                        syslog(LOG_ERROR, "send_data#tcp_snd_buf(%s.%d) => %d", s->addr, ((T_IPV4EP *)s->dst)->portno, slen);
-                        s->state = STATE_CLOSING;
-                        break;
-                }
-        }
-
-        s->response_body = NULL;
-        s->response_len = 0;
-        s->response_pos = 0;
-
-        s->out.state = OUT_STATE_SEND_END;
-}
-
-void send_headers(struct httpd_state *s, const char *statushdr)
-{
-        int len;
-        char *ptr;
-
-        len = strlen(statushdr);
-        tcp_snd_dat(s->cepid, (void *)statushdr, len, TMO_FEVR);
-
-        if ((s->filename[0] == '0') && (s->file.len > 0)) {
-                len = sizeof(http_content_encoding_gzip) - 1;
-                tcp_snd_dat(s->cepid, (void *)http_content_encoding_gzip, len, TMO_FEVR);
-        }
-
-        if (s->file.redirect) {
-                len = sizeof(http_location) - 1;
-                tcp_snd_dat(s->cepid, (void *)http_location, len, TMO_FEVR);
-                if (s->filename[0] == '1') {
-                        len = 2;
-                        tcp_snd_dat(s->cepid, "/~", len, TMO_FEVR);
-                }
-                len = strlen(s->filename);
-                tcp_snd_dat(s->cepid, s->filename, len, TMO_FEVR);
-                if (s->query != NULL) {
-                        tcp_snd_dat(s->cepid, "?", 1, TMO_FEVR);
-                        len = strlen(s->query);
-                        tcp_snd_dat(s->cepid, s->query, len, TMO_FEVR);
-                }
-                len = 2;
-                tcp_snd_dat(s->cepid, "\r", len, TMO_FEVR);
-        }
-
-        ptr = strrchr(s->filename, ISO_period);
-        if (ptr == NULL) {
-                len = sizeof(http_content_type_binary) - 1;
-                tcp_snd_dat(s->cepid, (void *)http_content_type_binary, len, TMO_FEVR);
-        }
-        else if (strncmp(http_html, ptr, sizeof(http_html) - 1) == 0 ||
-                strncmp(http_htm, ptr, sizeof(http_htm) - 1) == 0) {
-                len = sizeof(http_content_type_html) - 1;
-                tcp_snd_dat(s->cepid, (void *)http_content_type_html, len, TMO_FEVR);
-        }
-        else if (strncmp(http_css, ptr, sizeof(http_css) - 1) == 0) {
-                len = sizeof(http_content_type_css) - 1;
-                tcp_snd_dat(s->cepid, (void *)http_content_type_css, len, TMO_FEVR);
-        }
-        else if (strncmp(http_js, ptr, sizeof(http_js) - 1) == 0) {
-                len = sizeof(http_content_type_js) - 1;
-                tcp_snd_dat(s->cepid, (void *)http_content_type_js, len, TMO_FEVR);
-        }
-        else if (strncmp(http_json, ptr, sizeof(http_json) - 1) == 0) {
-                len = sizeof(http_content_type_json) - 1;
-                tcp_snd_dat(s->cepid, (void *)http_content_type_json, len, TMO_FEVR);
-        }
-        else if (strncmp(http_png, ptr, sizeof(http_png) - 1) == 0) {
-                len = sizeof(http_content_type_png) - 1;
-                tcp_snd_dat(s->cepid, (void *)http_content_type_png, len, TMO_FEVR);
-        }
-        else if (strncmp(http_gif, ptr, sizeof(http_gif) - 1) == 0) {
-                len = sizeof(http_content_type_gif) - 1;
-                tcp_snd_dat(s->cepid, (void *)http_content_type_gif, len, TMO_FEVR);
-        }
-        else if (strncmp(http_jpg, ptr, sizeof(http_jpg) - 1) == 0) {
-                len = sizeof(http_content_type_jpg) - 1;
-                tcp_snd_dat(s->cepid, (void *)http_content_type_jpg, len, TMO_FEVR);
-        }
-        else if (strncmp(http_svg, ptr, sizeof(http_svg) - 1) == 0) {
-                len = sizeof(http_content_type_svg) - 1;
-                tcp_snd_dat(s->cepid, (void *)http_content_type_svg, len, TMO_FEVR);
-        }
-        else if (strncmp(http_text, ptr, sizeof(http_text) - 1) == 0) {
-                len = sizeof(http_content_type_text) - 1;
-                tcp_snd_dat(s->cepid, (void *)http_content_type_text, len, TMO_FEVR);
-        }
-        else if (strncmp(http_eot, ptr, sizeof(http_eot) - 1) == 0) {
-                len = sizeof(http_content_type_eot) - 1;
-                tcp_snd_dat(s->cepid, (void *)http_content_type_eot, len, TMO_FEVR);
-        }
-        else if (strncmp(http_ttf, ptr, sizeof(http_ttf) - 1) == 0) {
-                len = sizeof(http_content_type_ttf) - 1;
-                tcp_snd_dat(s->cepid, (void *)http_content_type_ttf, len, TMO_FEVR);
-        }
-        else if (strncmp(http_woff, ptr, sizeof(http_woff) - 1) == 0) {
-                len = sizeof(http_content_type_woff) - 1;
-                tcp_snd_dat(s->cepid, (void *)http_content_type_woff, len, TMO_FEVR);
-        }
-        else if (strncmp(http_woff2, ptr, sizeof(http_woff2) - 1) == 0) {
-                len = sizeof(http_content_type_woff2) - 1;
-                tcp_snd_dat(s->cepid, (void *)http_content_type_woff2, len, TMO_FEVR);
-        }
-        else if (strncmp(http_ico, ptr, sizeof(http_ico) - 1) == 0) {
-                len = sizeof(http_content_type_ico) - 1;
-                tcp_snd_dat(s->cepid, (void *)http_content_type_ico, len, TMO_FEVR);
-        }
-        else {
-                len = sizeof(http_content_type_plain) - 1;
-                tcp_snd_dat(s->cepid, (void *)http_content_type_plain, len, TMO_FEVR);
-        }
-
-        if (s->file.len > 0) {
-                len = sizeof(http_content_length) - 1;
-                tcp_snd_dat(s->cepid, (void *)http_content_length, len, TMO_FEVR);
-                sprintf(s->temp, "%d\r\n", s->file.len);
-                tcp_snd_dat(s->cepid, (void *)s->temp, strlen(s->temp), TMO_FEVR);
-        }
-
-        if (s->message.should_keep_alive && s->reset == 0) {
-                len = sizeof(http_connection_keep_alive) - 1;
-                tcp_snd_dat(s->cepid, (void *)http_connection_keep_alive, len, TMO_FEVR);
-        }
-        else {
-                len = sizeof(http_connection_close) - 1;
-                tcp_snd_dat(s->cepid, (void *)http_connection_close, len, TMO_FEVR);
-        }
-
-        tcp_snd_dat(s->cepid, (void *)http_crnl, 2, TMO_FEVR);
-
-        if (s->filename != NULL) {
-                s->out.state = OUT_STATE_SEND_FILE;
-        }
-        else {
-                s->out.state = OUT_STATE_SEND_DATA;
-        }
-}
-
-void handle_output(struct httpd_state *s)
-{
-        s->out.wait = false;
-
-        switch (s->out.state) {
-        case OUT_STATE_WAIT_REQUEST:
-                s->out.wait = true;
-                break;
-        case OUT_STATE_OPEN_GET_FILE:
-                syslog(LOG_NOTICE, "open:      %s.%d %s", s->addr, ((T_IPV4EP *)s->dst)->portno, s->filename);
-                if (!httpd_fs_open(s->filename, sizeof(s->message.request_url), &s->file)) {
-                        s->filename = NULL;
-                        s->response_body = http_content_404;
-                        s->response_pos = 0;
-                        s->response_len = sizeof(http_content_403) - 1;
-                        s->out.statushdr = http_header_404;
-                }
-                else {
-                        s->out.statushdr = s->file.redirect ? http_header_301 : http_header_200;
-                }
-                s->out.state = OUT_STATE_SEND_HEADER;
-                break;
-        case OUT_STATE_WAIT_POST_BODY:
-                s->out.wait = true;
-                break;
-        case OUT_STATE_BODY_RECEIVED:
-                s->out.statushdr = http_header_200;
-                s->out.state = OUT_STATE_SEND_HEADER;
-                break;
-        case OUT_STATE_SEND_HEADER:
-                send_headers(s, s->out.statushdr);
-                break;
-        case OUT_STATE_SEND_FILE:
-                send_file(s);
-                break;
-        case OUT_STATE_SEND_DATA:
-                send_data(s);
-                break;
-        case OUT_STATE_SEND_END:
-                s->out.wait = true;
-                if (s->message.should_keep_alive && s->reset == 0) {
-                        s->out.state = OUT_STATE_WAIT_REQUEST;
-                }
-                else {
-                        s->state = STATE_CLOSING;
-                }
-                break;
-        }
-}
-
-void send_ws_headers(struct httpd_state *s, const char *statushdr)
-{
-        int len;
-
-        len = strlen(statushdr);
-        tcp_snd_dat(s->cepid, (void *)statushdr, len, TMO_FEVR);
-
-        len = sizeof(http_upgrade) - 1;
-        tcp_snd_dat(s->cepid, (void *)http_upgrade, len, TMO_FEVR);
-        len = strlen(s->message.upgrade);
-        tcp_snd_dat(s->cepid, s->message.upgrade, len, TMO_FEVR);
-        len = sizeof(http_crnl) - 1;
-        tcp_snd_dat(s->cepid, (void *)http_crnl, len, TMO_FEVR);
-
-        len = sizeof(http_connection) - 1;
-        tcp_snd_dat(s->cepid, (void *)http_connection, len, TMO_FEVR);
-        len = strlen(s->message.connection);
-        tcp_snd_dat(s->cepid, s->message.connection, len, TMO_FEVR);
-        len = sizeof(http_crnl) - 1;
-        tcp_snd_dat(s->cepid, (void *)http_crnl, len, TMO_FEVR);
-
-        len = sizeof(http_sec_websocket_accept) - 1;
-        tcp_snd_dat(s->cepid, (void *)http_sec_websocket_accept, len, TMO_FEVR);
-        len = strlen(s->message.response_key);
-        tcp_snd_dat(s->cepid, s->message.response_key, len, TMO_FEVR);
-        len = sizeof(http_crnl) - 1;
-        tcp_snd_dat(s->cepid, (void *)http_crnl, len, TMO_FEVR);
-
-        len = sizeof(http_sec_websocket_protocol) - 1;
-        tcp_snd_dat(s->cepid, (void *)http_sec_websocket_protocol, len, TMO_FEVR);
-        len = strlen(s->message.sec_websocket_protocol);
-        tcp_snd_dat(s->cepid, s->message.sec_websocket_protocol, len, TMO_FEVR);
-        len = sizeof(http_crnl) - 1;
-        tcp_snd_dat(s->cepid, (void *)http_crnl, len, TMO_FEVR);
-
-        len = sizeof(http_crnl) - 1;
-        tcp_snd_dat(s->cepid, (void *)http_crnl, len, TMO_FEVR);
-}
-
-void send_ws_data(struct httpd_state *s)
-{
-        char *buf;
-        int slen;
-
-        slen = tcp_get_buf(s->cepid, (void **)&buf, TMO_FEVR);
-        if (slen < 0) {
-                syslog(LOG_ERROR, "send_ws_data#tcp_get_buf(%s.%d) => %d", s->addr, ((T_IPV4EP *)s->dst)->portno, slen);
-                return;
-        }
-
-        websocket_output(&s->websocket, buf, slen);
-}
-
-void handle_ws_output(struct httpd_state *s)
-{
-        char shaHash[20];
-        SHA_CTX sha1;
-        int len;
-
-        strlncat(s->message.response_key, sizeof(s->message.response_key),
-                s->message.sec_websocket_key, sizeof(s->message.sec_websocket_key));
-        len = strlncat(s->message.response_key, sizeof(s->message.response_key),
-                http_websocket_guid, sizeof(http_websocket_guid));
-        memset(shaHash, 0, sizeof(shaHash));
-        SHA1_Init(&sha1);
-        SHA1_Update(&sha1, (sha1_byte *)s->message.response_key, len);
-        SHA1_Final((sha1_byte *)shaHash, &sha1);
-        base64_encode((unsigned char *)s->message.response_key,
-                sizeof(s->message.response_key), (unsigned char *)shaHash, sizeof(shaHash));
-
-        send_ws_headers(s, http_header_101);
-
-        s->message.response_key[0] = '\0';
-
-        do {
-                while (!websocket_newdata(&s->websocket))
-                        slp_tsk();
-
-                send_ws_data(s);
-        } while ((s->state == STATE_CONNECTED) && (!s->close_req));
-        s->state = STATE_DISCONNECTED;
-        websocket_destroy(&s->websocket);
-        s->close_req = 0;
-
-        s->state = STATE_CLOSING;
-}
-
-void handle_input(struct httpd_state *s)
-{
-        size_t done;
-        int len;
-
-        s->in.wait = false;
-
-        switch (s->in.state) {
-        case IN_STATE_START:
-                http_parser_init(&s->parser, HTTP_REQUEST);
-                s->in.state = IN_STATE_REQUEST;
-                break;
-        case IN_STATE_REQUEST:
-        case IN_STATE_RESPONSE:
-        case IN_STATE_UPLOAD:
-                if ((len = tcp_rcv_buf(s->cepid, (void **)&s->in.data, TMO_POL)) <= 0) {
-                        if ((len == E_TMOUT) || (len == 0)) {
-                                // 3秒はå¾
-つ
-                                if (main_time - s->in.timer < 30000000) {
-                                        s->in.wait = true;
-                                        break;
-                                }
-                        }
-                        syslog(LOG_ERROR, "handle_input#tcp_rcv_buf#%d(%s.%d) => %d", s->in.state, s->addr, ((T_IPV4EP *)s->dst)->portno, len);
-                        uploding = NULL;
-                        s->state = STATE_CLOSING;
-                        return;
-                }
-                done = http_parser_execute(&s->parser, &websvr_settings, s->in.data, len);
-                tcp_rel_buf(s->cepid, done);
-                if (s->parser.http_errno != HPE_OK) {
-                        syslog(LOG_ERROR, "http_parser error %s.%d => %d", s->addr, ((T_IPV4EP *)s->dst)->portno, s->parser.http_errno);
-                        uploding = NULL;
-                        s->state = STATE_CLOSING;
-                        return;
-                }
-
-                s->parse_pos = done;
-                s->parse_len = len - done;
-                break;
-        case IN_STATE_UPLOAD_WAIT:
-                if (uploding != NULL) {
-                        s->in.wait = true;
-                }
-                else {
-                        uploding = s;
-                        s->in.state = IN_STATE_UPLOAD;
-                }
-                break;
-        case IN_STATE_WEBSOCKET:
-                if (s->parse_len <= 0) {
-                        if ((len = tcp_rcv_buf(s->cepid, (void **)&s->in.data, TMO_POL)) <= 0) {
-                                if ((len == E_TMOUT) || (len == 0)) {
-                                        s->in.wait = true;
-                                        break;
-                                }
-                                syslog(LOG_ERROR, "handle_input#tcp_rcv_buf#%d(%s.%d) => %d", s->in.state, s->addr, ((T_IPV4EP *)s->dst)->portno, len);
-                                s->state = STATE_CLOSING;
-                                break;
-                        }
-
-                        s->parse_pos = 0;
-                        s->parse_len = len;
-                }
-                else
-                        len = s->parse_len;
-                done = websocket_input(&s->websocket, (void *)s->in.data, s->parse_len);
-                tcp_rel_buf(s->cepid, done);
-                if ((done != 0) || (s->websocket.rstate.opecode == connection_close)) {
-                        s->close_req = 1;
-                        s->state = STATE_CLOSING;
-                        break;
-                }
-                s->parse_pos = done;
-                s->parse_len -= done;
-                break;
-        case IN_STATE_END:
-                s->in.wait = true;
-                break;
-        default:
-                s->state = STATE_CLOSING;
-                break;
-        }
-}
-
-/*
- *  ノンブロッキングコールのコールバック関数
- */
-ER
-callback_nblk_tcp(ID cepid, FN fncd, void *p_parblk)
-{
-        struct httpd_state *s = get_httpd(cepid);
-
-        if (s == NULL)
-                syslog(LOG_NOTICE, "callback_nblk_tcp(%d, %d)", fncd, cepid);
-        else
-                syslog(LOG_NOTICE, "callback_nblk_tcp(%d, %s.%d)", fncd, s->addr, ((T_IPV4EP *)s->dst)->portno);
-
-        return E_PAR;
-}
-
-/*
- * メインタスク
- */
-void main_task(intptr_t exinf)
-{
-        ER ret, ret2;
-        struct httpd_state *s = &httpd_state[exinf];
-
-        if (exinf == 0) {
-                gpio_t led_blue, led_green, led_red, sw;
-                gpio_init_out(&led_blue, LED_BLUE);
-                gpio_init_out(&led_green, LED_GREEN);
-                gpio_init_out(&led_red, LED_RED);
-                gpio_init_in(&sw, USER_BUTTON0);
-
-                bool_t exec = gpio_read(&sw) == 1;
-
-                gpio_write(&led_blue, 1);
-                gpio_write(&led_green, exec ? 1 : 0);
-                gpio_write(&led_red, 0);
-
-                /* 初期化 */
-                if (mruby_arduino_init() == 0) {
-                        gpio_write(&led_blue, 0);
-                }
-                else {
-                        gpio_write(&led_blue, 0);
-                        gpio_write(&led_red, 1);
-                }
-
-                gpio_write(&led_green, 0);
-
-                /* TINETが起動するまでå¾
-つ */
-                ether_set_link_callback(netif_link_callback);
-
-                act_tsk(MAIN2_TASK);
-
-                if (exec) {
-                        strcpy_s(RubyFilename, sizeof(RubyFilename), "1:/upload/main.mrb");
-
-                        execute_ruby();
-                }
-        }
-
-        for (;;) {
-                ret2 = get_tim(&main_time);
-                if (ret2 != E_OK) {
-                        syslog(LOG_ERROR, "get_tim");
-                        return;
-                }
-
-                switch (s->state) {
-                case STATE_DISCONNECTED:
-                        memset(&s->dst, 0, sizeof(s->dst));
-                        if ((ret = TCP_ACP_CEP(s->cepid, TCP_REPID, (T_IPV4EP *)s->dst, TMO_FEVR)) != E_OK) {
-                                syslog(LOG_ERROR, "tcp_acp_cep(%d) => %d", s->cepid, ret);
-                                tslp_tsk(100000);       // TODO
-                                s->state = STATE_CLOSING;
-                                break;
-                        }
-                        IP2STR(s->addr, &((T_IPV4EP *)s->dst)->ipaddr);
-                        syslog(LOG_NOTICE, "connected: %s.%d", s->addr, ((T_IPV4EP *)s->dst)->portno);
-                        memset(&s->in, 0, sizeof(s->in));
-                        memset(&s->out, 0, sizeof(s->out));
-                        s->in.timer = main_time;
-                        s->state = STATE_CONNECTED;
-                        break;
-                case STATE_CONNECTED:
-                        handle_input(s);
-                        handle_output(s);
-                        break;
-                case STATE_WEBSOCKET:
-                        handle_input(s);
-                        handle_ws_output(s);
-                        break;
-                case STATE_CLOSING:
-                        syslog(LOG_NOTICE, "close:     %s.%d", s->addr, ((T_IPV4EP *)s->dst)->portno);
-                        tcp_sht_cep(s->cepid);
-                        tcp_cls_cep(s->cepid, TMO_FEVR);
-
-                        if (s->reset) {
-                                s->reset = 0;
-                                s->state = STATE_RESET;
-                        }
-                        else{
-                                s->state = STATE_DISCONNECTED;
-                        }
-                        break;
-                case STATE_RESET:
-                        execute_ruby();
-                        s->state = STATE_DISCONNECTED;
-                        break;
-                }
-
-                if (s->in.wait && s->out.wait) {
-                        tslp_tsk(100000);
-                }
-        }
-}
-
-struct udp_msg {
-        T_IPV4EP dst;
+#include <usrcmd.h>
+
+#define ETHER_MAX_LEN 1518
+#define IF_FLAG_UP              1
+#define IF_FLAG_LINK_UP 2
+#define MAKE_IPV4_ADDR(a,b,c,d)         htonl(((uint32_t)(a)<<24)|((uint32_t)(b)<<16)|((uint32_t)(c)<<8)|(d))
+
+struct udp_msg
+{
+        struct sockaddr_in dst;
         int len;
         uint8_t buffer[ETHER_MAX_LEN];
 };
 
-SYSTIM mruby_time;
+typedef struct
+{
+        cmd_table_t *table;
+        cmd_table_t *count;
+} cmd_table_info_t;
+
+extern int mrbc_main(int argc, char **argv);
+extern int mrdb_main(int argc, char **argv);
+extern int mruby_main(int argc, char **argv);
+extern int mirb_main(int argc, char **argv);
+extern int tcc_main(int argc, char **argv);
+extern int vi_main(int argc, char **argv);
+extern int onitest_main(int argc, char **argv);
+extern int tcp_echo_main(int argc, char **argv);
+extern int echo_client_main(int argc, char **argv);
+extern int mrdb_break(void);
+
+static const cmd_table_t cmdlist[] = {
+        {"mrbc", "mruby compiler executable", mrbc_main},
+        {"mrdb","mruby debugger command", mrdb_main},
+        {"mruby","mruby command", mruby_main},
+        {"mirb", "Embeddable Interactive Ruby Shell", mirb_main},
+        {"tcc", "Tiny C compiler", tcc_main},
+        {"vi", "Text editor", vi_main},
+        {"cd", "change directory", usrcmd_cd },
+        {"ls", "list files", usrcmd_ls },
+        {"cp", "copy file", usrcmd_cp },
+        {"rm", "remove file", usrcmd_rm },
+        {"mv", "move file", usrcmd_mv },
+        {"mkdir", "Make directory", usrcmd_mkdir},
+        {"hexdump", "Hex dump", usrcmd_hexdump},
+        {"onitest", "Onigumo Test", onitest_main},
+        {"tcp_echo", "TCP echo server/client", tcp_echo_main},
+        {"help", "This is a description text string for help command.", usrcmd_help},
+        {"info", "This is a description text string for info command.", usrcmd_info},
+        {"exit", "Exit Natural Tyny Shell", usrcmd_exit},
+};
+cmd_table_info_t cmd_table_info = { &cmdlist, sizeof(cmdlist) / sizeof(cmdlist[0]) };
+
+int echonet = 1;
+struct timeval main_time;
 struct RClass *_module_target_board;
-
-extern const uint8_t main_rb_code[];
-uint8_t RubyCode[16 * 1024];
-
-/* MACアドレスの設定時に呼ばれる */
-void mbed_mac_address(char *mac)
-{
-        memcpy(mac, mac_addr, 6);
-}
-
-/*
- *  mruby実行タスク
- */
-void mruby_task(intptr_t exinf)
-{
-        ER ret;
+int sock;
+
+int main(int argc, char **argv)
+{
+        if (argc == 0) {
+                return 0;
+        }
+        const cmd_table_t *p = cmd_table_info.table;
+        for (int i = 0; i < cmd_table_info.count; i++) {
+                if (strcmp((const char *)argv[0], p->cmd) == 0) {
+                        return p->func(argc, argv);
+                }
+                p++;
+        }
+        printf("Unknown command found.\n");
+        return 0;
+}
+
+int run_mruby_code(int argc, char **argv, const uint8_t *code, const char *cmdline)
+{
+        mrb_state *mrb;
         struct RProc* n;
         struct mrb_irep *irep;
-        mrb_state *mrb;
-
-        syslog(LOG_NOTICE, "mruby_task");
+        mrb_value ARGV;
+        mrbc_context *c;
+        mrb_value v;
+        mrb_sym zero_sym;
+
+        echonet = 0;
 
         /* mrubyの初期化 */
         mrb = mrb_open();
         if (mrb == NULL)
-                abort();
-
-        ret = get_tim(&mruby_time);
-        if (ret != E_OK) {
-                syslog(LOG_ERROR, "get_tim => %d", ret);
-                return;
-        }
-
-        irep = mrb_read_irep(mrb, RubyCode);
+                return -1;
+
+        int ai = mrb_gc_arena_save(mrb);
+        ARGV = mrb_ary_new_capa(mrb, argc);
+        for (int i = 0; i < argc; i++) {
+                mrb_ary_push(mrb, ARGV, mrb_str_new_cstr(mrb, argv[i]));
+        }
+        mrb_define_global_const(mrb, "ARGV", ARGV);
+
+        c = mrbc_context_new(mrb);
+        c->dump_result = TRUE;
+
+        /* Set $0 */
+        zero_sym = mrb_intern_lit(mrb, "$0");
+        mrbc_filename(mrb, c, cmdline);
+        mrb_gv_set(mrb, zero_sym, mrb_str_new_cstr(mrb, cmdline));
+
+        irep = mrb_read_irep(mrb, code);
         n = mrb_proc_new(mrb, irep);
         mrb_run(mrb, n, mrb_nil_value());
 
+        mrb_gc_arena_restore(mrb, ai);
+        mrbc_context_free(mrb, c);
+        if (mrb->exc) {
+                if (!mrb_undef_p(v)) {
+                        mrb_print_error(mrb);
+                }
+                n = -1;
+        }
+
         mrb_close(mrb);
-}
-
-static void execute_ruby()
-{
-        FIL fd;
-        FRESULT res;
-        ER ret;
-
-        syslog(LOG_NOTICE, "execute_ruby");
-
-        ret = ter_tsk(MRUBY_TASK);
-        if ((ret != E_OK) && (ret != E_OBJ)) {
-                syslog(LOG_ERROR, "ter_tsk => %d", ret);
-        }
-
-        tslp_tsk(100000);
-
-        reset_heap();
-
-        strcpy_s(ExeFilename, sizeof(ExeFilename), RubyFilename);
-        RubyFilename[0] = '\0';
-        ExeFilename[sizeof(ExeFilename) - 1] = '\0';
-
-        if (ExeFilename[0] == '\0') {
+        return 0;
+}
+
+int tcp_echo_main(int argc, char **argv)
+{
+        extern const uint8_t echo_server_code[];
+        extern const uint8_t echo_client_code[];
+
+        if (argc >= 2) {
+                if (strcmp(argv[1], "-s") == 0) {
+                        return run_mruby_code(argc - 2, &argv[2], echo_server_code, "echo_server");
+                }
+                else if (strcmp(argv[1], "-c") == 0) {
+                        return run_mruby_code(argc - 2, &argv[2], echo_client_code, "echo_client");
+                }
+        }
+
+        printf("tcp_echo -s port\n");
+        printf("tcp_echo -c ipaddr port\n");
+
+        return 0;
+}
+
+int usrcmd_help(int argc, char **argv)
+{
+        const cmd_table_t *p = cmd_table_info.table;
+        for (int i = 0; i < cmd_table_info.count; i++) {
+                printf(p->cmd);
+                printf("\t:");
+                printf(p->desc);
+                printf("\n");
+                p++;
+        }
+        return 0;
+}
+
+void sigusr1_handler(int sig)
+{
+        printf("signal called\n");
+}
+
+void mrb_target_board_init()
+{
+        int ret;
+        struct sockaddr_in ep;
+        struct ip_mreq mreq;
+
+        signal(SIGUSR1, sigusr1_handler);
+
+        sock = socket(AF_INET, SOCK_DGRAM, 0);
+
+        memset(&ep, 0, sizeof(ep));
+        ep.sin_family = AF_INET;
+        ep.sin_port = htons(3610);
+        ep.sin_addr.s_addr = INADDR_ANY;
+        //ep.sin_addr.s_addr = MAKE_IPV4_ADDR(192,168,137,200);
+
+        ret = bind(sock, &ep, sizeof(ep));
+        if (ret != 0) {
+                printf("bind %d", ret);
                 return;
         }
 
-        syslog(LOG_NOTICE, "%s", ExeFilename);
-
-        wai_sem(SEM_FILESYSTEM);
-
-        if ((res = f_open(&fd, ExeFilename, FA_OPEN_EXISTING | FA_READ)) == FR_OK) {
-                if (fd.fsize < sizeof(RubyCode)) {
-                        int len = fd.fsize;
-                        for (int pos = 0; pos < fd.fsize; pos += len) {
-                                if (len > 1024)
-                                        len = 1024;
-
-                                UINT rlen;
-                                if ((res = f_read(&fd, &RubyCode[pos], len, &rlen)) != FR_OK)
-                                        break;
-
-                                // 他に使う人のために解放
-                                sig_sem(SEM_FILESYSTEM);
-                                wai_sem(SEM_FILESYSTEM);
-                        }
-                }
-                f_close(&fd);
-        }
-
-        sig_sem(SEM_FILESYSTEM);
-
-        if (res == FR_OK) {
-                ret = act_tsk(MRUBY_TASK);
-                if (ret != E_OK) {
-                        syslog(LOG_ERROR, "act_tsk => %d", ret);
-                }
-        }
-}
-
-ER callback_nblk_udp(ID cepid, FN fncd, void *p_parblk)
-{
-        static struct udp_msg msg_inst[2];
-        static int msg_no = 0;
-        struct udp_msg *msg = &msg_inst[msg_no];
-        ER      error = E_OK;
-
-        switch (fncd) {
-        case TFN_UDP_CRE_CEP:
-        case TFN_UDP_RCV_DAT:
-                /* ECN_CAP_PUT("[UDP ECHO SRV] callback_nblk_udp() recv: %u", *(int *)p_parblk); */
-                memset(msg, 0, sizeof(struct udp_msg));
-                if ((msg->len = udp_rcv_dat(cepid, &msg->dst, msg->buffer, sizeof(msg->buffer), 0)) < 0) {
-                        syslog(LOG_WARNING, "[UDP ECHO SRV] recv, error: %s", itron_strerror(msg->len));
-                        return msg->len;
-                }
-                msg_no = (msg_no + 1) % 2;
-                return snd_dtq(MRUBY_DATAQUEUE, (intptr_t)msg);
-
-        case TFN_UDP_SND_DAT:
-                break;
-        default:
-                syslog(LOG_WARNING, "[UDP ECHO SRV] fncd:0x%04X(%s)", -fncd,
-                        (fncd == TFN_UDP_CRE_CEP ? "TFN_UDP_CRE_CEP" :
-                        (fncd == TFN_UDP_RCV_DAT ? "TFN_UDP_RCV_DAT" :
-                                (fncd == TFN_UDP_SND_DAT ? "TFN_UDP_SND_DAT" : "undef"))));
-
-                error = E_PAR;
-                break;
-        }
-        return error;
-}
-
-static void netif_link_callback(T_IFNET *ether)
-{
-        static struct udp_msg msg_inst[2];
-        static int msg_no = 0;
-        struct udp_msg *msg = &msg_inst[msg_no];
-        T_RTSK rtsk;
-        ER ret;
-
-        ret = ref_tsk(MRUBY_TASK, &rtsk);
-        if ((ret != E_OK) || (rtsk.tskstat == TTS_DMT))
+        mreq.imr_interface.s_addr = INADDR_ANY;
+        mreq.imr_multiaddr.s_addr = MAKE_IPV4_ADDR(224, 0, 23, 0);
+
+        ret = setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char *)&mreq, sizeof(mreq));
+        if (ret != 0) {
+                printf("setsockopt %d", ret);
                 return;
-
-        memset(msg, 0, sizeof(struct udp_msg));
-
-        msg->len = 1;
-        msg->buffer[0] = ether->flags;
-
-        msg_no = (msg_no + 1) % 2;
-        snd_dtq(MRUBY_DATAQUEUE, (intptr_t)msg);
+        }
+
+        ret = gettimeofday(&main_time, NULL);
+        if (ret != 0) {
+                printf("gettimeofday");
+                return;
+        }
+}
+
+void mrb_target_board_final()
+{
+        close(sock);
+}
+
+void mrb_target_board_break()
+{
+        raise(SIGUSR1);
 }
 
@@ -883 +294 @@
 static mrb_value mrb_target_board_wait_msg(mrb_state *mrb, mrb_value self)
 {
-        TMO timer;
-        SYSTIM now;
-        ER ret, ret2;
-        struct udp_msg *msg;
+        int tmr;
+        struct timeval timer, *ptimer;
+        struct timeval now, elps;
+        int ret, ret2;
+        struct udp_msg _msg;
+        struct udp_msg *msg = &_msg;
         mrb_value arv[3];
-        static int first = 1;
-
-        mrb_get_args(mrb, "i", &timer);
-        if (timer != TMO_FEVR)
-                timer *= 1000;
-
-        if (first) {
-                first = 0;
-                syslog(LOG_NOTICE, "wait_msg");
-        }
+        fd_set readfds, writefds, errorfds;
+
+        mrb_get_args(mrb, "i", &tmr);
+
+        if (tmr < 0)
+                ptimer = NULL;
+        else {
+                timer.tv_sec = tmr / 1000;
+                timer.tv_usec = (tmr % 1000) * 1000;
+                ptimer = &timer;
+        }
+
+        FD_ZERO(&readfds);
+        FD_ZERO(&writefds);
+        FD_ZERO(&errorfds);
+        FD_SET(sock, &readfds);
+        FD_SET(sock, &writefds);
+        FD_SET(sock, &errorfds);
 
         /* メッセージå¾
 ち */
-        ret = trcv_dtq(MRUBY_DATAQUEUE, (intptr_t *)&msg, timer);
-        if ((ret != E_OK) && (ret != E_TMOUT)) {
-                syslog(LOG_ERROR, "trcv_dtq => %d", ret);
+        memset(msg, 0, sizeof(*msg));
+        ret = select(sock + 1, &readfds, &writefds, &errorfds, ptimer);
+        if (ret < 0)
+                mrb_raise(mrb, E_RUNTIME_ERROR, "socket select error");
+        if (FD_ISSET(sock, &readfds)) {
+                int fromlen = sizeof(msg->dst);
+                msg->len = recvfrom(sock, msg->buffer, sizeof(msg->buffer), 0, &msg->dst, &fromlen);
+                if (msg->len < 0) {
+                        printf("recvfrom %d", msg->len);
+                        return mrb_nil_value();
+                }
+        }
+
+        ret2 = gettimeofday(&now, NULL);
+        if (ret2 != 0) {
+                printf("gettimeofday");
                 return mrb_nil_value();
         }
 
-        ret2 = get_tim(&now);
-        if (ret2 != E_OK) {
-                syslog(LOG_ERROR, "get_tim => %d", ret);
-                return mrb_nil_value();
-        }
-
-        arv[0] = mrb_fixnum_value((now - mruby_time) / 1000);
-        mruby_time = now;
+        timersub(&now, &main_time, &elps);
+        arv[0] = mrb_fixnum_value(elps.tv_sec);
+        main_time = now;
 
         /* ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆã®å ´åˆ */
-        if (ret == E_TMOUT) {
+        if (ret == 0) {
                 return mrb_ary_new_from_values(mrb, 1, arv);
         }
@@ -923 +352 @@
         /* å†
 éƒ¨ã‚¤ãƒ™ãƒ³ãƒˆã®å ´åˆ */
-        if (msg->dst.ipaddr == 0) {
+        if (msg->dst.sin_addr.s_addr == 0) {
                 /* Ethernet Link up */
                 if (msg->buffer[0] & IF_FLAG_LINK_UP) {
@@ -931 +360 @@
                 else if (msg->buffer[0] & IF_FLAG_UP) {
                         arv[1] = mrb_fixnum_value(2);
-                }
-                else {
-                        arv[1] = mrb_fixnum_value(0);
                 }
 
@@ -967 +393 @@
         mrb_value rep;
         mrb_value rdat;
-        T_IPV4EP *ep;
-        ER_UINT ret;
+        struct sockaddr_in *ep;
+        int ret;
 
         mrb_get_args(mrb, "SS", &rep, &rdat);
 
-        if (RSTRING_LEN(rep) != sizeof(T_IPV4EP)) {
+        if (RSTRING_LEN(rep) != sizeof(struct sockaddr_in)) {
                 mrb_raise(mrb, E_RUNTIME_ERROR, "snd_msg");
                 return mrb_nil_value();
         }
 
-        ep = (T_IPV4EP *)RSTRING_PTR(rep);
-
-        ret = udp_snd_dat(MRUBY_ECNL_UDP_CEPID, ep, RSTRING_PTR(rdat), RSTRING_LEN(rdat), TMO_FEVR);
+        ep = (struct sockaddr_in *)RSTRING_PTR(rep);
+
+        ret = sendto(sock, RSTRING_PTR(rdat), RSTRING_LEN(rdat), 0, (struct sockaddr *)ep, sizeof(*ep));
         if (ret < 0) {
-                mrb_raise(mrb, E_RUNTIME_ERROR, "snd_msg");
+                mrb_raise(mrb, E_RUNTIME_ERROR, "sendto");
                 return mrb_nil_value();
         }
@@ -994 +420 @@
 {
         mrb_value rep;
-        T_IPV4EP *ep;
+        struct sockaddr_in *ep;
 
         mrb_get_args(mrb, "S", &rep);
 
-        if (RSTRING_LEN(rep) < sizeof(T_IPV4EP)) {
+        if (RSTRING_LEN(rep) < sizeof(struct sockaddr_in)) {
                 mrb_raise(mrb, E_RUNTIME_ERROR, "is_local_addr");
                 return mrb_nil_value();
         }
 
-        ep = (T_IPV4EP *)RSTRING_PTR(rep);
-
-        return (ep->ipaddr == MAKE_IPV4_ADDR(127, 0, 0, 1)) ? mrb_true_value() : mrb_false_value();
+        ep = (struct sockaddr_in *)RSTRING_PTR(rep);
+
+        return (ep->sin_addr.s_addr == MAKE_IPV4_ADDR(127, 0, 0, 1)) ? mrb_true_value() : mrb_false_value();
 }
 
@@ -1014 +440 @@
 {
         mrb_value rep;
-        T_IPV4EP *ep;
+        struct sockaddr_in *ep;
 
         mrb_get_args(mrb, "S", &rep);
 
-        if (RSTRING_LEN(rep) < sizeof(T_IPV4EP)) {
+        if (RSTRING_LEN(rep) < sizeof(struct sockaddr_in)) {
                 mrb_raise(mrb, E_RUNTIME_ERROR, "is_multicast_addr");
                 return mrb_nil_value();
         }
 
-        ep = (T_IPV4EP *)RSTRING_PTR(rep);
-
-        return (ep->ipaddr == MAKE_IPV4_ADDR(224, 0, 23, 0)) ? mrb_true_value() : mrb_false_value();
+        ep = (struct sockaddr_in *)RSTRING_PTR(rep);
+
+        return (ep->sin_addr.s_addr == MAKE_IPV4_ADDR(224, 0, 23, 0)) ? mrb_true_value() : mrb_false_value();
 }
 
@@ -1034 +460 @@
 {
         mrb_value rep1, rep2;
-        T_IPV4EP *ep1, *ep2;
+        struct sockaddr_in *ep1, *ep2;
 
         mrb_get_args(mrb, "SS", &rep1, &rep2);
 
-        if ((RSTRING_LEN(rep1) != sizeof(T_IPV4EP)) || (RSTRING_LEN(rep2) != sizeof(T_IPV4EP))) {
+        if ((RSTRING_LEN(rep1) != sizeof(struct sockaddr_in)) || (RSTRING_LEN(rep2) != sizeof(struct sockaddr_in))) {
                 mrb_raise(mrb, E_RUNTIME_ERROR, "equals_addr");
                 return mrb_nil_value();
         }
 
-        ep1 = (T_IPV4EP *)RSTRING_PTR(rep1);
-        ep2 = (T_IPV4EP *)RSTRING_PTR(rep2);
-
-        return (ep1->ipaddr == ep2->ipaddr) ? mrb_true_value() : mrb_false_value();
+        ep1 = (struct sockaddr_in *)RSTRING_PTR(rep1);
+        ep2 = (struct sockaddr_in *)RSTRING_PTR(rep2);
+
+        return (ep1->sin_addr.s_addr == ep2->sin_addr.s_addr) ? mrb_true_value() : mrb_false_value();
 }
 
@@ -1054 +480 @@
 static mrb_value mrb_target_board_get_local_addr(mrb_state *mrb, mrb_value self)
 {
-        T_IPV4EP ep;
+        struct sockaddr_in ep;
         mrb_value rep;
 
-        ep.ipaddr = MAKE_IPV4_ADDR(127, 0, 0, 1);
-        ep.portno = 3610;
+        memset(&ep, 0, sizeof(ep));
+        ep.sin_family = AF_INET;
+        ep.sin_addr.s_addr = MAKE_IPV4_ADDR(127, 0, 0, 1);
+        ep.sin_port = htons(3610);
 
         rep = mrb_str_new(mrb, (char *)&ep, sizeof(ep));
@@ -1070 +498 @@
 static mrb_value mrb_target_board_get_multicast_addr(mrb_state *mrb, mrb_value self)
 {
-        T_IPV4EP ep;
+        struct sockaddr_in ep;
         mrb_value rep;
 
-        ep.ipaddr = MAKE_IPV4_ADDR(224, 0, 23, 0);
-        ep.portno = 3610;
+        memset(&ep, 0, sizeof(ep));
+        ep.sin_family = AF_INET;
+        ep.sin_addr.s_addr = MAKE_IPV4_ADDR(224, 0, 23, 0);
+        ep.sin_port = htons(3610);
 
         rep = mrb_str_new(mrb, (char *)&ep, sizeof(ep));
@@ -1083 +513 @@
 void mrb_mruby_others_gem_init(mrb_state* mrb)
 {
+        if (!echonet)
+                return;
+
         _module_target_board = mrb_define_module(mrb, "TargetBoard");
-
-        // mbed Pin Names
-        mrb_define_const(mrb, _module_target_board, "LED1", mrb_fixnum_value(LED1));
-        mrb_define_const(mrb, _module_target_board, "LED2", mrb_fixnum_value(LED2));
-        mrb_define_const(mrb, _module_target_board, "LED3", mrb_fixnum_value(LED3));
-        mrb_define_const(mrb, _module_target_board, "LED4", mrb_fixnum_value(LED4));
-
-        mrb_define_const(mrb, _module_target_board, "LED_RED", mrb_fixnum_value(LED_RED));
-        mrb_define_const(mrb, _module_target_board, "LED_GREEN", mrb_fixnum_value(LED_GREEN));
-        mrb_define_const(mrb, _module_target_board, "LED_BLUE", mrb_fixnum_value(LED_BLUE));
-        mrb_define_const(mrb, _module_target_board, "LED_USER", mrb_fixnum_value(LED_USER));
-
-        mrb_define_const(mrb, _module_target_board, "USBTX", mrb_fixnum_value(USBTX));
-        mrb_define_const(mrb, _module_target_board, "USBRX", mrb_fixnum_value(USBRX));
-
-        // Arduiono Pin Names
-        mrb_define_const(mrb, _module_target_board, "D0", mrb_fixnum_value(D0));
-        mrb_define_const(mrb, _module_target_board, "D1", mrb_fixnum_value(D1));
-        mrb_define_const(mrb, _module_target_board, "D2", mrb_fixnum_value(D2));
-        mrb_define_const(mrb, _module_target_board, "D3", mrb_fixnum_value(D3));
-        mrb_define_const(mrb, _module_target_board, "D4", mrb_fixnum_value(D4));
-        mrb_define_const(mrb, _module_target_board, "D5", mrb_fixnum_value(D5));
-        mrb_define_const(mrb, _module_target_board, "D6", mrb_fixnum_value(D6));
-        mrb_define_const(mrb, _module_target_board, "D7", mrb_fixnum_value(D7));
-        mrb_define_const(mrb, _module_target_board, "D8", mrb_fixnum_value(D8));
-        mrb_define_const(mrb, _module_target_board, "D9", mrb_fixnum_value(D9));
-        mrb_define_const(mrb, _module_target_board, "D10", mrb_fixnum_value(D10));
-        mrb_define_const(mrb, _module_target_board, "D11", mrb_fixnum_value(D11));
-        mrb_define_const(mrb, _module_target_board, "D12", mrb_fixnum_value(D12));
-        mrb_define_const(mrb, _module_target_board, "D13", mrb_fixnum_value(D13));
-        mrb_define_const(mrb, _module_target_board, "D14", mrb_fixnum_value(D14));
-        mrb_define_const(mrb, _module_target_board, "D15", mrb_fixnum_value(D15));
-
-        mrb_define_const(mrb, _module_target_board, "A0", mrb_fixnum_value(A0));
-        mrb_define_const(mrb, _module_target_board, "A1", mrb_fixnum_value(A1));
-        mrb_define_const(mrb, _module_target_board, "A2", mrb_fixnum_value(A2));
-        mrb_define_const(mrb, _module_target_board, "A3", mrb_fixnum_value(A3));
-        mrb_define_const(mrb, _module_target_board, "A4", mrb_fixnum_value(A4));
-        mrb_define_const(mrb, _module_target_board, "A5", mrb_fixnum_value(A5));
-
-        mrb_define_const(mrb, _module_target_board, "I2C_SCL", mrb_fixnum_value(I2C_SCL));
-        mrb_define_const(mrb, _module_target_board, "I2C_SDA", mrb_fixnum_value(I2C_SDA));
-
-        mrb_define_const(mrb, _module_target_board, "USER_BUTTON0", mrb_fixnum_value(USER_BUTTON0));
-
-        // Not connected
-        mrb_define_const(mrb, _module_target_board, "NC", mrb_fixnum_value(NC));
 
         mrb_define_class_method(mrb, _module_target_board, "wait_msg", mrb_target_board_wait_msg, MRB_ARGS_REQ(1));
@@ -1140 +526 @@
         mrb_define_class_method(mrb, _module_target_board, "get_local_addr", mrb_target_board_get_local_addr, MRB_ARGS_NONE());
         mrb_define_class_method(mrb, _module_target_board, "get_multicast_addr", mrb_target_board_get_multicast_addr, MRB_ARGS_NONE());
+
+        mrb_target_board_init();
 }
 
 void mrb_mruby_others_gem_final(mrb_state* mrb)
 {
-}
+        if (!echonet)
+                return;
+
+        mrb_target_board_final();
+}
+
+// Provide implementation of _sbrk (low-level dynamic memory allocation
+// routine) for GCC_ARM which compares new heap pointer with MSP instead of
+// SP.  This make it compatible with RTX RTOS thread stacks.
+
+// Linker defined symbol used by _sbrk to indicate where heap should start.
+int _end;
+uint32_t  _stack;
+
+// Turn off the errno macro and use actual global variable instead.
+#undef errno
+int errno;
+
+static unsigned char* heap = (unsigned char*)&_end;
+
+// Dynamic memory allocation related syscall.
+caddr_t _sbrk(int incr) {
+        unsigned char*        prev_heap = heap;
+        unsigned char*        new_heap = heap + incr;
+
+        if (new_heap >= (unsigned char*)&_stack) {     /* _stack is end of heap section */
+                errno = ENOMEM;
+                return (caddr_t)-1;
+        }
+
+        heap = new_heap;
+        return (caddr_t) prev_heap;
+}
+
+char *optarg;
+int _data, _mdata, _edata;
+int _bss, _ebss;
+
+int _PowerON_Reset(int argc, char **argv)
+{
+        memcpy(&_data, &_mdata, (size_t)&_edata - (size_t)&_data);
+        memset(&_bss, 0, (size_t)&_ebss - (size_t)&_bss);
+
+        optarg = *argv;
+        return main(argc, argv);
+}
+
+#define FVECT_SECT          __attribute__ ((section (".fvectors")))
+const void *HardwareVectors[] FVECT_SECT = {
+        _PowerON_Reset,
+        mrdb_break,
+};
+
+char stack_space[0x100000] __attribute__ ((section (".stack")));