spec: Add types to macros

22 files changed, 77 insertions, 42 deletions

diff --git a/spec/rtems/intr/if/disable.yml b/spec/rtems/intr/if/disable.yml
index bdfbc77f..a1a08cb6 100644
--- a/spec/rtems/intr/if/disable.yml
+++ b/spec/rtems/intr/if/disable.yml
@@ -8,8 +8,9 @@ definition:
   default:
     attributes: null
     body: ${/score/isr/if/local-disable:/name}( ${.:/params[0]/name} )
-    params: []
-    return: null
+    params:
+    - ${level:/name} ${.:/params[0]/name}
+    return: void
   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 e1d3d45a..5334f262 100644
--- a/spec/rtems/intr/if/enable.yml
+++ b/spec/rtems/intr/if/enable.yml
@@ -8,8 +8,9 @@ definition:
   default:
     attributes: null
     body: ${/score/isr/if/local-enable:/name}( ${.:/params[0]/name} )
-    params: []
-    return: null
+    params:
+    - ${level:/name} ${.:/params[0]/name}
+    return: void
   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 86fa327b..09b75573 100644
--- a/spec/rtems/intr/if/entry-initializer.yml
+++ b/spec/rtems/intr/if/entry-initializer.yml
@@ -7,8 +7,11 @@ definition:
   default:
     attributes: null
     body: |
-      { ${.:/params[0]/name},  ${.:/params[1]/name}, ${/c/if/null:/name}, ${.:/params[2]/name} }
-    params: []
+      { ${.:/params[0]/name}, ${.:/params[1]/name}, ${/c/if/null:/name}, ${.:/params[2]/name} }
+    params:
+    - ${handler:/name} ${.:/params[0]/name}
+    - void *${.:/params[1]/name}
+    - const char *${.:/params[2]/name}
     return: null
   variants: []
 description: null
diff --git a/spec/rtems/intr/if/flash.yml b/spec/rtems/intr/if/flash.yml
index e336ed4f..77d920ac 100644
--- a/spec/rtems/intr/if/flash.yml
+++ b/spec/rtems/intr/if/flash.yml
@@ -8,8 +8,9 @@ definition:
   default:
     attributes: null
     body: ${/score/isr/if/local-flash:/name}( ${.:/params[0]/name} )
-    params: []
-    return: null
+    params:
+    - ${level:/name} ${.:/params[0]/name}
+    return: void
   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 3b36f8db..f34ca7f9 100644
--- a/spec/rtems/intr/if/is-in-progress.yml
+++ b/spec/rtems/intr/if/is-in-progress.yml
@@ -9,7 +9,7 @@ definition:
     attributes: null
     body: ${/score/isr/if/is-in-progress:/name}()
     params: []
-    return: null
+    return: ${/c/if/bool:/name}
   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 ade83ec8..14aa9d66 100644
--- a/spec/rtems/intr/if/is-replace.yml
+++ b/spec/rtems/intr/if/is-replace.yml
@@ -8,8 +8,9 @@ definition:
     attributes: null
     body: |
       ( ( ${.:/params[0]/name} ) & ${replace:/name} )
-    params: []
-    return: null
+    params:
+    - ${../../option/if/option:/name} ${.:/params[0]/name}
+    return: ${/c/if/bool:/name}
   variants: []
 description: null
 enabled-by: true
diff --git a/spec/rtems/intr/if/is-shared.yml b/spec/rtems/intr/if/is-shared.yml
index be141e7d..0bb43002 100644
--- a/spec/rtems/intr/if/is-shared.yml
+++ b/spec/rtems/intr/if/is-shared.yml
@@ -8,8 +8,9 @@ definition:
     attributes: null
     body: |
       ( ( ${.:/params[0]/name} ) & ${shared:/name} )
-    params: []
-    return: null
+    params:
+    - ${../../option/if/option:/name} ${.:/params[0]/name}
+    return: ${/c/if/bool:/name}
   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 424ed4b4..e74634e4 100644
--- a/spec/rtems/intr/if/is-unique.yml
+++ b/spec/rtems/intr/if/is-unique.yml
@@ -8,8 +8,9 @@ definition:
     attributes: null
     body: |
       ( ( ${.:/params[0]/name} ) & ${unique:/name} )
-    params: []
-    return: null
+    params:
+    - ${../../option/if/option:/name} ${.:/params[0]/name}
+    return: ${/c/if/bool:/name}
   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 f80cf874..7c6a8fbe 100644
--- a/spec/rtems/intr/if/local-disable.yml
+++ b/spec/rtems/intr/if/local-disable.yml
@@ -8,8 +8,9 @@ definition:
   default:
     attributes: null
     body: ${/score/isr/if/local-disable:/name}( ${.:/params[0]/name} )
-    params: []
-    return: null
+    params:
+    - ${level:/name} ${.:/params[0]/name}
+    return: void
   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 973562e2..c0568aff 100644
--- a/spec/rtems/intr/if/local-enable.yml
+++ b/spec/rtems/intr/if/local-enable.yml
@@ -8,8 +8,9 @@ definition:
   default:
     attributes: null
     body: ${/score/isr/if/local-enable:/name}( ${.:/params[0]/name} )
-    params: []
-    return: null
+    params:
+    - ${level:/name} ${.:/params[0]/name}
+    return: void
   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 ab6ac810..e74ea8fe 100644
--- a/spec/rtems/intr/if/lock-acquire-isr.yml
+++ b/spec/rtems/intr/if/lock-acquire-isr.yml
@@ -8,8 +8,10 @@ definition:
   default:
     attributes: null
     body: do { (void) ${.:/params[1]/name}; } while ( 0 )
-    params: []
-    return: null
+    params:
+    - ${lock:/name} *${.:/params[0]/name}
+    - ${lock-context:/name} *${.:/params[1]/name}
+    return: void
   variants:
   - definition:
       attributes: null
@@ -18,8 +20,10 @@ definition:
           &( ${.:/params[0]/name} )->Lock,
           &( ${.:/params[1]/name} )->Lock_context
         )
-      params: []
-      return: null
+      params:
+      - ${lock:/name} *${.:/params[0]/name}
+      - ${lock-context:/name} *${.:/params[1]/name}
+      return: void
     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 df98ff05..d6b6ac19 100644
--- a/spec/rtems/intr/if/lock-acquire.yml
+++ b/spec/rtems/intr/if/lock-acquire.yml
@@ -9,8 +9,10 @@ definition:
     attributes: null
     body: |
       ${/score/isr/if/lock-isr-disable-acquire:/name}( ${.:/params[0]/name}, ${.:/params[1]/name} )
-    params: []
-    return: null
+    params:
+    - ${lock:/name} *${.:/params[0]/name}
+    - ${lock-context:/name} *${.:/params[1]/name}
+    return: void
   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 ceedc7c4..836b9b95 100644
--- a/spec/rtems/intr/if/lock-declare.yml
+++ b/spec/rtems/intr/if/lock-declare.yml
@@ -9,7 +9,9 @@ definition:
     attributes: null
     body: |
       ${/score/isr/if/lock-declare:/name}( ${.:/params[0]/name}, ${.:/params[1]/name} )
-    params: []
+    params:
+    - ${.:/params[0]/name}
+    - ${.:/params[1]/name}
     return: null
   variants: []
 description: null
diff --git a/spec/rtems/intr/if/lock-define.yml b/spec/rtems/intr/if/lock-define.yml
index 4f8cb2e6..9eb2db38 100644
--- a/spec/rtems/intr/if/lock-define.yml
+++ b/spec/rtems/intr/if/lock-define.yml
@@ -9,7 +9,10 @@ definition:
     attributes: null
     body: |
       ${/score/isr/if/lock-define:/name}( ${.:/params[0]/name}, ${.:/params[1]/name}, ${.:/params[2]/name} )
-    params: []
+    params:
+    - ${.:/params[0]/name}
+    - ${.:/params[1]/name}
+    - const char *${.:/params[2]/name}
     return: null
   variants: []
 description: null
diff --git a/spec/rtems/intr/if/lock-destroy.yml b/spec/rtems/intr/if/lock-destroy.yml
index bb442030..8092fde0 100644
--- a/spec/rtems/intr/if/lock-destroy.yml
+++ b/spec/rtems/intr/if/lock-destroy.yml
@@ -8,8 +8,9 @@ definition:
   default:
     attributes: null
     body: ${/score/isr/if/lock-destroy:/name}( ${.:/params[0]/name} )
-    params: []
-    return: null
+    params:
+    - ${lock:/name} *${.:/params[0]/name}
+    return: void
   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 e9fed290..f1bcaec1 100644
--- a/spec/rtems/intr/if/lock-initialize.yml
+++ b/spec/rtems/intr/if/lock-initialize.yml
@@ -9,8 +9,10 @@ definition:
     attributes: null
     body: |
       ${/score/isr/if/lock-initialize:/name}( ${.:/params[0]/name}, ${.:/params[1]/name} )
-    params: []
-    return: null
+    params:
+    - ${lock:/name} *${.:/params[0]/name}
+    - const char *${.:/params[1]/name}
+    return: void
   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 01bd8255..afd91643 100644
--- a/spec/rtems/intr/if/lock-initializer.yml
+++ b/spec/rtems/intr/if/lock-initializer.yml
@@ -8,7 +8,8 @@ definition:
   default:
     attributes: null
     body: ${/score/isr/if/lock-initializer:/name}( ${.:/params[0]/name} )
-    params: []
+    params:
+    - const char *${.:/params[0]/name}
     return: null
   variants: []
 description: null
diff --git a/spec/rtems/intr/if/lock-isr-disable.yml b/spec/rtems/intr/if/lock-isr-disable.yml
index eb4b7801..6639baac 100644
--- a/spec/rtems/intr/if/lock-isr-disable.yml
+++ b/spec/rtems/intr/if/lock-isr-disable.yml
@@ -8,8 +8,9 @@ definition:
   default:
     attributes: null
     body: ${/score/isr/if/lock-isr-disable:/name}( ${.:/params[0]/name} )
-    params: []
-    return: null
+    params:
+    - ${lock-context:/name} *${.:/params[0]/name}
+    return: void
   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 aa6a3cd1..1fb9208d 100644
--- a/spec/rtems/intr/if/lock-member.yml
+++ b/spec/rtems/intr/if/lock-member.yml
@@ -8,7 +8,8 @@ definition:
   default:
     attributes: null
     body: ${/score/isr/if/lock-member:/name}( ${.:/params[0]/name} )
-    params: []
+    params:
+    - ${.:/params[0]/name}
     return: null
   variants: []
 description: null
diff --git a/spec/rtems/intr/if/lock-reference.yml b/spec/rtems/intr/if/lock-reference.yml
index 47e9b440..0cff6e9c 100644
--- a/spec/rtems/intr/if/lock-reference.yml
+++ b/spec/rtems/intr/if/lock-reference.yml
@@ -9,7 +9,9 @@ definition:
     attributes: null
     body: |
       ${/score/isr/if/lock-reference:/name}( ${.:/params[0]/name}, ${.:/params[1]/name} )
-    params: []
+    params:
+    - ${.:/params[0]/name}
+    - ${lock:/name} *${.:/params[1]/name}
     return: null
   variants: []
 description: null
diff --git a/spec/rtems/intr/if/lock-release-isr.yml b/spec/rtems/intr/if/lock-release-isr.yml
index 07f673ef..16374018 100644
--- a/spec/rtems/intr/if/lock-release-isr.yml
+++ b/spec/rtems/intr/if/lock-release-isr.yml
@@ -8,8 +8,10 @@ definition:
   default:
     attributes: null
     body: do { (void) ${.:/params[1]/name}; } while ( 0 )
-    params: []
-    return: null
+    params:
+    - ${lock:/name} *${.:/params[0]/name}
+    - ${lock-context:/name} *${.:/params[1]/name}
+    return: void
   variants:
   - definition:
       attributes: null
@@ -18,8 +20,10 @@ definition:
           &( ${.:/params[0]/name} )->Lock,
           &( ${.:/params[1]/name} )->Lock_context
         )
-      params: []
-      return: null
+      params:
+      - ${lock:/name} *${.:/params[0]/name}
+      - ${lock-context:/name} *${.:/params[1]/name}
+      return: void
     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 cb43960b..7334f169 100644
--- a/spec/rtems/intr/if/lock-release.yml
+++ b/spec/rtems/intr/if/lock-release.yml
@@ -9,8 +9,9 @@ definition:
     attributes: null
     body: |
       ${/score/isr/if/lock-release-isr-enable:/name}( ${.:/params[0]/name}, ${.:/params[1]/name} )
-    params: []
-    return: null
+    params:
+    - ${lock-context:/name} *${.:/params[0]/name}
+    return: void
   variants: []
 description: |
   This directive releases the ISR lock specified by ${.:/params[0]/name} using