Changeset 374 for asp3_tinet_ecnl_arm/trunk/asp3_dcre/tecsgen/tecslib/plugin/lib/GenOpaqueMarshaler.rb

Timestamp:

Apr 5, 2019, 9:26:53 PM (5 years ago)

Author:

coas-nagasima

Message:

mbed関連を更新
シリアルドライバをmbedのHALを使うよう変更
ファイルディスクリプタの処理を更新

File:

• asp3_tinet_ecnl_arm/trunk/asp3_dcre/tecsgen/tecslib/plugin/lib/GenOpaqueMarshaler.rb (modified) (4 diffs)

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tecsgen/tecslib/plugin/lib/GenOpaqueMarshaler.rb

@@ -4 +4 @@
 #      Generator for TOPPERS Embedded Component System
 #  
-#   Copyright (C) 2008-2014 by TOPPERS Project
+#   Copyright (C) 2008-2018 by TOPPERS Project
 #--
 #   上記著作権者は，以下の(1)～(4)の条件を満たす場合に限り，本ソフトウェ
@@ -464 +464 @@
         /* Channel Lock */
         SET_RPC_STATE( state_, RPCSTATE_CLIENT_GET_SEM );
-        if( is_cLockChannel_joined() )
-                cLockChannel_wait();
+        if( is_cLockChannel_joined() ){
+                if( (ercd_=cLockChannel_wait()) != E_OK )
+                        goto error_reset;
+        }
 EOT
 
@@ -554 +556 @@
         /* Channel Unlock */
         SET_RPC_STATE( state_, RPCSTATE_CLIENT_RELEASE_SEM );
-        if( is_cLockChannel_joined() )
-                cLockChannel_signal();
+        if( is_cLockChannel_joined() ){
+                if( (ercd_=cLockChannel_signal()) != E_OK )
+                        goto error_reset;
+        }
+EOT
+
+    file.print <<EOT
+        /* state_ is not used in normal case */
+  /* below is to avoid 'set but not used' warnning */
+        (void)state_;
 EOT
 
@@ -630 +640 @@
         file.print <<EOT
         }else{
-                return;
+                return E_ID;
         }
 EOT