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

Timestamp:

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

Author:

coas-nagasima

Message:

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

File:

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

asp3_tinet_ecnl_arm/trunk/ntshell/src/ntshell_main.c

@@ -58 +58 @@
 #include "util/ntopt.h"
 #include "ntshell_main.h"
-#include "socket_stub.h"
+#include "fdtable.h"
 
 char command[NTOPT_TEXT_MAXLEN];
@@ -78 +78 @@
 }
 
+void stdio_open(ID portid);
 static int usrcmd_ntopt_callback(long *args, void *extobj);
 
@@ -86 +87 @@
 void ntshell_task_init(ID portid)
 {
-        serial_ctl_por(portid, IOCTL_CRLF | IOCTL_FCSND | IOCTL_FCRCV);
+        stdio_open(portid);
 }
 
@@ -95 +96 @@
 {
         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 +147 @@
                 printf("Unknown command found.\n");
 
-        clean_fd();
-
         return result;
 }
@@ -285 +291 @@
 }
 
-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 +333 @@
 
         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 +383 @@
 }
 
+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;
+}