From 39b71997bdd3bed71c735bc6239db650d1330563 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Fri, 19 Feb 2021 21:42:45 +0100
Subject: spec: Move rtems_task_priority item

---
 spec/rtems/scheduler/if/get-maximum-priority.yml    |  2 +-
 spec/rtems/scheduler/if/map-priority-from-posix.yml |  2 +-
 spec/rtems/scheduler/if/map-priority-to-posix.yml   |  2 +-
 spec/rtems/sem/if/create.yml                        |  2 +-
 spec/rtems/sem/if/set-priority.yml                  |  4 ++--
 spec/rtems/task/if/config.yml                       |  2 +-
 spec/rtems/task/if/create.yml                       |  2 +-
 spec/rtems/task/if/get-priority.yml                 |  2 +-
 spec/rtems/task/if/initialization-table.yml         |  2 +-
 spec/rtems/task/if/priority.yml                     | 20 --------------------
 spec/rtems/task/if/set-priority.yml                 |  4 ++--
 spec/rtems/task/if/set-scheduler.yml                |  2 +-
 spec/rtems/timer/if/initiate-server.yml             |  2 +-
 spec/rtems/timer/if/server-default-priority.yml     |  2 +-
 spec/rtems/type/if/priority.yml                     | 21 +++++++++++++++++++++
 spec/score/if/maximum-priority.yml                  |  2 +-
 16 files changed, 37 insertions(+), 36 deletions(-)
 delete mode 100644 spec/rtems/task/if/priority.yml
 create mode 100644 spec/rtems/type/if/priority.yml

diff --git a/spec/rtems/scheduler/if/get-maximum-priority.yml b/spec/rtems/scheduler/if/get-maximum-priority.yml
index 4f8e8417..e8bfb5a0 100644
--- a/spec/rtems/scheduler/if/get-maximum-priority.yml
+++ b/spec/rtems/scheduler/if/get-maximum-priority.yml
@@ -9,7 +9,7 @@ definition:
     body: null
     params:
     - ${../../type/if/id:/name} ${.:/params[0]/name}
-    - ${../../task/if/priority:/name} *${.:/params[1]/name}
+    - ${../../type/if/priority:/name} *${.:/params[1]/name}
     return: ${../../status/if/code:/name}
   variants: []
 description: null
diff --git a/spec/rtems/scheduler/if/map-priority-from-posix.yml b/spec/rtems/scheduler/if/map-priority-from-posix.yml
index 1c05f44b..660d5b30 100644
--- a/spec/rtems/scheduler/if/map-priority-from-posix.yml
+++ b/spec/rtems/scheduler/if/map-priority-from-posix.yml
@@ -10,7 +10,7 @@ definition:
     params:
     - ${../../type/if/id:/name} ${.:/params[0]/name}
     - int ${.:/params[1]/name}
-    - ${../../task/if/priority:/name} *${.:/params[2]/name}
+    - ${../../type/if/priority:/name} *${.:/params[2]/name}
     return: ${../../status/if/code:/name}
   variants: []
 description: null
diff --git a/spec/rtems/scheduler/if/map-priority-to-posix.yml b/spec/rtems/scheduler/if/map-priority-to-posix.yml
index c887d45f..9bd070ee 100644
--- a/spec/rtems/scheduler/if/map-priority-to-posix.yml
+++ b/spec/rtems/scheduler/if/map-priority-to-posix.yml
@@ -9,7 +9,7 @@ definition:
     body: null
     params:
     - ${../../type/if/id:/name} ${.:/params[0]/name}
-    - ${../../task/if/priority:/name} ${.:/params[1]/name}
+    - ${../../type/if/priority:/name} ${.:/params[1]/name}
     - int *${.:/params[2]/name}
     return: ${../../status/if/code:/name}
   variants: []
diff --git a/spec/rtems/sem/if/create.yml b/spec/rtems/sem/if/create.yml
index ddffa612..86abbebe 100644
--- a/spec/rtems/sem/if/create.yml
+++ b/spec/rtems/sem/if/create.yml
@@ -12,7 +12,7 @@ definition:
     - ${../../type/if/name:/name} ${.:/params[0]/name}
     - ${/c/if/uint32_t:/name} ${.:/params[1]/name}
     - ${../../attr/if/attribute:/name} ${.:/params[2]/name}
-    - ${../../task/if/priority:/name} ${.:/params[3]/name}
+    - ${../../type/if/priority:/name} ${.:/params[3]/name}
     - ${../../type/if/id:/name} *${.:/params[4]/name}
     return: ${../../status/if/code:/name}
   variants: []
diff --git a/spec/rtems/sem/if/set-priority.yml b/spec/rtems/sem/if/set-priority.yml
index 99b56947..5b76bd74 100644
--- a/spec/rtems/sem/if/set-priority.yml
+++ b/spec/rtems/sem/if/set-priority.yml
@@ -11,8 +11,8 @@ definition:
     params:
     - ${../../type/if/id:/name} ${.:/params[0]/name}
     - ${../../type/if/id:/name} ${.:/params[1]/name}
-    - ${../../task/if/priority:/name} ${.:/params[2]/name}
-    - ${../../task/if/priority:/name} *${.:/params[3]/name}
+    - ${../../type/if/priority:/name} ${.:/params[2]/name}
+    - ${../../type/if/priority:/name} *${.:/params[3]/name}
     return: ${../../status/if/code:/name}
   variants: []
 description: |
diff --git a/spec/rtems/task/if/config.yml b/spec/rtems/task/if/config.yml
index 52fe239d..423b8efe 100644
--- a/spec/rtems/task/if/config.yml
+++ b/spec/rtems/task/if/config.yml
@@ -16,7 +16,7 @@ definition:
 - default:
     brief: |
       This member defines the initial priority of the task.
-    definition: ${priority:/name} ${.:name}
+    definition: ${../../type/if/priority:/name} ${.:name}
     description: null
     kind: member
     name: initial_priority
diff --git a/spec/rtems/task/if/create.yml b/spec/rtems/task/if/create.yml
index 3b90a861..f9bf3b1a 100644
--- a/spec/rtems/task/if/create.yml
+++ b/spec/rtems/task/if/create.yml
@@ -10,7 +10,7 @@ definition:
     body: null
     params:
     - ${../../type/if/name:/name} ${.:/params[0]/name}
-    - ${priority:/name} ${.:/params[1]/name}
+    - ${../../type/if/priority:/name} ${.:/params[1]/name}
     - ${/c/if/size_t:/name} ${.:/params[2]/name}
     - ${../../mode/if/mode:/name} ${.:/params[3]/name}
     - ${../../attr/if/attribute:/name} ${.:/params[4]/name}
diff --git a/spec/rtems/task/if/get-priority.yml b/spec/rtems/task/if/get-priority.yml
index 43cdc7e4..07af9049 100644
--- a/spec/rtems/task/if/get-priority.yml
+++ b/spec/rtems/task/if/get-priority.yml
@@ -10,7 +10,7 @@ definition:
     params:
     - ${../../type/if/id:/name} ${.:/params[0]/name}
     - ${../../type/if/id:/name} ${.:/params[1]/name}
-    - ${priority:/name} *${.:/params[2]/name}
+    - ${../../type/if/priority:/name} *${.:/params[2]/name}
     return: ${../../status/if/code:/name}
   variants: []
 description: null
diff --git a/spec/rtems/task/if/initialization-table.yml b/spec/rtems/task/if/initialization-table.yml
index f454a1fe..e7022cff 100644
--- a/spec/rtems/task/if/initialization-table.yml
+++ b/spec/rtems/task/if/initialization-table.yml
@@ -20,7 +20,7 @@ definition:
   variants: []
 - default:
     brief: '%'
-    definition: ${priority:/name} ${.:name}
+    definition: ${../../type/if/priority:/name} ${.:name}
     description: '%'
     kind: member
     name: initial_priority
diff --git a/spec/rtems/task/if/priority.yml b/spec/rtems/task/if/priority.yml
deleted file mode 100644
index 701f0fd4..00000000
--- a/spec/rtems/task/if/priority.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
-brief: '%'
-copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-- Copyright (C) 1988, 2017 On-Line Applications Research Corporation (OAR)
-definition:
-  default: ${/c/if/uint32_t:/name} ${.:/name}
-  variants: []
-description: null
-enabled-by: true
-index-entries: []
-interface-type: typedef
-links:
-- role: interface-placement
-  uid: header
-- role: interface-ingroup
-  uid: group
-name: rtems_task_priority
-notes: null
-type: interface
diff --git a/spec/rtems/task/if/set-priority.yml b/spec/rtems/task/if/set-priority.yml
index ec50798e..c749c8ed 100644
--- a/spec/rtems/task/if/set-priority.yml
+++ b/spec/rtems/task/if/set-priority.yml
@@ -9,8 +9,8 @@ definition:
     body: null
     params:
     - ${../../type/if/id:/name} ${.:/params[0]/name}
-    - ${priority:/name} ${.:/params[1]/name}
-    - ${priority:/name} *${.:/params[2]/name}
+    - ${../../type/if/priority:/name} ${.:/params[1]/name}
+    - ${../../type/if/priority:/name} *${.:/params[2]/name}
     return: ${../../status/if/code:/name}
   variants: []
 description: null
diff --git a/spec/rtems/task/if/set-scheduler.yml b/spec/rtems/task/if/set-scheduler.yml
index 478285ea..1de8dbbc 100644
--- a/spec/rtems/task/if/set-scheduler.yml
+++ b/spec/rtems/task/if/set-scheduler.yml
@@ -10,7 +10,7 @@ definition:
     params:
     - ${../../type/if/id:/name} ${.:/params[0]/name}
     - ${../../type/if/id:/name} ${.:/params[1]/name}
-    - ${priority:/name} ${.:/params[2]/name}
+    - ${../../type/if/priority:/name} ${.:/params[2]/name}
     return: ${../../status/if/code:/name}
   variants: []
 description: null
diff --git a/spec/rtems/timer/if/initiate-server.yml b/spec/rtems/timer/if/initiate-server.yml
index 82d95169..5cf5ede3 100644
--- a/spec/rtems/timer/if/initiate-server.yml
+++ b/spec/rtems/timer/if/initiate-server.yml
@@ -9,7 +9,7 @@ definition:
     attributes: null
     body: null
     params:
-    - ${../../task/if/priority:/name} ${.:/params[0]/name}
+    - ${../../type/if/priority:/name} ${.:/params[0]/name}
     - ${/c/if/size_t:/name} ${.:/params[1]/name}
     - ${../../attr/if/attribute:/name} ${.:/params[2]/name}
     return: ${../../status/if/code:/name}
diff --git a/spec/rtems/timer/if/server-default-priority.yml b/spec/rtems/timer/if/server-default-priority.yml
index 3631f4a4..aebf4993 100644
--- a/spec/rtems/timer/if/server-default-priority.yml
+++ b/spec/rtems/timer/if/server-default-priority.yml
@@ -6,7 +6,7 @@ copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 - Copyright (C) 1988, 2008 On-Line Applications Research Corporation (OAR)
 definition:
-  default: ( (${../../task/if/priority:/name}) -1 )
+  default: ( (${../../type/if/priority:/name}) -1 )
   variants: []
 description: |
   When given this priority, a special high priority not accessible via the
diff --git a/spec/rtems/type/if/priority.yml b/spec/rtems/type/if/priority.yml
new file mode 100644
index 00000000..72d8c71b
--- /dev/null
+++ b/spec/rtems/type/if/priority.yml
@@ -0,0 +1,21 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+brief: |
+  This integer type represents task priorities of the Classic API.
+copyrights:
+- Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
+- Copyright (C) 1988, 2017 On-Line Applications Research Corporation (OAR)
+definition:
+  default: ${/c/if/uint32_t:/name} ${.:/name}
+  variants: []
+description: null
+enabled-by: true
+index-entries: []
+interface-type: typedef
+links:
+- role: interface-placement
+  uid: header
+- role: interface-ingroup
+  uid: group
+name: rtems_task_priority
+notes: null
+type: interface
diff --git a/spec/score/if/maximum-priority.yml b/spec/score/if/maximum-priority.yml
index ec10b3b6..45840f68 100644
--- a/spec/score/if/maximum-priority.yml
+++ b/spec/score/if/maximum-priority.yml
@@ -8,7 +8,7 @@ definition:
     attributes: null
     body: null
     params: []
-    return: ${/rtems/task/if/priority:/name}
+    return: ${/rtems/type/if/priority:/name}
   variants: []
 description: null
 enabled-by: true
-- 
cgit v1.2.3