Changeset 364 for asp3_tinet_ecnl_rx/trunk/asp3_dcre/syssvc

Timestamp:

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

Author:

coas-nagasima

Message:

TINETとSocket APIなどを更新

Location:

asp3_tinet_ecnl_rx/trunk/asp3_dcre/syssvc

Files:

• serial.h (modified) (1 diff)
• tSerialAdapter.c (modified) (2 diffs)
• tSerialPort.cdl (modified) (1 diff)
• tSerialPortMain.c (modified) (2 diffs)

asp3_tinet_ecnl_rx/trunk/asp3_dcre/syssvc/serial.h

@@ -79 +79 @@
 extern ER               serial_opn_por(ID portid) throw();
 extern ER               serial_cls_por(ID portid) throw();
-extern ER_UINT  serial_rea_dat(ID portid, char *buf, uint_t len) throw();
+extern ER_UINT  serial_trea_dat(ID portid, char *buf, uint_t len, TMO tmout) throw();
 extern ER_UINT  serial_wri_dat(ID portid, const char *buf, uint_t len) throw();
 extern ER               serial_ctl_por(ID portid, uint_t ioctl) throw();
 extern ER               serial_ref_por(ID portid, T_SERIAL_RPOR *pk_rpor) throw();
+
+Inline ER_UINT  serial_rea_dat(ID portid, char *buf, uint_t len)
+{
+        return serial_trea_dat(portid, buf, len, TMO_FEVR);
+}
 
 /*

asp3_tinet_ecnl_rx/trunk/asp3_dcre/syssvc/tSerialAdapter.c

@@ -83 +83 @@
  */
 ER_UINT
-serial_rea_dat(ID portid, char *buf, uint_t len)
+serial_trea_dat(ID portid, char *buf, uint_t len, TMO tmout)
 {
         if (sns_dpn()) {                                /* コンテキストのチェック */
@@ -92 +92 @@
         }
 
-        return(cSerialPort_read(portid - 1, buf, len));
+        return(cSerialPort_read(portid - 1, buf, len, tmout));
 }
 

asp3_tinet_ecnl_rx/trunk/asp3_dcre/syssvc/tSerialPort.cdl

@@ -57 +57 @@
         ER              open(void);
         ER              close(void);
-        ER_UINT read([out,size_is(length)] char *buffer, [in] uint_t length);
+        ER_UINT read([out,size_is(length)] char *buffer, [in] uint_t length, [in] TMO tmout);
         ER_UINT write([in,size_is(length)] const char *buffer, [in] uint_t length);
         ER              control([in] uint_t ioControl);

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);