spec: Use GRLIB definition of GRSPW2

Update #4842.

3 files changed, 786 insertions, 98 deletions

diff --git a/spec/dev/grlib/if/grspw2-dma.yml b/spec/dev/grlib/if/grspw2-dma.yml
new file mode 100644
index 00000000..49a6c188
--- /dev/null
+++ b/spec/dev/grlib/if/grspw2-dma.yml
@@ -0,0 +1,293 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+brief: |
+  This structure defines the ${.:/register-block-group} register block memory
+  map.
+copyrights:
+- Copyright (C) 2021 embedded brains GmbH & Co. KG
+description: null
+enabled-by: true
+identifier: RTEMSDeviceGRSPW2DMA
+index-entries: []
+interface-type: register-block
+links:
+- role: interface-ingroup
+  uid: grspw2
+- role: interface-placement
+  uid: grspw2-header
+definition:
+- default:
+    count: 1
+    name: DMACTRL
+  offset: 0x0
+  variants: []
+- default:
+    count: 1
+    name: DMAMAXLEN
+  offset: 0x4
+  variants: []
+- default:
+    count: 1
+    name: DMATXDESC
+  offset: 0x8
+  variants: []
+- default:
+    count: 1
+    name: DMARXDESC
+  offset: 0xc
+  variants: []
+- default:
+    count: 1
+    name: DMAADDR
+  offset: 0x10
+  variants: []
+register-prefix: grspw2
+register-block-group: GRSPW2 DMA
+register-block-size: 32
+registers:
+- bits:
+  - default:
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'INTNUM'
+      start: 26
+      width: 6
+    - properties: [r]
+      brief: null
+      description: null
+      name: 'RES'
+      start: 24
+      width: 2
+    - properties: [r, w1c]
+      brief: null
+      description: null
+      name: 'EP'
+      start: 23
+      width: 1
+    - properties: [r, w1c]
+      brief: null
+      description: null
+      name: 'TR'
+      start: 22
+      width: 1
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'IE'
+      start: 21
+      width: 1
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'IT'
+      start: 20
+      width: 1
+    - properties: [r, w1c]
+      brief: null
+      description: null
+      name: 'RP'
+      start: 19
+      width: 1
+    - properties: [r, w1c]
+      brief: null
+      description: null
+      name: 'TP'
+      start: 18
+      width: 1
+    - properties: [r, w1c]
+      brief: null
+      description: null
+      name: 'TL'
+      start: 17
+      width: 1
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'LE'
+      start: 16
+      width: 1
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'SP'
+      start: 15
+      width: 1
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'SA'
+      start: 14
+      width: 1
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'EN'
+      start: 13
+      width: 1
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'NS'
+      start: 12
+      width: 1
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'RD'
+      start: 11
+      width: 1
+    - properties: [r]
+      brief: null
+      description: null
+      name: 'RX'
+      start: 10
+      width: 1
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'AT'
+      start: 9
+      width: 1
+    - properties: [r, w1c]
+      brief: null
+      description: null
+      name: 'RA'
+      start: 8
+      width: 1
+    - properties: [r, w1c]
+      brief: null
+      description: null
+      name: 'TA'
+      start: 7
+      width: 1
+    - properties: [r, w1c]
+      brief: null
+      description: null
+      name: 'PR'
+      start: 6
+      width: 1
+    - properties: [r, w1c]
+      brief: null
+      description: null
+      name: 'PS'
+      start: 5
+      width: 1
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'AI'
+      start: 4
+      width: 1
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'RI'
+      start: 3
+      width: 1
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'TI'
+      start: 2
+      width: 1
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'RE'
+      start: 1
+      width: 1
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'TE'
+      start: 0
+      width: 1
+    variants: []
+  brief: |
+    DMA control/status
+  description: null
+  name: DMACTRL
+  width: 32
+- bits:
+  - default:
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'RXMAXLEN'
+      start: 2
+      width: 23
+    - properties: [r]
+      brief: null
+      description: null
+      name: 'RES'
+      start: 0
+      width: 2
+    variants: []
+  brief: |
+    DMA RX maximum length
+  description: null
+  name: DMAMAXLEN
+  width: 32
+- bits:
+  - default:
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'DESCBASEADDR'
+      start: 0
+      width: 32
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'DESCSEL'
+      start: 4
+      width: 28
+    variants: []
+  brief: |
+    DMA transmit descriptor table address
+  description: null
+  name: DMATXDESC
+  width: 32
+- bits:
+  - default:
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'DESCBASEADDR'
+      start: 10
+      width: 22
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'DESCSEL'
+      start: 3
+      width: 7
+    variants: []
+  brief: |
+    DMA receive descriptor table address
+  description: null
+  name: DMARXDESC
+  width: 32
+- bits:
+  - default:
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'MASK'
+      start: 8
+      width: 8
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'ADDR'
+      start: 0
+      width: 8
+    variants: []
+  brief: |
+    DMA address
+  description: null
+  name: DMAADDR
+  width: 32
+name: grspw2_dma
+notes: null
+type: interface
diff --git a/spec/dev/grlib/if/grspw2-header.yml b/spec/dev/grlib/if/grspw2-header.yml
index a26e39a7..ae4d1df9 100644
--- a/spec/dev/grlib/if/grspw2-header.yml
+++ b/spec/dev/grlib/if/grspw2-header.yml
@@ -2,7 +2,7 @@ SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 brief: |
   This header file defines the GRSPW2 register block interface.
 copyrights:
-- Copyright (C) 2021 embedded brains GmbH & Co. KG
+- Copyright (C) 2021, 2023 embedded brains GmbH & Co. KG
 enabled-by: true
 index-entries: []
 interface-type: header-file
diff --git a/spec/dev/grlib/if/grspw2.yml b/spec/dev/grlib/if/grspw2.yml
index a9e772a6..aece247a 100644
--- a/spec/dev/grlib/if/grspw2.yml
+++ b/spec/dev/grlib/if/grspw2.yml
@@ -3,7 +3,7 @@ brief: |
   This structure defines the ${.:/register-block-group} register block memory
   map.
 copyrights:
-- Copyright (C) 2021 embedded brains GmbH & Co. KG
+- Copyright (C) 2021, 2023 embedded brains GmbH & Co. KG
 description: null
 enabled-by: true
 identifier: RTEMSDeviceGRSPW2
@@ -14,6 +14,9 @@ links:
   uid: group
 - role: interface-placement
   uid: grspw2-header
+- name: DMA
+  role: register-block-include
+  uid: grspw2-dma
 definition:
 - default:
     count: 1
@@ -46,33 +49,113 @@ definition:
   offset: 0x14
   variants: []
 - default:
-    count: 1
-    name: DMACTRL
+    count: 4
+    name: DMA
   offset: 0x20
   variants: []
 - default:
     count: 1
-    name: DMAMAXLEN
-  offset: 0x24
+    name: INTCTRL
+  offset: 0xa0
+  variants: []
+- default:
+    count: 1
+    name: INTRX
+  offset: 0xa4
+  variants: []
+- default:
+    count: 1
+    name: INTTO
+  offset: 0xac
+  variants: []
+- default:
+    count: 1
+    name: INTTOEXT
+  offset: 0xb0
+  variants: []
+- default:
+    count: 1
+    name: TICKMASK
+  offset: 0xb4
+  variants: []
+- default:
+    count: 1
+    name: AUTOACK_TICKMASKEXT
+  offset: 0xb8
+  variants: []
+- default:
+    count: 1
+    name: INTCFG
+  offset: 0xbc
+  variants: []
+- default:
+    count: 1
+    name: ISR
+  offset: 0xc4
+  variants: []
+- default:
+    count: 1
+    name: ISREXT
+  offset: 0xc8
+  variants: []
+- default:
+    count: 1
+    name: PRESCALER
+  offset: 0xd0
+  variants: []
+- default:
+    count: 1
+    name: ISRTIMER
+  offset: 0xd4
+  variants: []
+- default:
+    count: 1
+    name: IATIMER
+  offset: 0xd8
+  variants: []
+- default:
+    count: 1
+    name: ICTIMER
+  offset: 0xdc
+  variants: []
+- default:
+    count: 1
+    name: PNPVEND
+  offset: 0xe0
+  variants: []
+- default:
+    count: 1
+    name: PNPOA0
+  offset: 0xe8
+  variants: []
+- default:
+    count: 1
+    name: PNPOA1
+  offset: 0xec
+  variants: []
+- default:
+    count: 1
+    name: PNPOA2
+  offset: 0xf0
   variants: []
 - default:
     count: 1
-    name: DMATXDESC
-  offset: 0x28
+    name: PNPDEVID
+  offset: 0xf4
   variants: []
 - default:
     count: 1
-    name: DMARXDESC
-  offset: 0x2c
+    name: PNPUVEND
+  offset: 0xf8
   variants: []
 - default:
     count: 1
-    name: DMAADDR
-  offset: 0x30
+    name: PNPUSN
+  offset: 0xfc
   variants: []
 register-prefix: null
 register-block-group: GRSPW2
-register-block-size: 52
+register-block-size: 256
 registers:
 - bits:
   - default:
@@ -106,6 +189,48 @@ registers:
       name: 'PO'
       start: 26
       width: 1
+    - properties: [r]
+      brief: null
+      description: null
+      name: 'CC'
+      start: 25
+      width: 1
+    - properties: [r]
+      brief: null
+      description: null
+      name: 'ID'
+      start: 24
+      width: 1
+    - properties: [r]
+      brief: null
+      description: null
+      name: 'R'
+      start: 23
+      width: 1
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'LE'
+      start: 22
+      width: 1
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'PS'
+      start: 21
+      width: 1
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'NP'
+      start: 20
+      width: 1
+    - properties: [r]
+      brief: null
+      description: null
+      name: 'PNPA'
+      start: 18
+      width: 2
     - properties: [r, w]
       brief: null
       description: null
@@ -121,6 +246,18 @@ registers:
     - properties: [r, w]
       brief: null
       description: null
+      name: 'PE'
+      start: 15
+      width: 1
+    - properties: [r]
+      brief: null
+      description: null
+      name: 'R'
+      start: 14
+      width: 1
+    - properties: [r, w]
+      brief: null
+      description: null
       name: 'TL'
       start: 13
       width: 1
@@ -154,6 +291,12 @@ registers:
       name: 'TQ'
       start: 8
       width: 1
+    - properties: [r]
+      brief: null
+      description: null
+      name: 'R'
+      start: 7
+      width: 1
     - properties: [r, w]
       brief: null
       description: null
@@ -214,14 +357,20 @@ registers:
       brief: null
       description: null
       name: 'NTXD'
-      start: 24
-      width: 2
+      start: 25
+      width: 1
     - properties: [r]
       brief: null
       description: null
       name: 'LS'
       start: 21
       width: 3
+    - properties: [r]
+      brief: null
+      description: null
+      name: 'AP'
+      start: 9
+      width: 1
     - properties: [r, w1c]
       brief: null
       description: null
@@ -234,6 +383,12 @@ registers:
       name: 'IA'
       start: 7
       width: 1
+    - properties: [r]
+      brief: null
+      description: null
+      name: 'RES'
+      start: 5
+      width: 2
     - properties: [r, w1c]
       brief: null
       description: null
@@ -312,7 +467,7 @@ registers:
   width: 32
 - bits:
   - default:
-    - properties: [r]
+    - properties: [r, w]
       brief: null
       description: null
       name: 'DESTKEY'
@@ -346,217 +501,457 @@ registers:
   width: 32
 - bits:
   - default:
-    - properties: [r, w1c]
+    - properties: [r, w]
       brief: null
       description: null
-      name: 'EP'
-      start: 23
-      width: 1
-    - properties: [r, w1c]
+      name: 'INTNUM'
+      start: 26
+      width: 6
+    - properties: [r, w]
       brief: null
       description: null
-      name: 'TR'
-      start: 22
+      name: 'RS'
+      start: 25
       width: 1
-    - properties: [r, w1c]
+    - properties: [r, w]
       brief: null
       description: null
-      name: 'RP'
-      start: 19
+      name: 'EE'
+      start: 24
       width: 1
-    - properties: [r, w1c]
+    - properties: [r, w]
       brief: null
       description: null
-      name: 'TP'
-      start: 18
+      name: 'IA'
+      start: 23
       width: 1
-    - properties: [r, w1c]
+    - properties: [r]
       brief: null
       description: null
-      name: 'TL'
-      start: 17
+      name: 'RES'
+      start: 1
       width: 1
     - properties: [r, w]
       brief: null
       description: null
-      name: 'LE'
-      start: 16
-      width: 1
+      name: 'TQ'
+      start: 21
+      width: 2
     - properties: [r, w]
       brief: null
       description: null
-      name: 'SP'
-      start: 15
+      name: 'AQ'
+      start: 20
       width: 1
     - properties: [r, w]
       brief: null
       description: null
-      name: 'SA'
-      start: 14
+      name: 'IQ'
+      start: 19
       width: 1
-    - properties: [r, w]
+    - properties: [r]
       brief: null
       description: null
-      name: 'EN'
-      start: 13
+      name: 'RES'
+      start: 18
       width: 1
     - properties: [r, w]
       brief: null
       description: null
-      name: 'NS'
-      start: 12
-      width: 1
+      name: 'AA'
+      start: 16
+      width: 2
     - properties: [r, w]
       brief: null
       description: null
-      name: 'RD'
-      start: 11
+      name: 'AT'
+      start: 15
       width: 1
-    - properties: [r]
+    - properties: [r, w]
       brief: null
       description: null
-      name: 'RX'
-      start: 10
+      name: 'IT'
+      start: 14
       width: 1
-    - properties: [r, w]
+    - properties: [r]
       brief: null
       description: null
-      name: 'AT'
-      start: 9
+      name: 'RES'
+      start: 13
       width: 1
     - properties: [r, w1c]
       brief: null
       description: null
-      name: 'RA'
+      name: 'ID'
       start: 8
-      width: 1
-    - properties: [r, w1c]
+      width: 5
+    - properties: [r, w]
       brief: null
       description: null
-      name: 'TA'
+      name: 'II'
       start: 7
       width: 1
-    - properties: [r, w1c]
+    - properties: [r, w]
       brief: null
       description: null
-      name: 'PR'
+      name: 'TXINT'
       start: 6
       width: 1
+    variants: []
+  brief: |
+    Interrupt distribution control
+  description: null
+  name: INTCTRL
+  width: 32
+- bits:
+  - default:
     - properties: [r, w1c]
       brief: null
       description: null
-      name: 'PS'
-      start: 5
-      width: 1
+      name: 'RXIRQ'
+      start: 0
+      width: 32
+    variants: []
+  brief: |
+    Interrupt-code receive
+  description: null
+  name: INTRX
+  width: 32
+- bits:
+  - default:
+    - properties: [r, w1c]
+      brief: null
+      description: null
+      name: 'INTTO'
+      start: 0
+      width: 32
+    variants: []
+  brief: |
+    Interrupt timeout
+  description: null
+  name: INTTO
+  width: 32
+- bits:
+  - default:
+    - properties: [r, w1c]
+      brief: null
+      description: null
+      name: 'INTTOEXT'
+      start: 0
+      width: 32
+    variants: []
+  brief: |
+    Interrupt timeout extended
+  description: null
+  name: INTTOEXT
+  width: 32
+- bits:
+  - default:
     - properties: [r, w]
       brief: null
       description: null
-      name: 'AI'
+      name: 'MASK'
+      start: 0
+      width: 32
+    variants: []
+  brief: |
+    Interrupt tick-out mask
+  description: null
+  name: TICKMASK
+  width: 32
+- bits:
+  - default:
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'AAMASK'
+      start: 0
+      width: 32
+    variants: []
+  brief: |
+     Interrupt-code auto acknowledge mask / interrupt tick-out mask extended
+  description: null
+  name: AUTOACK_TICKMASKEXT
+  width: 32
+- bits:
+  - default:
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'INTNUM3'
+      start: 26
+      width: 6
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'INTNUM2'
+      start: 20
+      width: 6
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'INTNUM1'
+      start: 14
+      width: 6
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'INTNUM0'
+      start: 8
+      width: 6
+    - properties: [r]
+      brief: null
+      description: null
+      name: 'NUMINT'
       start: 4
-      width: 1
+      width: 4
     - properties: [r, w]
       brief: null
       description: null
-      name: 'RI'
+      name: 'PR'
       start: 3
       width: 1
     - properties: [r, w]
       brief: null
       description: null
-      name: 'TI'
+      name: 'IR'
       start: 2
       width: 1
     - properties: [r, w]
       brief: null
       description: null
-      name: 'RE'
+      name: 'IT'
       start: 1
       width: 1
     - properties: [r, w]
       brief: null
       description: null
-      name: 'TE'
+      name: 'EE'
       start: 0
       width: 1
     variants: []
   brief: |
-    DMA control/status, channel 1
+    Interrupt distribution configuration
+  description: null
+  name: INTCFG
+  width: 32
+- bits:
+  - default:
+    - properties: [r, w1c]
+      brief: null
+      description: null
+      name: 'ISR'
+      start: 0
+      width: 32
+    variants: []
+  brief: |
+    Interrupt distribution ISR
+  description: null
+  name: ISR
+  width: 32
+- bits:
+  - default:
+    - properties: [r, w1c]
+      brief: null
+      description: null
+      name: 'ISR'
+      start: 0
+      width: 32
+    variants: []
+  brief: |
+    Interrupt distribution ISR extended
   description: null
-  name: DMACTRL
+  name: ISREXT
   width: 32
 - bits:
   - default:
+    - properties: [r]
+      brief: null
+      description: null
+      name: 'R'
+      start: 31
+      width: 1
     - properties: [r, w]
       brief: null
       description: null
-      name: 'RXMAXLEN'
-      start: 2
-      width: 23
+      name: 'RL'
+      start: 0
+      width: 31
     variants: []
   brief: |
-    DMA RX maximum length, channel 1
+    Interrupt distribution prescaler reload
   description: null
-  name: DMAMAXLEN
+  name: PRESCALER
   width: 32
 - bits:
   - default:
     - properties: [r, w]
       brief: null
       description: null
-      name: 'DESCBASEADDR'
-      start: 10
-      width: 22
+      name: 'EN'
+      start: 31
+      width: 1
     - properties: [r, w]
       brief: null
       description: null
-      name: 'DESCSEL'
-      start: 4
-      width: 6
+      name: 'RL'
+      start: 0
+      width: 31
     variants: []
   brief: |
-    DMA transmitter descriptor table address, channel 1
+    Interrupt distribution ISR timer reload
   description: null
-  name: DMATXDESC
+  name: ISRTIMER
   width: 32
 - bits:
   - default:
     - properties: [r, w]
       brief: null
       description: null
-      name: 'DESCBASEADDR'
-      start: 10
-      width: 22
+      name: 'EN'
+      start: 31
+      width: 1
     - properties: [r, w]
       brief: null
       description: null
-      name: 'DESCSEL'
-      start: 3
-      width: 7
+      name: 'RL'
+      start: 0
+      width: 31
     variants: []
   brief: |
-    DMA receiver descriptor table address, channel 1
+    Interrupt distribution INT / ACK timer reload
   description: null
-  name: DMARXDESC
+  name: IATIMER
   width: 32
 - bits:
   - default:
     - properties: [r, w]
       brief: null
       description: null
-      name: 'MASK'
-      start: 8
-      width: 8
+      name: 'EN'
+      start: 31
+      width: 1
     - properties: [r, w]
       brief: null
       description: null
-      name: 'ADDR'
+      name: 'RL'
       start: 0
-      width: 8
+      width: 31
+    variants: []
+  brief: |
+    Interrupt distribution change timer reload
+  description: null
+  name: ICTIMER
+  width: 32
+- bits:
+  - default:
+    - properties: [r]
+      brief: null
+      description: null
+      name: 'VEND'
+      start: 16
+      width: 16
+    - properties: [r]
+      brief: null
+      description: null
+      name: 'PROD'
+      start: 0
+      width: 16
+    variants: []
+  brief: |
+    SpaceWire Plug-and-Play - Device Vendor and Product ID
+  description: null
+  name: PNPVEND
+  width: 32
+- bits:
+  - default:
+    - properties: [r]
+      brief: null
+      description: null
+      name: 'RA'
+      start: 0
+      width: 32
+    variants: []
+  brief: |
+    SpaceWire Plug-and-Play - Owner Address 0
+  description: null
+  name: PNPOA0
+  width: 32
+- bits:
+  - default:
+    - properties: [r]
+      brief: null
+      description: null
+      name: 'RA'
+      start: 0
+      width: 32
+    variants: []
+  brief: |
+    SpaceWire Plug-and-Play - Owner Address 1
+  description: null
+  name: PNPOA1
+  width: 32
+- bits:
+  - default:
+    - properties: [r]
+      brief: null
+      description: null
+      name: 'RA'
+      start: 0
+      width: 32
+    variants: []
+  brief: |
+    SpaceWire Plug-and-Play - Owner Address 2
+  description: null
+  name: PNPOA2
+  width: 32
+- bits:
+  - default:
+    - properties: [r]
+      brief: null
+      description: null
+      name: 'DID'
+      start: 0
+      width: 32
+    variants: []
+  brief: |
+    SpaceWire Plug-and-Play - Device ID
+  description: null
+  name: PNPDEVID
+  width: 32
+- bits:
+  - default:
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'VEND'
+      start: 16
+      width: 16
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'PROD'
+      start: 0
+      width: 16
+    variants: []
+  brief: |
+    SpaceWire Plug-and-Play - Unit Vendor and Product ID
+  description: null
+  name: PNPUVEND
+  width: 32
+- bits:
+  - default:
+    - properties: [r, w]
+      brief: null
+      description: null
+      name: 'USN'
+      start: 0
+      width: 32
     variants: []
   brief: |
-    DMA address, channel 1
+    SpaceWire Plug-and-Play - Unit Serial Number
   description: null
-  name: DMAADDR
+  name: PNPUSN
   width: 32
 name: grspw2
 notes: null