Changeset 364 for asp3_tinet_ecnl_rx/trunk/asp3_dcre/syssvc/tSerialPortMain.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/asp3_dcre/syssvc/tSerialPortMain.c (modified) (2 diffs)

asp3_tinet_ecnl_rx/trunk/asp3_dcre/syssvc/tSerialPortMain.c

@@ -397 +397 @@
  */
 ER_UINT
-eSerialPort_read(CELLIDX idx, char *buffer, uint_t length)
+eSerialPort_read(CELLIDX idx, char *buffer, uint_t length, TMO tmout)
 {
         CELLCB  *p_cellcb;
@@ -423 +423 @@
         while (reacnt < length) {
                 if (buffer_empty) {
-                        SVC(rercd = cReceiveSemaphore_wait(),
-                                                                                gen_ercd_wait(rercd, p_cellcb));
+                        rercd = cReceiveSemaphore_waitTimeout(tmout);
+                        if (rercd == E_TMOUT)
+                                return E_TMOUT;
+                        if (rercd < 0) {
+                                gen_ercd_wait(rercd, p_cellcb);
+                                ercd = rercd;
+                                goto error_exit;
+                        }
                 }
                 SVC(rercd = serialPort_readChar(p_cellcb, &c), rercd);