Changeset 364 for asp3_tinet_ecnl_arm/trunk/ntshell/src/ntshell_main.c

Timestamp:

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

Author:

coas-nagasima

Message:

TINETとSocket APIなどを更新

File:

• asp3_tinet_ecnl_arm/trunk/ntshell/src/ntshell_main.c (modified) (8 diffs)

asp3_tinet_ecnl_arm/trunk/ntshell/src/ntshell_main.c

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