Changeset 364 for asp3_tinet_ecnl_rx/trunk/bnep_bridge/src/main.c

Timestamp:

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

Author:

coas-nagasima

Message:

TINETとSocket APIなどを更新

File:

• asp3_tinet_ecnl_rx/trunk/bnep_bridge/src/main.c (modified) (4 diffs)

asp3_tinet_ecnl_rx/trunk/bnep_bridge/src/main.c

@@ -117 +117 @@
 static void main_timeout();
 
+extern int ntshell_exit;
+
 int uart_read(char *buf, int cnt, void *extobj)
 {
-        return serial_rea_dat(SIO_PORTID, (char *)buf, cnt);
+        struct main_t *obj = (struct main_t *)extobj;
+        int result;
+        ER ret;
+        int timer;
+
+        obj->prev = obj->now;
+
+        /* タイマー取得 */
+        timer = main_get_timer();
+
+        /* 待ち */
+        ret = serial_trea_dat(SIO_PORTID, buf, cnt, timer);
+        if ((ret < 0) && (ret != E_OK) && (ret != E_TMOUT)) {
+                syslog(LOG_NOTICE, "tslp_tsk ret: %s %d", itron_strerror(ret), timer);
+                ntshell_exit = 1;
+                return -1;
+        }
+        result = (int)ret;
+
+        ret = get_tim(&obj->now);
+        if (ret != E_OK) {
+                syslog(LOG_NOTICE, "get_tim ret: %s", itron_strerror(ret));
+                ntshell_exit = 1;
+                return -1;
+        }
+
+                        /* 時間経過 */
+        int elapse = obj->now - obj->prev;
+        main_progress(elapse);
+
+        /* タイムアウト処理 */
+        main_timeout();
+
+        return result;
 }
 
@@ -125 +160 @@
 {
         return serial_wri_dat(SIO_PORTID, buf, cnt);
-}
-
-unsigned char ntstdio_xi(struct ntstdio_t *handle)
-{
-        char buf[1];
-        if(serial_rea_dat(SIO_PORTID, buf, 1) != 1)
-                return -EIO;
-        return buf[0];
-}
-
-void ntstdio_xo(struct ntstdio_t *handle, unsigned char c)
-{
-        char buf[1];
-        buf[0] = c;
-        serial_wri_dat(SIO_PORTID, buf, 1);
 }
 
@@ -154 +174 @@
         main_initialize();
 
-        ntshell_init(&ntshell, uart_read, uart_write, cmd_execute, NULL);
+        ntshell_init(&ntshell, uart_read, uart_write, cmd_execute, &main_obj);
         ntshell_set_prompt(&ntshell, "NTShell>");
         ntshell_execute(&ntshell);
@@ -172 +192 @@
         ER ret;
 
-        ntshell_task_init();
+#ifdef TOPPERS_OMIT_TECS
+        serial_opn_por(SIO_PORTID);
+#endif
+        serial_ctl_por(SIO_PORTID, IOCTL_FCSND | IOCTL_FCRCV);
+
+        ntshell_task_init(uart_read, uart_write, &main_obj);
 
         main_obj.timer = TMO_FEVR;