Changeset 449

Timestamp:

Jul 22, 2020, 12:28:25 PM (3 years ago)

Author:

coas-nagasima

Message:

fdとidの扱いが間違っているのを修正

File:

• EcnlProtoTool/trunk/ntshell/src/stdio_stub.c (modified) (7 diffs)

EcnlProtoTool/trunk/ntshell/src/stdio_stub.c

@@ -380 +380 @@
 }
 
-static void serial_rx_irq_handler(int fd)
-{
-        struct SHELL_FILE *fp = fd_to_fp(fd);
+static void serial_rx_irq_handler(struct SHELL_FILE *fp)
+{
         stdio_sio_t *uart = (stdio_sio_t *)((struct ntstdio_t *)fp->exinf)->exinf;
         serial_t *serial = (serial_t *)&uart->serial;
@@ -389 +388 @@
                 unsigned char c = (unsigned char)serial_getc(serial);
 
-                if (fd != STDIN_FILENO) {
+                if (fp->fd != STDIN_FILENO) {
                         ER ret;
                         FLGPTN flgptn = 0;
@@ -399 +398 @@
                         if (fp->readevt_w == fp->readevt_r) fp->readevt_w++;
 
-                        FD_SET(fd, (fd_set *)&flgptn);
+                        FD_SET(fp->fd, (fd_set *)&flgptn);
 
                         ret = set_flg(FLG_SELECT_WAIT, flgptn);
@@ -475 +474 @@
 }
 
-static void serial_tx_irq_handler(int fd)
-{
-        struct SHELL_FILE *fp = fd_to_fp(fd);
+static void serial_tx_irq_handler(struct SHELL_FILE *fp)
+{
         stdio_sio_t *uart = (stdio_sio_t *)((struct ntstdio_t *)fp->exinf)->exinf;
         serial_t *serial = (serial_t *)&uart->serial;
@@ -486 +484 @@
 
         FLGPTN flgptn = 0;
-        FD_SET(fd, (fd_set *)&flgptn);
+        FD_SET(fp->fd, (fd_set *)&flgptn);
 
         ret = set_flg(FLG_SELECT_WAIT, flgptn);
@@ -517 +515 @@
         switch (event) {
         case RxIrq:
-                serial_rx_irq_handler(STDIN_FILENO);
+                serial_rx_irq_handler(fd_to_fp(STDIN_FILENO));
                 break;
         case TxIrq:
-                serial_tx_irq_handler(STDOUT_FILENO);
+                serial_tx_irq_handler(fd_to_fp(STDOUT_FILENO));
                 break;
         }
@@ -527 +525 @@
 void sio_serial_irq_handler(uint32_t id, SerialIrq event)
 {
-        struct SHELL_FILE *fp = fd_to_fp(id);
-        if ((fp == NULL) || (fp->type != &IO_TYPE_SIO))
+        struct SHELL_FILE *fp = id_to_fd(&IO_TYPE_SIO, id);
+        if (fp == NULL)
                 return;
 
         switch (event) {
         case RxIrq:
-                serial_rx_irq_handler(id);
+                serial_rx_irq_handler(fp);
                 break;
         case TxIrq:
-                serial_tx_irq_handler(id);
+                serial_tx_irq_handler(fp);
                 break;
         }