spec: Unify interface functions and macros

22 files changed, 139 insertions, 44 deletions

diff --git a/spec/rtems/intr/if/disable.yml b/spec/rtems/intr/if/disable.yml
index 326f4843..bdfbc77f 100644
--- a/spec/rtems/intr/if/disable.yml
+++ b/spec/rtems/intr/if/disable.yml
@@ -5,7 +5,11 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 definition:
-  default: ${/score/isr/if/local-disable:/name}( ${.:/params[0]/name} )
+  default:
+    attributes: null
+    body: ${/score/isr/if/local-disable:/name}( ${.:/params[0]/name} )
+    params: []
+    return: null
   variants: []
 description: |
   This directive disables all maskable interrupts on the current processor and
diff --git a/spec/rtems/intr/if/enable.yml b/spec/rtems/intr/if/enable.yml
index bd71547e..e1d3d45a 100644
--- a/spec/rtems/intr/if/enable.yml
+++ b/spec/rtems/intr/if/enable.yml
@@ -5,7 +5,11 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 definition:
-  default: ${/score/isr/if/local-enable:/name}( ${.:/params[0]/name} )
+  default:
+    attributes: null
+    body: ${/score/isr/if/local-enable:/name}( ${.:/params[0]/name} )
+    params: []
+    return: null
   variants: []
 description: |
   This directive restores the interrupt level specified by
diff --git a/spec/rtems/intr/if/entry-initializer.yml b/spec/rtems/intr/if/entry-initializer.yml
index 53c211ac..86fa327b 100644
--- a/spec/rtems/intr/if/entry-initializer.yml
+++ b/spec/rtems/intr/if/entry-initializer.yml
@@ -4,8 +4,12 @@ brief: |
 copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 definition:
-  default: |
-    { ${.:/params[0]/name},  ${.:/params[1]/name}, ${/c/if/null:/name}, ${.:/params[2]/name} }
+  default:
+    attributes: null
+    body: |
+      { ${.:/params[0]/name},  ${.:/params[1]/name}, ${/c/if/null:/name}, ${.:/params[2]/name} }
+    params: []
+    return: null
   variants: []
 description: null
 enabled-by: true
diff --git a/spec/rtems/intr/if/flash.yml b/spec/rtems/intr/if/flash.yml
index 0fad1b03..e336ed4f 100644
--- a/spec/rtems/intr/if/flash.yml
+++ b/spec/rtems/intr/if/flash.yml
@@ -5,7 +5,11 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 definition:
-  default: ${/score/isr/if/local-flash:/name}( ${.:/params[0]/name} )
+  default:
+    attributes: null
+    body: ${/score/isr/if/local-flash:/name}( ${.:/params[0]/name} )
+    params: []
+    return: null
   variants: []
 description: |
   This directive is functionally equivalent to a calling ${enable:/name}
diff --git a/spec/rtems/intr/if/is-in-progress.yml b/spec/rtems/intr/if/is-in-progress.yml
index 32b5309e..3b36f8db 100644
--- a/spec/rtems/intr/if/is-in-progress.yml
+++ b/spec/rtems/intr/if/is-in-progress.yml
@@ -5,7 +5,11 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 definition:
-  default: ${/score/isr/if/is-in-progress:/name}()
+  default:
+    attributes: null
+    body: ${/score/isr/if/is-in-progress:/name}()
+    params: []
+    return: null
   variants: []
 description: |
   This directive returns ``true``, if the current processor is currently
diff --git a/spec/rtems/intr/if/is-replace.yml b/spec/rtems/intr/if/is-replace.yml
index d6f3e0d6..ade83ec8 100644
--- a/spec/rtems/intr/if/is-replace.yml
+++ b/spec/rtems/intr/if/is-replace.yml
@@ -4,8 +4,12 @@ brief: |
 copyrights:
 - Copyright (C) 2008, 2021 embedded brains GmbH (http://www.embedded-brains.de)
 definition:
-  default: |
-    ( ( ${.:/params[0]/name} ) & ${replace:/name} )
+  default:
+    attributes: null
+    body: |
+      ( ( ${.:/params[0]/name} ) & ${replace:/name} )
+    params: []
+    return: null
   variants: []
 description: null
 enabled-by: true
@@ -21,8 +25,7 @@ links:
 name: RTEMS_INTERRUPT_IS_REPLACE
 notes: null
 params:
-- description: 
-    is the interrupt handler option set to check.
+- description: is the interrupt handler option set to check.
   dir: null
   name: _options
 return:
diff --git a/spec/rtems/intr/if/is-shared.yml b/spec/rtems/intr/if/is-shared.yml
index aa9f1ee5..be141e7d 100644
--- a/spec/rtems/intr/if/is-shared.yml
+++ b/spec/rtems/intr/if/is-shared.yml
@@ -4,8 +4,12 @@ brief: |
 copyrights:
 - Copyright (C) 2008, 2021 embedded brains GmbH (http://www.embedded-brains.de)
 definition:
-  default: |
-    ( ( ${.:/params[0]/name} ) & ${shared:/name} )
+  default:
+    attributes: null
+    body: |
+      ( ( ${.:/params[0]/name} ) & ${shared:/name} )
+    params: []
+    return: null
   variants: []
 description: null
 enabled-by: true
diff --git a/spec/rtems/intr/if/is-unique.yml b/spec/rtems/intr/if/is-unique.yml
index 7381f0bf..424ed4b4 100644
--- a/spec/rtems/intr/if/is-unique.yml
+++ b/spec/rtems/intr/if/is-unique.yml
@@ -4,8 +4,12 @@ brief: |
 copyrights:
 - Copyright (C) 2008, 2021 embedded brains GmbH (http://www.embedded-brains.de)
 definition:
-  default: |
-    ( ( ${.:/params[0]/name} ) & ${unique:/name} )
+  default:
+    attributes: null
+    body: |
+      ( ( ${.:/params[0]/name} ) & ${unique:/name} )
+    params: []
+    return: null
   variants: []
 description: null
 enabled-by: true
diff --git a/spec/rtems/intr/if/local-disable.yml b/spec/rtems/intr/if/local-disable.yml
index 542ff14d..f80cf874 100644
--- a/spec/rtems/intr/if/local-disable.yml
+++ b/spec/rtems/intr/if/local-disable.yml
@@ -5,7 +5,11 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 definition:
-  default: ${/score/isr/if/local-disable:/name}( ${.:/params[0]/name} )
+  default:
+    attributes: null
+    body: ${/score/isr/if/local-disable:/name}( ${.:/params[0]/name} )
+    params: []
+    return: null
   variants: []
 description: |
   This directive disables all maskable interrupts on the current processor and
diff --git a/spec/rtems/intr/if/local-enable.yml b/spec/rtems/intr/if/local-enable.yml
index f1125d99..973562e2 100644
--- a/spec/rtems/intr/if/local-enable.yml
+++ b/spec/rtems/intr/if/local-enable.yml
@@ -5,7 +5,11 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 definition:
-  default: ${/score/isr/if/local-enable:/name}( ${.:/params[0]/name} )
+  default:
+    attributes: null
+    body: ${/score/isr/if/local-enable:/name}( ${.:/params[0]/name} )
+    params: []
+    return: null
   variants: []
 description: |
   This directive restores the interrupt level specified by
diff --git a/spec/rtems/intr/if/lock-acquire-isr.yml b/spec/rtems/intr/if/lock-acquire-isr.yml
index 14e1959a..ab6ac810 100644
--- a/spec/rtems/intr/if/lock-acquire-isr.yml
+++ b/spec/rtems/intr/if/lock-acquire-isr.yml
@@ -5,13 +5,21 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 definition:
-  default: do { (void) ${.:/params[1]/name}; } while ( 0 )
+  default:
+    attributes: null
+    body: do { (void) ${.:/params[1]/name}; } while ( 0 )
+    params: []
+    return: null
   variants:
-  - definition: |
-      ${/score/smp/if/lock-acquire:/name}(
-        &( ${.:/params[0]/name} )->Lock,
-        &( ${.:/params[1]/name} )->Lock_context
-      )
+  - definition:
+      attributes: null
+      body: |
+        ${/score/smp/if/lock-acquire:/name}(
+          &( ${.:/params[0]/name} )->Lock,
+          &( ${.:/params[1]/name} )->Lock_context
+        )
+      params: []
+      return: null
     enabled-by: defined(${/build-options/if/smp:/name})
 description: |
   This directive acquires the ISR lock specified by ${.:/params[0]/name} using
diff --git a/spec/rtems/intr/if/lock-acquire.yml b/spec/rtems/intr/if/lock-acquire.yml
index cfca358b..df98ff05 100644
--- a/spec/rtems/intr/if/lock-acquire.yml
+++ b/spec/rtems/intr/if/lock-acquire.yml
@@ -5,8 +5,12 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 definition:
-  default: |
-    ${/score/isr/if/lock-isr-disable-acquire:/name}( ${.:/params[0]/name}, ${.:/params[1]/name} )
+  default:
+    attributes: null
+    body: |
+      ${/score/isr/if/lock-isr-disable-acquire:/name}( ${.:/params[0]/name}, ${.:/params[1]/name} )
+    params: []
+    return: null
   variants: []
 description: |
   This directive acquires the ISR lock specified by ${.:/params[0]/name} using
diff --git a/spec/rtems/intr/if/lock-declare.yml b/spec/rtems/intr/if/lock-declare.yml
index 987507a7..ceedc7c4 100644
--- a/spec/rtems/intr/if/lock-declare.yml
+++ b/spec/rtems/intr/if/lock-declare.yml
@@ -5,8 +5,12 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 definition:
-  default: |
-    ${/score/isr/if/lock-declare:/name}( ${.:/params[0]/name}, ${.:/params[1]/name} )
+  default:
+    attributes: null
+    body: |
+      ${/score/isr/if/lock-declare:/name}( ${.:/params[0]/name}, ${.:/params[1]/name} )
+    params: []
+    return: null
   variants: []
 description: null
 enabled-by: true
diff --git a/spec/rtems/intr/if/lock-define.yml b/spec/rtems/intr/if/lock-define.yml
index b8bdaa97..4f8cb2e6 100644
--- a/spec/rtems/intr/if/lock-define.yml
+++ b/spec/rtems/intr/if/lock-define.yml
@@ -5,8 +5,12 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 definition:
-  default: |
-    ${/score/isr/if/lock-define:/name}( ${.:/params[0]/name}, ${.:/params[1]/name}, ${.:/params[2]/name} )
+  default:
+    attributes: null
+    body: |
+      ${/score/isr/if/lock-define:/name}( ${.:/params[0]/name}, ${.:/params[1]/name}, ${.:/params[2]/name} )
+    params: []
+    return: null
   variants: []
 description: null
 enabled-by: true
diff --git a/spec/rtems/intr/if/lock-destroy.yml b/spec/rtems/intr/if/lock-destroy.yml
index 90282e9e..bb442030 100644
--- a/spec/rtems/intr/if/lock-destroy.yml
+++ b/spec/rtems/intr/if/lock-destroy.yml
@@ -5,7 +5,11 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 definition:
-  default: ${/score/isr/if/lock-destroy:/name}( ${.:/params[0]/name} )
+  default:
+    attributes: null
+    body: ${/score/isr/if/lock-destroy:/name}( ${.:/params[0]/name} )
+    params: []
+    return: null
   variants: []
 description: null
 enabled-by: true
diff --git a/spec/rtems/intr/if/lock-initialize.yml b/spec/rtems/intr/if/lock-initialize.yml
index a23c2718..e9fed290 100644
--- a/spec/rtems/intr/if/lock-initialize.yml
+++ b/spec/rtems/intr/if/lock-initialize.yml
@@ -5,8 +5,12 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 definition:
-  default: |
-    ${/score/isr/if/lock-initialize:/name}( ${.:/params[0]/name}, ${.:/params[1]/name} )
+  default:
+    attributes: null
+    body: |
+      ${/score/isr/if/lock-initialize:/name}( ${.:/params[0]/name}, ${.:/params[1]/name} )
+    params: []
+    return: null
   variants: []
 description: null
 enabled-by: true
diff --git a/spec/rtems/intr/if/lock-initializer.yml b/spec/rtems/intr/if/lock-initializer.yml
index 89deb039..01bd8255 100644
--- a/spec/rtems/intr/if/lock-initializer.yml
+++ b/spec/rtems/intr/if/lock-initializer.yml
@@ -5,7 +5,11 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 definition:
-  default: ${/score/isr/if/lock-initializer:/name}( ${.:/params[0]/name} )
+  default:
+    attributes: null
+    body: ${/score/isr/if/lock-initializer:/name}( ${.:/params[0]/name} )
+    params: []
+    return: null
   variants: []
 description: null
 enabled-by: true
diff --git a/spec/rtems/intr/if/lock-isr-disable.yml b/spec/rtems/intr/if/lock-isr-disable.yml
index 3ecc3e1d..eb4b7801 100644
--- a/spec/rtems/intr/if/lock-isr-disable.yml
+++ b/spec/rtems/intr/if/lock-isr-disable.yml
@@ -5,7 +5,11 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 definition:
-  default: ${/score/isr/if/lock-isr-disable:/name}( ${.:/params[0]/name} )
+  default:
+    attributes: null
+    body: ${/score/isr/if/lock-isr-disable:/name}( ${.:/params[0]/name} )
+    params: []
+    return: null
   variants: []
 description: |
   This directive disables maskable interrupts on the current processor and
diff --git a/spec/rtems/intr/if/lock-member.yml b/spec/rtems/intr/if/lock-member.yml
index e093aec7..aa6a3cd1 100644
--- a/spec/rtems/intr/if/lock-member.yml
+++ b/spec/rtems/intr/if/lock-member.yml
@@ -5,7 +5,11 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 definition:
-  default: ${/score/isr/if/lock-member:/name}( ${.:/params[0]/name} )
+  default:
+    attributes: null
+    body: ${/score/isr/if/lock-member:/name}( ${.:/params[0]/name} )
+    params: []
+    return: null
   variants: []
 description: null
 enabled-by: true
diff --git a/spec/rtems/intr/if/lock-reference.yml b/spec/rtems/intr/if/lock-reference.yml
index be2b16d9..47e9b440 100644
--- a/spec/rtems/intr/if/lock-reference.yml
+++ b/spec/rtems/intr/if/lock-reference.yml
@@ -5,8 +5,12 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 definition:
-  default: |
-    ${/score/isr/if/lock-reference:/name}( ${.:/params[0]/name}, ${.:/params[1]/name} )
+  default:
+    attributes: null
+    body: |
+      ${/score/isr/if/lock-reference:/name}( ${.:/params[0]/name}, ${.:/params[1]/name} )
+    params: []
+    return: null
   variants: []
 description: null
 enabled-by: true
diff --git a/spec/rtems/intr/if/lock-release-isr.yml b/spec/rtems/intr/if/lock-release-isr.yml
index 21f50623..07f673ef 100644
--- a/spec/rtems/intr/if/lock-release-isr.yml
+++ b/spec/rtems/intr/if/lock-release-isr.yml
@@ -5,13 +5,21 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 definition:
-  default: do { (void) ${.:/params[1]/name}; } while ( 0 )
+  default:
+    attributes: null
+    body: do { (void) ${.:/params[1]/name}; } while ( 0 )
+    params: []
+    return: null
   variants:
-  - definition: |
-      ${/score/smp/if/lock-release:/name}(
-        &( ${.:/params[0]/name} )->Lock,
-        &( ${.:/params[1]/name} )->Lock_context
-      )
+  - definition:
+      attributes: null
+      body: |
+        ${/score/smp/if/lock-release:/name}(
+          &( ${.:/params[0]/name} )->Lock,
+          &( ${.:/params[1]/name} )->Lock_context
+        )
+      params: []
+      return: null
     enabled-by: defined(${/build-options/if/smp:/name})
 description: |
   This directive releases the ISR lock specified by ${.:/params[0]/name} using
diff --git a/spec/rtems/intr/if/lock-release.yml b/spec/rtems/intr/if/lock-release.yml
index 76ba5771..cb43960b 100644
--- a/spec/rtems/intr/if/lock-release.yml
+++ b/spec/rtems/intr/if/lock-release.yml
@@ -5,8 +5,12 @@ copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 definition:
-  default: |
-    ${/score/isr/if/lock-release-isr-enable:/name}( ${.:/params[0]/name}, ${.:/params[1]/name} )
+  default:
+    attributes: null
+    body: |
+      ${/score/isr/if/lock-release-isr-enable:/name}( ${.:/params[0]/name}, ${.:/params[1]/name} )
+    params: []
+    return: null
   variants: []
 description: |
   This directive releases the ISR lock specified by ${.:/params[0]/name} using