Changeset 429 for EcnlProtoTool/trunk/asp3_dcre/syssvc/tTestService.cdl

Timestamp:

Jul 3, 2020, 7:19:17 PM (4 years ago)

Author:

coas-nagasima

Message:

ASP3, TINET, mbed を更新

File:

• EcnlProtoTool/trunk/asp3_dcre/syssvc/tTestService.cdl (modified) (6 diffs)

EcnlProtoTool/trunk/asp3_dcre/syssvc/tTestService.cdl

@@ -1 +1 @@
 /*
- *  TOPPERS/ASP Kernel
- *      Toyohashi Open Platform for Embedded Real-Time Systems/
- *      Advanced Standard Profile Kernel
+ *  TOPPERS Software
+ *      Toyohashi Open Platform for Embedded Real-Time Systems
  * 
- *  Copyright (C) 2016 by Embedded and Real-Time Systems Laboratory
+ *  Copyright (C) 2016-2018 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
@@ -46 +45 @@
  *  自己診断サービスのシグニチャ
  */
+[callback]
 signature sBuiltInTest {
         ER              builtInTest(void);
@@ -52 +52 @@
 /*
  *  テストプログラム用サービスのシグニチャ
- *
- *  setBuiltInTestは，TECSの中では動的結合を使って実現すべきであるが，
- *  C言語のアプリケーションから呼び出しやすくするために，TECSの作法違
- *  反のコードとなっている．
  *
  *  getInterruptPriorityMaskは，そのままカーネルを呼び出すだけの関数で
@@ -64 +60 @@
  */
 signature sTestService {
-        void    start([in, string] const char *progname);
-        void    setBuiltInTest([in] Descriptor(sBuiltInTest) desc);
-        void    checkPoint([in] uint_t count);
-        void    finishPoint([in] uint_t count);
-        void    assertError([in, string] const char *expr,
+        ER              start([in, string] const char *progname);
+        ER              checkPoint([in] uint_t count);
+        ER              finishPoint([in] uint_t count);
+        ER              assertError([in, string] const char *expr,
                                                         [in, string] const char *file, [in] int_t line);
-        void    serviceError([in] ER ercd,
+        ER              serviceError([in] ER ercd,
                                                         [in, string] const char *file, [in] int_t line);
         ER              getInterruptPriorityMask([out] PRI *p_ipm);
@@ -80 +75 @@
 [singleton, active]
 celltype tTestService {
-        entry           sTestService    eTestService;
-        [dynamic, optional] call        sBuiltInTest    cBuiltInTest;
-        call            sSysLog                 cSysLog;
+        entry                           sTestService    eTestService;
+        call                            sSysLog                 cSysLog;
+        [optional] call         sBuiltInTest    cBuiltInTest;
 
         var {
@@ -88 +83 @@
         };
 };
-
-/*
- *  自己診断サービスのディスクリプタを取得するシグニチャ
- */
-signature sGetBuiltInTestDescriptor {
-        ER              getDescriptor([out] Descriptor(sBuiltInTest) *p_desc,
-                                                                                                                [in] int_t i);
-};
-
-/*
- *  自己診断サービスのディスクリプタを取得するセルタイプ
- */
-[singleton, active]
-celltype tBuiltInTestAdaptor {
-        [ref_desc] call sBuiltInTest                            cBuiltInTest[];
-        entry                   sGetBuiltInTestDescriptor       eGetBuiltInTestDescriptor;
-};