Changeset 433

Timestamp:

Jul 5, 2020, 9:26:49 PM (3 years ago)

Author:

coas-nagasima

Message:

dateコマンド追加
コードの整理

Location:

EcnlProtoTool/trunk/ntshell

Files:

• ntshell/usrcmd.c (modified) (1 diff)
• ntshell/usrcmd.h (modified) (1 diff)
• ntshell/util/ntstdio.c (modified) (5 diffs)
• ntshell/util/ntstdio.h (modified) (2 diffs)
• src/fdtable.c (modified) (1 diff)
• src/fdtable.h (moved) (moved from EcnlProtoTool/trunk/ntshell/src/socket_stub.h )
• src/io_stub.c (modified) (1 diff)
• src/main.c (modified) (5 diffs)
• src/main.h (modified) (2 diffs)
• src/socket_stub.c (modified) (1 diff)

EcnlProtoTool/trunk/ntshell/ntshell/usrcmd.c

@@ -789 +789 @@
 }
 
+int usrcmd_date(int argc, char **argv)
+{
+        int ret;
+        struct timespec tp;
+        char buf[30];
+
+        ret = shell_clock_gettime(CLOCK_REALTIME, &tp);
+        if (ret != 0) {
+                ntstdio_printf(&ntstdio, "clock_gettime error %d", ret);
+                return 0;
+        }
+
+        memset(buf, 0, sizeof(buf));
+        if (ctime_r(&tp.tv_sec, buf) == NULL) {
+                ntstdio_printf(&ntstdio, "ctime_r error");
+                return 0;
+        }
+
+        /* 改行コードの削除 */
+        ret = ntlibc_strlen(buf);
+        buf[ret - 1] = '\0';
+
+        ntstdio_printf(&ntstdio, "%s .%09ld\n", buf, tp.tv_nsec);
+        return 0;
+}
+
 int usrcmd_info(int argc, char **argv)
 {

EcnlProtoTool/trunk/ntshell/ntshell/usrcmd.h

@@ -50 +50 @@
 int usrcmd_mkdir(int argc, char **argv);
 int usrcmd_hexdump(int argc, char **argv);
+int usrcmd_date(int argc, char **argv);
 
 int usrcmd_help(int argc, char **argv);

EcnlProtoTool/trunk/ntshell/ntshell/util/ntstdio.c

@@ -186 +186 @@
                  */
                 value = (flag & FLAG_SIZE_LONG_INT) ? va_arg(arp, long)
-                        : (flag & FLAG_SIZE_HALF_INT) ? ((d == 'D') ? (long)va_arg(arp, short) : (long)va_arg(arp, unsigned short))
+                        : (flag & FLAG_SIZE_HALF_INT) ? ((d == 'D') ? (long)((short)va_arg(arp, int)) : (long)((unsigned short)va_arg(arp, unsigned int)))
                                 : ((d == 'D') ? (long)va_arg(arp, int) : (long)va_arg(arp, unsigned int));
                 if ((d == 'D') && (value & 0x80000000)) {
@@ -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;
 }

EcnlProtoTool/trunk/ntshell/ntshell/util/ntstdio.h

@@ -67 +67 @@
 #define NTSTDIO_OPTION_LF_CR        (1 << 3)
 
+struct ntstdio_t;
 typedef unsigned char (*NTSTDIO_XI)(struct ntstdio_t *handle);
 typedef void (*NTSTDIO_XO)(struct ntstdio_t *handle, unsigned char c);
@@ -73 +74 @@
         NTSTDIO_XI xi;
         NTSTDIO_XO xo;
-        char *outptr;
-        int len;
         int pos;
         unsigned int option;
+        void *exinf;
 } ntstdio_t;
 

EcnlProtoTool/trunk/ntshell/src/fdtable.c

@@ -56 +56 @@
 //#include <ethernet_api.h>
 #include "ff.h"
-#include "socket_stub.h"
+#include "fdtable.h"
 #include "kernel_cfg.h"
 //#include <string.h>

EcnlProtoTool/trunk/ntshell/src/io_stub.c

@@ -57 +57 @@
 #include <netinet/udp_var.h>
 //#include <ethernet_api.h>
-#include "socket_stub.h"
+#include "fdtable.h"
 //#include <sys/stat.h>
 #include "util/ntstdio.h"

EcnlProtoTool/trunk/ntshell/src/main.c

@@ -1 +1 @@
 /*
- *  TOPPERS ECHONET Lite Communication Middleware
+ *  TOPPERS PROJECT Home Network Working Group Software
  * 
- *  Copyright (C) 2014-2017 Cores Co., Ltd. Japan
+ *  Copyright (C) 2014-2019 Cores Co., Ltd. Japan
  * 
  *  上記著作権者は，以下の(1)～(4)の条件を満たす場合に限り，本ソフトウェ
@@ -45 +45 @@
 #include <sil.h>
 #include <setjmp.h>
-//#include <string.h>
+#include <string.h>
 #include "syssvc/serial.h"
 #include "syssvc/syslog.h"
@@ -70 +70 @@
 #include "usrcmd.h"
 #include "util/ntopt.h"
-#include "socket_stub.h"
+#include "fdtable.h"
+#include "target_syssvc.h"
 
 ID ws_api_mailboxid = MAIN_DATAQUEUE;
 ID ws_mempoolid = MPF_NET_BUF_256;
-
-#define SIO_PORTID 1
 
 char command[NTOPT_TEXT_MAXLEN];
@@ -98 +97 @@
 const struct utsname host_name = {
         "TOPPERS/ASP3",
-    "GR-PEACH",
-    "3.1.0",
-    "3.1.0",
-    "GR-PEACH",
+        TARGET_NAME,
+        "3.5.0",
+        "3.5.0",
+        TARGET_NAME,
     "toppers.jp"
 };
@@ -315 +314 @@
         {"mkdir", "Make directory", usrcmd_mkdir},
         {"hexdump", "Hex dump", usrcmd_hexdump},
+        {"date", "print date and time", usrcmd_date},
         {"info", "This is a description text string for info command.", usrcmd_info},
         {"exit", "Exit Natural Tiny Shell", usrcmd_exit},

EcnlProtoTool/trunk/ntshell/src/main.h

@@ -40 +40 @@
 
 /*
- *              サンプルプログラム(1)のヘッダファイル
+ *              ntshellタスクのヘッダファイル
  */
 
@@ -47 +47 @@
  */
 #include <kernel.h>
+
+#include "usrcmd.h"
+#include "core/ntshell.h"
 
 /*

EcnlProtoTool/trunk/ntshell/src/socket_stub.c

@@ -57 +57 @@
 extern const ID tmax_tcp_cepid;
 #include "ff.h"
-#include "socket_stub.h"
+#include "fdtable.h"
 
 #define SOCKET_TIMEOUT 2000000