[rtems-central commit] spec: Rename "cause" in "raise"

Sebastian Huber sebh at rtems.org
Fri Jul 23 14:15:42 UTC 2021


Module:    rtems-central
Branch:    master
Commit:    b2f87ba6c9b7661fa495d291876b4f3fa6ac4e2b
Changeset: http://git.rtems.org/rtems-central/commit/?id=b2f87ba6c9b7661fa495d291876b4f3fa6ac4e2b

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Thu Jul 22 16:14:35 2021 +0200

spec: Rename "cause" in "raise"

---

 spec/rtems/intr/if/attributes.yml                  | 18 ++--
 spec/rtems/intr/if/clear.yml                       |  2 +-
 spec/rtems/intr/if/group.yml                       |  4 +-
 spec/rtems/intr/if/is-pending.yml                  |  4 +-
 spec/rtems/intr/if/{cause-on.yml => raise-on.yml}  | 12 +--
 spec/rtems/intr/if/{cause.yml => raise.yml}        | 10 +--
 spec/rtems/intr/if/vector-enable.yml               |  2 +-
 spec/rtems/intr/req/clear.yml                      |  8 +-
 spec/rtems/intr/req/is-pending.yml                 |  8 +-
 spec/rtems/intr/req/{cause-on.yml => raise-on.yml} | 96 +++++++++++-----------
 spec/rtems/intr/req/{cause.yml => raise.yml}       | 72 ++++++++--------
 11 files changed, 118 insertions(+), 118 deletions(-)

diff --git a/spec/rtems/intr/if/attributes.yml b/spec/rtems/intr/if/attributes.yml
index 1280a17..d14fb75 100644
--- a/spec/rtems/intr/if/attributes.yml
+++ b/spec/rtems/intr/if/attributes.yml
@@ -80,21 +80,21 @@ definition:
   variants: []
 - default:
     brief: |
-      This member is true, if the interrupt vector can be caused by
-      ${cause:/name}, otherwise it is false.
+      This member is true, if the interrupt vector can be raised by
+      ${raise:/name}, otherwise it is false.
     definition: bool ${.:name}
     description: null
     kind: member
-    name: can_cause
+    name: can_raise
   variants: []
 - default:
     brief: |
-      This member is true, if the interrupt vector can be caused on a processor
-      by ${cause-on:/name}, otherwise it is false.
+      This member is true, if the interrupt vector can be raised on a processor
+      by ${raise-on:/name}, otherwise it is false.
     definition: bool ${.:name}
     description: null
     kind: member
-    name: can_cause_on
+    name: can_raise_on
   variants: []
 - default:
     brief: |
@@ -139,8 +139,8 @@ definition:
       vector can be triggered by a message.
     definition: bool ${.:name}
     description: |
-      Interrupts may be also triggered by signals, ${cause:/name}, or
-      ${cause-on:/name}.  Examples for message triggered interrupts are the
+      Interrupts may be also triggered by signals, ${raise:/name}, or
+      ${raise-on:/name}.  Examples for message triggered interrupts are the
       PCIe MSI/MSI-X and the ARM GICv3 Locality-specific Peripheral Interrupts
       (LPI).
     kind: member
@@ -154,7 +154,7 @@ definition:
     description: |
       Interrupts are normally triggered by signals which indicate an interrupt
       request from a peripheral.  Interrupts may be also triggered by messages,
-      ${cause:/name}, or ${cause-on:/name}.
+      ${raise:/name}, or ${raise-on:/name}.
     kind: member
     name: trigger_signal
   variants: []
diff --git a/spec/rtems/intr/if/clear.yml b/spec/rtems/intr/if/clear.yml
index c9730e7..07ec774 100644
--- a/spec/rtems/intr/if/clear.yml
+++ b/spec/rtems/intr/if/clear.yml
@@ -49,6 +49,6 @@ return:
       ${.:/params[0]/name}.
     value: ${../../status/if/invalid-id:/name}
   - description: |
-      The request to cause the interrupt vector has not been satisfied.
+      The request to raise the interrupt vector has not been satisfied.
     value: ${../../status/if/unsatisfied:/name}
 type: interface
diff --git a/spec/rtems/intr/if/group.yml b/spec/rtems/intr/if/group.yml
index 975bd8c..c16e0a7 100644
--- a/spec/rtems/intr/if/group.yml
+++ b/spec/rtems/intr/if/group.yml
@@ -92,9 +92,9 @@ links:
 - role: placement-order
   uid: is-pending
 - role: placement-order
-  uid: cause
+  uid: raise
 - role: placement-order
-  uid: cause-on
+  uid: raise-on
 - role: placement-order
   uid: clear
 - role: placement-order
diff --git a/spec/rtems/intr/if/is-pending.yml b/spec/rtems/intr/if/is-pending.yml
index 5ef1861..bef64fe 100644
--- a/spec/rtems/intr/if/is-pending.yml
+++ b/spec/rtems/intr/if/is-pending.yml
@@ -34,8 +34,8 @@ links:
   uid: /constraint/directive-no-preempt
 name: rtems_interrupt_is_pending
 notes: |
-  Interrupts may be made pending by calling the ${cause:/name} or
-  ${cause-on:/name} directives or due to exernal signals or messages.  The
+  Interrupts may be made pending by calling the ${raise:/name} or
+  ${raise-on:/name} directives or due to exernal signals or messages.  The
   pending state may be cleared by ${clear:/name}.
 params:
 - description: |
diff --git a/spec/rtems/intr/if/cause-on.yml b/spec/rtems/intr/if/raise-on.yml
similarity index 88%
rename from spec/rtems/intr/if/cause-on.yml
rename to spec/rtems/intr/if/raise-on.yml
index 6aee24d..c079383 100644
--- a/spec/rtems/intr/if/cause-on.yml
+++ b/spec/rtems/intr/if/raise-on.yml
@@ -1,6 +1,6 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 brief: |
-  Causes the interrupt vector on the processor.
+  Raises the interrupt vector on the processor.
 copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 definition:
@@ -29,17 +29,17 @@ links:
   uid: /constraint/directive-ctx-task
 - role: constraint
   uid: /constraint/directive-no-preempt
-name: rtems_interrupt_cause_on
+name: rtems_interrupt_raise_on
 notes: |
   The ${get-attributes:/name} directive may be used to check if an interrupt
-  vector can be caused on a processor.
+  vector can be raised on a processor.
 params:
 - description: |
-    is the number of the interrupt vector to cause.
+    is the number of the interrupt vector to raise.
   dir: null
   name: vector
 - description: |
-    is the index of the target processor of the interrupt vector to cause.
+    is the index of the target processor of the interrupt vector to raise.
   dir: null
   name: cpu_index
 return:
@@ -61,6 +61,6 @@ return:
       by the application, however, it was not online.
     value: ${../../status/if/incorrect-state:/name}
   - description: |
-      The request to cause the interrupt vector has not been satisfied.
+      The request to raise the interrupt vector has not been satisfied.
     value: ${../../status/if/unsatisfied:/name}
 type: interface
diff --git a/spec/rtems/intr/if/cause.yml b/spec/rtems/intr/if/raise.yml
similarity index 87%
rename from spec/rtems/intr/if/cause.yml
rename to spec/rtems/intr/if/raise.yml
index e93835d..268ba15 100644
--- a/spec/rtems/intr/if/cause.yml
+++ b/spec/rtems/intr/if/raise.yml
@@ -1,6 +1,6 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 brief: |
-  Causes the interrupt vector.
+  Raises the interrupt vector.
 copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
@@ -29,13 +29,13 @@ links:
   uid: /constraint/directive-ctx-task
 - role: constraint
   uid: /constraint/directive-no-preempt
-name: rtems_interrupt_cause
+name: rtems_interrupt_raise
 notes: |
   The ${get-attributes:/name} directive may be used to check if an interrupt
-  vector can be caused.
+  vector can be raised.
 params:
 - description: |
-    is the number of the interrupt vector to cause.
+    is the number of the interrupt vector to raise.
   dir: null
   name: vector
 return:
@@ -49,6 +49,6 @@ return:
       ${.:/params[0]/name}.
     value: ${../../status/if/invalid-id:/name}
   - description: |
-      The request to cause the interrupt vector has not been satisfied.
+      The request to raise the interrupt vector has not been satisfied.
     value: ${../../status/if/unsatisfied:/name}
 type: interface
diff --git a/spec/rtems/intr/if/vector-enable.yml b/spec/rtems/intr/if/vector-enable.yml
index 359a4ae..c9081ae 100644
--- a/spec/rtems/intr/if/vector-enable.yml
+++ b/spec/rtems/intr/if/vector-enable.yml
@@ -15,7 +15,7 @@ description: |
   The directive enables the interrupt vector specified by ${.:/params[0]/name}.
   This allows that interrupt service requests are issued to the target
   processors of the interrupt vector.  Interrupt service requests for an
-  interrupt vector may be caused by ${cause:/name}, ${cause-on:/name},
+  interrupt vector may be raised by ${raise:/name}, ${raise-on:/name},
   external signals, or messages.
 enabled-by: true
 index-entries: []
diff --git a/spec/rtems/intr/req/clear.yml b/spec/rtems/intr/req/clear.yml
index 039c19d..41a3452 100644
--- a/spec/rtems/intr/req/clear.yml
+++ b/spec/rtems/intr/req/clear.yml
@@ -195,11 +195,11 @@ test-support: |
     T_rsc_success( sc );
   }
 
-  static void Cause( const Context *ctx )
+  static void Raise( const Context *ctx )
   {
     rtems_status_code sc;
 
-    sc = rtems_interrupt_cause( ctx->vector );
+    sc = rtems_interrupt_raise( ctx->vector );
     T_rsc_success( sc );
   }
 
@@ -297,7 +297,7 @@ test-support: |
 
         if ( attr->can_disable ) {
           Disable( ctx );
-          Cause( ctx );
+          Raise( ctx );
           T_true( IsPending( ctx ) );
           Clear( ctx );
           T_false( IsPending( ctx ) );
@@ -311,7 +311,7 @@ test-support: |
         T_false( IsPending( ctx ) );
 
         rtems_interrupt_local_disable( level );
-        Cause( ctx );
+        Raise( ctx );
         T_true( IsPending( ctx ) );
         Clear( ctx );
         T_false( IsPending( ctx ) );
diff --git a/spec/rtems/intr/req/is-pending.yml b/spec/rtems/intr/req/is-pending.yml
index a475901..7930313 100644
--- a/spec/rtems/intr/req/is-pending.yml
+++ b/spec/rtems/intr/req/is-pending.yml
@@ -235,11 +235,11 @@ test-support: |
     T_rsc_success( sc );
   }
 
-  static void Cause( const Context *ctx )
+  static void Raise( const Context *ctx )
   {
     rtems_status_code sc;
 
-    sc = rtems_interrupt_cause( ctx->vector );
+    sc = rtems_interrupt_raise( ctx->vector );
     T_rsc_success( sc );
   }
 
@@ -304,7 +304,7 @@ test-support: |
       if ( !IsPending( ctx) && ( attr->can_enable || IsEnabled( ctx ) ) ) {
         if ( attr->can_disable ) {
           Disable( ctx );
-          Cause( ctx );
+          Raise( ctx );
           T_true( IsPending( ctx ) );
 
           sc = rtems_interrupt_vector_enable( ctx->vector );
@@ -318,7 +318,7 @@ test-support: |
         }
 
         rtems_interrupt_local_disable( level );
-        Cause( ctx );
+        Raise( ctx );
         T_true( IsPending( ctx ) );
         rtems_interrupt_local_enable( level );
 
diff --git a/spec/rtems/intr/req/cause-on.yml b/spec/rtems/intr/req/raise-on.yml
similarity index 80%
rename from spec/rtems/intr/req/cause-on.yml
rename to spec/rtems/intr/req/raise-on.yml
index c6a9b3d..8de673e 100644
--- a/spec/rtems/intr/req/cause-on.yml
+++ b/spec/rtems/intr/req/raise-on.yml
@@ -5,39 +5,39 @@ enabled-by: true
 functional-type: action
 links:
 - role: interface-function
-  uid: ../if/cause-on
+  uid: ../if/raise-on
 post-conditions:
 - name: Status
   states:
   - name: Ok
     test-code: |
-      /* Validation is done by CheckCauseOn() for each interrupt vector */
+      /* Validation is done by CheckRaiseOn() for each interrupt vector */
     text: |
-      The return status of ${../if/cause-on:/name} shall be
+      The return status of ${../if/raise-on:/name} shall be
       ${../../status/if/successful:/name}.
   - name: InvId
     test-code: |
       T_rsc( ctx->status, RTEMS_INVALID_ID );
     text: |
-      The return status of ${../if/cause-on:/name} shall be
+      The return status of ${../if/raise-on:/name} shall be
       ${../../status/if/invalid-id:/name}.
   - name: NotConf
     test-code: |
       T_rsc( ctx->status, RTEMS_NOT_CONFIGURED );
     text: |
-      The return status of ${../if/cause-on:/name} shall be
+      The return status of ${../if/raise-on:/name} shall be
       ${../../status/if/not-configured:/name}.
   - name: IncStat
     test-code: |
       T_rsc( ctx->status, RTEMS_INCORRECT_STATE );
     text: |
-      The return status of ${../if/cause-on:/name} shall be
+      The return status of ${../if/raise-on:/name} shall be
       ${../../status/if/incorrect-state:/name}.
   - name: Unsat
     test-code: |
-      /* Validation is done by CheckCauseOn() for each interrupt vector */
+      /* Validation is done by CheckRaiseOn() for each interrupt vector */
     text: |
-      The return status of ${../if/cause-on:/name} shall be
+      The return status of ${../if/raise-on:/name} shall be
       ${../../status/if/unsatisfied:/name}.
   test-epilogue: null
   test-prologue: null
@@ -45,18 +45,18 @@ post-conditions:
   states:
   - name: 'Yes'
     test-code: |
-      /* Validation is done by CheckCauseOn() for each interrupt vector */
+      /* Validation is done by CheckRaiseOn() for each interrupt vector */
     text: |
       The interrupt associated with the interrupt vector specified by
-      ${../if/cause-on:/params[0]/name} shall be made pending by the
-      ${../if/cause-on:/name} call.
+      ${../if/raise-on:/params[0]/name} shall be made pending by the
+      ${../if/raise-on:/name} call.
   - name: 'No'
     test-code: |
-      /* Validation is done by CheckCauseOn() for each interrupt vector */
+      /* Validation is done by CheckRaiseOn() for each interrupt vector */
     text: |
       The interrupt associated with the interrupt vector specified by
-      ${../if/cause-on:/params[0]/name} shall not be made pending by the
-      ${../if/cause-on:/name} call.
+      ${../if/raise-on:/params[0]/name} shall not be made pending by the
+      ${../if/raise-on:/name} call.
   test-epilogue: null
   test-prologue: null
 pre-conditions:
@@ -66,13 +66,13 @@ pre-conditions:
     test-code: |
       ctx->valid_vector = true;
     text: |
-      While the ${../if/cause-on:/params[0]/name} parameter is
+      While the ${../if/raise-on:/params[0]/name} parameter is
       associated with an interrupt vector.
   - name: Invalid
     test-code: |
       ctx->valid_vector = false;
     text: |
-      While the ${../if/cause-on:/params[0]/name} parameter is
+      While the ${../if/raise-on:/params[0]/name} parameter is
       not associated with an interrupt vector.
   test-epilogue: null
   test-prologue: null
@@ -82,46 +82,46 @@ pre-conditions:
     test-code: |
       ctx->cpu_index = 0;
     text: |
-      While the ${../if/cause-on:/params[1]/name} parameter is associated with
+      While the ${../if/raise-on:/params[1]/name} parameter is associated with
       a configured processor,
-      while the processor specified by ${../if/cause-on:/params[1]/name} is not
+      while the processor specified by ${../if/raise-on:/params[1]/name} is not
       online.
   - name: NotOnline
     test-code: |
       ctx->cpu_index = 4;
     text: |
-      While the ${../if/cause-on:/params[1]/name} parameter is associated with
+      While the ${../if/raise-on:/params[1]/name} parameter is associated with
       a configured processor,
-      while the processor specified by ${../if/cause-on:/params[1]/name} is not
+      while the processor specified by ${../if/raise-on:/params[1]/name} is not
       online.
   - name: NotConf
     test-code: |
       ctx->cpu_index = 5;
     text: |
-      While the ${../if/cause-on:/params[1]/name} parameter is not associated
+      While the ${../if/raise-on:/params[1]/name} parameter is not associated
       with a configured processor.
   test-epilogue: null
   test-prologue: null
-- name: CanCauseOn
+- name: CanRaiseOn
   states:
   - name: 'Yes'
     test-code: |
       /*
        * This pre-condition depends on the attributes of an interrupt vector,
-       * see CheckCauseOn().
+       * see CheckRaiseOn().
        */
     text: |
       While the interrupt vector associated with the
-      ${../if/cause-on:/params[0]/name} parameter can be caused on a processor.
+      ${../if/raise-on:/params[0]/name} parameter can be raised on a processor.
   - name: 'No'
     test-code: |
       /*
        * This pre-condition depends on the attributes of an interrupt vector,
-       * see CheckCauseOn().
+       * see CheckRaiseOn().
        */
     text: |
       While the interrupt vector associated with the
-      ${../if/cause-on:/params[0]/name} parameter cannot be caused on a
+      ${../if/raise-on:/params[0]/name} parameter cannot be raised on a
       processor.
   test-epilogue: null
   test-prologue: null
@@ -153,7 +153,7 @@ test-action: |
       T_rsc_success( sc );
 
       has_installed_entries = HasInterruptVectorEntriesInstalled( ctx->vector );
-      CheckCauseOn( ctx, &attr, has_installed_entries );
+      CheckRaiseOn( ctx, &attr, has_installed_entries );
     }
   } else {
     if ( ctx->valid_vector ) {
@@ -162,7 +162,7 @@ test-action: |
       ctx->vector = BSP_INTERRUPT_VECTOR_COUNT;
     }
 
-    ctx->status = rtems_interrupt_cause_on( ctx->vector, ctx->cpu_index );
+    ctx->status = rtems_interrupt_raise_on( ctx->vector, ctx->cpu_index );
   }
 test-brief: null
 test-cleanup: null
@@ -188,18 +188,18 @@ test-context:
   member: |
     rtems_vector_number some_vector
 - brief: |
-    If this member is true, then the ${../if/cause-on:/params[0]/name}
+    If this member is true, then the ${../if/raise-on:/params[0]/name}
     parameter shall be valid.
   description: null
   member: |
     bool valid_vector
 - brief: |
-    This member specifies the ${../if/cause-on:/params[1]/name} parameter.
+    This member specifies the ${../if/raise-on:/params[1]/name} parameter.
   description: null
   member: |
     uint32_t cpu_index
 - brief: |
-    This member contains the return value of the ${../if/cause-on:/name}
+    This member contains the return value of the ${../if/raise-on:/name}
     call.
   description: null
   member: |
@@ -221,7 +221,7 @@ test-setup:
   description: null
 test-stop: null
 test-support: |
-  typedef RtemsIntrReqCauseOn_Context Context;
+  typedef RtemsIntrReqRaiseOn_Context Context;
 
   static bool IsEnabled( const Context *ctx )
   {
@@ -255,11 +255,11 @@ test-support: |
     T_rsc_success( sc );
   }
 
-  static void CauseOn( const Context *ctx )
+  static void RaiseOn( const Context *ctx )
   {
     rtems_status_code sc;
 
-    sc = rtems_interrupt_cause_on( ctx->vector, ctx->cpu_index );
+    sc = rtems_interrupt_raise_on( ctx->vector, ctx->cpu_index );
     T_rsc_success( sc );
   }
 
@@ -297,7 +297,7 @@ test-support: |
     sc = rtems_interrupt_is_pending( ctx->vector, &pending_before );
     T_rsc_success( sc );
 
-    sc = rtems_interrupt_cause_on( ctx->vector, ctx->cpu_index );
+    sc = rtems_interrupt_raise_on( ctx->vector, ctx->cpu_index );
     T_rsc( sc, RTEMS_UNSATISFIED );
 
     pending_after = !pending_before;
@@ -307,7 +307,7 @@ test-support: |
     T_eq( pending_before, pending_after );
   }
 
-  static void CheckCauseOn(
+  static void CheckRaiseOn(
     Context                          *ctx,
     const rtems_interrupt_attributes *attr,
     bool                              has_installed_entries
@@ -315,7 +315,7 @@ test-support: |
   {
     rtems_status_code sc;
 
-    if ( !attr->can_cause_on ) {
+    if ( !attr->can_raise_on ) {
       CheckUnsatisfied( ctx );
     } else if ( has_installed_entries ) {
       /* We cannot test this vector, since it is used by a device driver */
@@ -323,7 +323,7 @@ test-support: |
       /* We can only safely test maskable interrupts */
     } else if ( IsPending( ctx ) ) {
       /*
-       * If there is already an interrupt pending, then it is probably caused
+       * If there is already an interrupt pending, then it is probably raised
        * by a peripheral which we cannot control.
        */
     } else if (
@@ -348,7 +348,7 @@ test-support: |
 
         if ( attr->can_disable ) {
           Disable( ctx );
-          CauseOn( ctx );
+          RaiseOn( ctx );
           T_true( IsPending( ctx ) );
 
           sc = rtems_interrupt_vector_enable( ctx->vector );
@@ -364,7 +364,7 @@ test-support: |
         T_false( IsPending( ctx ) );
 
         rtems_interrupt_local_disable( level );
-        CauseOn( ctx );
+        RaiseOn( ctx );
         T_true( IsPending( ctx ) );
         rtems_interrupt_local_enable( level );
 
@@ -379,7 +379,7 @@ test-support: |
       T_rsc_success( sc );
     }
   }
-test-target: testsuites/validation/tc-intr-cause-on.c
+test-target: testsuites/validation/tc-intr-raise-on.c
 test-teardown: null
 text: ${.:text-template}
 transition-map:
@@ -392,7 +392,7 @@ transition-map:
     - Valid
     CPU:
     - Online
-    CanCauseOn:
+    CanRaiseOn:
     - 'Yes'
 - enabled-by: true
   post-conditions:
@@ -402,7 +402,7 @@ transition-map:
     Vector:
     - Invalid
     CPU: all
-    CanCauseOn: N/A
+    CanRaiseOn: N/A
 - enabled-by: true
   post-conditions:
     Status: NotConf
@@ -412,7 +412,7 @@ transition-map:
     - Valid
     CPU:
     - NotConf
-    CanCauseOn: all
+    CanRaiseOn: all
 - enabled-by: true
   post-conditions:
     Status: Unsat
@@ -422,7 +422,7 @@ transition-map:
     - Valid
     CPU:
     - Online
-    CanCauseOn:
+    CanRaiseOn:
     - 'No'
 - enabled-by: true
   post-conditions: OnlyOneCPU
@@ -430,7 +430,7 @@ transition-map:
     Vector: all
     CPU:
     - NotOnline
-    CanCauseOn: all
+    CanRaiseOn: all
 - enabled-by: RTEMS_SMP
   post-conditions:
     Status: InvId
@@ -440,7 +440,7 @@ transition-map:
     - Invalid
     CPU:
     - NotOnline
-    CanCauseOn: N/A
+    CanRaiseOn: N/A
 - enabled-by: RTEMS_SMP
   post-conditions:
     Status: IncStat
@@ -450,5 +450,5 @@ transition-map:
     - Valid
     CPU:
     - NotOnline
-    CanCauseOn: all
+    CanRaiseOn: all
 type: requirement
diff --git a/spec/rtems/intr/req/cause.yml b/spec/rtems/intr/req/raise.yml
similarity index 82%
rename from spec/rtems/intr/req/cause.yml
rename to spec/rtems/intr/req/raise.yml
index 7e3a5b2..70ba3a6 100644
--- a/spec/rtems/intr/req/cause.yml
+++ b/spec/rtems/intr/req/raise.yml
@@ -5,27 +5,27 @@ enabled-by: true
 functional-type: action
 links:
 - role: interface-function
-  uid: ../if/cause
+  uid: ../if/raise
 post-conditions:
 - name: Status
   states:
   - name: Ok
     test-code: |
-      /* Validation is done by CheckCause() for each interrupt vector */
+      /* Validation is done by CheckRaise() for each interrupt vector */
     text: |
-      The return status of ${../if/cause:/name} shall be
+      The return status of ${../if/raise:/name} shall be
       ${../../status/if/successful:/name}.
   - name: InvId
     test-code: |
       T_rsc( ctx->status, RTEMS_INVALID_ID );
     text: |
-      The return status of ${../if/cause:/name} shall be
+      The return status of ${../if/raise:/name} shall be
       ${../../status/if/invalid-id:/name}.
   - name: Unsat
     test-code: |
-      /* Validation is done by CheckCause() for each interrupt vector */
+      /* Validation is done by CheckRaise() for each interrupt vector */
     text: |
-      The return status of ${../if/cause:/name} shall be
+      The return status of ${../if/raise:/name} shall be
       ${../../status/if/unsatisfied:/name}.
   test-epilogue: null
   test-prologue: null
@@ -33,18 +33,18 @@ post-conditions:
   states:
   - name: 'Yes'
     test-code: |
-      /* Validation is done by CheckCause() for each interrupt vector */
+      /* Validation is done by CheckRaise() for each interrupt vector */
     text: |
       The interrupt associated with the interrupt vector specified by
-      ${../if/cause:/params[0]/name} shall be made pending by the
-      ${../if/cause:/name} call.
+      ${../if/raise:/params[0]/name} shall be made pending by the
+      ${../if/raise:/name} call.
   - name: 'No'
     test-code: |
-      /* Validation is done by CheckCause() for each interrupt vector */
+      /* Validation is done by CheckRaise() for each interrupt vector */
     text: |
       The interrupt associated with the interrupt vector specified by
-      ${../if/cause:/params[0]/name} shall not be made pending by the
-      ${../if/cause:/name} call.
+      ${../if/raise:/params[0]/name} shall not be made pending by the
+      ${../if/raise:/name} call.
   test-epilogue: null
   test-prologue: null
 pre-conditions:
@@ -54,36 +54,36 @@ pre-conditions:
     test-code: |
       ctx->valid_vector = true;
     text: |
-      While the ${../if/cause:/params[0]/name} parameter is
+      While the ${../if/raise:/params[0]/name} parameter is
       associated with an interrupt vector.
   - name: Invalid
     test-code: |
       ctx->valid_vector = false;
     text: |
-      While the ${../if/cause:/params[0]/name} parameter is
+      While the ${../if/raise:/params[0]/name} parameter is
       not associated with an interrupt vector.
   test-epilogue: null
   test-prologue: null
-- name: CanCause
+- name: CanRaise
   states:
   - name: 'Yes'
     test-code: |
       /*
        * This pre-condition depends on the attributes of an interrupt vector,
-       * see CheckCause().
+       * see CheckRaise().
        */
     text: |
       While the interrupt vector associated with the
-      ${../if/cause:/params[0]/name} parameter can be caused.
+      ${../if/raise:/params[0]/name} parameter can be raised.
   - name: 'No'
     test-code: |
       /*
        * This pre-condition depends on the attributes of an interrupt vector,
-       * see CheckCause().
+       * see CheckRaise().
        */
     text: |
       While the interrupt vector associated with the
-      ${../if/cause:/params[0]/name} parameter cannot be caused.
+      ${../if/raise:/params[0]/name} parameter cannot be raised.
   test-epilogue: null
   test-prologue: null
 rationale: null
@@ -111,11 +111,11 @@ test-action: |
       T_rsc_success( sc );
 
       has_installed_entries = HasInterruptVectorEntriesInstalled( ctx->vector );
-      CheckCause( ctx, &attr, has_installed_entries );
+      CheckRaise( ctx, &attr, has_installed_entries );
     }
   } else {
     ctx->vector = BSP_INTERRUPT_VECTOR_COUNT;
-    ctx->status = rtems_interrupt_cause( ctx->vector );
+    ctx->status = rtems_interrupt_raise( ctx->vector );
   }
 test-brief: null
 test-cleanup: null
@@ -136,13 +136,13 @@ test-context:
   member: |
     rtems_vector_number vector
 - brief: |
-    If this member is true, then the ${../if/cause:/params[0]/name}
+    If this member is true, then the ${../if/raise:/params[0]/name}
     parameter shall be valid.
   description: null
   member: |
     bool valid_vector
 - brief: |
-    This member contains the return value of the ${../if/cause:/name}
+    This member contains the return value of the ${../if/raise:/name}
     call.
   description: null
   member: |
@@ -160,7 +160,7 @@ test-prepare: null
 test-setup: null
 test-stop: null
 test-support: |
-  typedef RtemsIntrReqCause_Context Context;
+  typedef RtemsIntrReqRaise_Context Context;
 
   static bool IsEnabled( const Context *ctx )
   {
@@ -194,11 +194,11 @@ test-support: |
     T_rsc_success( sc );
   }
 
-  static void Cause( const Context *ctx )
+  static void Raise( const Context *ctx )
   {
     rtems_status_code sc;
 
-    sc = rtems_interrupt_cause( ctx->vector );
+    sc = rtems_interrupt_raise( ctx->vector );
     T_rsc_success( sc );
   }
 
@@ -236,7 +236,7 @@ test-support: |
     sc = rtems_interrupt_is_pending( ctx->vector, &pending_before );
     T_rsc_success( sc );
 
-    sc = rtems_interrupt_cause( ctx->vector );
+    sc = rtems_interrupt_raise( ctx->vector );
     T_rsc( sc, RTEMS_UNSATISFIED );
 
     pending_after = !pending_before;
@@ -246,7 +246,7 @@ test-support: |
     T_eq( pending_before, pending_after );
   }
 
-  static void CheckCause(
+  static void CheckRaise(
     Context                          *ctx,
     const rtems_interrupt_attributes *attr,
     bool                              has_installed_entries
@@ -254,7 +254,7 @@ test-support: |
   {
     rtems_status_code sc;
 
-    if ( !attr->can_cause ) {
+    if ( !attr->can_raise ) {
       CheckUnsatisfied( ctx );
     } else if ( has_installed_entries ) {
       /* We cannot test this vector, since it is used by a device driver */
@@ -262,7 +262,7 @@ test-support: |
       /* We can only safely test maskable interrupts */
     } else if ( IsPending( ctx ) ) {
       /*
-       * If there is already an interrupt pending, then it is probably caused
+       * If there is already an interrupt pending, then it is probably raised
        * by a peripheral which we cannot control.
        */
     } else if (
@@ -287,7 +287,7 @@ test-support: |
 
         if ( attr->can_disable ) {
           Disable( ctx );
-          Cause( ctx );
+          Raise( ctx );
           T_true( IsPending( ctx ) );
 
           sc = rtems_interrupt_vector_enable( ctx->vector );
@@ -303,7 +303,7 @@ test-support: |
         T_false( IsPending( ctx ) );
 
         rtems_interrupt_local_disable( level );
-        Cause( ctx );
+        Raise( ctx );
         T_true( IsPending( ctx ) );
         rtems_interrupt_local_enable( level );
 
@@ -318,7 +318,7 @@ test-support: |
       T_rsc_success( sc );
     }
   }
-test-target: testsuites/validation/tc-intr-cause.c
+test-target: testsuites/validation/tc-intr-raise.c
 test-teardown: null
 text: ${.:text-template}
 transition-map:
@@ -329,7 +329,7 @@ transition-map:
   pre-conditions:
     Vector:
     - Valid
-    CanCause:
+    CanRaise:
     - 'Yes'
 - enabled-by: true
   post-conditions:
@@ -338,7 +338,7 @@ transition-map:
   pre-conditions:
     Vector:
     - Invalid
-    CanCause: N/A
+    CanRaise: N/A
 - enabled-by: true
   post-conditions:
     Status: Unsat
@@ -346,6 +346,6 @@ transition-map:
   pre-conditions:
     Vector:
     - Valid
-    CanCause:
+    CanRaise:
     - 'No'
 type: requirement



More information about the vc mailing list