[rtems-central commit] spec: Remove always enabled interrupt attribute
Sebastian Huber
sebh at rtems.org
Fri Jul 23 14:15:42 UTC 2021
Module: rtems-central
Branch: master
Commit: 50aea7ae978ce62abde4760126fe5a200ad2bee0
Changeset: http://git.rtems.org/rtems-central/commit/?id=50aea7ae978ce62abde4760126fe5a200ad2bee0
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Fri Jul 23 11:03:56 2021 +0200
spec: Remove always enabled interrupt attribute
---
spec/rtems/intr/if/attributes.yml | 11 -----------
spec/rtems/intr/req/clear.yml | 2 +-
spec/rtems/intr/req/get-attributes.yml | 6 ------
spec/rtems/intr/req/is-pending.yml | 3 +--
spec/rtems/intr/req/raise-on.yml | 3 +--
spec/rtems/intr/req/raise.yml | 3 +--
spec/rtems/intr/req/vector-enable.yml | 5 +----
7 files changed, 5 insertions(+), 28 deletions(-)
diff --git a/spec/rtems/intr/if/attributes.yml b/spec/rtems/intr/if/attributes.yml
index d47470d..f162aa6 100644
--- a/spec/rtems/intr/if/attributes.yml
+++ b/spec/rtems/intr/if/attributes.yml
@@ -17,17 +17,6 @@ definition:
variants: []
- default:
brief: |
- This member is true, if the interrupt vector is always enabled, otherwise
- it is false.
- definition: bool ${.:name}
- description: |
- For an always enabled interrupt vector it follows that it can be enabled
- and that it cannot be disabled.
- kind: member
- name: always_enabled
- variants: []
-- default:
- brief: |
This member is true, if the interrupt vector can be enabled by
${vector-enable:/name}, otherwise it is false.
definition: bool ${.:name}
diff --git a/spec/rtems/intr/req/clear.yml b/spec/rtems/intr/req/clear.yml
index 41a3452..065f352 100644
--- a/spec/rtems/intr/req/clear.yml
+++ b/spec/rtems/intr/req/clear.yml
@@ -274,7 +274,7 @@ test-support: |
* If there is already an interrupt pending, then it is probably cleard
* by a peripheral which we cannot control.
*/
- } else if ( attr->always_enabled || attr->can_disable ) {
+ } else if ( attr->can_disable ) {
rtems_interrupt_entry entry;
rtems_interrupt_level level;
diff --git a/spec/rtems/intr/req/get-attributes.yml b/spec/rtems/intr/req/get-attributes.yml
index 687c2f7..dd4fbe9 100644
--- a/spec/rtems/intr/req/get-attributes.yml
+++ b/spec/rtems/intr/req/get-attributes.yml
@@ -114,12 +114,6 @@ test-action: |
T_rsc_success( sc );
ctx->status = sc;
- if ( ctx->attributes_obj.always_enabled ) {
- T_true( ctx->attributes_obj.can_enable );
- T_true( ctx->attributes_obj.maybe_enable );
- T_false( ctx->attributes_obj.can_disable );
- }
-
if ( ctx->attributes_obj.can_enable ) {
T_true( ctx->attributes_obj.maybe_enable );
}
diff --git a/spec/rtems/intr/req/is-pending.yml b/spec/rtems/intr/req/is-pending.yml
index 7930313..7f4b887 100644
--- a/spec/rtems/intr/req/is-pending.yml
+++ b/spec/rtems/intr/req/is-pending.yml
@@ -285,8 +285,7 @@ test-support: |
/* We can only safely test maskable interrupts */
T_false( IsPending( ctx ) );
} else if (
- ( attr->always_enabled || attr->can_disable ) &&
- ( attr->can_clear || attr->cleared_by_acknowledge )
+ attr->can_disable && ( attr->can_clear || attr->cleared_by_acknowledge )
) {
rtems_interrupt_entry entry;
rtems_interrupt_level level;
diff --git a/spec/rtems/intr/req/raise-on.yml b/spec/rtems/intr/req/raise-on.yml
index 8de673e..d4ebed1 100644
--- a/spec/rtems/intr/req/raise-on.yml
+++ b/spec/rtems/intr/req/raise-on.yml
@@ -327,8 +327,7 @@ test-support: |
* by a peripheral which we cannot control.
*/
} else if (
- ( attr->always_enabled || attr->can_disable ) &&
- ( attr->can_clear || attr->cleared_by_acknowledge )
+ attr->can_disable && ( attr->can_clear || attr->cleared_by_acknowledge )
) {
rtems_interrupt_entry entry;
rtems_interrupt_level level;
diff --git a/spec/rtems/intr/req/raise.yml b/spec/rtems/intr/req/raise.yml
index 70ba3a6..f3540f1 100644
--- a/spec/rtems/intr/req/raise.yml
+++ b/spec/rtems/intr/req/raise.yml
@@ -266,8 +266,7 @@ test-support: |
* by a peripheral which we cannot control.
*/
} else if (
- ( attr->always_enabled || attr->can_disable ) &&
- ( attr->can_clear || attr->cleared_by_acknowledge )
+ attr->can_disable && ( attr->can_clear || attr->cleared_by_acknowledge )
) {
rtems_interrupt_entry entry;
rtems_interrupt_level level;
diff --git a/spec/rtems/intr/req/vector-enable.yml b/spec/rtems/intr/req/vector-enable.yml
index 35da563..95cd740 100644
--- a/spec/rtems/intr/req/vector-enable.yml
+++ b/spec/rtems/intr/req/vector-enable.yml
@@ -291,10 +291,7 @@ test-support: |
Enable( ctx );
T_true( IsEnabled( ctx ) );
- } else if (
- attr->is_maskable && attr->maybe_enable &&
- ( attr->always_enabled || attr->can_disable )
- ) {
+ } else if ( attr->is_maskable && attr->can_disable ) {
rtems_interrupt_entry entry;
bool enabled;
More information about the vc
mailing list