chiptool fmt.

2023-09-15 23:00:25 +02:00 · 2023-09-15 23:00:25 +02:00 · 86fb0cfc2f
commit 86fb0cfc2f
parent 9b5d631059
222 changed files with 121632 additions and 121853 deletions
--- a/data/registers/adc_f1.yaml
+++ b/data/registers/adc_f1.yaml
@ -1,400 +1,399 @@
---
 block/ADC:
  description: Analog-to-digital converter
  items:
-    - name: SR
-      description: status register
-      byte_offset: 0
-      fieldset: SR
-    - name: CR1
-      description: control register 1
-      byte_offset: 4
-      fieldset: CR1
-    - name: CR2
-      description: control register 2
-      byte_offset: 8
-      fieldset: CR2
-    - name: SMPR1
-      description: sample time register 1
-      byte_offset: 12
-      fieldset: SMPR1
-    - name: SMPR2
-      description: sample time register 2
-      byte_offset: 16
-      fieldset: SMPR2
-    - name: JOFR
-      description: injected channel data offset register x
-      array:
-        len: 4
-        stride: 4
-      byte_offset: 20
-      fieldset: JOFR
-    - name: HTR
-      description: watchdog higher threshold register
-      byte_offset: 36
-      fieldset: HTR
-    - name: LTR
-      description: watchdog lower threshold register
-      byte_offset: 40
-      fieldset: LTR
-    - name: SQR1
-      description: regular sequence register 1
-      byte_offset: 44
-      fieldset: SQR1
-    - name: SQR2
-      description: regular sequence register 2
-      byte_offset: 48
-      fieldset: SQR2
-    - name: SQR3
-      description: regular sequence register 3
-      byte_offset: 52
-      fieldset: SQR3
-    - name: JSQR
-      description: injected sequence register
-      byte_offset: 56
-      fieldset: JSQR
-    - name: JDR
-      description: injected data register x
-      array:
-        len: 4
-        stride: 4
-      byte_offset: 60
-      access: Read
-      fieldset: JDR
-    - name: DR
-      description: regular data register
-      byte_offset: 76
-      access: Read
-      fieldset: DR
+  - name: SR
+    description: status register
+    byte_offset: 0
+    fieldset: SR
+  - name: CR1
+    description: control register 1
+    byte_offset: 4
+    fieldset: CR1
+  - name: CR2
+    description: control register 2
+    byte_offset: 8
+    fieldset: CR2
+  - name: SMPR1
+    description: sample time register 1
+    byte_offset: 12
+    fieldset: SMPR1
+  - name: SMPR2
+    description: sample time register 2
+    byte_offset: 16
+    fieldset: SMPR2
+  - name: JOFR
+    description: injected channel data offset register x
+    array:
+      len: 4
+      stride: 4
+    byte_offset: 20
+    fieldset: JOFR
+  - name: HTR
+    description: watchdog higher threshold register
+    byte_offset: 36
+    fieldset: HTR
+  - name: LTR
+    description: watchdog lower threshold register
+    byte_offset: 40
+    fieldset: LTR
+  - name: SQR1
+    description: regular sequence register 1
+    byte_offset: 44
+    fieldset: SQR1
+  - name: SQR2
+    description: regular sequence register 2
+    byte_offset: 48
+    fieldset: SQR2
+  - name: SQR3
+    description: regular sequence register 3
+    byte_offset: 52
+    fieldset: SQR3
+  - name: JSQR
+    description: injected sequence register
+    byte_offset: 56
+    fieldset: JSQR
+  - name: JDR
+    description: injected data register x
+    array:
+      len: 4
+      stride: 4
+    byte_offset: 60
+    access: Read
+    fieldset: JDR
+  - name: DR
+    description: regular data register
+    byte_offset: 76
+    access: Read
+    fieldset: DR
 fieldset/CR1:
  description: control register 1
  fields:
-    - name: AWDCH
-      description: Analog watchdog channel select bits
-      bit_offset: 0
-      bit_size: 5
-    - name: EOCIE
-      description: Interrupt enable for EOC
-      bit_offset: 5
-      bit_size: 1
-    - name: AWDIE
-      description: Analog watchdog interrupt enable
-      bit_offset: 6
-      bit_size: 1
-    - name: JEOCIE
-      description: Interrupt enable for injected channels
-      bit_offset: 7
-      bit_size: 1
-    - name: SCAN
-      description: Scan mode
-      bit_offset: 8
-      bit_size: 1
-    - name: AWDSGL
-      description: Enable the watchdog on a single channel in scan mode
-      bit_offset: 9
-      bit_size: 1
-    - name: JAUTO
-      description: Automatic injected group conversion
-      bit_offset: 10
-      bit_size: 1
-    - name: DISCEN
-      description: Discontinuous mode on regular channels
-      bit_offset: 11
-      bit_size: 1
-    - name: JDISCEN
-      description: Discontinuous mode on injected channels
-      bit_offset: 12
-      bit_size: 1
-    - name: DISCNUM
-      description: Discontinuous mode channel count
-      bit_offset: 13
-      bit_size: 3
-    - name: DUALMOD
-      description: Dual mode selection
-      bit_offset: 16
-      bit_size: 4
-      enum: DUALMOD
-    - name: JAWDEN
-      description: Analog watchdog enable on injected channels
-      bit_offset: 22
-      bit_size: 1
-    - name: AWDEN
-      description: Analog watchdog enable on regular channels
-      bit_offset: 23
-      bit_size: 1
+  - name: AWDCH
+    description: Analog watchdog channel select bits
+    bit_offset: 0
+    bit_size: 5
+  - name: EOCIE
+    description: Interrupt enable for EOC
+    bit_offset: 5
+    bit_size: 1
+  - name: AWDIE
+    description: Analog watchdog interrupt enable
+    bit_offset: 6
+    bit_size: 1
+  - name: JEOCIE
+    description: Interrupt enable for injected channels
+    bit_offset: 7
+    bit_size: 1
+  - name: SCAN
+    description: Scan mode
+    bit_offset: 8
+    bit_size: 1
+  - name: AWDSGL
+    description: Enable the watchdog on a single channel in scan mode
+    bit_offset: 9
+    bit_size: 1
+  - name: JAUTO
+    description: Automatic injected group conversion
+    bit_offset: 10
+    bit_size: 1
+  - name: DISCEN
+    description: Discontinuous mode on regular channels
+    bit_offset: 11
+    bit_size: 1
+  - name: JDISCEN
+    description: Discontinuous mode on injected channels
+    bit_offset: 12
+    bit_size: 1
+  - name: DISCNUM
+    description: Discontinuous mode channel count
+    bit_offset: 13
+    bit_size: 3
+  - name: DUALMOD
+    description: Dual mode selection
+    bit_offset: 16
+    bit_size: 4
+    enum: DUALMOD
+  - name: JAWDEN
+    description: Analog watchdog enable on injected channels
+    bit_offset: 22
+    bit_size: 1
+  - name: AWDEN
+    description: Analog watchdog enable on regular channels
+    bit_offset: 23
+    bit_size: 1
 fieldset/CR2:
  description: control register 2
  fields:
-    - name: ADON
-      description: A/D Converter ON / OFF
-      bit_offset: 0
-      bit_size: 1
-    - name: CONT
-      description: Continuous conversion
-      bit_offset: 1
-      bit_size: 1
-    - name: CAL
-      description: A/D Calibration
-      bit_offset: 2
-      bit_size: 1
-    - name: RSTCAL
-      description: Reset calibration
-      bit_offset: 3
-      bit_size: 1
-    - name: DMA
-      description: Direct memory access mode (for single ADC mode)
-      bit_offset: 8
-      bit_size: 1
-    - name: ALIGN
-      description: Data alignment
-      bit_offset: 11
-      bit_size: 1
-    - name: JEXTSEL
-      description: External event select for injected group
-      bit_offset: 12
-      bit_size: 3
-      enum: EXTSEL
-    - name: JEXTTRIG
-      description: External trigger conversion mode for injected channels
-      bit_offset: 15
-      bit_size: 1
-    - name: EXTSEL
-      description: External event select for regular group
-      bit_offset: 17
-      bit_size: 3
-      enum: EXTSEL
-    - name: EXTTRIG
-      description: External trigger conversion mode for regular channels
-      bit_offset: 20
-      bit_size: 1
-    - name: JSWSTART
-      description: Start conversion of injected channels
-      bit_offset: 21
-      bit_size: 1
-    - name: SWSTART
-      description: Start conversion of regular channels
-      bit_offset: 22
-      bit_size: 1
-    - name: TSVREFE
-      description: Temperature sensor and VREFINT enable
-      bit_offset: 23
-      bit_size: 1
+  - name: ADON
+    description: A/D Converter ON / OFF
+    bit_offset: 0
+    bit_size: 1
+  - name: CONT
+    description: Continuous conversion
+    bit_offset: 1
+    bit_size: 1
+  - name: CAL
+    description: A/D Calibration
+    bit_offset: 2
+    bit_size: 1
+  - name: RSTCAL
+    description: Reset calibration
+    bit_offset: 3
+    bit_size: 1
+  - name: DMA
+    description: Direct memory access mode (for single ADC mode)
+    bit_offset: 8
+    bit_size: 1
+  - name: ALIGN
+    description: Data alignment
+    bit_offset: 11
+    bit_size: 1
+  - name: JEXTSEL
+    description: External event select for injected group
+    bit_offset: 12
+    bit_size: 3
+    enum: EXTSEL
+  - name: JEXTTRIG
+    description: External trigger conversion mode for injected channels
+    bit_offset: 15
+    bit_size: 1
+  - name: EXTSEL
+    description: External event select for regular group
+    bit_offset: 17
+    bit_size: 3
+    enum: EXTSEL
+  - name: EXTTRIG
+    description: External trigger conversion mode for regular channels
+    bit_offset: 20
+    bit_size: 1
+  - name: JSWSTART
+    description: Start conversion of injected channels
+    bit_offset: 21
+    bit_size: 1
+  - name: SWSTART
+    description: Start conversion of regular channels
+    bit_offset: 22
+    bit_size: 1
+  - name: TSVREFE
+    description: Temperature sensor and VREFINT enable
+    bit_offset: 23
+    bit_size: 1
 fieldset/DR:
  description: regular data register
  fields:
-    - name: DATA
-      description: Regular data
-      bit_offset: 0
-      bit_size: 16
-    - name: ADC2DATA
-      description: ADC2 data
-      bit_offset: 16
-      bit_size: 16
+  - name: DATA
+    description: Regular data
+    bit_offset: 0
+    bit_size: 16
+  - name: ADC2DATA
+    description: ADC2 data
+    bit_offset: 16
+    bit_size: 16
 fieldset/HTR:
  description: watchdog higher threshold register
  fields:
-    - name: HT
-      description: Analog watchdog higher threshold
-      bit_offset: 0
-      bit_size: 12
+  - name: HT
+    description: Analog watchdog higher threshold
+    bit_offset: 0
+    bit_size: 12
 fieldset/JDR:
  description: injected data register x
  fields:
-    - name: JDATA
-      description: Injected data
-      bit_offset: 0
-      bit_size: 16
+  - name: JDATA
+    description: Injected data
+    bit_offset: 0
+    bit_size: 16
 fieldset/JOFR:
  description: injected channel data offset register x
  fields:
-    - name: JOFFSET
-      description: Data offset for injected channel x
-      bit_offset: 0
-      bit_size: 12
+  - name: JOFFSET
+    description: Data offset for injected channel x
+    bit_offset: 0
+    bit_size: 12
 fieldset/JSQR:
  description: injected sequence register
  fields:
-    - name: JSQ
-      description: 1st conversion in injected sequence
-      bit_offset: 0
-      bit_size: 5
-      array:
-        len: 4
-        stride: 5
-    - name: JL
-      description: Injected sequence length
-      bit_offset: 20
-      bit_size: 2
+  - name: JSQ
+    description: 1st conversion in injected sequence
+    bit_offset: 0
+    bit_size: 5
+    array:
+      len: 4
+      stride: 5
+  - name: JL
+    description: Injected sequence length
+    bit_offset: 20
+    bit_size: 2
 fieldset/LTR:
  description: watchdog lower threshold register
  fields:
-    - name: LT
-      description: Analog watchdog lower threshold
-      bit_offset: 0
-      bit_size: 12
+  - name: LT
+    description: Analog watchdog lower threshold
+    bit_offset: 0
+    bit_size: 12
 fieldset/SMPR1:
  description: sample time register 1
  fields:
-    - name: SMP
-      description: Channel x sample time selection
-      bit_offset: 0
-      bit_size: 3
-      array:
-        len: 8
-        stride: 3
-      enum: SAMPLE_TIME
+  - name: SMP
+    description: Channel x sample time selection
+    bit_offset: 0
+    bit_size: 3
+    array:
+      len: 8
+      stride: 3
+    enum: SAMPLE_TIME
 fieldset/SMPR2:
  description: sample time register 2
  fields:
-    - name: SMP
-      description: Channel 0 sampling time selection
-      bit_offset: 0
-      bit_size: 3
-      array:
-        len: 10
-        stride: 3
-      enum: SAMPLE_TIME
+  - name: SMP
+    description: Channel 0 sampling time selection
+    bit_offset: 0
+    bit_size: 3
+    array:
+      len: 10
+      stride: 3
+    enum: SAMPLE_TIME
 fieldset/SQR1:
  description: regular sequence register 1
  fields:
-    - name: SQ
-      description: 13th to 16th conversion in regular sequence
-      bit_offset: 0
-      bit_size: 5
-      array:
-        len: 4
-        stride: 5
-    - name: L
-      description: Regular channel sequence length
-      bit_offset: 20
-      bit_size: 4
+  - name: SQ
+    description: 13th to 16th conversion in regular sequence
+    bit_offset: 0
+    bit_size: 5
+    array:
+      len: 4
+      stride: 5
+  - name: L
+    description: Regular channel sequence length
+    bit_offset: 20
+    bit_size: 4
 fieldset/SQR2:
  description: regular sequence register 2
  fields:
-    - name: SQ
-      description: 7th to 12th conversion in regular sequence
-      bit_offset: 0
-      bit_size: 5
-      array:
-        len: 6
-        stride: 5
+  - name: SQ
+    description: 7th to 12th conversion in regular sequence
+    bit_offset: 0
+    bit_size: 5
+    array:
+      len: 6
+      stride: 5
 fieldset/SQR3:
  description: regular sequence register 3
  fields:
-    - name: SQ
-      description: 1st to 6th conversion in regular sequence
-      bit_offset: 0
-      bit_size: 5
-      array:
-        len: 6
-        stride: 5
+  - name: SQ
+    description: 1st to 6th conversion in regular sequence
+    bit_offset: 0
+    bit_size: 5
+    array:
+      len: 6
+      stride: 5
 fieldset/SR:
  description: status register
  fields:
-    - name: AWD
-      description: Analog watchdog flag
-      bit_offset: 0
-      bit_size: 1
-    - name: EOC
-      description: Regular channel end of conversion
-      bit_offset: 1
-      bit_size: 1
-    - name: JEOC
-      description: Injected channel end of conversion
-      bit_offset: 2
-      bit_size: 1
-    - name: JSTRT
-      description: Injected channel start flag
-      bit_offset: 3
-      bit_size: 1
-    - name: STRT
-      description: Regular channel start flag
-      bit_offset: 4
-      bit_size: 1
+  - name: AWD
+    description: Analog watchdog flag
+    bit_offset: 0
+    bit_size: 1
+  - name: EOC
+    description: Regular channel end of conversion
+    bit_offset: 1
+    bit_size: 1
+  - name: JEOC
+    description: Injected channel end of conversion
+    bit_offset: 2
+    bit_size: 1
+  - name: JSTRT
+    description: Injected channel start flag
+    bit_offset: 3
+    bit_size: 1
+  - name: STRT
+    description: Regular channel start flag
+    bit_offset: 4
+    bit_size: 1
 enum/DUALMOD:
  bit_size: 4
  variants:
-    - name: Independent
-      description: Independent mode.
-      value: 0
-    - name: RegularInjected
-      description: Combined regular simultaneous + injected simultaneous mode
-      value: 1
-    - name: RegularAlternateTrigger
-      description: Combined regular simultaneous + alternate trigger mode
-      value: 2
-    - name: InjectedFastInterleaved
-      description: Combined injected simultaneous + fast interleaved mode
-      value: 3
-    - name: InjectedSlowInterleaved
-      description: Combined injected simultaneous + slow Interleaved mode
-      value: 4
-    - name: Injected
-      description: Injected simultaneous mode only
-      value: 5
-    - name: Regular
-      description: Regular simultaneous mode only
-      value: 6
-    - name: FastInterleaved
-      description: Fast interleaved mode only
-      value: 7
-    - name: SlowInterleaved
-      description: Slow interleaved mode only
-      value: 8
-    - name: AlternateTrigger
-      description: Alternate trigger mode only
-      value: 9
+  - name: Independent
+    description: Independent mode.
+    value: 0
+  - name: RegularInjected
+    description: Combined regular simultaneous + injected simultaneous mode
+    value: 1
+  - name: RegularAlternateTrigger
+    description: Combined regular simultaneous + alternate trigger mode
+    value: 2
+  - name: InjectedFastInterleaved
+    description: Combined injected simultaneous + fast interleaved mode
+    value: 3
+  - name: InjectedSlowInterleaved
+    description: Combined injected simultaneous + slow Interleaved mode
+    value: 4
+  - name: Injected
+    description: Injected simultaneous mode only
+    value: 5
+  - name: Regular
+    description: Regular simultaneous mode only
+    value: 6
+  - name: FastInterleaved
+    description: Fast interleaved mode only
+    value: 7
+  - name: SlowInterleaved
+    description: Slow interleaved mode only
+    value: 8
+  - name: AlternateTrigger
+    description: Alternate trigger mode only
+    value: 9
 enum/EXTSEL:
  bit_size: 3
  variants:
-    - name: TIM1TRGO
-      description: Timer 1 TRGO event
-      value: 0
-    - name: TIM1CC4
-      description: Timer 1 CC4 event
-      value: 1
-    - name: TIM2TRGO
-      description: Timer 2 TRGO event
-      value: 2
-    - name: TIM2CC1
-      description: Timer 2 CC1 event
-      value: 3
-    - name: TIM3CC4
-      description: Timer 3 CC4 event
-      value: 4
-    - name: TIM4TRGO
-      description: Timer 4 TRGO event
-      value: 5
-    - name: TIM8CC4
-      description: EXTI line 15/Timer 8 CC4 event
-      value: 6
-    - name: SWSTART
-      description: SWSTART
-      value: 7
+  - name: TIM1TRGO
+    description: Timer 1 TRGO event
+    value: 0
+  - name: TIM1CC4
+    description: Timer 1 CC4 event
+    value: 1
+  - name: TIM2TRGO
+    description: Timer 2 TRGO event
+    value: 2
+  - name: TIM2CC1
+    description: Timer 2 CC1 event
+    value: 3
+  - name: TIM3CC4
+    description: Timer 3 CC4 event
+    value: 4
+  - name: TIM4TRGO
+    description: Timer 4 TRGO event
+    value: 5
+  - name: TIM8CC4
+    description: EXTI line 15/Timer 8 CC4 event
+    value: 6
+  - name: SWSTART
+    description: SWSTART
+    value: 7
 enum/SAMPLE_TIME:
  bit_size: 3
  variants:
-    - name: Cycles1_5
-      description: 1.5 cycles
-      value: 0
-    - name: Cycles7_5
-      description: 7.5 cycles
-      value: 1
-    - name: Cycles13_5
-      description: 13.5 cycles
-      value: 2
-    - name: Cycles28_5
-      description: 28.5 cycles
-      value: 3
-    - name: Cycles41_5
-      description: 41.5 cycles
-      value: 4
-    - name: Cycles55_5
-      description: 55.5 cycles
-      value: 5
-    - name: Cycles71_5
-      description: 71.5 cycles
-      value: 6
-    - name: Cycles239_5
-      description: 239.5 cycles
-      value: 7
+  - name: Cycles1_5
+    description: 1.5 cycles
+    value: 0
+  - name: Cycles7_5
+    description: 7.5 cycles
+    value: 1
+  - name: Cycles13_5
+    description: 13.5 cycles
+    value: 2
+  - name: Cycles28_5
+    description: 28.5 cycles
+    value: 3
+  - name: Cycles41_5
+    description: 41.5 cycles
+    value: 4
+  - name: Cycles55_5
+    description: 55.5 cycles
+    value: 5
+  - name: Cycles71_5
+    description: 71.5 cycles
+    value: 6
+  - name: Cycles239_5
+    description: 239.5 cycles
+    value: 7
--- a/data/registers/adc_f3.yaml
+++ b/data/registers/adc_f3.yaml
--- a/data/registers/adc_f3_v2.yaml
+++ b/data/registers/adc_f3_v2.yaml
--- a/data/registers/adc_g0.yaml
+++ b/data/registers/adc_g0.yaml
--- a/data/registers/adc_v1.yaml
+++ b/data/registers/adc_v1.yaml
@ -1,384 +1,383 @@
---
 block/ADC:
  description: Analog-to-digital converter
  items:
-    - name: ISR
-      description: interrupt and status register
-      byte_offset: 0
-      fieldset: ISR
-    - name: IER
-      description: interrupt enable register
-      byte_offset: 4
-      fieldset: IER
-    - name: CR
-      description: control register
-      byte_offset: 8
-      fieldset: CR
-    - name: CFGR1
-      description: configuration register 1
-      byte_offset: 12
-      fieldset: CFGR1
-    - name: CFGR2
-      description: configuration register 2
-      byte_offset: 16
-      fieldset: CFGR2
-    - name: SMPR
-      description: sampling time register
-      byte_offset: 20
-      fieldset: SMPR
-    - name: TR
-      description: watchdog threshold register
-      byte_offset: 32
-      fieldset: TR
-    - name: CHSELR
-      description: channel selection register
-      byte_offset: 40
-      fieldset: CHSELR
-    - name: DR
-      description: data register
-      byte_offset: 64
-      access: Read
-      fieldset: DR
-    - name: CCR
-      description: common configuration register
-      byte_offset: 776
-      fieldset: CCR
+  - name: ISR
+    description: interrupt and status register
+    byte_offset: 0
+    fieldset: ISR
+  - name: IER
+    description: interrupt enable register
+    byte_offset: 4
+    fieldset: IER
+  - name: CR
+    description: control register
+    byte_offset: 8
+    fieldset: CR
+  - name: CFGR1
+    description: configuration register 1
+    byte_offset: 12
+    fieldset: CFGR1
+  - name: CFGR2
+    description: configuration register 2
+    byte_offset: 16
+    fieldset: CFGR2
+  - name: SMPR
+    description: sampling time register
+    byte_offset: 20
+    fieldset: SMPR
+  - name: TR
+    description: watchdog threshold register
+    byte_offset: 32
+    fieldset: TR
+  - name: CHSELR
+    description: channel selection register
+    byte_offset: 40
+    fieldset: CHSELR
+  - name: DR
+    description: data register
+    byte_offset: 64
+    access: Read
+    fieldset: DR
+  - name: CCR
+    description: common configuration register
+    byte_offset: 776
+    fieldset: CCR
 fieldset/CCR:
  description: common configuration register
  fields:
-    - name: VREFEN
-      description: Temperature sensor and VREFINT enable
-      bit_offset: 22
-      bit_size: 1
-    - name: TSEN
-      description: Temperature sensor enable
-      bit_offset: 23
-      bit_size: 1
-    - name: VBATEN
-      description: VBAT enable
-      bit_offset: 24
-      bit_size: 1
+  - name: VREFEN
+    description: Temperature sensor and VREFINT enable
+    bit_offset: 22
+    bit_size: 1
+  - name: TSEN
+    description: Temperature sensor enable
+    bit_offset: 23
+    bit_size: 1
+  - name: VBATEN
+    description: VBAT enable
+    bit_offset: 24
+    bit_size: 1
 fieldset/CFGR1:
  description: configuration register 1
  fields:
-    - name: DMAEN
-      description: Direct memory access enable
-      bit_offset: 0
-      bit_size: 1
-    - name: DMACFG
-      description: Direct memery access configuration
-      bit_offset: 1
-      bit_size: 1
-      enum: DMACFG
-    - name: SCANDIR
-      description: Scan sequence direction
-      bit_offset: 2
-      bit_size: 1
-      enum: SCANDIR
-    - name: RES
-      description: Data resolution
-      bit_offset: 3
-      bit_size: 2
-      enum: RES
-    - name: ALIGN
-      description: Data alignment
-      bit_offset: 5
-      bit_size: 1
-      enum: ALIGN
-    - name: EXTSEL
-      description: External trigger selection
-      bit_offset: 6
-      bit_size: 3
-      enum: EXTSEL
-    - name: EXTEN
-      description: External trigger enable and polarity selection
-      bit_offset: 10
-      bit_size: 2
-      enum: EXTEN
-    - name: OVRMOD
-      description: Overrun management mode
-      bit_offset: 12
-      bit_size: 1
-      enum: OVRMOD
-    - name: CONT
-      description: Single / continuous conversion mode
-      bit_offset: 13
-      bit_size: 1
-    - name: WAIT
-      description: Wait conversion mode
-      bit_offset: 14
-      bit_size: 1
-    - name: AUTOFF
-      description: Auto-off mode
-      bit_offset: 15
-      bit_size: 1
-    - name: DISCEN
-      description: Discontinuous mode
-      bit_offset: 16
-      bit_size: 1
-    - name: AWDSGL
-      description: Enable the watchdog on a single channel or on all channels
-      bit_offset: 22
-      bit_size: 1
-      enum: AWDSGL
-    - name: AWDEN
-      description: Analog watchdog enable
-      bit_offset: 23
-      bit_size: 1
-    - name: AWDCH
-      description: Analog watchdog channel selection
-      bit_offset: 26
-      bit_size: 5
+  - name: DMAEN
+    description: Direct memory access enable
+    bit_offset: 0
+    bit_size: 1
+  - name: DMACFG
+    description: Direct memery access configuration
+    bit_offset: 1
+    bit_size: 1
+    enum: DMACFG
+  - name: SCANDIR
+    description: Scan sequence direction
+    bit_offset: 2
+    bit_size: 1
+    enum: SCANDIR
+  - name: RES
+    description: Data resolution
+    bit_offset: 3
+    bit_size: 2
+    enum: RES
+  - name: ALIGN
+    description: Data alignment
+    bit_offset: 5
+    bit_size: 1
+    enum: ALIGN
+  - name: EXTSEL
+    description: External trigger selection
+    bit_offset: 6
+    bit_size: 3
+    enum: EXTSEL
+  - name: EXTEN
+    description: External trigger enable and polarity selection
+    bit_offset: 10
+    bit_size: 2
+    enum: EXTEN
+  - name: OVRMOD
+    description: Overrun management mode
+    bit_offset: 12
+    bit_size: 1
+    enum: OVRMOD
+  - name: CONT
+    description: Single / continuous conversion mode
+    bit_offset: 13
+    bit_size: 1
+  - name: WAIT
+    description: Wait conversion mode
+    bit_offset: 14
+    bit_size: 1
+  - name: AUTOFF
+    description: Auto-off mode
+    bit_offset: 15
+    bit_size: 1
+  - name: DISCEN
+    description: Discontinuous mode
+    bit_offset: 16
+    bit_size: 1
+  - name: AWDSGL
+    description: Enable the watchdog on a single channel or on all channels
+    bit_offset: 22
+    bit_size: 1
+    enum: AWDSGL
+  - name: AWDEN
+    description: Analog watchdog enable
+    bit_offset: 23
+    bit_size: 1
+  - name: AWDCH
+    description: Analog watchdog channel selection
+    bit_offset: 26
+    bit_size: 5
 fieldset/CFGR2:
  description: configuration register 2
  fields:
-    - name: CKMODE
-      description: ADC clock mode
-      bit_offset: 30
-      bit_size: 2
-      enum: CKMODE
+  - name: CKMODE
+    description: ADC clock mode
+    bit_offset: 30
+    bit_size: 2
+    enum: CKMODE
 fieldset/CHSELR:
  description: channel selection register
  fields:
-    - name: CHSEL x
-      description: Channel-x selection
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 19
-        stride: 1
+  - name: CHSEL x
+    description: Channel-x selection
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 19
+      stride: 1
 fieldset/CR:
  description: control register
  fields:
-    - name: ADEN
-      description: ADC enable command
-      bit_offset: 0
-      bit_size: 1
-    - name: ADDIS
-      description: ADC disable command
-      bit_offset: 1
-      bit_size: 1
-    - name: ADSTART
-      description: ADC start conversion command
-      bit_offset: 2
-      bit_size: 1
-    - name: ADSTP
-      description: ADC stop conversion command
-      bit_offset: 4
-      bit_size: 1
-    - name: ADCAL
-      description: ADC calibration
-      bit_offset: 31
-      bit_size: 1
+  - name: ADEN
+    description: ADC enable command
+    bit_offset: 0
+    bit_size: 1
+  - name: ADDIS
+    description: ADC disable command
+    bit_offset: 1
+    bit_size: 1
+  - name: ADSTART
+    description: ADC start conversion command
+    bit_offset: 2
+    bit_size: 1
+  - name: ADSTP
+    description: ADC stop conversion command
+    bit_offset: 4
+    bit_size: 1
+  - name: ADCAL
+    description: ADC calibration
+    bit_offset: 31
+    bit_size: 1
 fieldset/DR:
  description: data register
  fields:
-    - name: DATA
-      description: Converted data
-      bit_offset: 0
-      bit_size: 16
+  - name: DATA
+    description: Converted data
+    bit_offset: 0
+    bit_size: 16
 fieldset/IER:
  description: interrupt enable register
  fields:
-    - name: ADRDYIE
-      description: ADC ready interrupt enable
-      bit_offset: 0
-      bit_size: 1
-    - name: EOSMPIE
-      description: End of sampling flag interrupt enable
-      bit_offset: 1
-      bit_size: 1
-    - name: EOCIE
-      description: End of conversion interrupt enable
-      bit_offset: 2
-      bit_size: 1
-    - name: EOSEQIE
-      description: End of conversion sequence interrupt enable
-      bit_offset: 3
-      bit_size: 1
-    - name: OVRIE
-      description: Overrun interrupt enable
-      bit_offset: 4
-      bit_size: 1
-    - name: AWDIE
-      description: Analog watchdog interrupt enable
-      bit_offset: 7
-      bit_size: 1
+  - name: ADRDYIE
+    description: ADC ready interrupt enable
+    bit_offset: 0
+    bit_size: 1
+  - name: EOSMPIE
+    description: End of sampling flag interrupt enable
+    bit_offset: 1
+    bit_size: 1
+  - name: EOCIE
+    description: End of conversion interrupt enable
+    bit_offset: 2
+    bit_size: 1
+  - name: EOSEQIE
+    description: End of conversion sequence interrupt enable
+    bit_offset: 3
+    bit_size: 1
+  - name: OVRIE
+    description: Overrun interrupt enable
+    bit_offset: 4
+    bit_size: 1
+  - name: AWDIE
+    description: Analog watchdog interrupt enable
+    bit_offset: 7
+    bit_size: 1
 fieldset/ISR:
  description: interrupt and status register
  fields:
-    - name: ADRDY
-      description: ADC ready
-      bit_offset: 0
-      bit_size: 1
-    - name: EOSMP
-      description: End of sampling flag
-      bit_offset: 1
-      bit_size: 1
-    - name: EOC
-      description: End of conversion flag
-      bit_offset: 2
-      bit_size: 1
-    - name: EOSEQ
-      description: End of sequence flag
-      bit_offset: 3
-      bit_size: 1
-    - name: OVR
-      description: ADC overrun
-      bit_offset: 4
-      bit_size: 1
-    - name: AWD
-      description: Analog watchdog flag
-      bit_offset: 7
-      bit_size: 1
+  - name: ADRDY
+    description: ADC ready
+    bit_offset: 0
+    bit_size: 1
+  - name: EOSMP
+    description: End of sampling flag
+    bit_offset: 1
+    bit_size: 1
+  - name: EOC
+    description: End of conversion flag
+    bit_offset: 2
+    bit_size: 1
+  - name: EOSEQ
+    description: End of sequence flag
+    bit_offset: 3
+    bit_size: 1
+  - name: OVR
+    description: ADC overrun
+    bit_offset: 4
+    bit_size: 1
+  - name: AWD
+    description: Analog watchdog flag
+    bit_offset: 7
+    bit_size: 1
 fieldset/SMPR:
  description: sampling time register
  fields:
-    - name: SMP
-      description: Sampling time selection
-      bit_offset: 0
-      bit_size: 3
-      enum: SAMPLE_TIME
+  - name: SMP
+    description: Sampling time selection
+    bit_offset: 0
+    bit_size: 3
+    enum: SAMPLE_TIME
 fieldset/TR:
  description: watchdog threshold register
  fields:
-    - name: LT
-      description: Analog watchdog lower threshold
-      bit_offset: 0
-      bit_size: 12
-    - name: HT
-      description: Analog watchdog higher threshold
-      bit_offset: 16
-      bit_size: 12
+  - name: LT
+    description: Analog watchdog lower threshold
+    bit_offset: 0
+    bit_size: 12
+  - name: HT
+    description: Analog watchdog higher threshold
+    bit_offset: 16
+    bit_size: 12
 enum/ALIGN:
  bit_size: 1
  variants:
-    - name: Right
-      description: Right alignment
-      value: 0
-    - name: Left
-      description: Left alignment
-      value: 1
+  - name: Right
+    description: Right alignment
+    value: 0
+  - name: Left
+    description: Left alignment
+    value: 1
 enum/AWDSGL:
  bit_size: 1
  variants:
-    - name: AllChannels
-      description: Analog watchdog enabled on all channels
-      value: 0
-    - name: SingleChannel
-      description: Analog watchdog enabled on a single channel
-      value: 1
+  - name: AllChannels
+    description: Analog watchdog enabled on all channels
+    value: 0
+  - name: SingleChannel
+    description: Analog watchdog enabled on a single channel
+    value: 1
 enum/CKMODE:
  bit_size: 2
  variants:
-    - name: ADCCLK
-      description: Asynchronous clock mode
-      value: 0
-    - name: PCLK_Div2
-      description: Synchronous clock mode (PCLK/2)
-      value: 1
-    - name: PCLK_Div4
-      description: Sychronous clock mode (PCLK/4)
-      value: 2
+  - name: ADCCLK
+    description: Asynchronous clock mode
+    value: 0
+  - name: PCLK_Div2
+    description: Synchronous clock mode (PCLK/2)
+    value: 1
+  - name: PCLK_Div4
+    description: Sychronous clock mode (PCLK/4)
+    value: 2
 enum/DMACFG:
  bit_size: 1
  variants:
-    - name: OneShot
-      description: DMA one shot mode
-      value: 0
-    - name: Circular
-      description: DMA circular mode
-      value: 1
+  - name: OneShot
+    description: DMA one shot mode
+    value: 0
+  - name: Circular
+    description: DMA circular mode
+    value: 1
 enum/EXTEN:
  bit_size: 2
  variants:
-    - name: Disabled
-      description: Trigger detection disabled
-      value: 0
-    - name: RisingEdge
-      description: Trigger detection on the rising edge
-      value: 1
-    - name: FallingEdge
-      description: Trigger detection on the falling edge
-      value: 2
-    - name: BothEdges
-      description: Trigger detection on both the rising and falling edges
-      value: 3
+  - name: Disabled
+    description: Trigger detection disabled
+    value: 0
+  - name: RisingEdge
+    description: Trigger detection on the rising edge
+    value: 1
+  - name: FallingEdge
+    description: Trigger detection on the falling edge
+    value: 2
+  - name: BothEdges
+    description: Trigger detection on both the rising and falling edges
+    value: 3
 enum/EXTSEL:
  bit_size: 3
  variants:
-    - name: TIM1_TRGO
-      description: Timer 1 TRGO Event
-      value: 0
-    - name: TIM1_CC4
-      description: Timer 1 CC4 event
-      value: 1
-    - name: TIM2_TRGO
-      description: Timer 2 TRGO event
-      value: 2
-    - name: TIM3_TRGO
-      description: Timer 3 TRGO event
-      value: 3
-    - name: TIM15_TRGO
-      description: Timer 15 TRGO event
-      value: 4
+  - name: TIM1_TRGO
+    description: Timer 1 TRGO Event
+    value: 0
+  - name: TIM1_CC4
+    description: Timer 1 CC4 event
+    value: 1
+  - name: TIM2_TRGO
+    description: Timer 2 TRGO event
+    value: 2
+  - name: TIM3_TRGO
+    description: Timer 3 TRGO event
+    value: 3
+  - name: TIM15_TRGO
+    description: Timer 15 TRGO event
+    value: 4
 enum/OVRMOD:
  bit_size: 1
  variants:
-    - name: Preserved
-      description: ADC_DR register is preserved with the old data when an overrun is detected
-      value: 0
-    - name: Overwritten
-      description: ADC_DR register is overwritten with the last conversion result when an overrun is detected
-      value: 1
+  - name: Preserved
+    description: ADC_DR register is preserved with the old data when an overrun is detected
+    value: 0
+  - name: Overwritten
+    description: ADC_DR register is overwritten with the last conversion result when an overrun is detected
+    value: 1
 enum/RES:
  bit_size: 2
  variants:
-    - name: TwelveBit
-      description: 12-bit (14 ADCCLK cycles)
-      value: 0
-    - name: TenBit
-      description: 10-bit (13 ADCCLK cycles)
-      value: 1
-    - name: EightBit
-      description: 8-bit (11 ADCCLK cycles)
-      value: 2
-    - name: SixBit
-      description: 6-bit (9 ADCCLK cycles)
-      value: 3
+  - name: TwelveBit
+    description: 12-bit (14 ADCCLK cycles)
+    value: 0
+  - name: TenBit
+    description: 10-bit (13 ADCCLK cycles)
+    value: 1
+  - name: EightBit
+    description: 8-bit (11 ADCCLK cycles)
+    value: 2
+  - name: SixBit
+    description: 6-bit (9 ADCCLK cycles)
+    value: 3
 enum/SAMPLE_TIME:
  bit_size: 3
  variants:
-    - name: Cycles1_5
-      description: 1.5 cycles
-      value: 0
-    - name: Cycles7_5
-      description: 7.5 cycles
-      value: 1
-    - name: Cycles13_5
-      description: 13.5 cycles
-      value: 2
-    - name: Cycles28_5
-      description: 28.5 cycles
-      value: 3
-    - name: Cycles41_5
-      description: 41.5 cycles
-      value: 4
-    - name: Cycles55_5
-      description: 55.5 cycles
-      value: 5
-    - name: Cycles71_5
-      description: 71.5 cycles
-      value: 6
-    - name: Cycles239_5
-      description: 239.5 cycles
-      value: 7
+  - name: Cycles1_5
+    description: 1.5 cycles
+    value: 0
+  - name: Cycles7_5
+    description: 7.5 cycles
+    value: 1
+  - name: Cycles13_5
+    description: 13.5 cycles
+    value: 2
+  - name: Cycles28_5
+    description: 28.5 cycles
+    value: 3
+  - name: Cycles41_5
+    description: 41.5 cycles
+    value: 4
+  - name: Cycles55_5
+    description: 55.5 cycles
+    value: 5
+  - name: Cycles71_5
+    description: 71.5 cycles
+    value: 6
+  - name: Cycles239_5
+    description: 239.5 cycles
+    value: 7
 enum/SCANDIR:
  bit_size: 1
  variants:
-    - name: Upward
-      description: Upward scan (from CHSEL0 to CHSEL18)
-      value: 0
-    - name: Backward
-      description: Backward scan (from CHSEL18 to CHSEL0)
-      value: 1
+  - name: Upward
+    description: Upward scan (from CHSEL0 to CHSEL18)
+    value: 0
+  - name: Backward
+    description: Backward scan (from CHSEL18 to CHSEL0)
+    value: 1
--- a/data/registers/adc_v2.yaml
+++ b/data/registers/adc_v2.yaml
--- a/data/registers/adc_v3.yaml
+++ b/data/registers/adc_v3.yaml
@ -1,525 +1,524 @@
---
 block/ADC:
  description: Analog-to-Digital Converter
  items:
-    - name: ISR
-      description: interrupt and status register
-      byte_offset: 0
-      fieldset: ISR
-    - name: IER
-      description: interrupt enable register
-      byte_offset: 4
-      fieldset: IER
-    - name: CR
-      description: control register
-      byte_offset: 8
-      fieldset: CR
-    - name: CFGR
-      description: configuration register
-      byte_offset: 12
-      fieldset: CFGR
-    - name: CFGR2
-      description: configuration register
-      byte_offset: 16
-      fieldset: CFGR2
-    - name: SMPR
-      description: sample time register 1
-      array:
-        len: 2
-        stride: 4
-      byte_offset: 20
-      fieldset: SMPR
-    - name: TR
-      description: watchdog threshold register 1
-      array:
-        len: 3
-        stride: 4
-      byte_offset: 32
-      fieldset: TR
-    - name: SQR1
-      description: regular sequence register 1
-      byte_offset: 48
-      fieldset: SQR1
-    - name: SQR2
-      description: regular sequence register 2
-      byte_offset: 52
-      fieldset: SQR2
-    - name: SQR3
-      description: regular sequence register 3
-      byte_offset: 56
-      fieldset: SQR3
-    - name: SQR4
-      description: regular sequence register 4
-      byte_offset: 60
-      fieldset: SQR4
-    - name: DR
-      description: regular Data Register
-      byte_offset: 64
-      access: Read
-      fieldset: DR
-    - name: JSQR
-      description: injected sequence register
-      byte_offset: 76
-      fieldset: JSQR
-    - name: OFR
-      description: offset register 1
-      array:
-        len: 4
-        stride: 4
-      byte_offset: 96
-      fieldset: OFR
-    - name: JDR
-      description: injected data registers
-      array:
-        len: 4
-        stride: 4
-      byte_offset: 128
-      access: Read
-      fieldset: JDR
-    - name: AWD2CR
-      description: Analog Watchdog 2 Configuration Register
-      byte_offset: 160
-      fieldset: AWD2CR
-    - name: AWD3CR
-      description: Analog Watchdog 3 Configuration Register
-      byte_offset: 164
-      fieldset: AWD3CR
-    - name: DIFSEL
-      description: Differential Mode Selection Register 2
-      byte_offset: 176
-      fieldset: DIFSEL
-    - name: CALFACT
-      description: Calibration Factors
-      byte_offset: 180
-      fieldset: CALFACT
+  - name: ISR
+    description: interrupt and status register
+    byte_offset: 0
+    fieldset: ISR
+  - name: IER
+    description: interrupt enable register
+    byte_offset: 4
+    fieldset: IER
+  - name: CR
+    description: control register
+    byte_offset: 8
+    fieldset: CR
+  - name: CFGR
+    description: configuration register
+    byte_offset: 12
+    fieldset: CFGR
+  - name: CFGR2
+    description: configuration register
+    byte_offset: 16
+    fieldset: CFGR2
+  - name: SMPR
+    description: sample time register 1
+    array:
+      len: 2
+      stride: 4
+    byte_offset: 20
+    fieldset: SMPR
+  - name: TR
+    description: watchdog threshold register 1
+    array:
+      len: 3
+      stride: 4
+    byte_offset: 32
+    fieldset: TR
+  - name: SQR1
+    description: regular sequence register 1
+    byte_offset: 48
+    fieldset: SQR1
+  - name: SQR2
+    description: regular sequence register 2
+    byte_offset: 52
+    fieldset: SQR2
+  - name: SQR3
+    description: regular sequence register 3
+    byte_offset: 56
+    fieldset: SQR3
+  - name: SQR4
+    description: regular sequence register 4
+    byte_offset: 60
+    fieldset: SQR4
+  - name: DR
+    description: regular Data Register
+    byte_offset: 64
+    access: Read
+    fieldset: DR
+  - name: JSQR
+    description: injected sequence register
+    byte_offset: 76
+    fieldset: JSQR
+  - name: OFR
+    description: offset register 1
+    array:
+      len: 4
+      stride: 4
+    byte_offset: 96
+    fieldset: OFR
+  - name: JDR
+    description: injected data registers
+    array:
+      len: 4
+      stride: 4
+    byte_offset: 128
+    access: Read
+    fieldset: JDR
+  - name: AWD2CR
+    description: Analog Watchdog 2 Configuration Register
+    byte_offset: 160
+    fieldset: AWD2CR
+  - name: AWD3CR
+    description: Analog Watchdog 3 Configuration Register
+    byte_offset: 164
+    fieldset: AWD3CR
+  - name: DIFSEL
+    description: Differential Mode Selection Register 2
+    byte_offset: 176
+    fieldset: DIFSEL
+  - name: CALFACT
+    description: Calibration Factors
+    byte_offset: 180
+    fieldset: CALFACT
 fieldset/AWD2CR:
  description: Analog Watchdog 2 Configuration Register
  fields:
-    - name: AWD2CH
-      description: AWD2CH
-      bit_offset: 1
-      bit_size: 18
+  - name: AWD2CH
+    description: AWD2CH
+    bit_offset: 1
+    bit_size: 18
 fieldset/AWD3CR:
  description: Analog Watchdog 3 Configuration Register
  fields:
-    - name: AWD3CH
-      description: AWD3CH
-      bit_offset: 1
-      bit_size: 18
+  - name: AWD3CH
+    description: AWD3CH
+    bit_offset: 1
+    bit_size: 18
 fieldset/CALFACT:
  description: Calibration Factors
  fields:
-    - name: CALFACT_S
-      description: CALFACT_S
-      bit_offset: 0
-      bit_size: 7
-    - name: CALFACT_D
-      description: CALFACT_D
-      bit_offset: 16
-      bit_size: 7
+  - name: CALFACT_S
+    description: CALFACT_S
+    bit_offset: 0
+    bit_size: 7
+  - name: CALFACT_D
+    description: CALFACT_D
+    bit_offset: 16
+    bit_size: 7
 fieldset/CFGR:
  description: configuration register
  fields:
-    - name: DMAEN
-      description: DMAEN
-      bit_offset: 0
-      bit_size: 1
-    - name: DMACFG
-      description: DMACFG
-      bit_offset: 1
-      bit_size: 1
-    - name: RES
-      description: RES
-      bit_offset: 3
-      bit_size: 2
-      enum: RES
-    - name: ALIGN
-      description: ALIGN
-      bit_offset: 5
-      bit_size: 1
-    - name: EXTSEL
-      description: EXTSEL
-      bit_offset: 6
-      bit_size: 4
-    - name: EXTEN
-      description: EXTEN
-      bit_offset: 10
-      bit_size: 2
-    - name: OVRMOD
-      description: OVRMOD
-      bit_offset: 12
-      bit_size: 1
-    - name: CONT
-      description: CONT
-      bit_offset: 13
-      bit_size: 1
-    - name: AUTDLY
-      description: AUTDLY
-      bit_offset: 14
-      bit_size: 1
-    - name: AUTOFF
-      description: AUTOFF
-      bit_offset: 15
-      bit_size: 1
-    - name: DISCEN
-      description: DISCEN
-      bit_offset: 16
-      bit_size: 1
-    - name: DISCNUM
-      description: DISCNUM
-      bit_offset: 17
-      bit_size: 3
-    - name: JDISCEN
-      description: JDISCEN
-      bit_offset: 20
-      bit_size: 1
-    - name: JQM
-      description: JQM
-      bit_offset: 21
-      bit_size: 1
-    - name: AWD1SGL
-      description: AWD1SGL
-      bit_offset: 22
-      bit_size: 1
-    - name: AWD1EN
-      description: AWD1EN
-      bit_offset: 23
-      bit_size: 1
-    - name: JAWD1EN
-      description: JAWD1EN
-      bit_offset: 24
-      bit_size: 1
-    - name: JAUTO
-      description: JAUTO
-      bit_offset: 25
-      bit_size: 1
-    - name: AWDCH1CH
-      description: AWDCH1CH
-      bit_offset: 26
-      bit_size: 5
+  - name: DMAEN
+    description: DMAEN
+    bit_offset: 0
+    bit_size: 1
+  - name: DMACFG
+    description: DMACFG
+    bit_offset: 1
+    bit_size: 1
+  - name: RES
+    description: RES
+    bit_offset: 3
+    bit_size: 2
+    enum: RES
+  - name: ALIGN
+    description: ALIGN
+    bit_offset: 5
+    bit_size: 1
+  - name: EXTSEL
+    description: EXTSEL
+    bit_offset: 6
+    bit_size: 4
+  - name: EXTEN
+    description: EXTEN
+    bit_offset: 10
+    bit_size: 2
+  - name: OVRMOD
+    description: OVRMOD
+    bit_offset: 12
+    bit_size: 1
+  - name: CONT
+    description: CONT
+    bit_offset: 13
+    bit_size: 1
+  - name: AUTDLY
+    description: AUTDLY
+    bit_offset: 14
+    bit_size: 1
+  - name: AUTOFF
+    description: AUTOFF
+    bit_offset: 15
+    bit_size: 1
+  - name: DISCEN
+    description: DISCEN
+    bit_offset: 16
+    bit_size: 1
+  - name: DISCNUM
+    description: DISCNUM
+    bit_offset: 17
+    bit_size: 3
+  - name: JDISCEN
+    description: JDISCEN
+    bit_offset: 20
+    bit_size: 1
+  - name: JQM
+    description: JQM
+    bit_offset: 21
+    bit_size: 1
+  - name: AWD1SGL
+    description: AWD1SGL
+    bit_offset: 22
+    bit_size: 1
+  - name: AWD1EN
+    description: AWD1EN
+    bit_offset: 23
+    bit_size: 1
+  - name: JAWD1EN
+    description: JAWD1EN
+    bit_offset: 24
+    bit_size: 1
+  - name: JAUTO
+    description: JAUTO
+    bit_offset: 25
+    bit_size: 1
+  - name: AWDCH1CH
+    description: AWDCH1CH
+    bit_offset: 26
+    bit_size: 5
 fieldset/CFGR2:
  description: configuration register
  fields:
-    - name: ROVSE
-      description: DMAEN
-      bit_offset: 0
-      bit_size: 1
-    - name: JOVSE
-      description: DMACFG
-      bit_offset: 1
-      bit_size: 1
-    - name: OVSR
-      description: RES
-      bit_offset: 2
-      bit_size: 3
-    - name: OVSS
-      description: ALIGN
-      bit_offset: 5
-      bit_size: 4
-    - name: TOVS
-      description: EXTSEL
-      bit_offset: 9
-      bit_size: 1
-    - name: ROVSM
-      description: EXTEN
-      bit_offset: 10
-      bit_size: 1
+  - name: ROVSE
+    description: DMAEN
+    bit_offset: 0
+    bit_size: 1
+  - name: JOVSE
+    description: DMACFG
+    bit_offset: 1
+    bit_size: 1
+  - name: OVSR
+    description: RES
+    bit_offset: 2
+    bit_size: 3
+  - name: OVSS
+    description: ALIGN
+    bit_offset: 5
+    bit_size: 4
+  - name: TOVS
+    description: EXTSEL
+    bit_offset: 9
+    bit_size: 1
+  - name: ROVSM
+    description: EXTEN
+    bit_offset: 10
+    bit_size: 1
 fieldset/CR:
  description: control register
  fields:
-    - name: ADEN
-      description: ADEN
-      bit_offset: 0
-      bit_size: 1
-    - name: ADDIS
-      description: ADDIS
-      bit_offset: 1
-      bit_size: 1
-    - name: ADSTART
-      description: ADSTART
-      bit_offset: 2
-      bit_size: 1
-    - name: JADSTART
-      description: JADSTART
-      bit_offset: 3
-      bit_size: 1
-    - name: ADSTP
-      description: ADSTP
-      bit_offset: 4
-      bit_size: 1
-    - name: JADSTP
-      description: JADSTP
-      bit_offset: 5
-      bit_size: 1
-    - name: ADVREGEN
-      description: ADVREGEN
-      bit_offset: 28
-      bit_size: 1
-    - name: DEEPPWD
-      description: DEEPPWD
-      bit_offset: 29
-      bit_size: 1
-    - name: ADCALDIF
-      description: ADCALDIF
-      bit_offset: 30
-      bit_size: 1
-    - name: ADCAL
-      description: ADCAL
-      bit_offset: 31
-      bit_size: 1
+  - name: ADEN
+    description: ADEN
+    bit_offset: 0
+    bit_size: 1
+  - name: ADDIS
+    description: ADDIS
+    bit_offset: 1
+    bit_size: 1
+  - name: ADSTART
+    description: ADSTART
+    bit_offset: 2
+    bit_size: 1
+  - name: JADSTART
+    description: JADSTART
+    bit_offset: 3
+    bit_size: 1
+  - name: ADSTP
+    description: ADSTP
+    bit_offset: 4
+    bit_size: 1
+  - name: JADSTP
+    description: JADSTP
+    bit_offset: 5
+    bit_size: 1
+  - name: ADVREGEN
+    description: ADVREGEN
+    bit_offset: 28
+    bit_size: 1
+  - name: DEEPPWD
+    description: DEEPPWD
+    bit_offset: 29
+    bit_size: 1
+  - name: ADCALDIF
+    description: ADCALDIF
+    bit_offset: 30
+    bit_size: 1
+  - name: ADCAL
+    description: ADCAL
+    bit_offset: 31
+    bit_size: 1
 fieldset/DIFSEL:
  description: Differential Mode Selection Register 2
  fields:
-    - name: DIFSEL_1_15
-      description: Differential mode for channels 15 to 1
-      bit_offset: 1
-      bit_size: 15
-    - name: DIFSEL_16_18
-      description: Differential mode for channels 18 to 16
-      bit_offset: 16
-      bit_size: 3
+  - name: DIFSEL_1_15
+    description: Differential mode for channels 15 to 1
+    bit_offset: 1
+    bit_size: 15
+  - name: DIFSEL_16_18
+    description: Differential mode for channels 18 to 16
+    bit_offset: 16
+    bit_size: 3
 fieldset/DR:
  description: regular Data Register
  fields:
-    - name: regularDATA
-      description: regularDATA
-      bit_offset: 0
-      bit_size: 16
+  - name: regularDATA
+    description: regularDATA
+    bit_offset: 0
+    bit_size: 16
 fieldset/IER:
  description: interrupt enable register
  fields:
-    - name: ADRDYIE
-      description: ADRDYIE
-      bit_offset: 0
-      bit_size: 1
-    - name: EOSMPIE
-      description: EOSMPIE
-      bit_offset: 1
-      bit_size: 1
-    - name: EOCIE
-      description: EOCIE
-      bit_offset: 2
-      bit_size: 1
-    - name: EOSIE
-      description: EOSIE
-      bit_offset: 3
-      bit_size: 1
-    - name: OVRIE
-      description: OVRIE
-      bit_offset: 4
-      bit_size: 1
-    - name: JEOCIE
-      description: JEOCIE
-      bit_offset: 5
-      bit_size: 1
-    - name: JEOSIE
-      description: JEOSIE
-      bit_offset: 6
-      bit_size: 1
-    - name: AWD1IE
-      description: AWD1IE
-      bit_offset: 7
-      bit_size: 1
-    - name: AWD2IE
-      description: AWD2IE
-      bit_offset: 8
-      bit_size: 1
-    - name: AWD3IE
-      description: AWD3IE
-      bit_offset: 9
-      bit_size: 1
-    - name: JQOVFIE
-      description: JQOVFIE
-      bit_offset: 10
-      bit_size: 1
+  - name: ADRDYIE
+    description: ADRDYIE
+    bit_offset: 0
+    bit_size: 1
+  - name: EOSMPIE
+    description: EOSMPIE
+    bit_offset: 1
+    bit_size: 1
+  - name: EOCIE
+    description: EOCIE
+    bit_offset: 2
+    bit_size: 1
+  - name: EOSIE
+    description: EOSIE
+    bit_offset: 3
+    bit_size: 1
+  - name: OVRIE
+    description: OVRIE
+    bit_offset: 4
+    bit_size: 1
+  - name: JEOCIE
+    description: JEOCIE
+    bit_offset: 5
+    bit_size: 1
+  - name: JEOSIE
+    description: JEOSIE
+    bit_offset: 6
+    bit_size: 1
+  - name: AWD1IE
+    description: AWD1IE
+    bit_offset: 7
+    bit_size: 1
+  - name: AWD2IE
+    description: AWD2IE
+    bit_offset: 8
+    bit_size: 1
+  - name: AWD3IE
+    description: AWD3IE
+    bit_offset: 9
+    bit_size: 1
+  - name: JQOVFIE
+    description: JQOVFIE
+    bit_offset: 10
+    bit_size: 1
 fieldset/ISR:
  description: interrupt and status register
  fields:
-    - name: ADRDY
-      description: ADRDY
-      bit_offset: 0
-      bit_size: 1
-    - name: EOSMP
-      description: EOSMP
-      bit_offset: 1
-      bit_size: 1
-    - name: EOC
-      description: EOC
-      bit_offset: 2
-      bit_size: 1
-    - name: EOS
-      description: EOS
-      bit_offset: 3
-      bit_size: 1
-    - name: OVR
-      description: OVR
-      bit_offset: 4
-      bit_size: 1
-    - name: JEOC
-      description: JEOC
-      bit_offset: 5
-      bit_size: 1
-    - name: JEOS
-      description: JEOS
-      bit_offset: 6
-      bit_size: 1
-    - name: AWD
-      description: AWD1
-      bit_offset: 7
-      bit_size: 1
-      array:
-        len: 3
-        stride: 1
-    - name: JQOVF
-      description: JQOVF
-      bit_offset: 10
-      bit_size: 1
+  - name: ADRDY
+    description: ADRDY
+    bit_offset: 0
+    bit_size: 1
+  - name: EOSMP
+    description: EOSMP
+    bit_offset: 1
+    bit_size: 1
+  - name: EOC
+    description: EOC
+    bit_offset: 2
+    bit_size: 1
+  - name: EOS
+    description: EOS
+    bit_offset: 3
+    bit_size: 1
+  - name: OVR
+    description: OVR
+    bit_offset: 4
+    bit_size: 1
+  - name: JEOC
+    description: JEOC
+    bit_offset: 5
+    bit_size: 1
+  - name: JEOS
+    description: JEOS
+    bit_offset: 6
+    bit_size: 1
+  - name: AWD
+    description: AWD1
+    bit_offset: 7
+    bit_size: 1
+    array:
+      len: 3
+      stride: 1
+  - name: JQOVF
+    description: JQOVF
+    bit_offset: 10
+    bit_size: 1
 fieldset/JDR:
  description: injected data register 1
  fields:
-    - name: JDATA
-      description: JDATA1
-      bit_offset: 0
-      bit_size: 16
+  - name: JDATA
+    description: JDATA1
+    bit_offset: 0
+    bit_size: 16
 fieldset/JSQR:
  description: injected sequence register
  fields:
-    - name: JL
-      description: JL
-      bit_offset: 0
-      bit_size: 2
-    - name: JEXTSEL
-      description: JEXTSEL
-      bit_offset: 2
-      bit_size: 4
-    - name: JEXTEN
-      description: JEXTEN
-      bit_offset: 6
-      bit_size: 2
-    - name: JSQ
-      description: JSQ1
-      bit_offset: 8
-      bit_size: 5
-      array:
-        len: 4
-        stride: 6
+  - name: JL
+    description: JL
+    bit_offset: 0
+    bit_size: 2
+  - name: JEXTSEL
+    description: JEXTSEL
+    bit_offset: 2
+    bit_size: 4
+  - name: JEXTEN
+    description: JEXTEN
+    bit_offset: 6
+    bit_size: 2
+  - name: JSQ
+    description: JSQ1
+    bit_offset: 8
+    bit_size: 5
+    array:
+      len: 4
+      stride: 6
 fieldset/OFR:
  description: offset register
  fields:
-    - name: OFFSET
-      bit_offset: 0
-      bit_size: 12
-    - name: OFFSET_CH
-      bit_offset: 26
-      bit_size: 5
-    - name: OFFSET_EN
-      bit_offset: 31
-      bit_size: 1
+  - name: OFFSET
+    bit_offset: 0
+    bit_size: 12
+  - name: OFFSET_CH
+    bit_offset: 26
+    bit_size: 5
+  - name: OFFSET_EN
+    bit_offset: 31
+    bit_size: 1
 fieldset/SMPR:
  description: sample time register 1
  fields:
-    - name: SMP
-      description: Channel 0 sampling time selection
-      bit_offset: 0
-      bit_size: 3
-      array:
-        len: 10
-        stride: 3
-      enum: SAMPLE_TIME
+  - name: SMP
+    description: Channel 0 sampling time selection
+    bit_offset: 0
+    bit_size: 3
+    array:
+      len: 10
+      stride: 3
+    enum: SAMPLE_TIME
 fieldset/SQR1:
  description: regular sequence register 1
  fields:
-    - name: L
-      description: Regular channel sequence length
-      bit_offset: 0
-      bit_size: 4
-    - name: SQ
-      description: SQ1
-      bit_offset: 6
-      bit_size: 5
-      array:
-        len: 4
-        stride: 6
+  - name: L
+    description: Regular channel sequence length
+    bit_offset: 0
+    bit_size: 4
+  - name: SQ
+    description: SQ1
+    bit_offset: 6
+    bit_size: 5
+    array:
+      len: 4
+      stride: 6
 fieldset/SQR2:
  description: regular sequence register 2
  fields:
-    - name: SQ
-      description: SQ5
-      bit_offset: 0
-      bit_size: 5
-      array:
-        len: 5
-        stride: 6
+  - name: SQ
+    description: SQ5
+    bit_offset: 0
+    bit_size: 5
+    array:
+      len: 5
+      stride: 6
 fieldset/SQR3:
  description: regular sequence register 3
  fields:
-    - name: SQ
-      description: SQ10
-      bit_offset: 0
-      bit_size: 5
-      array:
-        len: 5
-        stride: 6
+  - name: SQ
+    description: SQ10
+    bit_offset: 0
+    bit_size: 5
+    array:
+      len: 5
+      stride: 6
 fieldset/SQR4:
  description: regular sequence register 4
  fields:
-    - name: SQ
-      description: SQ15
-      bit_offset: 0
-      bit_size: 5
-      array:
-        len: 2
-        stride: 6
+  - name: SQ
+    description: SQ15
+    bit_offset: 0
+    bit_size: 5
+    array:
+      len: 2
+      stride: 6
 fieldset/TR:
  description: watchdog threshold register
  fields:
-    - name: LT
-      description: LT1
-      bit_offset: 0
-      bit_size: 12
-    - name: HT
-      description: HT1
-      bit_offset: 16
-      bit_size: 12
+  - name: LT
+    description: LT1
+    bit_offset: 0
+    bit_size: 12
+  - name: HT
+    description: HT1
+    bit_offset: 16
+    bit_size: 12
 enum/RES:
  bit_size: 2
  variants:
-    - name: TwelveBit
-      description: 12-bit resolution
-      value: 0
-    - name: TenBit
-      description: 10-bit resolution
-      value: 1
-    - name: EightBit
-      description: 8-bit resolution
-      value: 2
-    - name: SixBit
-      description: 6-bit resolution
-      value: 3
+  - name: TwelveBit
+    description: 12-bit resolution
+    value: 0
+  - name: TenBit
+    description: 10-bit resolution
+    value: 1
+  - name: EightBit
+    description: 8-bit resolution
+    value: 2
+  - name: SixBit
+    description: 6-bit resolution
+    value: 3
 enum/SAMPLE_TIME:
  bit_size: 3
  variants:
-    - name: Cycles2_5
-      description: 2.5 ADC cycles
-      value: 0
-    - name: Cycles6_5
-      description: 6.5 ADC cycles
-      value: 1
-    - name: Cycles12_5
-      description: 12.5 ADC cycles
-      value: 2
-    - name: Cycles24_5
-      description: 24.5 ADC cycles
-      value: 3
-    - name: Cycles47_5
-      description: 47.5 ADC cycles
-      value: 4
-    - name: Cycles92_5
-      description: 92.5 ADC cycles
-      value: 5
-    - name: Cycles247_5
-      description: 247.5 ADC cycles
-      value: 6
-    - name: Cycles640_5
-      description: 640.5 ADC cycles
-      value: 7
+  - name: Cycles2_5
+    description: 2.5 ADC cycles
+    value: 0
+  - name: Cycles6_5
+    description: 6.5 ADC cycles
+    value: 1
+  - name: Cycles12_5
+    description: 12.5 ADC cycles
+    value: 2
+  - name: Cycles24_5
+    description: 24.5 ADC cycles
+    value: 3
+  - name: Cycles47_5
+    description: 47.5 ADC cycles
+    value: 4
+  - name: Cycles92_5
+    description: 92.5 ADC cycles
+    value: 5
+  - name: Cycles247_5
+    description: 247.5 ADC cycles
+    value: 6
+  - name: Cycles640_5
+    description: 640.5 ADC cycles
+    value: 7
--- a/data/registers/adc_v4.yaml
+++ b/data/registers/adc_v4.yaml
--- a/data/registers/adccommon_f3.yaml
+++ b/data/registers/adccommon_f3.yaml
@ -1,286 +1,284 @@
---
 block/ADC_COMMON:
  description: ADC common registers
  items:
-    - name: CSR
-      description: ADC Common status register
-      byte_offset: 0
-      access: Read
-      fieldset: CSR
-    - name: CCR
-      description: ADC common control register
-      byte_offset: 8
-      fieldset: CCR
-    - name: CDR
-      description: ADC common regular data register for dual and triple modes
-      byte_offset: 12
-      access: Read
-      fieldset: CDR
-fieldset/CSR:
-  decsription: ADC common status register
-  fields:
-    - name: ADRDY_MST
-      description: Master ADC ready
-      bit_offset: 0
-      bit_size: 1
-    - name: EOSMP_MST
-      description: End of sampling phase flag of the master ADC
-      bit_offset: 1
-      bit_size: 1
-      enum: ENDED
-    - name: EOC_MST
-      description: End of regular conversion of the master ADC
-      bit_offset: 2
-      bit_size: 1
-      enum: ENDED
-    - name: EOS_MST
-      description: End of regular sequence flag of the master ADC
-      bit_offset: 3
-      bit_size: 1
-      enum: ENDED
-    - name: OVR_MST
-      description: Overrun flag of the master ADC
-      bit_offset: 4
-      bit_size: 1
-      enum: OVR
-    - name: JEOC_MST
-      description: End of injected conversion of the master ADC
-      bit_offset: 5
-      bit_size: 1
-      enum: ENDED
-    - name: JEOS
-      description: End of injected sequence flag of the master ADC
-      bit_offset: 6
-      bit_size: 1
-      enum: ENDED
-    - name: AWD1_MST
-      description: Analog watchdog 1 flag of the master ADC
-      bit_offset: 7
-      bit_size: 1
-      enum: AWD
-    - name: AWD2_MST
-      description: Analog watchdog 2 flag of the master ADC
-      bit_offset: 8
-      bit_size: 1
-      enum: AWD
-    - name: AWD3_MST
-      description: Analog watchdog 3 flag of the master ADC
-      bit_offset: 9
-      bit_size: 1
-      enum: AWD
-    - name: JQOVF_MST
-      description: Injected context queue overflow flag of the master ADC
-      bit_offset: 10
-      bit_size: 1
-      enum: JQOVF
-    - name: ADRDY_SLV
-      description: Slave ADC ready
-      bit_offset: 16
-      bit_size: 1
-    - name: EOSMP_SLV
-      description: End of sampling phase flag of the slave ADC
-      bit_offset: 17
-      bit_size: 1
-      enum: ENDED
-    - name: EOC_SLV
-      description: End of regular conversion of the slave ADC
-      bit_offset: 18
-      bit_size: 1
-      enum: ENDED
-    - name: EOS_SLV
-      description: End of regular sequence flag of the slave ADC
-      bit_offset: 19
-      bit_size: 1
-      enum: ENDED
-    - name: OVR_SLV
-      description: Overrun flag of the slave ADC
-      bit_offset: 20
-      bit_size: 1
-      enum: OVR
-    - name: JEOC_SLV
-      description: End of injected conversion of the slave ADC
-      bit_offset: 21
-      bit_size: 1
-      enum: ENDED
-    - name: JEOS_SLV
-      description: End of injected sequence flag of the slave ADC
-      bit_offset: 22
-      bit_size: 1
-      enum: ENDED
-    - name: AWD1_SLV
-      description: Analog watchdog 1 flag of the slave ADC
-      bit_offset: 23
-      bit_size: 1
-      enum: AWD
-    - name: AWD2_SLV
-      description: Analog watchdog 2 flag of the slave ADC
-      bit_offset: 24
-      bit_size: 1
-      enum: AWD
-    - name: AWD3_SLV
-      description: Analog watchdog 3 flag of the slave ADC
-      bit_offset: 25
-      bit_size: 1
-      enum: AWD
-    - name: JQOVF_SLV
-      description: Injected context queue overflow flag of the slave ADC
-      bit_offset: 26
-      bit_size: 1
-      enum: JQOVF
+  - name: CSR
+    description: ADC Common status register
+    byte_offset: 0
+    access: Read
+    fieldset: CSR
+  - name: CCR
+    description: ADC common control register
+    byte_offset: 8
+    fieldset: CCR
+  - name: CDR
+    description: ADC common regular data register for dual and triple modes
+    byte_offset: 12
+    access: Read
+    fieldset: CDR
 fieldset/CCR:
  description: ADC common control register
  fields:
-    - name: DUAL
-      description: Dual ADC mode selection
-      bit_offset: 0
-      bit_size: 5
-      enum: DUAL
-    - name: DELAY
-      description: Delay between 2 sampling phases
-      bit_offset: 8
-      bit_size: 4
-    - name: DMACFG
-      description: DMA configuration (for multi-ADC mode)
-      bit_offset: 13
-      bit_size: 1
-      enum: DMACFG
-    - name: MDMA
-      description: Direct memory access mode for multi ADC mode
-      bit_offset: 14
-      bit_size: 2
-      enum: MDMA
-    - name: CKMODE
-      description: ADC clock mode
-      bit_offset: 16
-      bit_size: 2
-      enum: CKMODE
-    - name: VREFEN
-      description: VREFINT enable
-      bit_offset: 22
-      bit_size: 1
-    - name: TSEN
-      description: Temperature sensor enable
-      bit_offset: 23
-      bit_size: 1
-    - name: VBATEN
-      description: VBAT enable
-      bit_offset: 24
-      bit_size: 1
+  - name: DUAL
+    description: Dual ADC mode selection
+    bit_offset: 0
+    bit_size: 5
+    enum: DUAL
+  - name: DELAY
+    description: Delay between 2 sampling phases
+    bit_offset: 8
+    bit_size: 4
+  - name: DMACFG
+    description: DMA configuration (for multi-ADC mode)
+    bit_offset: 13
+    bit_size: 1
+    enum: DMACFG
+  - name: MDMA
+    description: Direct memory access mode for multi ADC mode
+    bit_offset: 14
+    bit_size: 2
+    enum: MDMA
+  - name: CKMODE
+    description: ADC clock mode
+    bit_offset: 16
+    bit_size: 2
+    enum: CKMODE
+  - name: VREFEN
+    description: VREFINT enable
+    bit_offset: 22
+    bit_size: 1
+  - name: TSEN
+    description: Temperature sensor enable
+    bit_offset: 23
+    bit_size: 1
+  - name: VBATEN
+    description: VBAT enable
+    bit_offset: 24
+    bit_size: 1
 fieldset/CDR:
  description: ADC common regular data register for dual and triple modes
  fields:
-    - name: RDATA_MST
-      description: Regular data of the master ADC
-      bit_offset: 0
-      bit_size: 16
-    - name: RDATA_SLV
-      description: Regular data of the master ADC
-      bit_offset: 16
-      bit_size: 16
-enum/ENDED:
-  description: End of operation
-  bit_size: 1
-  variants:
-    - name: NotEnded
-      value: 0
-      description: Operation is not ended
-    - name: Ended
-      value: 1
-      description: Operation is ended
-enum/OVR:
-  description: Overrun flag
-  bit_size: 1
-  variants:
-    - name: NoOverrun
-      value: 0
-      description: No overrun occurred
-    - name: Overrun
-      value: 1
-      description: Overrun occurred
+  - name: RDATA_MST
+    description: Regular data of the master ADC
+    bit_offset: 0
+    bit_size: 16
+  - name: RDATA_SLV
+    description: Regular data of the master ADC
+    bit_offset: 16
+    bit_size: 16
+fieldset/CSR:
+  fields:
+  - name: ADRDY_MST
+    description: Master ADC ready
+    bit_offset: 0
+    bit_size: 1
+  - name: EOSMP_MST
+    description: End of sampling phase flag of the master ADC
+    bit_offset: 1
+    bit_size: 1
+    enum: ENDED
+  - name: EOC_MST
+    description: End of regular conversion of the master ADC
+    bit_offset: 2
+    bit_size: 1
+    enum: ENDED
+  - name: EOS_MST
+    description: End of regular sequence flag of the master ADC
+    bit_offset: 3
+    bit_size: 1
+    enum: ENDED
+  - name: OVR_MST
+    description: Overrun flag of the master ADC
+    bit_offset: 4
+    bit_size: 1
+    enum: OVR
+  - name: JEOC_MST
+    description: End of injected conversion of the master ADC
+    bit_offset: 5
+    bit_size: 1
+    enum: ENDED
+  - name: JEOS
+    description: End of injected sequence flag of the master ADC
+    bit_offset: 6
+    bit_size: 1
+    enum: ENDED
+  - name: AWD1_MST
+    description: Analog watchdog 1 flag of the master ADC
+    bit_offset: 7
+    bit_size: 1
+    enum: AWD
+  - name: AWD2_MST
+    description: Analog watchdog 2 flag of the master ADC
+    bit_offset: 8
+    bit_size: 1
+    enum: AWD
+  - name: AWD3_MST
+    description: Analog watchdog 3 flag of the master ADC
+    bit_offset: 9
+    bit_size: 1
+    enum: AWD
+  - name: JQOVF_MST
+    description: Injected context queue overflow flag of the master ADC
+    bit_offset: 10
+    bit_size: 1
+    enum: JQOVF
+  - name: ADRDY_SLV
+    description: Slave ADC ready
+    bit_offset: 16
+    bit_size: 1
+  - name: EOSMP_SLV
+    description: End of sampling phase flag of the slave ADC
+    bit_offset: 17
+    bit_size: 1
+    enum: ENDED
+  - name: EOC_SLV
+    description: End of regular conversion of the slave ADC
+    bit_offset: 18
+    bit_size: 1
+    enum: ENDED
+  - name: EOS_SLV
+    description: End of regular sequence flag of the slave ADC
+    bit_offset: 19
+    bit_size: 1
+    enum: ENDED
+  - name: OVR_SLV
+    description: Overrun flag of the slave ADC
+    bit_offset: 20
+    bit_size: 1
+    enum: OVR
+  - name: JEOC_SLV
+    description: End of injected conversion of the slave ADC
+    bit_offset: 21
+    bit_size: 1
+    enum: ENDED
+  - name: JEOS_SLV
+    description: End of injected sequence flag of the slave ADC
+    bit_offset: 22
+    bit_size: 1
+    enum: ENDED
+  - name: AWD1_SLV
+    description: Analog watchdog 1 flag of the slave ADC
+    bit_offset: 23
+    bit_size: 1
+    enum: AWD
+  - name: AWD2_SLV
+    description: Analog watchdog 2 flag of the slave ADC
+    bit_offset: 24
+    bit_size: 1
+    enum: AWD
+  - name: AWD3_SLV
+    description: Analog watchdog 3 flag of the slave ADC
+    bit_offset: 25
+    bit_size: 1
+    enum: AWD
+  - name: JQOVF_SLV
+    description: Injected context queue overflow flag of the slave ADC
+    bit_offset: 26
+    bit_size: 1
+    enum: JQOVF
 enum/AWD:
  description: Analog watchdog flag
  bit_size: 1
  variants:
-    - name: NoEvent
-      value: 0
-      description: No analog watchdog event occurred
-    - name: Event
-      value: 1
-      description: Analog watchdog event occurred
-enum/JQOVF:
-  description: Injected context queue overflow flag
-  bit_size: 1
-  variants:
-    - name: NoOverflow
-      value: 0
-      description: No injected context queue overflow
-    - name: Overflow
-      value: 1
-      description: Injected context queue overflow
-enum/DUAL:
-  description: Dual ADC mode selection
-  bit_size: 5
-  variants:
-    - name: Independent
-      value: 0
-      description: Independent mode
-    - name: DualRJ
-      value: 1
-      description: Dual, combined regular simultaneous + injected simultaneous mode
-    - name: DualRA
-      value: 2
-      description: Dual, combined regular simultaneous + alternate trigger mode
-    - name: DualIJ
-      value: 3
-      description: Dual, combined injected simultaneous + fast interleaved mode
-    - name: DualJ
-      value: 5
-      description: Dual, injected simultaneous mode only
-    - name: DualR
-      value: 6
-      description: Dual, regular simultaneous mode only
-    - name: DualI
-      value: 7
-      description: dual, interleaved mode only
-    - name: DualA
-      value: 9
-      description: Dual, alternate trigger mode only
-enum/DMACFG:
-  description: DMA configuration (for multi-ADC mode)
-  bit_size: 1
-  variants:
-    - name: OneShot
-      value: 0
-      description: DMA one shot mode selected
-    - name: Circulator
-      value: 1
-      description: DMA circular mode selected
-enum/MDMA:
-  description: Direct memory access mode for multi ADC mode
-  bit_size: 2
-  variants:
-    - name: Disabled
-      value: 0
-      description: MDMA mode disabled
-    - name: Bits12_10
-      value: 2
-      description: MDMA mode enabled for 12 and 10-bit resolution
-    - name: Bit8_6
-      value: 3
-      description: MDMA mode enabled for 8 and 6-bit resolution
+  - name: NoEvent
+    description: No analog watchdog event occurred
+    value: 0
+  - name: Event
+    description: Analog watchdog event occurred
+    value: 1
 enum/CKMODE:
  description: ADC clock mode
  bit_size: 2
  variants:
-    - name: Asynchronous
-      value: 0
-      description: Use Kernel Clock adc_ker_ck_input divided by PRESC. Asynchronous mode
-    - name: SyncDiv1
-      value: 1
-      description: Use AHB clock rcc_hclk3. In this case rcc_hclk must equal sys_d1cpre_ck.
-    - name: SyncDiv2
-      value: 2
-      description: Use AHB clock rcc_hclk3 divided by 2.
-    - name: SyncDiv4
-      value: 3
-      description: Use AHB clock rcc_hclk3 divided by 4.
+  - name: Asynchronous
+    description: Use Kernel Clock adc_ker_ck_input divided by PRESC. Asynchronous mode
+    value: 0
+  - name: SyncDiv1
+    description: Use AHB clock rcc_hclk3. In this case rcc_hclk must equal sys_d1cpre_ck.
+    value: 1
+  - name: SyncDiv2
+    description: Use AHB clock rcc_hclk3 divided by 2.
+    value: 2
+  - name: SyncDiv4
+    description: Use AHB clock rcc_hclk3 divided by 4.
+    value: 3
+enum/DMACFG:
+  description: DMA configuration (for multi-ADC mode)
+  bit_size: 1
+  variants:
+  - name: OneShot
+    description: DMA one shot mode selected
+    value: 0
+  - name: Circulator
+    description: DMA circular mode selected
+    value: 1
+enum/DUAL:
+  description: Dual ADC mode selection
+  bit_size: 5
+  variants:
+  - name: Independent
+    description: Independent mode
+    value: 0
+  - name: DualRJ
+    description: Dual, combined regular simultaneous + injected simultaneous mode
+    value: 1
+  - name: DualRA
+    description: Dual, combined regular simultaneous + alternate trigger mode
+    value: 2
+  - name: DualIJ
+    description: Dual, combined injected simultaneous + fast interleaved mode
+    value: 3
+  - name: DualJ
+    description: Dual, injected simultaneous mode only
+    value: 5
+  - name: DualR
+    description: Dual, regular simultaneous mode only
+    value: 6
+  - name: DualI
+    description: dual, interleaved mode only
+    value: 7
+  - name: DualA
+    description: Dual, alternate trigger mode only
+    value: 9
+enum/ENDED:
+  description: End of operation
+  bit_size: 1
+  variants:
+  - name: NotEnded
+    description: Operation is not ended
+    value: 0
+  - name: Ended
+    description: Operation is ended
+    value: 1
+enum/JQOVF:
+  description: Injected context queue overflow flag
+  bit_size: 1
+  variants:
+  - name: NoOverflow
+    description: No injected context queue overflow
+    value: 0
+  - name: Overflow
+    description: Injected context queue overflow
+    value: 1
+enum/MDMA:
+  description: Direct memory access mode for multi ADC mode
+  bit_size: 2
+  variants:
+  - name: Disabled
+    description: MDMA mode disabled
+    value: 0
+  - name: Bits12_10
+    description: MDMA mode enabled for 12 and 10-bit resolution
+    value: 2
+  - name: Bit8_6
+    description: MDMA mode enabled for 8 and 6-bit resolution
+    value: 3
+enum/OVR:
+  description: Overrun flag
+  bit_size: 1
+  variants:
+  - name: NoOverrun
+    description: No overrun occurred
+    value: 0
+  - name: Overrun
+    description: Overrun occurred
+    value: 1
--- a/data/registers/adccommon_v2.yaml
+++ b/data/registers/adccommon_v2.yaml
@ -1,249 +1,248 @@
---
 block/ADC_COMMON:
  description: ADC common registers
  items:
-    - name: CSR
-      description: ADC Common status register
-      byte_offset: 0
-      access: Read
-      fieldset: CSR
-    - name: CCR
-      description: ADC common control register
-      byte_offset: 4
-      fieldset: CCR
-    - name: CDR
-      description: ADC common regular data register for dual and triple modes
-      byte_offset: 8
-      access: Read
-      fieldset: CDR
+  - name: CSR
+    description: ADC Common status register
+    byte_offset: 0
+    access: Read
+    fieldset: CSR
+  - name: CCR
+    description: ADC common control register
+    byte_offset: 4
+    fieldset: CCR
+  - name: CDR
+    description: ADC common regular data register for dual and triple modes
+    byte_offset: 8
+    access: Read
+    fieldset: CDR
 fieldset/CCR:
  description: ADC common control register
  fields:
-    - name: MULTI
-      description: Multi ADC mode selection
-      bit_offset: 0
-      bit_size: 5
-      enum: MULTI
-    - name: DELAY
-      description: Delay between 2 sampling phases
-      bit_offset: 8
-      bit_size: 4
-    - name: DDS
-      description: DMA disable selection for multi-ADC mode
-      bit_offset: 13
-      bit_size: 1
-      enum: DDS
-    - name: DMA
-      description: Direct memory access mode for multi ADC mode
-      bit_offset: 14
-      bit_size: 2
-      enum: DMA
-    - name: ADCPRE
-      description: ADC prescaler
-      bit_offset: 16
-      bit_size: 2
-      enum: ADCPRE
-    - name: VBATE
-      description: VBAT enable
-      bit_offset: 22
-      bit_size: 1
-    - name: TSVREFE
-      description: Temperature sensor and VREFINT enable
-      bit_offset: 23
-      bit_size: 1
+  - name: MULTI
+    description: Multi ADC mode selection
+    bit_offset: 0
+    bit_size: 5
+    enum: MULTI
+  - name: DELAY
+    description: Delay between 2 sampling phases
+    bit_offset: 8
+    bit_size: 4
+  - name: DDS
+    description: DMA disable selection for multi-ADC mode
+    bit_offset: 13
+    bit_size: 1
+    enum: DDS
+  - name: DMA
+    description: Direct memory access mode for multi ADC mode
+    bit_offset: 14
+    bit_size: 2
+    enum: DMA
+  - name: ADCPRE
+    description: ADC prescaler
+    bit_offset: 16
+    bit_size: 2
+    enum: ADCPRE
+  - name: VBATE
+    description: VBAT enable
+    bit_offset: 22
+    bit_size: 1
+  - name: TSVREFE
+    description: Temperature sensor and VREFINT enable
+    bit_offset: 23
+    bit_size: 1
 fieldset/CDR:
  description: ADC common regular data register for dual and triple modes
  fields:
-    - name: DATA
-      description: 1st data item of a pair of regular conversions
-      bit_offset: 0
-      bit_size: 16
-      array:
-        len: 2
-        stride: 16
+  - name: DATA
+    description: 1st data item of a pair of regular conversions
+    bit_offset: 0
+    bit_size: 16
+    array:
+      len: 2
+      stride: 16
 fieldset/CSR:
  description: ADC common status register
  fields:
-    - name: AWD
-      description: Analog watchdog flag of ADC 1
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 3
-        stride: 8
-      enum: AWD
-    - name: EOC
-      description: End of conversion of ADC 1
-      bit_offset: 1
-      bit_size: 1
-      array:
-        len: 3
-        stride: 8
-      enum: EOC
-    - name: JEOC
-      description: Injected channel end of conversion of ADC 1
-      bit_offset: 2
-      bit_size: 1
-      array:
-        len: 3
-        stride: 8
-      enum: JEOC
-    - name: JSTRT
-      description: Injected channel Start flag of ADC 1
-      bit_offset: 3
-      bit_size: 1
-      array:
-        len: 3
-        stride: 8
-      enum: JSTRT
-    - name: STRT
-      description: Regular channel Start flag of ADC 1
-      bit_offset: 4
-      bit_size: 1
-      array:
-        len: 3
-        stride: 8
-      enum: STRT
-    - name: OVR
-      description: Overrun flag of ADC 1
-      bit_offset: 5
-      bit_size: 1
-      array:
-        len: 3
-        stride: 8
-      enum: OVR
+  - name: AWD
+    description: Analog watchdog flag of ADC 1
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 3
+      stride: 8
+    enum: AWD
+  - name: EOC
+    description: End of conversion of ADC 1
+    bit_offset: 1
+    bit_size: 1
+    array:
+      len: 3
+      stride: 8
+    enum: EOC
+  - name: JEOC
+    description: Injected channel end of conversion of ADC 1
+    bit_offset: 2
+    bit_size: 1
+    array:
+      len: 3
+      stride: 8
+    enum: JEOC
+  - name: JSTRT
+    description: Injected channel Start flag of ADC 1
+    bit_offset: 3
+    bit_size: 1
+    array:
+      len: 3
+      stride: 8
+    enum: JSTRT
+  - name: STRT
+    description: Regular channel Start flag of ADC 1
+    bit_offset: 4
+    bit_size: 1
+    array:
+      len: 3
+      stride: 8
+    enum: STRT
+  - name: OVR
+    description: Overrun flag of ADC 1
+    bit_offset: 5
+    bit_size: 1
+    array:
+      len: 3
+      stride: 8
+    enum: OVR
 enum/ADCPRE:
  bit_size: 2
  variants:
-    - name: Div2
-      description: PCLK2 divided by 2
-      value: 0
-    - name: Div4
-      description: PCLK2 divided by 4
-      value: 1
-    - name: Div6
-      description: PCLK2 divided by 6
-      value: 2
-    - name: Div8
-      description: PCLK2 divided by 8
-      value: 3
+  - name: Div2
+    description: PCLK2 divided by 2
+    value: 0
+  - name: Div4
+    description: PCLK2 divided by 4
+    value: 1
+  - name: Div6
+    description: PCLK2 divided by 6
+    value: 2
+  - name: Div8
+    description: PCLK2 divided by 8
+    value: 3
 enum/AWD:
  bit_size: 1
  variants:
-    - name: NoEvent
-      description: No analog watchdog event occurred
-      value: 0
-    - name: Event
-      description: Analog watchdog event occurred
-      value: 1
+  - name: NoEvent
+    description: No analog watchdog event occurred
+    value: 0
+  - name: Event
+    description: Analog watchdog event occurred
+    value: 1
 enum/DDS:
  bit_size: 1
  variants:
-    - name: Single
-      description: No new DMA request is issued after the last transfer
-      value: 0
-    - name: Continuous
-      description: "DMA requests are issued as long as data are converted and DMA=01, 10 or 11"
-      value: 1
+  - name: Single
+    description: No new DMA request is issued after the last transfer
+    value: 0
+  - name: Continuous
+    description: DMA requests are issued as long as data are converted and DMA=01, 10 or 11
+    value: 1
 enum/DMA:
  bit_size: 2
  variants:
-    - name: Disabled
-      description: DMA mode disabled
-      value: 0
-    - name: Mode1
-      description: DMA mode 1 enabled (2 / 3 half-words one by one - 1 then 2 then 3)
-      value: 1
-    - name: Mode2
-      description: DMA mode 2 enabled (2 / 3 half-words by pairs - 2&1 then 1&3 then 3&2)
-      value: 2
-    - name: Mode3
-      description: DMA mode 3 enabled (2 / 3 half-words by pairs - 2&1 then 1&3 then 3&2)
-      value: 3
+  - name: Disabled
+    description: DMA mode disabled
+    value: 0
+  - name: Mode1
+    description: DMA mode 1 enabled (2 / 3 half-words one by one - 1 then 2 then 3)
+    value: 1
+  - name: Mode2
+    description: DMA mode 2 enabled (2 / 3 half-words by pairs - 2&1 then 1&3 then 3&2)
+    value: 2
+  - name: Mode3
+    description: DMA mode 3 enabled (2 / 3 half-words by pairs - 2&1 then 1&3 then 3&2)
+    value: 3
 enum/EOC:
  bit_size: 1
  variants:
-    - name: NotComplete
-      description: Conversion is not complete
-      value: 0
-    - name: Complete
-      description: Conversion complete
-      value: 1
+  - name: NotComplete
+    description: Conversion is not complete
+    value: 0
+  - name: Complete
+    description: Conversion complete
+    value: 1
 enum/JEOC:
  bit_size: 1
  variants:
-    - name: NotComplete
-      description: Conversion is not complete
-      value: 0
-    - name: Complete
-      description: Conversion complete
-      value: 1
+  - name: NotComplete
+    description: Conversion is not complete
+    value: 0
+  - name: Complete
+    description: Conversion complete
+    value: 1
 enum/JSTRT:
  bit_size: 1
  variants:
-    - name: NotStarted
-      description: No injected channel conversion started
-      value: 0
-    - name: Started
-      description: Injected channel conversion has started
-      value: 1
+  - name: NotStarted
+    description: No injected channel conversion started
+    value: 0
+  - name: Started
+    description: Injected channel conversion has started
+    value: 1
 enum/MULTI:
  bit_size: 5
  variants:
-    - name: Independent
-      description: "All the ADCs independent: independent mode"
-      value: 0
-    - name: DualRJ
-      description: "Dual ADC1 and ADC2, combined regular and injected simultaneous mode"
-      value: 1
-    - name: DualRA
-      description: "Dual ADC1 and ADC2, combined regular and alternate trigger mode"
-      value: 2
-    - name: DualJ
-      description: "Dual ADC1 and ADC2, injected simultaneous mode only"
-      value: 5
-    - name: DualR
-      description: "Dual ADC1 and ADC2, regular simultaneous mode only"
-      value: 6
-    - name: DualI
-      description: "Dual ADC1 and ADC2, interleaved mode only"
-      value: 7
-    - name: DualA
-      description: "Dual ADC1 and ADC2, alternate trigger mode only"
-      value: 9
-    - name: TripleRJ
-      description: "Triple ADC, regular and injected simultaneous mode"
-      value: 17
-    - name: TripleRA
-      description: "Triple ADC, regular and alternate trigger mode"
-      value: 18
-    - name: TripleJ
-      description: "Triple ADC, injected simultaneous mode only"
-      value: 21
-    - name: TripleR
-      description: "Triple ADC, regular simultaneous mode only"
-      value: 22
-    - name: TripleI
-      description: "Triple ADC, interleaved mode only"
-      value: 23
-    - name: TripleA
-      description: "Triple ADC, alternate trigger mode only"
-      value: 24
+  - name: Independent
+    description: 'All the ADCs independent: independent mode'
+    value: 0
+  - name: DualRJ
+    description: Dual ADC1 and ADC2, combined regular and injected simultaneous mode
+    value: 1
+  - name: DualRA
+    description: Dual ADC1 and ADC2, combined regular and alternate trigger mode
+    value: 2
+  - name: DualJ
+    description: Dual ADC1 and ADC2, injected simultaneous mode only
+    value: 5
+  - name: DualR
+    description: Dual ADC1 and ADC2, regular simultaneous mode only
+    value: 6
+  - name: DualI
+    description: Dual ADC1 and ADC2, interleaved mode only
+    value: 7
+  - name: DualA
+    description: Dual ADC1 and ADC2, alternate trigger mode only
+    value: 9
+  - name: TripleRJ
+    description: Triple ADC, regular and injected simultaneous mode
+    value: 17
+  - name: TripleRA
+    description: Triple ADC, regular and alternate trigger mode
+    value: 18
+  - name: TripleJ
+    description: Triple ADC, injected simultaneous mode only
+    value: 21
+  - name: TripleR
+    description: Triple ADC, regular simultaneous mode only
+    value: 22
+  - name: TripleI
+    description: Triple ADC, interleaved mode only
+    value: 23
+  - name: TripleA
+    description: Triple ADC, alternate trigger mode only
+    value: 24
 enum/OVR:
  bit_size: 1
  variants:
-    - name: NoOverrun
-      description: No overrun occurred
-      value: 0
-    - name: Overrun
-      description: Overrun occurred
-      value: 1
+  - name: NoOverrun
+    description: No overrun occurred
+    value: 0
+  - name: Overrun
+    description: Overrun occurred
+    value: 1
 enum/STRT:
  bit_size: 1
  variants:
-    - name: NotStarted
-      description: No regular channel conversion started
-      value: 0
-    - name: Started
-      description: Regular channel conversion has started
-      value: 1
+  - name: NotStarted
+    description: No regular channel conversion started
+    value: 0
+  - name: Started
+    description: Regular channel conversion has started
+    value: 1
--- a/data/registers/adccommon_v3.yaml
+++ b/data/registers/adccommon_v3.yaml
@ -1,155 +1,154 @@
---
 block/ADC_COMMON:
  description: Analog-to-Digital Converter
  items:
-    - name: CSR
-      description: ADC Common status register
-      byte_offset: 0
-      access: Read
-      fieldset: CSR
-    - name: CCR
-      description: ADC common control register
-      byte_offset: 8
-      fieldset: CCR
-    - name: CDR
-      description: ADC common regular data register for dual and triple modes
-      byte_offset: 12
-      access: Read
-      fieldset: CDR
+  - name: CSR
+    description: ADC Common status register
+    byte_offset: 0
+    access: Read
+    fieldset: CSR
+  - name: CCR
+    description: ADC common control register
+    byte_offset: 8
+    fieldset: CCR
+  - name: CDR
+    description: ADC common regular data register for dual and triple modes
+    byte_offset: 12
+    access: Read
+    fieldset: CDR
 fieldset/CCR:
  description: ADC common control register
  fields:
-    - name: MULT
-      description: Multi ADC mode selection
-      bit_offset: 0
-      bit_size: 5
-    - name: DELAY
-      description: Delay between 2 sampling phases
-      bit_offset: 8
-      bit_size: 4
-    - name: DMACFG
-      description: DMA configuration (for multi-ADC mode)
-      bit_offset: 13
-      bit_size: 1
-    - name: MDMA
-      description: Direct memory access mode for multi ADC mode
-      bit_offset: 14
-      bit_size: 2
-    - name: CKMODE
-      description: ADC clock mode
-      bit_offset: 16
-      bit_size: 2
-    - name: VREFEN
-      description: VREFINT enable
-      bit_offset: 22
-      bit_size: 1
-    - name: CH18SEL
-      description: CH18 selection (Vbat)
-      bit_offset: 23
-      bit_size: 1
-    - name: CH17SEL
-      description: CH17 selection (temperature)
-      bit_offset: 24
-      bit_size: 1
+  - name: MULT
+    description: Multi ADC mode selection
+    bit_offset: 0
+    bit_size: 5
+  - name: DELAY
+    description: Delay between 2 sampling phases
+    bit_offset: 8
+    bit_size: 4
+  - name: DMACFG
+    description: DMA configuration (for multi-ADC mode)
+    bit_offset: 13
+    bit_size: 1
+  - name: MDMA
+    description: Direct memory access mode for multi ADC mode
+    bit_offset: 14
+    bit_size: 2
+  - name: CKMODE
+    description: ADC clock mode
+    bit_offset: 16
+    bit_size: 2
+  - name: VREFEN
+    description: VREFINT enable
+    bit_offset: 22
+    bit_size: 1
+  - name: CH18SEL
+    description: CH18 selection (Vbat)
+    bit_offset: 23
+    bit_size: 1
+  - name: CH17SEL
+    description: CH17 selection (temperature)
+    bit_offset: 24
+    bit_size: 1
 fieldset/CDR:
  description: ADC common regular data register for dual and triple modes
  fields:
-    - name: RDATA_MST
-      description: Regular data of the master ADC
-      bit_offset: 0
-      bit_size: 16
-    - name: RDATA_SLV
-      description: Regular data of the slave ADC
-      bit_offset: 16
-      bit_size: 16
+  - name: RDATA_MST
+    description: Regular data of the master ADC
+    bit_offset: 0
+    bit_size: 16
+  - name: RDATA_SLV
+    description: Regular data of the slave ADC
+    bit_offset: 16
+    bit_size: 16
 fieldset/CSR:
  description: ADC Common status register
  fields:
-    - name: ADDRDY_MST
-      description: ADDRDY_MST
-      bit_offset: 0
-      bit_size: 1
-    - name: EOSMP_MST
-      description: EOSMP_MST
-      bit_offset: 1
-      bit_size: 1
-    - name: EOC_MST
-      description: EOC_MST
-      bit_offset: 2
-      bit_size: 1
-    - name: EOS_MST
-      description: EOS_MST
-      bit_offset: 3
-      bit_size: 1
-    - name: OVR_MST
-      description: OVR_MST
-      bit_offset: 4
-      bit_size: 1
-    - name: JEOC_MST
-      description: JEOC_MST
-      bit_offset: 5
-      bit_size: 1
-    - name: JEOS_MST
-      description: JEOS_MST
-      bit_offset: 6
-      bit_size: 1
-    - name: AWD1_MST
-      description: AWD1_MST
-      bit_offset: 7
-      bit_size: 1
-    - name: AWD2_MST
-      description: AWD2_MST
-      bit_offset: 8
-      bit_size: 1
-    - name: AWD3_MST
-      description: AWD3_MST
-      bit_offset: 9
-      bit_size: 1
-    - name: JQOVF_MST
-      description: JQOVF_MST
-      bit_offset: 10
-      bit_size: 1
-    - name: ADRDY_SLV
-      description: ADRDY_SLV
-      bit_offset: 16
-      bit_size: 1
-    - name: EOSMP_SLV
-      description: EOSMP_SLV
-      bit_offset: 17
-      bit_size: 1
-    - name: EOC_SLV
-      description: End of regular conversion of the slave ADC
-      bit_offset: 18
-      bit_size: 1
-    - name: EOS_SLV
-      description: End of regular sequence flag of the slave ADC
-      bit_offset: 19
-      bit_size: 1
-    - name: OVR_SLV
-      description: Overrun flag of the slave ADC
-      bit_offset: 20
-      bit_size: 1
-    - name: JEOC_SLV
-      description: End of injected conversion flag of the slave ADC
-      bit_offset: 21
-      bit_size: 1
-    - name: JEOS_SLV
-      description: End of injected sequence flag of the slave ADC
-      bit_offset: 22
-      bit_size: 1
-    - name: AWD1_SLV
-      description: Analog watchdog 1 flag of the slave ADC
-      bit_offset: 23
-      bit_size: 1
-    - name: AWD2_SLV
-      description: Analog watchdog 2 flag of the slave ADC
-      bit_offset: 24
-      bit_size: 1
-    - name: AWD3_SLV
-      description: Analog watchdog 3 flag of the slave ADC
-      bit_offset: 25
-      bit_size: 1
-    - name: JQOVF_SLV
-      description: Injected Context Queue Overflow flag of the slave ADC
-      bit_offset: 26
-      bit_size: 1
+  - name: ADDRDY_MST
+    description: ADDRDY_MST
+    bit_offset: 0
+    bit_size: 1
+  - name: EOSMP_MST
+    description: EOSMP_MST
+    bit_offset: 1
+    bit_size: 1
+  - name: EOC_MST
+    description: EOC_MST
+    bit_offset: 2
+    bit_size: 1
+  - name: EOS_MST
+    description: EOS_MST
+    bit_offset: 3
+    bit_size: 1
+  - name: OVR_MST
+    description: OVR_MST
+    bit_offset: 4
+    bit_size: 1
+  - name: JEOC_MST
+    description: JEOC_MST
+    bit_offset: 5
+    bit_size: 1
+  - name: JEOS_MST
+    description: JEOS_MST
+    bit_offset: 6
+    bit_size: 1
+  - name: AWD1_MST
+    description: AWD1_MST
+    bit_offset: 7
+    bit_size: 1
+  - name: AWD2_MST
+    description: AWD2_MST
+    bit_offset: 8
+    bit_size: 1
+  - name: AWD3_MST
+    description: AWD3_MST
+    bit_offset: 9
+    bit_size: 1
+  - name: JQOVF_MST
+    description: JQOVF_MST
+    bit_offset: 10
+    bit_size: 1
+  - name: ADRDY_SLV
+    description: ADRDY_SLV
+    bit_offset: 16
+    bit_size: 1
+  - name: EOSMP_SLV
+    description: EOSMP_SLV
+    bit_offset: 17
+    bit_size: 1
+  - name: EOC_SLV
+    description: End of regular conversion of the slave ADC
+    bit_offset: 18
+    bit_size: 1
+  - name: EOS_SLV
+    description: End of regular sequence flag of the slave ADC
+    bit_offset: 19
+    bit_size: 1
+  - name: OVR_SLV
+    description: Overrun flag of the slave ADC
+    bit_offset: 20
+    bit_size: 1
+  - name: JEOC_SLV
+    description: End of injected conversion flag of the slave ADC
+    bit_offset: 21
+    bit_size: 1
+  - name: JEOS_SLV
+    description: End of injected sequence flag of the slave ADC
+    bit_offset: 22
+    bit_size: 1
+  - name: AWD1_SLV
+    description: Analog watchdog 1 flag of the slave ADC
+    bit_offset: 23
+    bit_size: 1
+  - name: AWD2_SLV
+    description: Analog watchdog 2 flag of the slave ADC
+    bit_offset: 24
+    bit_size: 1
+  - name: AWD3_SLV
+    description: Analog watchdog 3 flag of the slave ADC
+    bit_offset: 25
+    bit_size: 1
+  - name: JQOVF_SLV
+    description: Injected Context Queue Overflow flag of the slave ADC
+    bit_offset: 26
+    bit_size: 1
--- a/data/registers/adccommon_v4.yaml
+++ b/data/registers/adccommon_v4.yaml
@ -1,367 +1,366 @@
---
 block/ADC_COMMON:
  description: Analog-to-Digital Converter
  items:
-    - name: CSR
-      description: ADC Common status register
-      byte_offset: 0
-      access: Read
-      fieldset: CSR
-    - name: CCR
-      description: ADC common control register
-      byte_offset: 8
-      fieldset: CCR
-    - name: CDR
-      description: ADC common regular data register for dual and triple modes
-      byte_offset: 12
-      access: Read
-      fieldset: CDR
-    - name: CDR2
-      description: ADC x common regular data register for 32-bit dual mode
-      byte_offset: 16
-      access: Read
-      fieldset: CDR2
+  - name: CSR
+    description: ADC Common status register
+    byte_offset: 0
+    access: Read
+    fieldset: CSR
+  - name: CCR
+    description: ADC common control register
+    byte_offset: 8
+    fieldset: CCR
+  - name: CDR
+    description: ADC common regular data register for dual and triple modes
+    byte_offset: 12
+    access: Read
+    fieldset: CDR
+  - name: CDR2
+    description: ADC x common regular data register for 32-bit dual mode
+    byte_offset: 16
+    access: Read
+    fieldset: CDR2
 fieldset/CCR:
  description: ADC common control register
  fields:
-    - name: DUAL
-      description: Dual ADC mode selection
-      bit_offset: 0
-      bit_size: 5
-      enum: DUAL
-    - name: DELAY
-      description: Delay between 2 sampling phases
-      bit_offset: 8
-      bit_size: 4
-    - name: DAMDF
-      description: Dual ADC Mode Data Format
-      bit_offset: 14
-      bit_size: 2
-      enum: DAMDF
-    - name: CKMODE
-      description: ADC clock mode
-      bit_offset: 16
-      bit_size: 2
-      enum: CKMODE
-    - name: PRESC
-      description: ADC prescaler
-      bit_offset: 18
-      bit_size: 4
-      enum: PRESC
-    - name: VREFEN
-      description: VREFINT enable
-      bit_offset: 22
-      bit_size: 1
-    - name: VSENSEEN
-      description: Temperature sensor enable
-      bit_offset: 23
-      bit_size: 1
-    - name: VBATEN
-      description: VBAT enable
-      bit_offset: 24
-      bit_size: 1
+  - name: DUAL
+    description: Dual ADC mode selection
+    bit_offset: 0
+    bit_size: 5
+    enum: DUAL
+  - name: DELAY
+    description: Delay between 2 sampling phases
+    bit_offset: 8
+    bit_size: 4
+  - name: DAMDF
+    description: Dual ADC Mode Data Format
+    bit_offset: 14
+    bit_size: 2
+    enum: DAMDF
+  - name: CKMODE
+    description: ADC clock mode
+    bit_offset: 16
+    bit_size: 2
+    enum: CKMODE
+  - name: PRESC
+    description: ADC prescaler
+    bit_offset: 18
+    bit_size: 4
+    enum: PRESC
+  - name: VREFEN
+    description: VREFINT enable
+    bit_offset: 22
+    bit_size: 1
+  - name: VSENSEEN
+    description: Temperature sensor enable
+    bit_offset: 23
+    bit_size: 1
+  - name: VBATEN
+    description: VBAT enable
+    bit_offset: 24
+    bit_size: 1
 fieldset/CDR:
  description: ADC common regular data register for dual and triple modes
  fields:
-    - name: RDATA_MST
-      description: Regular data of the master ADC
-      bit_offset: 0
-      bit_size: 16
-    - name: RDATA_SLV
-      description: Regular data of the slave ADC
-      bit_offset: 16
-      bit_size: 16
+  - name: RDATA_MST
+    description: Regular data of the master ADC
+    bit_offset: 0
+    bit_size: 16
+  - name: RDATA_SLV
+    description: Regular data of the slave ADC
+    bit_offset: 16
+    bit_size: 16
 fieldset/CDR2:
  description: ADC x common regular data register for 32-bit dual mode
  fields:
-    - name: RDATA_ALT
-      description: Regular data of the master/slave alternated ADCs
-      bit_offset: 0
-      bit_size: 32
+  - name: RDATA_ALT
+    description: Regular data of the master/slave alternated ADCs
+    bit_offset: 0
+    bit_size: 32
 fieldset/CSR:
  description: ADC Common status register
  fields:
-    - name: ADRDY_MST
-      description: Master ADC ready
-      bit_offset: 0
-      bit_size: 1
-      enum: ADRDY_MST
-    - name: EOSMP_MST
-      description: End of Sampling phase flag of the master ADC
-      bit_offset: 1
-      bit_size: 1
-      enum: EOSMP_MST
-    - name: EOC_MST
-      description: End of regular conversion of the master ADC
-      bit_offset: 2
-      bit_size: 1
-      enum: EOC_MST
-    - name: EOS_MST
-      description: End of regular sequence flag of the master ADC
-      bit_offset: 3
-      bit_size: 1
-      enum: EOS_MST
-    - name: OVR_MST
-      description: Overrun flag of the master ADC
-      bit_offset: 4
-      bit_size: 1
-      enum: OVR_MST
-    - name: JEOC_MST
-      description: End of injected conversion flag of the master ADC
-      bit_offset: 5
-      bit_size: 1
-      enum: JEOC_MST
-    - name: JEOS_MST
-      description: End of injected sequence flag of the master ADC
-      bit_offset: 6
-      bit_size: 1
-      enum: JEOS_MST
-    - name: AWD1_MST
-      description: Analog watchdog 1 flag of the master ADC
-      bit_offset: 7
-      bit_size: 1
-      enum: AWD1_MST
-    - name: AWD2_MST
-      description: Analog watchdog 2 flag of the master ADC
-      bit_offset: 8
-      bit_size: 1
-      enum: AWD1_MST
-    - name: AWD3_MST
-      description: Analog watchdog 3 flag of the master ADC
-      bit_offset: 9
-      bit_size: 1
-      enum: AWD1_MST
-    - name: JQOVF_MST
-      description: Injected Context Queue Overflow flag of the master ADC
-      bit_offset: 10
-      bit_size: 1
-      enum: JQOVF_MST
-    - name: ADRDY_SLV
-      description: Slave ADC ready
-      bit_offset: 16
-      bit_size: 1
-      enum: ADRDY_MST
-    - name: EOSMP_SLV
-      description: End of Sampling phase flag of the slave ADC
-      bit_offset: 17
-      bit_size: 1
-      enum: EOSMP_MST
-    - name: EOC_SLV
-      description: End of regular conversion of the slave ADC
-      bit_offset: 18
-      bit_size: 1
-      enum: EOC_MST
-    - name: EOS_SLV
-      description: End of regular sequence flag of the slave ADC
-      bit_offset: 19
-      bit_size: 1
-      enum: EOS_MST
-    - name: OVR_SLV
-      description: Overrun flag of the slave ADC
-      bit_offset: 20
-      bit_size: 1
-      enum: OVR_MST
-    - name: JEOC_SLV
-      description: End of injected conversion flag of the slave ADC
-      bit_offset: 21
-      bit_size: 1
-      enum: JEOC_MST
-    - name: JEOS_SLV
-      description: End of injected sequence flag of the slave ADC
-      bit_offset: 22
-      bit_size: 1
-      enum: JEOS_MST
-    - name: AWD1_SLV
-      description: Analog watchdog 1 flag of the slave ADC
-      bit_offset: 23
-      bit_size: 1
-      enum: AWD1_MST
-    - name: AWD2_SLV
-      description: Analog watchdog 2 flag of the slave ADC
-      bit_offset: 24
-      bit_size: 1
-      enum: AWD1_MST
-    - name: AWD3_SLV
-      description: Analog watchdog 3 flag of the slave ADC
-      bit_offset: 25
-      bit_size: 1
-      enum: AWD1_MST
-    - name: JQOVF_SLV
-      description: Injected Context Queue Overflow flag of the slave ADC
-      bit_offset: 26
-      bit_size: 1
-      enum: JQOVF_MST
+  - name: ADRDY_MST
+    description: Master ADC ready
+    bit_offset: 0
+    bit_size: 1
+    enum: ADRDY_MST
+  - name: EOSMP_MST
+    description: End of Sampling phase flag of the master ADC
+    bit_offset: 1
+    bit_size: 1
+    enum: EOSMP_MST
+  - name: EOC_MST
+    description: End of regular conversion of the master ADC
+    bit_offset: 2
+    bit_size: 1
+    enum: EOC_MST
+  - name: EOS_MST
+    description: End of regular sequence flag of the master ADC
+    bit_offset: 3
+    bit_size: 1
+    enum: EOS_MST
+  - name: OVR_MST
+    description: Overrun flag of the master ADC
+    bit_offset: 4
+    bit_size: 1
+    enum: OVR_MST
+  - name: JEOC_MST
+    description: End of injected conversion flag of the master ADC
+    bit_offset: 5
+    bit_size: 1
+    enum: JEOC_MST
+  - name: JEOS_MST
+    description: End of injected sequence flag of the master ADC
+    bit_offset: 6
+    bit_size: 1
+    enum: JEOS_MST
+  - name: AWD1_MST
+    description: Analog watchdog 1 flag of the master ADC
+    bit_offset: 7
+    bit_size: 1
+    enum: AWD1_MST
+  - name: AWD2_MST
+    description: Analog watchdog 2 flag of the master ADC
+    bit_offset: 8
+    bit_size: 1
+    enum: AWD1_MST
+  - name: AWD3_MST
+    description: Analog watchdog 3 flag of the master ADC
+    bit_offset: 9
+    bit_size: 1
+    enum: AWD1_MST
+  - name: JQOVF_MST
+    description: Injected Context Queue Overflow flag of the master ADC
+    bit_offset: 10
+    bit_size: 1
+    enum: JQOVF_MST
+  - name: ADRDY_SLV
+    description: Slave ADC ready
+    bit_offset: 16
+    bit_size: 1
+    enum: ADRDY_MST
+  - name: EOSMP_SLV
+    description: End of Sampling phase flag of the slave ADC
+    bit_offset: 17
+    bit_size: 1
+    enum: EOSMP_MST
+  - name: EOC_SLV
+    description: End of regular conversion of the slave ADC
+    bit_offset: 18
+    bit_size: 1
+    enum: EOC_MST
+  - name: EOS_SLV
+    description: End of regular sequence flag of the slave ADC
+    bit_offset: 19
+    bit_size: 1
+    enum: EOS_MST
+  - name: OVR_SLV
+    description: Overrun flag of the slave ADC
+    bit_offset: 20
+    bit_size: 1
+    enum: OVR_MST
+  - name: JEOC_SLV
+    description: End of injected conversion flag of the slave ADC
+    bit_offset: 21
+    bit_size: 1
+    enum: JEOC_MST
+  - name: JEOS_SLV
+    description: End of injected sequence flag of the slave ADC
+    bit_offset: 22
+    bit_size: 1
+    enum: JEOS_MST
+  - name: AWD1_SLV
+    description: Analog watchdog 1 flag of the slave ADC
+    bit_offset: 23
+    bit_size: 1
+    enum: AWD1_MST
+  - name: AWD2_SLV
+    description: Analog watchdog 2 flag of the slave ADC
+    bit_offset: 24
+    bit_size: 1
+    enum: AWD1_MST
+  - name: AWD3_SLV
+    description: Analog watchdog 3 flag of the slave ADC
+    bit_offset: 25
+    bit_size: 1
+    enum: AWD1_MST
+  - name: JQOVF_SLV
+    description: Injected Context Queue Overflow flag of the slave ADC
+    bit_offset: 26
+    bit_size: 1
+    enum: JQOVF_MST
 enum/ADRDY_MST:
  bit_size: 1
  variants:
-    - name: NotReady
-      description: ADC is not ready to start conversion
-      value: 0
-    - name: Ready
-      description: ADC is ready to start conversion
-      value: 1
+  - name: NotReady
+    description: ADC is not ready to start conversion
+    value: 0
+  - name: Ready
+    description: ADC is ready to start conversion
+    value: 1
 enum/AWD1_MST:
  bit_size: 1
  variants:
-    - name: NoEvent
-      description: No analog watchdog event occurred
-      value: 0
-    - name: Event
-      description: Analog watchdog event occurred
-      value: 1
+  - name: NoEvent
+    description: No analog watchdog event occurred
+    value: 0
+  - name: Event
+    description: Analog watchdog event occurred
+    value: 1
 enum/CKMODE:
  bit_size: 2
  variants:
-    - name: Asynchronous
-      description: Use Kernel Clock adc_ker_ck_input divided by PRESC. Asynchronous to AHB clock
-      value: 0
-    - name: SyncDiv1
-      description: Use AHB clock rcc_hclk3. In this case rcc_hclk must equal sys_d1cpre_ck
-      value: 1
-    - name: SyncDiv2
-      description: Use AHB clock rcc_hclk3 divided by 2
-      value: 2
-    - name: SyncDiv4
-      description: Use AHB clock rcc_hclk3 divided by 4
-      value: 3
+  - name: Asynchronous
+    description: Use Kernel Clock adc_ker_ck_input divided by PRESC. Asynchronous to AHB clock
+    value: 0
+  - name: SyncDiv1
+    description: Use AHB clock rcc_hclk3. In this case rcc_hclk must equal sys_d1cpre_ck
+    value: 1
+  - name: SyncDiv2
+    description: Use AHB clock rcc_hclk3 divided by 2
+    value: 2
+  - name: SyncDiv4
+    description: Use AHB clock rcc_hclk3 divided by 4
+    value: 3
 enum/DAMDF:
  bit_size: 2
  variants:
-    - name: NoPack
-      description: "Without data packing, CDR/CDR2 not used"
-      value: 0
-    - name: Format32to10
-      description: CDR formatted for 32-bit down to 10-bit resolution
-      value: 2
-    - name: Format8
-      description: CDR formatted for 8-bit resolution
-      value: 3
+  - name: NoPack
+    description: Without data packing, CDR/CDR2 not used
+    value: 0
+  - name: Format32to10
+    description: CDR formatted for 32-bit down to 10-bit resolution
+    value: 2
+  - name: Format8
+    description: CDR formatted for 8-bit resolution
+    value: 3
 enum/DUAL:
  bit_size: 5
  variants:
-    - name: Independent
-      description: Independent mode
-      value: 0
-    - name: DualRJ
-      description: "Dual, combined regular simultaneous + injected simultaneous mode"
-      value: 1
-    - name: DualRA
-      description: "Dual, combined regular simultaneous + alternate trigger mode"
-      value: 2
-    - name: DualIJ
-      description: "Dual, combined interleaved mode + injected simultaneous mode"
-      value: 3
-    - name: DualJ
-      description: "Dual, injected simultaneous mode only"
-      value: 5
-    - name: DualR
-      description: "Dual, regular simultaneous mode only"
-      value: 6
-    - name: DualI
-      description: "Dual, interleaved mode only"
-      value: 7
-    - name: DualA
-      description: "Dual, alternate trigger mode only"
-      value: 9
+  - name: Independent
+    description: Independent mode
+    value: 0
+  - name: DualRJ
+    description: Dual, combined regular simultaneous + injected simultaneous mode
+    value: 1
+  - name: DualRA
+    description: Dual, combined regular simultaneous + alternate trigger mode
+    value: 2
+  - name: DualIJ
+    description: Dual, combined interleaved mode + injected simultaneous mode
+    value: 3
+  - name: DualJ
+    description: Dual, injected simultaneous mode only
+    value: 5
+  - name: DualR
+    description: Dual, regular simultaneous mode only
+    value: 6
+  - name: DualI
+    description: Dual, interleaved mode only
+    value: 7
+  - name: DualA
+    description: Dual, alternate trigger mode only
+    value: 9
 enum/EOC_MST:
  bit_size: 1
  variants:
-    - name: NotComplete
-      description: Regular conversion is not complete
-      value: 0
-    - name: Complete
-      description: Regular conversion complete
-      value: 1
+  - name: NotComplete
+    description: Regular conversion is not complete
+    value: 0
+  - name: Complete
+    description: Regular conversion complete
+    value: 1
 enum/EOSMP_MST:
  bit_size: 1
  variants:
-    - name: NotEnded
-      description: End of sampling phase no yet reached
-      value: 0
-    - name: Ended
-      description: End of sampling phase reached
-      value: 1
+  - name: NotEnded
+    description: End of sampling phase no yet reached
+    value: 0
+  - name: Ended
+    description: End of sampling phase reached
+    value: 1
 enum/EOS_MST:
  bit_size: 1
  variants:
-    - name: NotComplete
-      description: Regular sequence is not complete
-      value: 0
-    - name: Complete
-      description: Regular sequence complete
-      value: 1
+  - name: NotComplete
+    description: Regular sequence is not complete
+    value: 0
+  - name: Complete
+    description: Regular sequence complete
+    value: 1
 enum/JEOC_MST:
  bit_size: 1
  variants:
-    - name: NotComplete
-      description: Injected conversion is not complete
-      value: 0
-    - name: Complete
-      description: Injected conversion complete
-      value: 1
+  - name: NotComplete
+    description: Injected conversion is not complete
+    value: 0
+  - name: Complete
+    description: Injected conversion complete
+    value: 1
 enum/JEOS_MST:
  bit_size: 1
  variants:
-    - name: NotComplete
-      description: Injected sequence is not complete
-      value: 0
-    - name: Complete
-      description: Injected sequence complete
-      value: 1
+  - name: NotComplete
+    description: Injected sequence is not complete
+    value: 0
+  - name: Complete
+    description: Injected sequence complete
+    value: 1
 enum/JQOVF_MST:
  bit_size: 1
  variants:
-    - name: NoOverflow
-      description: No injected context queue overflow has occurred
-      value: 0
-    - name: Overflow
-      description: Injected context queue overflow has occurred
-      value: 1
+  - name: NoOverflow
+    description: No injected context queue overflow has occurred
+    value: 0
+  - name: Overflow
+    description: Injected context queue overflow has occurred
+    value: 1
 enum/OVR_MST:
  bit_size: 1
  variants:
-    - name: NoOverrun
-      description: No overrun occurred
-      value: 0
-    - name: Overrun
-      description: Overrun occurred
-      value: 1
+  - name: NoOverrun
+    description: No overrun occurred
+    value: 0
+  - name: Overrun
+    description: Overrun occurred
+    value: 1
 enum/PRESC:
  bit_size: 4
  variants:
-    - name: Div1
-      description: adc_ker_ck_input not divided
-      value: 0
-    - name: Div2
-      description: adc_ker_ck_input divided by 2
-      value: 1
-    - name: Div4
-      description: adc_ker_ck_input divided by 4
-      value: 2
-    - name: Div6
-      description: adc_ker_ck_input divided by 6
-      value: 3
-    - name: Div8
-      description: adc_ker_ck_input divided by 8
-      value: 4
-    - name: Div10
-      description: adc_ker_ck_input divided by 10
-      value: 5
-    - name: Div12
-      description: adc_ker_ck_input divided by 12
-      value: 6
-    - name: Div16
-      description: adc_ker_ck_input divided by 16
-      value: 7
-    - name: Div32
-      description: adc_ker_ck_input divided by 32
-      value: 8
-    - name: Div64
-      description: adc_ker_ck_input divided by 64
-      value: 9
-    - name: Div128
-      description: adc_ker_ck_input divided by 128
-      value: 10
-    - name: Div256
-      description: adc_ker_ck_input divided by 256
-      value: 11
+  - name: Div1
+    description: adc_ker_ck_input not divided
+    value: 0
+  - name: Div2
+    description: adc_ker_ck_input divided by 2
+    value: 1
+  - name: Div4
+    description: adc_ker_ck_input divided by 4
+    value: 2
+  - name: Div6
+    description: adc_ker_ck_input divided by 6
+    value: 3
+  - name: Div8
+    description: adc_ker_ck_input divided by 8
+    value: 4
+  - name: Div10
+    description: adc_ker_ck_input divided by 10
+    value: 5
+  - name: Div12
+    description: adc_ker_ck_input divided by 12
+    value: 6
+  - name: Div16
+    description: adc_ker_ck_input divided by 16
+    value: 7
+  - name: Div32
+    description: adc_ker_ck_input divided by 32
+    value: 8
+  - name: Div64
+    description: adc_ker_ck_input divided by 64
+    value: 9
+  - name: Div128
+    description: adc_ker_ck_input divided by 128
+    value: 10
+  - name: Div256
+    description: adc_ker_ck_input divided by 256
+    value: 11
--- a/data/registers/aes_f7.yaml
+++ b/data/registers/aes_f7.yaml
@ -1,205 +1,204 @@
---
 block/AES:
  description: Advanced encryption standard hardware accelerator
  items:
-    - name: CR
-      description: Control register
-      byte_offset: 0
-      fieldset: CR
-    - name: SR
-      description: Status register
-      byte_offset: 4
-      fieldset: SR
-    - name: DINR
-      description: Data input register
-      byte_offset: 8
-      fieldset: DINR
-    - name: DOUTR
-      description: Data output register
-      byte_offset: 12
-      fieldset: DOUTR
-    - name: KEYR
-      description: Key register
-      array:
-        offsets:
-          - 0
-          - 4
-          - 8
-          - 12
-          - 32
-          - 36
-          - 40
-          - 44
-      byte_offset: 16
-      fieldset: KEYR
-    - name: IVR
-      description: Initialization vector register
-      array:
-        len: 4
-        stride: 4
-      byte_offset: 32
-      fieldset: IVR
-    - name: SUSPR
-      description: Suspend register
-      array:
-        len: 8
-        stride: 4
-      byte_offset: 64
-      fieldset: SUSPR
+  - name: CR
+    description: Control register
+    byte_offset: 0
+    fieldset: CR
+  - name: SR
+    description: Status register
+    byte_offset: 4
+    fieldset: SR
+  - name: DINR
+    description: Data input register
+    byte_offset: 8
+    fieldset: DINR
+  - name: DOUTR
+    description: Data output register
+    byte_offset: 12
+    fieldset: DOUTR
+  - name: KEYR
+    description: Key register
+    array:
+      offsets:
+      - 0
+      - 4
+      - 8
+      - 12
+      - 32
+      - 36
+      - 40
+      - 44
+    byte_offset: 16
+    fieldset: KEYR
+  - name: IVR
+    description: Initialization vector register
+    array:
+      len: 4
+      stride: 4
+    byte_offset: 32
+    fieldset: IVR
+  - name: SUSPR
+    description: Suspend register
+    array:
+      len: 8
+      stride: 4
+    byte_offset: 64
+    fieldset: SUSPR
 fieldset/CR:
  description: Control register
  fields:
-    - name: EN
-      description: AES enable
-      bit_offset: 0
-      bit_size: 1
-    - name: DATATYPE
-      description: Data type selection
-      bit_offset: 1
-      bit_size: 2
-      enum: DATATYPE
-    - name: MODE
-      description: Operating mode
-      bit_offset: 3
-      bit_size: 2
-      enum: MODE
-    - name: CHMOD10
-      description: Chaining mode bit1 bit0
-      bit_offset: 5
-      bit_size: 2
-    - name: CCFC
-      description: Computation Complete Flag Clear
-      bit_offset: 7
-      bit_size: 1
-    - name: ERRC
-      description: Error clear
-      bit_offset: 8
-      bit_size: 1
-    - name: CCFIE
-      description: CCF flag interrupt enable
-      bit_offset: 9
-      bit_size: 1
-    - name: ERRIE
-      description: Error interrupt enable
-      bit_offset: 10
-      bit_size: 1
-    - name: DMAINEN
-      description: Enable DMA management of data input phase
-      bit_offset: 11
-      bit_size: 1
-    - name: DMAOUTEN
-      description: Enable DMA management of data output phase
-      bit_offset: 12
-      bit_size: 1
-    - name: GCMPH
-      description: GCM or CCM phase selection
-      bit_offset: 13
-      bit_size: 2
-      enum: GCMPH
-    - name: CHMOD2
-      description: Chaining mode bit2
-      bit_offset: 16
-      bit_size: 1
-    - name: KEYSIZE
-      description: Key size selection
-      bit_offset: 18
-      bit_size: 1
+  - name: EN
+    description: AES enable
+    bit_offset: 0
+    bit_size: 1
+  - name: DATATYPE
+    description: Data type selection
+    bit_offset: 1
+    bit_size: 2
+    enum: DATATYPE
+  - name: MODE
+    description: Operating mode
+    bit_offset: 3
+    bit_size: 2
+    enum: MODE
+  - name: CHMOD10
+    description: Chaining mode bit1 bit0
+    bit_offset: 5
+    bit_size: 2
+  - name: CCFC
+    description: Computation Complete Flag Clear
+    bit_offset: 7
+    bit_size: 1
+  - name: ERRC
+    description: Error clear
+    bit_offset: 8
+    bit_size: 1
+  - name: CCFIE
+    description: CCF flag interrupt enable
+    bit_offset: 9
+    bit_size: 1
+  - name: ERRIE
+    description: Error interrupt enable
+    bit_offset: 10
+    bit_size: 1
+  - name: DMAINEN
+    description: Enable DMA management of data input phase
+    bit_offset: 11
+    bit_size: 1
+  - name: DMAOUTEN
+    description: Enable DMA management of data output phase
+    bit_offset: 12
+    bit_size: 1
+  - name: GCMPH
+    description: GCM or CCM phase selection
+    bit_offset: 13
+    bit_size: 2
+    enum: GCMPH
+  - name: CHMOD2
+    description: Chaining mode bit2
+    bit_offset: 16
+    bit_size: 1
+  - name: KEYSIZE
+    description: Key size selection
+    bit_offset: 18
+    bit_size: 1
 fieldset/DINR:
  description: Data input register
  fields:
-    - name: DIN
-      description: Input data word
-      bit_offset: 0
-      bit_size: 32
+  - name: DIN
+    description: Input data word
+    bit_offset: 0
+    bit_size: 32
 fieldset/DOUTR:
  description: Data output register
  fields:
-    - name: DOUT
-      description: Output data word
-      bit_offset: 0
-      bit_size: 32
+  - name: DOUT
+    description: Output data word
+    bit_offset: 0
+    bit_size: 32
 fieldset/IVR:
  description: Initialization vector register
  fields:
-    - name: IVI
-      description: Initialization vector input
-      bit_offset: 0
-      bit_size: 32
+  - name: IVI
+    description: Initialization vector input
+    bit_offset: 0
+    bit_size: 32
 fieldset/KEYR:
  description: Key register
  fields:
-    - name: KEY
-      description: Cryptographic key
-      bit_offset: 0
-      bit_size: 32
+  - name: KEY
+    description: Cryptographic key
+    bit_offset: 0
+    bit_size: 32
 fieldset/SR:
  description: Status register
  fields:
-    - name: CCF
-      description: Computation complete flag
-      bit_offset: 0
-      bit_size: 1
-    - name: RDERR
-      description: Read error flag
-      bit_offset: 1
-      bit_size: 1
-    - name: WRERR
-      description: Write error flag
-      bit_offset: 2
-      bit_size: 1
-    - name: BUSY
-      description: Busy flag
-      bit_offset: 3
-      bit_size: 1
+  - name: CCF
+    description: Computation complete flag
+    bit_offset: 0
+    bit_size: 1
+  - name: RDERR
+    description: Read error flag
+    bit_offset: 1
+    bit_size: 1
+  - name: WRERR
+    description: Write error flag
+    bit_offset: 2
+    bit_size: 1
+  - name: BUSY
+    description: Busy flag
+    bit_offset: 3
+    bit_size: 1
 fieldset/SUSPR:
  description: Suspend register
  fields:
-    - name: SUSP
-      description: AES suspend
-      bit_offset: 0
-      bit_size: 32
+  - name: SUSP
+    description: AES suspend
+    bit_offset: 0
+    bit_size: 32
 enum/DATATYPE:
  bit_size: 2
  variants:
-    - name: None
-      description: Word
-      value: 0
-    - name: HalfWord
-      description: Half-word (16-bit)
-      value: 1
-    - name: Byte
-      description: Byte (8-bit)
-      value: 2
-    - name: Bit
-      description: Bit
-      value: 3
+  - name: None
+    description: Word
+    value: 0
+  - name: HalfWord
+    description: Half-word (16-bit)
+    value: 1
+  - name: Byte
+    description: Byte (8-bit)
+    value: 2
+  - name: Bit
+    description: Bit
+    value: 3
 enum/GCMPH:
  bit_size: 2
  variants:
-    - name: Init phase
-      description: Init phase
-      value: 0
-    - name: Header phase
-      description: Header phase
-      value: 1
-    - name: Payload phase
-      description: Payload phase
-      value: 2
-    - name: Final phase
-      description: Final phase
-      value: 3
+  - name: Init phase
+    description: Init phase
+    value: 0
+  - name: Header phase
+    description: Header phase
+    value: 1
+  - name: Payload phase
+    description: Payload phase
+    value: 2
+  - name: Final phase
+    description: Final phase
+    value: 3
 enum/MODE:
  bit_size: 2
  variants:
-    - name: Mode1
-      description: "Encryption"
-      value: 0
-    - name: Mode2
-      description: "Key derivation (or key preparation for ECB/CBC decryption)"
-      value: 1
-    - name: Mode3
-      description: "Decryption"
-      value: 2
-    - name: Mode4
-      description: "Key derivation then single decryption"
-      value: 3
+  - name: Mode1
+    description: Encryption
+    value: 0
+  - name: Mode2
+    description: Key derivation (or key preparation for ECB/CBC decryption)
+    value: 1
+  - name: Mode3
+    description: Decryption
+    value: 2
+  - name: Mode4
+    description: Key derivation then single decryption
+    value: 3
--- a/data/registers/aes_u5.yaml
+++ b/data/registers/aes_u5.yaml
@ -1,259 +1,258 @@
---
 block/AES:
  description: Advanced encryption standard hardware accelerator
  items:
-    - name: CR
-      description: Control register
-      byte_offset: 0
-      fieldset: CR
-    - name: SR
-      description: Status register
-      byte_offset: 4
-      fieldset: SR
-    - name: DINR
-      description: Data input register
-      byte_offset: 8
-      fieldset: DINR
-    - name: DOUTR
-      description: Data output register
-      byte_offset: 12
-      fieldset: DOUTR
-    - name: IER
-      description: interrupt enable register
-      byte_offset: 768
-      fieldset: IER
-    - name: ISR
-      description: interrupt status register
-      byte_offset: 772
-      fieldset: ISR
-    - name: ICR
-      description: interrupt clear register
-      byte_offset: 776
-      fieldset: ICR
-    - name: KEYR
-      description: Key register
-      array:
-        offsets:
-          - 0
-          - 4
-          - 8
-          - 12
-          - 32
-          - 36
-          - 40
-          - 44
-      byte_offset: 16
-      fieldset: KEYR
-    - name: IVR
-      description: Initialization vector register
-      array:
-        len: 4
-        stride: 4
-      byte_offset: 32
-      fieldset: IVR
-    - name: SUSPR
-      description: Suspend register
-      array:
-        len: 8
-        stride: 4
-      byte_offset: 64
-      fieldset: SUSPR
+  - name: CR
+    description: Control register
+    byte_offset: 0
+    fieldset: CR
+  - name: SR
+    description: Status register
+    byte_offset: 4
+    fieldset: SR
+  - name: DINR
+    description: Data input register
+    byte_offset: 8
+    fieldset: DINR
+  - name: DOUTR
+    description: Data output register
+    byte_offset: 12
+    fieldset: DOUTR
+  - name: KEYR
+    description: Key register
+    array:
+      offsets:
+      - 0
+      - 4
+      - 8
+      - 12
+      - 32
+      - 36
+      - 40
+      - 44
+    byte_offset: 16
+    fieldset: KEYR
+  - name: IVR
+    description: Initialization vector register
+    array:
+      len: 4
+      stride: 4
+    byte_offset: 32
+    fieldset: IVR
+  - name: SUSPR
+    description: Suspend register
+    array:
+      len: 8
+      stride: 4
+    byte_offset: 64
+    fieldset: SUSPR
+  - name: IER
+    description: interrupt enable register
+    byte_offset: 768
+    fieldset: IER
+  - name: ISR
+    description: interrupt status register
+    byte_offset: 772
+    fieldset: ISR
+  - name: ICR
+    description: interrupt clear register
+    byte_offset: 776
+    fieldset: ICR
 fieldset/CR:
  description: Control register
  fields:
-    - name: EN
-      description: AES enable
-      bit_offset: 0
-      bit_size: 1
-    - name: DATATYPE
-      description: Data type selection
-      bit_offset: 1
-      bit_size: 2
-      enum: DATATYPE
-    - name: MODE
-      description: Operating mode
-      bit_offset: 3
-      bit_size: 2
-      enum: MODE
-    - name: CHMOD10
-      description: Chaining mode bit1 bit0
-      bit_offset: 5
-      bit_size: 2
-    - name: DMAINEN
-      description: Enable DMA management of data input phase
-      bit_offset: 11
-      bit_size: 1
-    - name: DMAOUTEN
-      description: Enable DMA management of data output phase
-      bit_offset: 12
-      bit_size: 1
-    - name: GCMPH
-      description: GCM or CCM phase selection
-      bit_offset: 13
-      bit_size: 2
-      enum: GCMPH
-    - name: CHMOD2
-      description: Chaining mode bit2
-      bit_offset: 16
-      bit_size: 1
-    - name: KEYSIZE
-      description: Key size selection
-      bit_offset: 18
-      bit_size: 1
-    - name: NPBLB
-      description: Number of padding bytes in last block of payload
-      bit_offset: 20
-      bit_size: 4
-    - name: KMOD
-      description: Key mode selection
-      bit_offset: 24
-      bit_size: 2
-    - name: IPRST
-      description: AES peripheral software reset
-      bit_offset: 31
-      bit_size: 1
+  - name: EN
+    description: AES enable
+    bit_offset: 0
+    bit_size: 1
+  - name: DATATYPE
+    description: Data type selection
+    bit_offset: 1
+    bit_size: 2
+    enum: DATATYPE
+  - name: MODE
+    description: Operating mode
+    bit_offset: 3
+    bit_size: 2
+    enum: MODE
+  - name: CHMOD10
+    description: Chaining mode bit1 bit0
+    bit_offset: 5
+    bit_size: 2
+  - name: DMAINEN
+    description: Enable DMA management of data input phase
+    bit_offset: 11
+    bit_size: 1
+  - name: DMAOUTEN
+    description: Enable DMA management of data output phase
+    bit_offset: 12
+    bit_size: 1
+  - name: GCMPH
+    description: GCM or CCM phase selection
+    bit_offset: 13
+    bit_size: 2
+    enum: GCMPH
+  - name: CHMOD2
+    description: Chaining mode bit2
+    bit_offset: 16
+    bit_size: 1
+  - name: KEYSIZE
+    description: Key size selection
+    bit_offset: 18
+    bit_size: 1
+  - name: NPBLB
+    description: Number of padding bytes in last block of payload
+    bit_offset: 20
+    bit_size: 4
+  - name: KMOD
+    description: Key mode selection
+    bit_offset: 24
+    bit_size: 2
+  - name: IPRST
+    description: AES peripheral software reset
+    bit_offset: 31
+    bit_size: 1
 fieldset/DINR:
  description: Data input register
  fields:
-    - name: DIN
-      description: Input data word
-      bit_offset: 0
-      bit_size: 32
+  - name: DIN
+    description: Input data word
+    bit_offset: 0
+    bit_size: 32
 fieldset/DOUTR:
  description: Data output register
  fields:
-    - name: DOUT
-      description: Output data word
-      bit_offset: 0
-      bit_size: 32
+  - name: DOUT
+    description: Output data word
+    bit_offset: 0
+    bit_size: 32
 fieldset/ICR:
  description: Interrupt clear register
  fields:
-    - name: CCF
-      description: Computation complete flag clear
-      bit_offset: 0
-      bit_size: 1
-    - name: RWEIF
-      description: Read or write error interrupt flag clear
-      bit_offset: 1
-      bit_size: 1
-    - name: KEIF
-      description: Key error interrupt flag clear
-      bit_offset: 2
-      bit_size: 1
+  - name: CCF
+    description: Computation complete flag clear
+    bit_offset: 0
+    bit_size: 1
+  - name: RWEIF
+    description: Read or write error interrupt flag clear
+    bit_offset: 1
+    bit_size: 1
+  - name: KEIF
+    description: Key error interrupt flag clear
+    bit_offset: 2
+    bit_size: 1
 fieldset/IER:
  description: Interrupt enable register
  fields:
-    - name: CCFIE
-      description: Computation complete flag interrupt enable
-      bit_offset: 0
-      bit_size: 1
-    - name: RWEIE
-      description: Read or write error interrupt enable
-      bit_offset: 1
-      bit_size: 1
-    - name: KEIE
-      description: Key error interrupt enable
-      bit_offset: 2
-      bit_size: 1
+  - name: CCFIE
+    description: Computation complete flag interrupt enable
+    bit_offset: 0
+    bit_size: 1
+  - name: RWEIE
+    description: Read or write error interrupt enable
+    bit_offset: 1
+    bit_size: 1
+  - name: KEIE
+    description: Key error interrupt enable
+    bit_offset: 2
+    bit_size: 1
 fieldset/ISR:
  description: Interrupt status register
  fields:
-    - name: CCF
-      description: Computation complete flag
-      bit_offset: 0
-      bit_size: 1
-    - name: RWEIF
-      description: Read or write error interrupt flag
-      bit_offset: 1
-      bit_size: 1
-    - name: KEIF
-      description: Key error interrupt flag
-      bit_offset: 2
-      bit_size: 1
+  - name: CCF
+    description: Computation complete flag
+    bit_offset: 0
+    bit_size: 1
+  - name: RWEIF
+    description: Read or write error interrupt flag
+    bit_offset: 1
+    bit_size: 1
+  - name: KEIF
+    description: Key error interrupt flag
+    bit_offset: 2
+    bit_size: 1
 fieldset/IVR:
  description: Initialization vector register
  fields:
-    - name: IVI
-      description: Initialization vector input
-      bit_offset: 0
-      bit_size: 32
+  - name: IVI
+    description: Initialization vector input
+    bit_offset: 0
+    bit_size: 32
 fieldset/KEYR:
  description: Key register
  fields:
-    - name: KEY
-      description: Cryptographic key
-      bit_offset: 0
-      bit_size: 32
+  - name: KEY
+    description: Cryptographic key
+    bit_offset: 0
+    bit_size: 32
 fieldset/SR:
  description: Status register
  fields:
-    - name: CCF
-      description: Computation complete flag
-      bit_offset: 0
-      bit_size: 1
-    - name: RDERR
-      description: Read error flag
-      bit_offset: 1
-      bit_size: 1
-    - name: WRERR
-      description: Write error flag
-      bit_offset: 2
-      bit_size: 1
-    - name: BUSY
-      description: Busy flag
-      bit_offset: 3
-      bit_size: 1
-    - name: KEYVALID
-      description: Key valid flag
-      bit_offset: 7
-      bit_size: 1
+  - name: CCF
+    description: Computation complete flag
+    bit_offset: 0
+    bit_size: 1
+  - name: RDERR
+    description: Read error flag
+    bit_offset: 1
+    bit_size: 1
+  - name: WRERR
+    description: Write error flag
+    bit_offset: 2
+    bit_size: 1
+  - name: BUSY
+    description: Busy flag
+    bit_offset: 3
+    bit_size: 1
+  - name: KEYVALID
+    description: Key valid flag
+    bit_offset: 7
+    bit_size: 1
 fieldset/SUSPR:
  description: Suspend register
  fields:
-    - name: SUSP
-      description: AES suspend
-      bit_offset: 0
-      bit_size: 32
+  - name: SUSP
+    description: AES suspend
+    bit_offset: 0
+    bit_size: 32
 enum/DATATYPE:
  bit_size: 2
  variants:
-    - name: None
-      description: Word
-      value: 0
-    - name: HalfWord
-      description: Half-word (16-bit)
-      value: 1
-    - name: Byte
-      description: Byte (8-bit)
-      value: 2
-    - name: Bit
-      description: Bit
-      value: 3
+  - name: None
+    description: Word
+    value: 0
+  - name: HalfWord
+    description: Half-word (16-bit)
+    value: 1
+  - name: Byte
+    description: Byte (8-bit)
+    value: 2
+  - name: Bit
+    description: Bit
+    value: 3
 enum/GCMPH:
  bit_size: 2
  variants:
-    - name: Init phase
-      description: Init phase
-      value: 0
-    - name: Header phase
-      description: Header phase
-      value: 1
-    - name: Payload phase
-      description: Payload phase
-      value: 2
-    - name: Final phase
-      description: Final phase
-      value: 3
+  - name: Init phase
+    description: Init phase
+    value: 0
+  - name: Header phase
+    description: Header phase
+    value: 1
+  - name: Payload phase
+    description: Payload phase
+    value: 2
+  - name: Final phase
+    description: Final phase
+    value: 3
 enum/MODE:
  bit_size: 2
  variants:
-    - name: Mode1
-      description: "Encryption"
-      value: 0
-    - name: Mode2
-      description: "Key derivation (or key preparation for ECB/CBC decryption)"
-      value: 1
-    - name: Mode3
-      description: "Decryption"
-      value: 2
+  - name: Mode1
+    description: Encryption
+    value: 0
+  - name: Mode2
+    description: Key derivation (or key preparation for ECB/CBC decryption)
+    value: 1
+  - name: Mode3
+    description: Decryption
+    value: 2
--- a/data/registers/aes_v1.yaml
+++ b/data/registers/aes_v1.yaml
@ -1,152 +1,151 @@
---
 block/AES:
  description: Advanced encryption standard hardware accelerator
  items:
-    - name: CR
-      description: Control register
-      byte_offset: 0
-      fieldset: CR
-    - name: SR
-      description: Status register
-      byte_offset: 4
-      fieldset: SR
-    - name: DINR
-      description: Data input register
-      byte_offset: 8
-      fieldset: DINR
-    - name: DOUTR
-      description: Data output register
-      byte_offset: 12
-      fieldset: DOUTR
-    - name: KEYR
-      description: Key register
-      array:
-        len: 4
-        stride: 4
-      byte_offset: 16
-      fieldset: KEYR
-    - name: IVR
-      description: Initialization vector register
-      array:
-        len: 4
-        stride: 4
-      byte_offset: 32
-      fieldset: IVR
+  - name: CR
+    description: Control register
+    byte_offset: 0
+    fieldset: CR
+  - name: SR
+    description: Status register
+    byte_offset: 4
+    fieldset: SR
+  - name: DINR
+    description: Data input register
+    byte_offset: 8
+    fieldset: DINR
+  - name: DOUTR
+    description: Data output register
+    byte_offset: 12
+    fieldset: DOUTR
+  - name: KEYR
+    description: Key register
+    array:
+      len: 4
+      stride: 4
+    byte_offset: 16
+    fieldset: KEYR
+  - name: IVR
+    description: Initialization vector register
+    array:
+      len: 4
+      stride: 4
+    byte_offset: 32
+    fieldset: IVR
 fieldset/CR:
  description: Control register
  fields:
-    - name: EN
-      description: AES enable
-      bit_offset: 0
-      bit_size: 1
-    - name: DATATYPE
-      description: Data type selection
-      bit_offset: 1
-      bit_size: 2
-      enum: DATATYPE
-    - name: MODE
-      description: Operating mode
-      bit_offset: 3
-      bit_size: 2
-      enum: MODE
-    - name: CHMOD10
-      description: Chaining mode bit1 bit0
-      bit_offset: 5
-      bit_size: 2
-    - name: CCFC
-      description: Computation Complete Flag Clear
-      bit_offset: 7
-      bit_size: 1
-    - name: ERRC
-      description: Error clear
-      bit_offset: 8
-      bit_size: 1
-    - name: CCFIE
-      description: CCF flag interrupt enable
-      bit_offset: 9
-      bit_size: 1
-    - name: ERRIE
-      description: Error interrupt enable
-      bit_offset: 10
-      bit_size: 1
-    - name: DMAINEN
-      description: Enable DMA management of data input phase
-      bit_offset: 11
-      bit_size: 1
-    - name: DMAOUTEN
-      description: Enable DMA management of data output phase
-      bit_offset: 12
-      bit_size: 1
+  - name: EN
+    description: AES enable
+    bit_offset: 0
+    bit_size: 1
+  - name: DATATYPE
+    description: Data type selection
+    bit_offset: 1
+    bit_size: 2
+    enum: DATATYPE
+  - name: MODE
+    description: Operating mode
+    bit_offset: 3
+    bit_size: 2
+    enum: MODE
+  - name: CHMOD10
+    description: Chaining mode bit1 bit0
+    bit_offset: 5
+    bit_size: 2
+  - name: CCFC
+    description: Computation Complete Flag Clear
+    bit_offset: 7
+    bit_size: 1
+  - name: ERRC
+    description: Error clear
+    bit_offset: 8
+    bit_size: 1
+  - name: CCFIE
+    description: CCF flag interrupt enable
+    bit_offset: 9
+    bit_size: 1
+  - name: ERRIE
+    description: Error interrupt enable
+    bit_offset: 10
+    bit_size: 1
+  - name: DMAINEN
+    description: Enable DMA management of data input phase
+    bit_offset: 11
+    bit_size: 1
+  - name: DMAOUTEN
+    description: Enable DMA management of data output phase
+    bit_offset: 12
+    bit_size: 1
 fieldset/DINR:
  description: Data input register
  fields:
-    - name: DIN
-      description: Input data word
-      bit_offset: 0
-      bit_size: 32
+  - name: DIN
+    description: Input data word
+    bit_offset: 0
+    bit_size: 32
 fieldset/DOUTR:
  description: Data output register
  fields:
-    - name: DOUT
-      description: Output data word
-      bit_offset: 0
-      bit_size: 32
+  - name: DOUT
+    description: Output data word
+    bit_offset: 0
+    bit_size: 32
 fieldset/IVR:
  description: Initialization vector register
  fields:
-    - name: IVI
-      description: "Initialization vector input"
-      bit_offset: 0
-      bit_size: 32
+  - name: IVI
+    description: Initialization vector input
+    bit_offset: 0
+    bit_size: 32
 fieldset/KEYR:
  description: Key register
  fields:
-    - name: KEY
-      description: Cryptographic key
-      bit_offset: 0
-      bit_size: 32
+  - name: KEY
+    description: Cryptographic key
+    bit_offset: 0
+    bit_size: 32
 fieldset/SR:
  description: Status register
  fields:
-    - name: CCF
-      description: Computation complete flag
-      bit_offset: 0
-      bit_size: 1
-    - name: RDERR
-      description: Read error flag
-      bit_offset: 1
-      bit_size: 1
-    - name: WRERR
-      description: Write error flag
-      bit_offset: 2
-      bit_size: 1
+  - name: CCF
+    description: Computation complete flag
+    bit_offset: 0
+    bit_size: 1
+  - name: RDERR
+    description: Read error flag
+    bit_offset: 1
+    bit_size: 1
+  - name: WRERR
+    description: Write error flag
+    bit_offset: 2
+    bit_size: 1
 enum/DATATYPE:
  bit_size: 2
  variants:
-    - name: None
-      description: Word
-      value: 0
-    - name: HalfWord
-      description: Half-word (16-bit)
-      value: 1
-    - name: Byte
-      description: Byte (8-bit)
-      value: 2
-    - name: Bit
-      description: Bit
-      value: 3
+  - name: None
+    description: Word
+    value: 0
+  - name: HalfWord
+    description: Half-word (16-bit)
+    value: 1
+  - name: Byte
+    description: Byte (8-bit)
+    value: 2
+  - name: Bit
+    description: Bit
+    value: 3
 enum/MODE:
  bit_size: 2
  variants:
-    - name: Mode1
-      description: "Encryption"
-      value: 0
-    - name: Mode2
-      description: "Key derivation (or key preparation for ECB/CBC decryption)"
-      value: 1
-    - name: Mode3
-      description: "Decryption"
-      value: 2
-    - name: Mode4
-      description: "Key derivation then single decryption"
-      value: 3
+  - name: Mode1
+    description: Encryption
+    value: 0
+  - name: Mode2
+    description: Key derivation (or key preparation for ECB/CBC decryption)
+    value: 1
+  - name: Mode3
+    description: Decryption
+    value: 2
+  - name: Mode4
+    description: Key derivation then single decryption
+    value: 3
--- a/data/registers/aes_v2.yaml
+++ b/data/registers/aes_v2.yaml
@ -1,209 +1,208 @@
---
 block/AES:
  description: Advanced encryption standard hardware accelerator
  items:
-    - name: CR
-      description: Control register
-      byte_offset: 0
-      fieldset: CR
-    - name: SR
-      description: Status register
-      byte_offset: 4
-      fieldset: SR
-    - name: DINR
-      description: Data input register
-      byte_offset: 8
-      fieldset: DINR
-    - name: DOUTR
-      description: Data output register
-      byte_offset: 12
-      fieldset: DOUTR
-    - name: KEYR
-      description: Key register
-      array:
-        offsets:
-          - 0
-          - 4
-          - 8
-          - 12
-          - 32
-          - 36
-          - 40
-          - 44
-      byte_offset: 16
-      fieldset: KEYR
-    - name: IVR
-      description: Initialization vector register
-      array:
-        len: 4
-        stride: 4
-      byte_offset: 32
-      fieldset: IVR
-    - name: SUSPR
-      description: Suspend register
-      array:
-        len: 8
-        stride: 4
-      byte_offset: 64
-      fieldset: SUSPR
+  - name: CR
+    description: Control register
+    byte_offset: 0
+    fieldset: CR
+  - name: SR
+    description: Status register
+    byte_offset: 4
+    fieldset: SR
+  - name: DINR
+    description: Data input register
+    byte_offset: 8
+    fieldset: DINR
+  - name: DOUTR
+    description: Data output register
+    byte_offset: 12
+    fieldset: DOUTR
+  - name: KEYR
+    description: Key register
+    array:
+      offsets:
+      - 0
+      - 4
+      - 8
+      - 12
+      - 32
+      - 36
+      - 40
+      - 44
+    byte_offset: 16
+    fieldset: KEYR
+  - name: IVR
+    description: Initialization vector register
+    array:
+      len: 4
+      stride: 4
+    byte_offset: 32
+    fieldset: IVR
+  - name: SUSPR
+    description: Suspend register
+    array:
+      len: 8
+      stride: 4
+    byte_offset: 64
+    fieldset: SUSPR
 fieldset/CR:
  description: Control register
  fields:
-    - name: EN
-      description: AES enable
-      bit_offset: 0
-      bit_size: 1
-    - name: DATATYPE
-      description: Data type selection
-      bit_offset: 1
-      bit_size: 2
-      enum: DATATYPE
-    - name: MODE
-      description: Operating mode
-      bit_offset: 3
-      bit_size: 2
-      enum: MODE
-    - name: CHMOD10
-      description: Chaining mode bit1 bit0
-      bit_offset: 5
-      bit_size: 2
-    - name: CCFC
-      description: Computation Complete Flag Clear
-      bit_offset: 7
-      bit_size: 1
-    - name: ERRC
-      description: Error clear
-      bit_offset: 8
-      bit_size: 1
-    - name: CCFIE
-      description: CCF flag interrupt enable
-      bit_offset: 9
-      bit_size: 1
-    - name: ERRIE
-      description: Error interrupt enable
-      bit_offset: 10
-      bit_size: 1
-    - name: DMAINEN
-      description: Enable DMA management of data input phase
-      bit_offset: 11
-      bit_size: 1
-    - name: DMAOUTEN
-      description: Enable DMA management of data output phase
-      bit_offset: 12
-      bit_size: 1
-    - name: GCMPH
-      description: GCM or CCM phase selection
-      bit_offset: 13
-      bit_size: 2
-      enum: GCMPH
-    - name: CHMOD2
-      description: Chaining mode bit2
-      bit_offset: 16
-      bit_size: 1
-    - name: KEYSIZE
-      description: Key size selection
-      bit_offset: 18
-      bit_size: 1
-    - name: NPBLB
-      description: Number of padding bytes in last block of payload
-      bit_offset: 20
-      bit_size: 4
+  - name: EN
+    description: AES enable
+    bit_offset: 0
+    bit_size: 1
+  - name: DATATYPE
+    description: Data type selection
+    bit_offset: 1
+    bit_size: 2
+    enum: DATATYPE
+  - name: MODE
+    description: Operating mode
+    bit_offset: 3
+    bit_size: 2
+    enum: MODE
+  - name: CHMOD10
+    description: Chaining mode bit1 bit0
+    bit_offset: 5
+    bit_size: 2
+  - name: CCFC
+    description: Computation Complete Flag Clear
+    bit_offset: 7
+    bit_size: 1
+  - name: ERRC
+    description: Error clear
+    bit_offset: 8
+    bit_size: 1
+  - name: CCFIE
+    description: CCF flag interrupt enable
+    bit_offset: 9
+    bit_size: 1
+  - name: ERRIE
+    description: Error interrupt enable
+    bit_offset: 10
+    bit_size: 1
+  - name: DMAINEN
+    description: Enable DMA management of data input phase
+    bit_offset: 11
+    bit_size: 1
+  - name: DMAOUTEN
+    description: Enable DMA management of data output phase
+    bit_offset: 12
+    bit_size: 1
+  - name: GCMPH
+    description: GCM or CCM phase selection
+    bit_offset: 13
+    bit_size: 2
+    enum: GCMPH
+  - name: CHMOD2
+    description: Chaining mode bit2
+    bit_offset: 16
+    bit_size: 1
+  - name: KEYSIZE
+    description: Key size selection
+    bit_offset: 18
+    bit_size: 1
+  - name: NPBLB
+    description: Number of padding bytes in last block of payload
+    bit_offset: 20
+    bit_size: 4
 fieldset/DINR:
  description: Data input register
  fields:
-    - name: DIN
-      description: Input data word
-      bit_offset: 0
-      bit_size: 32
+  - name: DIN
+    description: Input data word
+    bit_offset: 0
+    bit_size: 32
 fieldset/DOUTR:
  description: Data output register
  fields:
-    - name: DOUT
-      description: Output data word
-      bit_offset: 0
-      bit_size: 32
+  - name: DOUT
+    description: Output data word
+    bit_offset: 0
+    bit_size: 32
 fieldset/IVR:
  description: Initialization vector register
  fields:
-    - name: IVI
-      description: Initialization vector input
-      bit_offset: 0
-      bit_size: 32
+  - name: IVI
+    description: Initialization vector input
+    bit_offset: 0
+    bit_size: 32
 fieldset/KEYR:
  description: Key register
  fields:
-    - name: KEY
-      description: Cryptographic key
-      bit_offset: 0
-      bit_size: 32
+  - name: KEY
+    description: Cryptographic key
+    bit_offset: 0
+    bit_size: 32
 fieldset/SR:
  description: Status register
  fields:
-    - name: CCF
-      description: Computation complete flag
-      bit_offset: 0
-      bit_size: 1
-    - name: RDERR
-      description: Read error flag
-      bit_offset: 1
-      bit_size: 1
-    - name: WRERR
-      description: Write error flag
-      bit_offset: 2
-      bit_size: 1
-    - name: BUSY
-      description: Busy flag
-      bit_offset: 3
-      bit_size: 1
+  - name: CCF
+    description: Computation complete flag
+    bit_offset: 0
+    bit_size: 1
+  - name: RDERR
+    description: Read error flag
+    bit_offset: 1
+    bit_size: 1
+  - name: WRERR
+    description: Write error flag
+    bit_offset: 2
+    bit_size: 1
+  - name: BUSY
+    description: Busy flag
+    bit_offset: 3
+    bit_size: 1
 fieldset/SUSPR:
  description: Suspend register
  fields:
-    - name: SUSP
-      description: AES suspend
-      bit_offset: 0
-      bit_size: 32
+  - name: SUSP
+    description: AES suspend
+    bit_offset: 0
+    bit_size: 32
 enum/DATATYPE:
  bit_size: 2
  variants:
-    - name: None
-      description: Word
-      value: 0
-    - name: HalfWord
-      description: Half-word (16-bit)
-      value: 1
-    - name: Byte
-      description: Byte (8-bit)
-      value: 2
-    - name: Bit
-      description: Bit
-      value: 3
+  - name: None
+    description: Word
+    value: 0
+  - name: HalfWord
+    description: Half-word (16-bit)
+    value: 1
+  - name: Byte
+    description: Byte (8-bit)
+    value: 2
+  - name: Bit
+    description: Bit
+    value: 3
 enum/GCMPH:
  bit_size: 2
  variants:
-    - name: Init phase
-      description: Init phase
-      value: 0
-    - name: Header phase
-      description: Header phase
-      value: 1
-    - name: Payload phase
-      description: Payload phase
-      value: 2
-    - name: Final phase
-      description: Final phase
-      value: 3
+  - name: Init phase
+    description: Init phase
+    value: 0
+  - name: Header phase
+    description: Header phase
+    value: 1
+  - name: Payload phase
+    description: Payload phase
+    value: 2
+  - name: Final phase
+    description: Final phase
+    value: 3
 enum/MODE:
  bit_size: 2
  variants:
-    - name: Mode1
-      description: "Encryption"
-      value: 0
-    - name: Mode2
-      description: "Key derivation (or key preparation for ECB/CBC decryption)"
-      value: 1
-    - name: Mode3
-      description: "Decryption"
-      value: 2
-    - name: Mode4
-      description: "Key derivation then single decryption"
-      value: 3
+  - name: Mode1
+    description: Encryption
+    value: 0
+  - name: Mode2
+    description: Key derivation (or key preparation for ECB/CBC decryption)
+    value: 1
+  - name: Mode3
+    description: Decryption
+    value: 2
+  - name: Mode4
+    description: Key derivation then single decryption
+    value: 3
--- a/data/registers/afio_f1.yaml
+++ b/data/registers/afio_f1.yaml
@ -1,202 +1,201 @@
---
 block/AFIO:
  description: Alternate function I/O
  items:
-    - name: EVCR
-      description: Event Control Register (AFIO_EVCR)
-      byte_offset: 0
-      fieldset: EVCR
-    - name: MAPR
-      description: AF remap and debug I/O configuration register (AFIO_MAPR)
-      byte_offset: 4
-      fieldset: MAPR
-    - name: EXTICR
-      description: External interrupt configuration register 1 (AFIO_EXTICR1)
-      array:
-        len: 4
-        stride: 4
-      byte_offset: 8
-      fieldset: EXTICR
-    - name: MAPR2
-      description: AF remap and debug I/O configuration register
-      byte_offset: 28
-      fieldset: MAPR2
+  - name: EVCR
+    description: Event Control Register (AFIO_EVCR)
+    byte_offset: 0
+    fieldset: EVCR
+  - name: MAPR
+    description: AF remap and debug I/O configuration register (AFIO_MAPR)
+    byte_offset: 4
+    fieldset: MAPR
+  - name: EXTICR
+    description: External interrupt configuration register 1 (AFIO_EXTICR1)
+    array:
+      len: 4
+      stride: 4
+    byte_offset: 8
+    fieldset: EXTICR
+  - name: MAPR2
+    description: AF remap and debug I/O configuration register
+    byte_offset: 28
+    fieldset: MAPR2
 fieldset/EVCR:
  description: Event Control Register (AFIO_EVCR)
  fields:
-    - name: PIN
-      description: Pin selection
-      bit_offset: 0
-      bit_size: 4
-    - name: PORT
-      description: Port selection
-      bit_offset: 4
-      bit_size: 3
-    - name: EVOE
-      description: Event Output Enable
-      bit_offset: 7
-      bit_size: 1
+  - name: PIN
+    description: Pin selection
+    bit_offset: 0
+    bit_size: 4
+  - name: PORT
+    description: Port selection
+    bit_offset: 4
+    bit_size: 3
+  - name: EVOE
+    description: Event Output Enable
+    bit_offset: 7
+    bit_size: 1
 fieldset/EXTICR:
  description: External interrupt configuration register 3 (AFIO_EXTICR3)
  fields:
-    - name: EXTI
-      description: EXTI12 configuration
-      bit_offset: 0
-      bit_size: 4
-      array:
-        len: 4
-        stride: 4
+  - name: EXTI
+    description: EXTI12 configuration
+    bit_offset: 0
+    bit_size: 4
+    array:
+      len: 4
+      stride: 4
 fieldset/MAPR:
  description: AF remap and debug I/O configuration register (AFIO_MAPR)
  fields:
-    - name: SPI1_REMAP
-      description: SPI1 remapping
-      bit_offset: 0
-      bit_size: 1
-    - name: I2C1_REMAP
-      description: I2C1 remapping
-      bit_offset: 1
-      bit_size: 1
-    - name: USART1_REMAP
-      description: USART1 remapping
-      bit_offset: 2
-      bit_size: 1
-    - name: USART2_REMAP
-      description: USART2 remapping
-      bit_offset: 3
-      bit_size: 1
-    - name: USART3_REMAP
-      description: USART3 remapping
-      bit_offset: 4
-      bit_size: 2
-    - name: TIM1_REMAP
-      description: TIM1 remapping
-      bit_offset: 6
-      bit_size: 2
-    - name: TIM2_REMAP
-      description: TIM2 remapping
-      bit_offset: 8
-      bit_size: 2
-    - name: TIM3_REMAP
-      description: TIM3 remapping
-      bit_offset: 10
-      bit_size: 2
-    - name: TIM4_REMAP
-      description: TIM4 remapping
-      bit_offset: 12
-      bit_size: 1
-    - name: CAN1_REMAP
-      description: CAN1 remapping
-      bit_offset: 13
-      bit_size: 2
-    - name: PD01_REMAP
-      description: Port D0/Port D1 mapping on OSCIN/OSCOUT
-      bit_offset: 15
-      bit_size: 1
-    - name: TIM5CH4_IREMAP
-      description: Set and cleared by software
-      bit_offset: 16
-      bit_size: 1
-    - name: ADC1_ETRGINJ_REMAP
-      description: ADC 1 External trigger injected conversion remapping
-      bit_offset: 17
-      bit_size: 1
-    - name: ADC1_ETRGREG_REMAP
-      description: ADC 1 external trigger regular conversion remapping
-      bit_offset: 18
-      bit_size: 1
-    - name: ADC2_ETRGINJ_REMAP
-      description: ADC 2 external trigger injected conversion remapping
-      bit_offset: 19
-      bit_size: 1
-    - name: ADC2_ETRGREG_REMAP
-      description: ADC 2 external trigger regular conversion remapping
-      bit_offset: 20
-      bit_size: 1
-    - name: ETH_REMAP
-      description: Ethernet MAC I/O remapping
-      bit_offset: 21
-      bit_size: 1
-    - name: CAN2_REMAP
-      description: CAN2 I/O remapping
-      bit_offset: 22
-      bit_size: 1
-    - name: MII_RMII_SEL
-      description: MII or RMII selection
-      bit_offset: 23
-      bit_size: 1
-    - name: SWJ_CFG
-      description: Serial wire JTAG configuration
-      bit_offset: 24
-      bit_size: 3
-    - name: SPI3_REMAP
-      description: SPI3/I2S3 remapping
-      bit_offset: 28
-      bit_size: 1
-    - name: TIM2ITR1_IREMAP
-      description: TIM2 internal trigger 1 remapping
-      bit_offset: 29
-      bit_size: 1
-    - name: PTP_PPS_REMAP
-      description: Ethernet PTP PPS remapping
-      bit_offset: 30
-      bit_size: 1
+  - name: SPI1_REMAP
+    description: SPI1 remapping
+    bit_offset: 0
+    bit_size: 1
+  - name: I2C1_REMAP
+    description: I2C1 remapping
+    bit_offset: 1
+    bit_size: 1
+  - name: USART1_REMAP
+    description: USART1 remapping
+    bit_offset: 2
+    bit_size: 1
+  - name: USART2_REMAP
+    description: USART2 remapping
+    bit_offset: 3
+    bit_size: 1
+  - name: USART3_REMAP
+    description: USART3 remapping
+    bit_offset: 4
+    bit_size: 2
+  - name: TIM1_REMAP
+    description: TIM1 remapping
+    bit_offset: 6
+    bit_size: 2
+  - name: TIM2_REMAP
+    description: TIM2 remapping
+    bit_offset: 8
+    bit_size: 2
+  - name: TIM3_REMAP
+    description: TIM3 remapping
+    bit_offset: 10
+    bit_size: 2
+  - name: TIM4_REMAP
+    description: TIM4 remapping
+    bit_offset: 12
+    bit_size: 1
+  - name: CAN1_REMAP
+    description: CAN1 remapping
+    bit_offset: 13
+    bit_size: 2
+  - name: PD01_REMAP
+    description: Port D0/Port D1 mapping on OSCIN/OSCOUT
+    bit_offset: 15
+    bit_size: 1
+  - name: TIM5CH4_IREMAP
+    description: Set and cleared by software
+    bit_offset: 16
+    bit_size: 1
+  - name: ADC1_ETRGINJ_REMAP
+    description: ADC 1 External trigger injected conversion remapping
+    bit_offset: 17
+    bit_size: 1
+  - name: ADC1_ETRGREG_REMAP
+    description: ADC 1 external trigger regular conversion remapping
+    bit_offset: 18
+    bit_size: 1
+  - name: ADC2_ETRGINJ_REMAP
+    description: ADC 2 external trigger injected conversion remapping
+    bit_offset: 19
+    bit_size: 1
+  - name: ADC2_ETRGREG_REMAP
+    description: ADC 2 external trigger regular conversion remapping
+    bit_offset: 20
+    bit_size: 1
+  - name: ETH_REMAP
+    description: Ethernet MAC I/O remapping
+    bit_offset: 21
+    bit_size: 1
+  - name: CAN2_REMAP
+    description: CAN2 I/O remapping
+    bit_offset: 22
+    bit_size: 1
+  - name: MII_RMII_SEL
+    description: MII or RMII selection
+    bit_offset: 23
+    bit_size: 1
+  - name: SWJ_CFG
+    description: Serial wire JTAG configuration
+    bit_offset: 24
+    bit_size: 3
+  - name: SPI3_REMAP
+    description: SPI3/I2S3 remapping
+    bit_offset: 28
+    bit_size: 1
+  - name: TIM2ITR1_IREMAP
+    description: TIM2 internal trigger 1 remapping
+    bit_offset: 29
+    bit_size: 1
+  - name: PTP_PPS_REMAP
+    description: Ethernet PTP PPS remapping
+    bit_offset: 30
+    bit_size: 1
 fieldset/MAPR2:
  description: AF remap and debug I/O configuration register
  fields:
-    - name: TIM15_REMAP
-      description: TIM15 remapping
-      bit_offset: 0
-      bit_size: 1
-    - name: TIM16_REMAP
-      description: TIM16 remapping
-      bit_offset: 1
-      bit_size: 1
-    - name: TIM17_REMAP
-      description: TIM17 remapping
-      bit_offset: 2
-      bit_size: 1
-    - name: CEC_REMAP
-      description: CEC remapping
-      bit_offset: 3
-      bit_size: 1
-    - name: TIM1_DMA_REMAP
-      description: TIM1 DMA remapping
-      bit_offset: 4
-      bit_size: 1
-    - name: TIM9_REMAP
-      description: TIM9 remapping
-      bit_offset: 5
-      bit_size: 1
-    - name: TIM10_REMAP
-      description: TIM10 remapping
-      bit_offset: 6
-      bit_size: 1
-    - name: TIM11_REMAP
-      description: TIM11 remapping
-      bit_offset: 7
-      bit_size: 1
-    - name: TIM13_REMAP
-      description: TIM13 remapping
-      bit_offset: 8
-      bit_size: 1
-    - name: TIM14_REMAP
-      description: TIM14 remapping
-      bit_offset: 9
-      bit_size: 1
-    - name: FSMC_NADV
-      description: NADV connect/disconnect
-      bit_offset: 10
-      bit_size: 1
-    - name: TIM67_DAC_DMA_REMAP
-      description: TIM67_DAC DMA remapping
-      bit_offset: 11
-      bit_size: 1
-    - name: TIM12_REMAP
-      description: TIM12 remapping
-      bit_offset: 12
-      bit_size: 1
-    - name: MISC_REMAP
-      description: Miscellaneous features remapping
-      bit_offset: 13
-      bit_size: 1
+  - name: TIM15_REMAP
+    description: TIM15 remapping
+    bit_offset: 0
+    bit_size: 1
+  - name: TIM16_REMAP
+    description: TIM16 remapping
+    bit_offset: 1
+    bit_size: 1
+  - name: TIM17_REMAP
+    description: TIM17 remapping
+    bit_offset: 2
+    bit_size: 1
+  - name: CEC_REMAP
+    description: CEC remapping
+    bit_offset: 3
+    bit_size: 1
+  - name: TIM1_DMA_REMAP
+    description: TIM1 DMA remapping
+    bit_offset: 4
+    bit_size: 1
+  - name: TIM9_REMAP
+    description: TIM9 remapping
+    bit_offset: 5
+    bit_size: 1
+  - name: TIM10_REMAP
+    description: TIM10 remapping
+    bit_offset: 6
+    bit_size: 1
+  - name: TIM11_REMAP
+    description: TIM11 remapping
+    bit_offset: 7
+    bit_size: 1
+  - name: TIM13_REMAP
+    description: TIM13 remapping
+    bit_offset: 8
+    bit_size: 1
+  - name: TIM14_REMAP
+    description: TIM14 remapping
+    bit_offset: 9
+    bit_size: 1
+  - name: FSMC_NADV
+    description: NADV connect/disconnect
+    bit_offset: 10
+    bit_size: 1
+  - name: TIM67_DAC_DMA_REMAP
+    description: TIM67_DAC DMA remapping
+    bit_offset: 11
+    bit_size: 1
+  - name: TIM12_REMAP
+    description: TIM12 remapping
+    bit_offset: 12
+    bit_size: 1
+  - name: MISC_REMAP
+    description: Miscellaneous features remapping
+    bit_offset: 13
+    bit_size: 1
--- a/data/registers/bdma_v1.yaml
+++ b/data/registers/bdma_v1.yaml
@ -1,198 +1,197 @@
---
 block/CH:
-  description: "Channel cluster: CCR?, CNDTR?, CPAR?, and CMAR? registers"
+  description: 'Channel cluster: CCR?, CNDTR?, CPAR?, and CMAR? registers'
  items:
-    - name: CR
-      description: DMA channel configuration register (DMA_CCR)
-      byte_offset: 0
-      fieldset: CR
-    - name: NDTR
-      description: DMA channel 1 number of data register
-      byte_offset: 4
-      fieldset: NDTR
-    - name: PAR
-      description: DMA channel 1 peripheral address register
-      byte_offset: 8
-    - name: MAR
-      description: DMA channel 1 memory address register
-      byte_offset: 12
+  - name: CR
+    description: DMA channel configuration register (DMA_CCR)
+    byte_offset: 0
+    fieldset: CR
+  - name: NDTR
+    description: DMA channel 1 number of data register
+    byte_offset: 4
+    fieldset: NDTR
+  - name: PAR
+    description: DMA channel 1 peripheral address register
+    byte_offset: 8
+  - name: MAR
+    description: DMA channel 1 memory address register
+    byte_offset: 12
 block/DMA:
  description: DMA controller
  items:
-    - name: ISR
-      description: DMA interrupt status register (DMA_ISR)
-      byte_offset: 0
-      access: Read
-      fieldset: ISR
-    - name: IFCR
-      description: DMA interrupt flag clear register (DMA_IFCR)
-      byte_offset: 4
-      access: Write
-      fieldset: ISR
-    - name: CH
-      description: "Channel cluster: CCR?, CNDTR?, CPAR?, and CMAR? registers"
-      array:
-        len: 8
-        stride: 20
-      byte_offset: 8
-      block: CH
+  - name: ISR
+    description: DMA interrupt status register (DMA_ISR)
+    byte_offset: 0
+    access: Read
+    fieldset: ISR
+  - name: IFCR
+    description: DMA interrupt flag clear register (DMA_IFCR)
+    byte_offset: 4
+    access: Write
+    fieldset: ISR
+  - name: CH
+    description: 'Channel cluster: CCR?, CNDTR?, CPAR?, and CMAR? registers'
+    array:
+      len: 8
+      stride: 20
+    byte_offset: 8
+    block: CH
 fieldset/CR:
  description: DMA channel configuration register (DMA_CCR)
  fields:
-    - name: EN
-      description: Channel enable
-      bit_offset: 0
-      bit_size: 1
-    - name: TCIE
-      description: Transfer complete interrupt enable
-      bit_offset: 1
-      bit_size: 1
-    - name: HTIE
-      description: Half Transfer interrupt enable
-      bit_offset: 2
-      bit_size: 1
-    - name: TEIE
-      description: Transfer error interrupt enable
-      bit_offset: 3
-      bit_size: 1
-    - name: DIR
-      description: Data transfer direction
-      bit_offset: 4
-      bit_size: 1
-      enum: DIR
-    - name: CIRC
-      description: Circular mode
-      bit_offset: 5
-      bit_size: 1
-      enum: CIRC
-    - name: PINC
-      description: Peripheral increment mode
-      bit_offset: 6
-      bit_size: 1
-      enum: INC
-    - name: MINC
-      description: Memory increment mode
-      bit_offset: 7
-      bit_size: 1
-      enum: INC
-    - name: PSIZE
-      description: Peripheral size
-      bit_offset: 8
-      bit_size: 2
-      enum: SIZE
-    - name: MSIZE
-      description: Memory size
-      bit_offset: 10
-      bit_size: 2
-      enum: SIZE
-    - name: PL
-      description: Channel Priority level
-      bit_offset: 12
-      bit_size: 2
-      enum: PL
-    - name: MEM2MEM
-      description: Memory to memory mode
-      bit_offset: 14
-      bit_size: 1
-      enum: MEMMEM
+  - name: EN
+    description: Channel enable
+    bit_offset: 0
+    bit_size: 1
+  - name: TCIE
+    description: Transfer complete interrupt enable
+    bit_offset: 1
+    bit_size: 1
+  - name: HTIE
+    description: Half Transfer interrupt enable
+    bit_offset: 2
+    bit_size: 1
+  - name: TEIE
+    description: Transfer error interrupt enable
+    bit_offset: 3
+    bit_size: 1
+  - name: DIR
+    description: Data transfer direction
+    bit_offset: 4
+    bit_size: 1
+    enum: DIR
+  - name: CIRC
+    description: Circular mode
+    bit_offset: 5
+    bit_size: 1
+    enum: CIRC
+  - name: PINC
+    description: Peripheral increment mode
+    bit_offset: 6
+    bit_size: 1
+    enum: INC
+  - name: MINC
+    description: Memory increment mode
+    bit_offset: 7
+    bit_size: 1
+    enum: INC
+  - name: PSIZE
+    description: Peripheral size
+    bit_offset: 8
+    bit_size: 2
+    enum: SIZE
+  - name: MSIZE
+    description: Memory size
+    bit_offset: 10
+    bit_size: 2
+    enum: SIZE
+  - name: PL
+    description: Channel Priority level
+    bit_offset: 12
+    bit_size: 2
+    enum: PL
+  - name: MEM2MEM
+    description: Memory to memory mode
+    bit_offset: 14
+    bit_size: 1
+    enum: MEMMEM
 fieldset/ISR:
  description: DMA interrupt status register (DMA_ISR)
  fields:
-    - name: GIF
-      description: Channel 1 Global interrupt flag
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 8
-        stride: 4
-    - name: TCIF
-      description: Channel 1 Transfer Complete flag
-      bit_offset: 1
-      bit_size: 1
-      array:
-        len: 8
-        stride: 4
-    - name: HTIF
-      description: Channel 1 Half Transfer Complete flag
-      bit_offset: 2
-      bit_size: 1
-      array:
-        len: 8
-        stride: 4
-    - name: TEIF
-      description: Channel 1 Transfer Error flag
-      bit_offset: 3
-      bit_size: 1
-      array:
-        len: 8
-        stride: 4
+  - name: GIF
+    description: Channel 1 Global interrupt flag
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 8
+      stride: 4
+  - name: TCIF
+    description: Channel 1 Transfer Complete flag
+    bit_offset: 1
+    bit_size: 1
+    array:
+      len: 8
+      stride: 4
+  - name: HTIF
+    description: Channel 1 Half Transfer Complete flag
+    bit_offset: 2
+    bit_size: 1
+    array:
+      len: 8
+      stride: 4
+  - name: TEIF
+    description: Channel 1 Transfer Error flag
+    bit_offset: 3
+    bit_size: 1
+    array:
+      len: 8
+      stride: 4
 fieldset/NDTR:
  description: DMA channel 1 number of data register
  fields:
-    - name: NDT
-      description: Number of data to transfer
-      bit_offset: 0
-      bit_size: 16
+  - name: NDT
+    description: Number of data to transfer
+    bit_offset: 0
+    bit_size: 16
 enum/CIRC:
  bit_size: 1
  variants:
-    - name: Disabled
-      description: Circular buffer disabled
-      value: 0
-    - name: Enabled
-      description: Circular buffer enabled
-      value: 1
+  - name: Disabled
+    description: Circular buffer disabled
+    value: 0
+  - name: Enabled
+    description: Circular buffer enabled
+    value: 1
 enum/DIR:
  bit_size: 1
  variants:
-    - name: FromPeripheral
-      description: Read from peripheral
-      value: 0
-    - name: FromMemory
-      description: Read from memory
-      value: 1
+  - name: FromPeripheral
+    description: Read from peripheral
+    value: 0
+  - name: FromMemory
+    description: Read from memory
+    value: 1
 enum/INC:
  bit_size: 1
  variants:
-    - name: Disabled
-      description: Increment mode disabled
-      value: 0
-    - name: Enabled
-      description: Increment mode enabled
-      value: 1
+  - name: Disabled
+    description: Increment mode disabled
+    value: 0
+  - name: Enabled
+    description: Increment mode enabled
+    value: 1
 enum/MEMMEM:
  bit_size: 1
  variants:
-    - name: Disabled
-      description: Memory to memory mode disabled
-      value: 0
-    - name: Enabled
-      description: Memory to memory mode enabled
-      value: 1
+  - name: Disabled
+    description: Memory to memory mode disabled
+    value: 0
+  - name: Enabled
+    description: Memory to memory mode enabled
+    value: 1
 enum/PL:
  bit_size: 2
  variants:
-    - name: Low
-      description: Low priority
-      value: 0
-    - name: Medium
-      description: Medium priority
-      value: 1
-    - name: High
-      description: High priority
-      value: 2
-    - name: VeryHigh
-      description: Very high priority
-      value: 3
+  - name: Low
+    description: Low priority
+    value: 0
+  - name: Medium
+    description: Medium priority
+    value: 1
+  - name: High
+    description: High priority
+    value: 2
+  - name: VeryHigh
+    description: Very high priority
+    value: 3
 enum/SIZE:
  bit_size: 2
  variants:
-    - name: Bits8
-      description: 8-bit size
-      value: 0
-    - name: Bits16
-      description: 16-bit size
-      value: 1
-    - name: Bits32
-      description: 32-bit size
-      value: 2
+  - name: Bits8
+    description: 8-bit size
+    value: 0
+  - name: Bits16
+    description: 16-bit size
+    value: 1
+  - name: Bits32
+    description: 32-bit size
+    value: 2
--- a/data/registers/bdma_v2.yaml
+++ b/data/registers/bdma_v2.yaml
@ -1,212 +1,211 @@
---
 block/CH:
-  description: "Channel cluster: CCR?, CNDTR?, CPAR?, and CMAR? registers"
+  description: 'Channel cluster: CCR?, CNDTR?, CPAR?, and CMAR? registers'
  items:
-    - name: CR
-      description: DMA channel configuration register (DMA_CCR)
-      byte_offset: 0
-      fieldset: CR
-    - name: NDTR
-      description: DMA channel 1 number of data register
-      byte_offset: 4
-      fieldset: NDTR
-    - name: PAR
-      description: DMA channel 1 peripheral address register
-      byte_offset: 8
-    - name: MAR
-      description: DMA channel 1 memory address register
-      byte_offset: 12
+  - name: CR
+    description: DMA channel configuration register (DMA_CCR)
+    byte_offset: 0
+    fieldset: CR
+  - name: NDTR
+    description: DMA channel 1 number of data register
+    byte_offset: 4
+    fieldset: NDTR
+  - name: PAR
+    description: DMA channel 1 peripheral address register
+    byte_offset: 8
+  - name: MAR
+    description: DMA channel 1 memory address register
+    byte_offset: 12
 block/DMA:
  description: DMA controller
  items:
-    - name: ISR
-      description: DMA interrupt status register (DMA_ISR)
-      byte_offset: 0
-      access: Read
-      fieldset: ISR
-    - name: IFCR
-      description: DMA interrupt flag clear register (DMA_IFCR)
-      byte_offset: 4
-      access: Write
-      fieldset: ISR
-    - name: CH
-      description: "Channel cluster: CCR?, CNDTR?, CPAR?, and CMAR? registers"
-      array:
-        len: 8
-        stride: 20
-      byte_offset: 8
-      block: CH
-    - name: CSELR
-      description: channel selection register
-      byte_offset: 168
-      fieldset: CSELR
+  - name: ISR
+    description: DMA interrupt status register (DMA_ISR)
+    byte_offset: 0
+    access: Read
+    fieldset: ISR
+  - name: IFCR
+    description: DMA interrupt flag clear register (DMA_IFCR)
+    byte_offset: 4
+    access: Write
+    fieldset: ISR
+  - name: CH
+    description: 'Channel cluster: CCR?, CNDTR?, CPAR?, and CMAR? registers'
+    array:
+      len: 8
+      stride: 20
+    byte_offset: 8
+    block: CH
+  - name: CSELR
+    description: channel selection register
+    byte_offset: 168
+    fieldset: CSELR
 fieldset/CR:
  description: DMA channel configuration register (DMA_CCR)
  fields:
-    - name: EN
-      description: Channel enable
-      bit_offset: 0
-      bit_size: 1
-    - name: TCIE
-      description: Transfer complete interrupt enable
-      bit_offset: 1
-      bit_size: 1
-    - name: HTIE
-      description: Half Transfer interrupt enable
-      bit_offset: 2
-      bit_size: 1
-    - name: TEIE
-      description: Transfer error interrupt enable
-      bit_offset: 3
-      bit_size: 1
-    - name: DIR
-      description: Data transfer direction
-      bit_offset: 4
-      bit_size: 1
-      enum: DIR
-    - name: CIRC
-      description: Circular mode
-      bit_offset: 5
-      bit_size: 1
-      enum: CIRC
-    - name: PINC
-      description: Peripheral increment mode
-      bit_offset: 6
-      bit_size: 1
-      enum: INC
-    - name: MINC
-      description: Memory increment mode
-      bit_offset: 7
-      bit_size: 1
-      enum: INC
-    - name: PSIZE
-      description: Peripheral size
-      bit_offset: 8
-      bit_size: 2
-      enum: SIZE
-    - name: MSIZE
-      description: Memory size
-      bit_offset: 10
-      bit_size: 2
-      enum: SIZE
-    - name: PL
-      description: Channel Priority level
-      bit_offset: 12
-      bit_size: 2
-      enum: PL
-    - name: MEM2MEM
-      description: Memory to memory mode
-      bit_offset: 14
-      bit_size: 1
-      enum: MEMMEM
+  - name: EN
+    description: Channel enable
+    bit_offset: 0
+    bit_size: 1
+  - name: TCIE
+    description: Transfer complete interrupt enable
+    bit_offset: 1
+    bit_size: 1
+  - name: HTIE
+    description: Half Transfer interrupt enable
+    bit_offset: 2
+    bit_size: 1
+  - name: TEIE
+    description: Transfer error interrupt enable
+    bit_offset: 3
+    bit_size: 1
+  - name: DIR
+    description: Data transfer direction
+    bit_offset: 4
+    bit_size: 1
+    enum: DIR
+  - name: CIRC
+    description: Circular mode
+    bit_offset: 5
+    bit_size: 1
+    enum: CIRC
+  - name: PINC
+    description: Peripheral increment mode
+    bit_offset: 6
+    bit_size: 1
+    enum: INC
+  - name: MINC
+    description: Memory increment mode
+    bit_offset: 7
+    bit_size: 1
+    enum: INC
+  - name: PSIZE
+    description: Peripheral size
+    bit_offset: 8
+    bit_size: 2
+    enum: SIZE
+  - name: MSIZE
+    description: Memory size
+    bit_offset: 10
+    bit_size: 2
+    enum: SIZE
+  - name: PL
+    description: Channel Priority level
+    bit_offset: 12
+    bit_size: 2
+    enum: PL
+  - name: MEM2MEM
+    description: Memory to memory mode
+    bit_offset: 14
+    bit_size: 1
+    enum: MEMMEM
 fieldset/CSELR:
  description: channel selection register
  fields:
-    - name: CS
-      description: DMA channel selection
-      bit_offset: 0
-      bit_size: 4
-      array:
-        len: 8
-        stride: 4
+  - name: CS
+    description: DMA channel selection
+    bit_offset: 0
+    bit_size: 4
+    array:
+      len: 8
+      stride: 4
 fieldset/ISR:
  description: DMA interrupt status register (DMA_ISR)
  fields:
-    - name: GIF
-      description: Channel 1 Global interrupt flag
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 8
-        stride: 4
-    - name: TCIF
-      description: Channel 1 Transfer Complete flag
-      bit_offset: 1
-      bit_size: 1
-      array:
-        len: 8
-        stride: 4
-    - name: HTIF
-      description: Channel 1 Half Transfer Complete flag
-      bit_offset: 2
-      bit_size: 1
-      array:
-        len: 8
-        stride: 4
-    - name: TEIF
-      description: Channel 1 Transfer Error flag
-      bit_offset: 3
-      bit_size: 1
-      array:
-        len: 8
-        stride: 4
+  - name: GIF
+    description: Channel 1 Global interrupt flag
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 8
+      stride: 4
+  - name: TCIF
+    description: Channel 1 Transfer Complete flag
+    bit_offset: 1
+    bit_size: 1
+    array:
+      len: 8
+      stride: 4
+  - name: HTIF
+    description: Channel 1 Half Transfer Complete flag
+    bit_offset: 2
+    bit_size: 1
+    array:
+      len: 8
+      stride: 4
+  - name: TEIF
+    description: Channel 1 Transfer Error flag
+    bit_offset: 3
+    bit_size: 1
+    array:
+      len: 8
+      stride: 4
 fieldset/NDTR:
  description: DMA channel 1 number of data register
  fields:
-    - name: NDT
-      description: Number of data to transfer
-      bit_offset: 0
-      bit_size: 16
+  - name: NDT
+    description: Number of data to transfer
+    bit_offset: 0
+    bit_size: 16
 enum/CIRC:
  bit_size: 1
  variants:
-    - name: Disabled
-      description: Circular buffer disabled
-      value: 0
-    - name: Enabled
-      description: Circular buffer enabled
-      value: 1
+  - name: Disabled
+    description: Circular buffer disabled
+    value: 0
+  - name: Enabled
+    description: Circular buffer enabled
+    value: 1
 enum/DIR:
  bit_size: 1
  variants:
-    - name: FromPeripheral
-      description: Read from peripheral
-      value: 0
-    - name: FromMemory
-      description: Read from memory
-      value: 1
+  - name: FromPeripheral
+    description: Read from peripheral
+    value: 0
+  - name: FromMemory
+    description: Read from memory
+    value: 1
 enum/INC:
  bit_size: 1
  variants:
-    - name: Disabled
-      description: Increment mode disabled
-      value: 0
-    - name: Enabled
-      description: Increment mode enabled
-      value: 1
+  - name: Disabled
+    description: Increment mode disabled
+    value: 0
+  - name: Enabled
+    description: Increment mode enabled
+    value: 1
 enum/MEMMEM:
  bit_size: 1
  variants:
-    - name: Disabled
-      description: Memory to memory mode disabled
-      value: 0
-    - name: Enabled
-      description: Memory to memory mode enabled
-      value: 1
+  - name: Disabled
+    description: Memory to memory mode disabled
+    value: 0
+  - name: Enabled
+    description: Memory to memory mode enabled
+    value: 1
 enum/PL:
  bit_size: 2
  variants:
-    - name: Low
-      description: Low priority
-      value: 0
-    - name: Medium
-      description: Medium priority
-      value: 1
-    - name: High
-      description: High priority
-      value: 2
-    - name: VeryHigh
-      description: Very high priority
-      value: 3
+  - name: Low
+    description: Low priority
+    value: 0
+  - name: Medium
+    description: Medium priority
+    value: 1
+  - name: High
+    description: High priority
+    value: 2
+  - name: VeryHigh
+    description: Very high priority
+    value: 3
 enum/SIZE:
  bit_size: 2
  variants:
-    - name: Bits8
-      description: 8-bit size
-      value: 0
-    - name: Bits16
-      description: 16-bit size
-      value: 1
-    - name: Bits32
-      description: 32-bit size
-      value: 2
+  - name: Bits8
+    description: 8-bit size
+    value: 0
+  - name: Bits16
+    description: 16-bit size
+    value: 1
+  - name: Bits32
+    description: 32-bit size
+    value: 2
--- a/data/registers/bkp_v1.yaml
+++ b/data/registers/bkp_v1.yaml
@ -1,144 +1,143 @@
---
 block/BKP:
  description: Backup registers
  items:
-    - name: DR
-      description: Data register
-      array:
-        offsets:
-          - 0
-          - 4
-          - 8
-          - 12
-          - 16
-          - 20
-          - 24
-          - 28
-          - 32
-          - 36
-          - 60
-          - 64
-          - 68
-          - 72
-          - 76
-          - 80
-          - 84
-          - 88
-          - 92
-          - 96
-          - 100
-          - 104
-          - 108
-          - 112
-          - 116
-          - 120
-          - 124
-          - 128
-          - 132
-          - 136
-          - 140
-          - 144
-          - 148
-          - 152
-          - 156
-          - 160
-          - 164
-          - 168
-          - 172
-          - 176
-          - 180
-          - 184
-      byte_offset: 0
-      fieldset: DR
-    - name: RTCCR
-      description: RTC clock calibration register
-      byte_offset: 40
-      fieldset: RTCCR
-    - name: CR
-      description: Control register
-      byte_offset: 44
-      fieldset: CR
-    - name: CSR
-      description: Control/status register
-      byte_offset: 48
-      fieldset: CSR
+  - name: DR
+    description: Data register
+    array:
+      offsets:
+      - 0
+      - 4
+      - 8
+      - 12
+      - 16
+      - 20
+      - 24
+      - 28
+      - 32
+      - 36
+      - 60
+      - 64
+      - 68
+      - 72
+      - 76
+      - 80
+      - 84
+      - 88
+      - 92
+      - 96
+      - 100
+      - 104
+      - 108
+      - 112
+      - 116
+      - 120
+      - 124
+      - 128
+      - 132
+      - 136
+      - 140
+      - 144
+      - 148
+      - 152
+      - 156
+      - 160
+      - 164
+      - 168
+      - 172
+      - 176
+      - 180
+      - 184
+    byte_offset: 0
+    fieldset: DR
+  - name: RTCCR
+    description: RTC clock calibration register
+    byte_offset: 40
+    fieldset: RTCCR
+  - name: CR
+    description: Control register
+    byte_offset: 44
+    fieldset: CR
+  - name: CSR
+    description: Control/status register
+    byte_offset: 48
+    fieldset: CSR
 fieldset/CR:
  description: Control register
  fields:
-    - name: TPE
-      description: Tamper pin enable
-      bit_offset: 0
-      bit_size: 1
-    - name: TPAL
-      description: Tamper pin active level
-      bit_offset: 1
-      bit_size: 1
-      enum: TPAL
+  - name: TPE
+    description: Tamper pin enable
+    bit_offset: 0
+    bit_size: 1
+  - name: TPAL
+    description: Tamper pin active level
+    bit_offset: 1
+    bit_size: 1
+    enum: TPAL
 fieldset/CSR:
  description: Control/status register
  fields:
-    - name: CTE
-      description: Clear Tamper event
-      bit_offset: 0
-      bit_size: 1
-    - name: CTI
-      description: Clear Tamper Interrupt
-      bit_offset: 1
-      bit_size: 1
-    - name: TPIE
-      description: Tamper Pin interrupt enable
-      bit_offset: 2
-      bit_size: 1
-    - name: TEF
-      description: Tamper Event Flag
-      bit_offset: 8
-      bit_size: 1
-    - name: TIF
-      description: Tamper Interrupt Flag
-      bit_offset: 9
-      bit_size: 1
+  - name: CTE
+    description: Clear Tamper event
+    bit_offset: 0
+    bit_size: 1
+  - name: CTI
+    description: Clear Tamper Interrupt
+    bit_offset: 1
+    bit_size: 1
+  - name: TPIE
+    description: Tamper Pin interrupt enable
+    bit_offset: 2
+    bit_size: 1
+  - name: TEF
+    description: Tamper Event Flag
+    bit_offset: 8
+    bit_size: 1
+  - name: TIF
+    description: Tamper Interrupt Flag
+    bit_offset: 9
+    bit_size: 1
 fieldset/DR:
  description: Data register
  fields:
-    - name: D
-      description: Backup data
-      bit_offset: 0
-      bit_size: 16
+  - name: D
+    description: Backup data
+    bit_offset: 0
+    bit_size: 16
 fieldset/RTCCR:
  description: RTC clock calibration register
  fields:
-    - name: CAL
-      description: Calibration value
-      bit_offset: 0
-      bit_size: 7
-    - name: CCO
-      description: Calibration Clock Output
-      bit_offset: 7
-      bit_size: 1
-    - name: ASOE
-      description: Alarm or second output enable
-      bit_offset: 8
-      bit_size: 1
-    - name: ASOS
-      description: Alarm or second output selection
-      bit_offset: 9
-      bit_size: 1
-      enum: ASOS
+  - name: CAL
+    description: Calibration value
+    bit_offset: 0
+    bit_size: 7
+  - name: CCO
+    description: Calibration Clock Output
+    bit_offset: 7
+    bit_size: 1
+  - name: ASOE
+    description: Alarm or second output enable
+    bit_offset: 8
+    bit_size: 1
+  - name: ASOS
+    description: Alarm or second output selection
+    bit_offset: 9
+    bit_size: 1
+    enum: ASOS
 enum/ASOS:
  bit_size: 1
  variants:
-    - name: Alarm
-      description: RTC Alarm pulse output selected
-      value: 0
-    - name: Second
-      description: RTC Second pulse output selected
-      value: 1
+  - name: Alarm
+    description: RTC Alarm pulse output selected
+    value: 0
+  - name: Second
+    description: RTC Second pulse output selected
+    value: 1
 enum/TPAL:
  bit_size: 1
  variants:
-    - name: High
-      description: A high level on the TAMPER pin resets all data backup registers (if TPE bit is set)
-      value: 0
-    - name: Low
-      description: A low level on the TAMPER pin resets all data backup registers (if TPE bit is set)
-      value: 1
+  - name: High
+    description: A high level on the TAMPER pin resets all data backup registers (if TPE bit is set)
+    value: 0
+  - name: Low
+    description: A low level on the TAMPER pin resets all data backup registers (if TPE bit is set)
+    value: 1
--- a/data/registers/can_bxcan.yaml
+++ b/data/registers/can_bxcan.yaml
--- a/data/registers/can_fdcan.yaml
+++ b/data/registers/can_fdcan.yaml
--- a/data/registers/crc_v1.yaml
+++ b/data/registers/crc_v1.yaml
@ -1,21 +1,20 @@
---
 block/CRC:
  description: Cyclic Redundancy Check calculation unit
  items:
-    - name: DR
-      description: Data register
-      byte_offset: 0
-    - name: IDR
-      description: Independent Data register
-      byte_offset: 4
-    - name: CR
-      description: Control register
-      byte_offset: 8
-      fieldset: CR
+  - name: DR
+    description: Data register
+    byte_offset: 0
+  - name: IDR
+    description: Independent Data register
+    byte_offset: 4
+  - name: CR
+    description: Control register
+    byte_offset: 8
+    fieldset: CR
 fieldset/CR:
  description: Control register
  fields:
-    - name: RESET
-      description: RESET bit
-      bit_offset: 0
-      bit_size: 1
+  - name: RESET
+    description: RESET bit
+    bit_offset: 0
+    bit_size: 1
--- a/data/registers/crc_v2.yaml
+++ b/data/registers/crc_v2.yaml
@ -1,86 +1,85 @@
---
 block/CRC:
  description: Cyclic Redundancy Check calculation unit
  items:
-    - name: DR
-      description: Data register
-      byte_offset: 0
-    - name: DR16
-      description: Data register - half-word sized
-      byte_offset: 0
-      bit_size: 16
-    - name: DR8
-      description: Data register - byte sized
-      byte_offset: 0
-      bit_size: 8
-    - name: IDR
-      description: Independent Data register
-      byte_offset: 4
-    - name: CR
-      description: Control register
-      byte_offset: 8
-      fieldset: CR
-    - name: INIT
-      description: Initial CRC value
-      byte_offset: 16
+  - name: DR
+    description: Data register
+    byte_offset: 0
+  - name: DR16
+    description: Data register - half-word sized
+    byte_offset: 0
+    bit_size: 16
+  - name: DR8
+    description: Data register - byte sized
+    byte_offset: 0
+    bit_size: 8
+  - name: IDR
+    description: Independent Data register
+    byte_offset: 4
+  - name: CR
+    description: Control register
+    byte_offset: 8
+    fieldset: CR
+  - name: INIT
+    description: Initial CRC value
+    byte_offset: 16
 fieldset/CR:
  description: Control register
  fields:
-    - name: RESET
-      description: RESET bit
-      bit_offset: 0
-      bit_size: 1
-    - name: POLYSIZE
-      description: Polynomial size
-      bit_offset: 3
-      bit_size: 2
-      enum: POLYSIZE
-    - name: REV_IN
-      description: Reverse input data
-      bit_offset: 5
-      bit_size: 2
-      enum: REV_IN
-    - name: REV_OUT
-      description: Reverse output data
-      bit_offset: 7
-      bit_size: 1
-      enum: REV_OUT
+  - name: RESET
+    description: RESET bit
+    bit_offset: 0
+    bit_size: 1
+  - name: POLYSIZE
+    description: Polynomial size
+    bit_offset: 3
+    bit_size: 2
+    enum: POLYSIZE
+  - name: REV_IN
+    description: Reverse input data
+    bit_offset: 5
+    bit_size: 2
+    enum: REV_IN
+  - name: REV_OUT
+    description: Reverse output data
+    bit_offset: 7
+    bit_size: 1
+    enum: REV_OUT
 enum/POLYSIZE:
  bit_size: 2
  variants:
-    - name: Polysize32
-      description: 32-bit polynomial
-      value: 0
-    - name: Polysize16
-      description: 16-bit polynomial
-      value: 1
-    - name: Polysize8
-      description: 8-bit polynomial
-      value: 2
-    - name: Polysize7
-      description: 7-bit polynomial
-      value: 3
+  - name: Polysize32
+    description: 32-bit polynomial
+    value: 0
+  - name: Polysize16
+    description: 16-bit polynomial
+    value: 1
+  - name: Polysize8
+    description: 8-bit polynomial
+    value: 2
+  - name: Polysize7
+    description: 7-bit polynomial
+    value: 3
 enum/REV_IN:
  bit_size: 2
  variants:
-    - name: Normal
-      description: Bit order not affected
-      value: 0
-    - name: Byte
-      description: Bit reversal done by byte
-      value: 1
-    - name: HalfWord
-      description: Bit reversal done by half-word
-      value: 2
-    - name: Word
-      description: Bit reversal done by word
-      value: 3
+  - name: Normal
+    description: Bit order not affected
+    value: 0
+  - name: Byte
+    description: Bit reversal done by byte
+    value: 1
+  - name: HalfWord
+    description: Bit reversal done by half-word
+    value: 2
+  - name: Word
+    description: Bit reversal done by word
+    value: 3
 enum/REV_OUT:
  bit_size: 1
  variants:
-    - name: Normal
-      description: Bit order not affected
-      value: 0
-    - name: Reversed
-      description: Bit reversed output
-      value: 1
+  - name: Normal
+    description: Bit order not affected
+    value: 0
+  - name: Reversed
+    description: Bit reversed output
+    value: 1
--- a/data/registers/crc_v3.yaml
+++ b/data/registers/crc_v3.yaml
@ -1,89 +1,88 @@
---
 block/CRC:
  description: Cyclic Redundancy Check calculation unit
  items:
-    - name: DR
-      description: Data register
-      byte_offset: 0
-    - name: DR16
-      description: Data register - half-word sized
-      byte_offset: 0
-      bit_size: 16
-    - name: DR8
-      description: Data register - byte sized
-      byte_offset: 0
-      bit_size: 8
-    - name: IDR
-      description: Independent Data register
-      byte_offset: 4
-    - name: CR
-      description: Control register
-      byte_offset: 8
-      fieldset: CR
-    - name: INIT
-      description: Initial CRC value
-      byte_offset: 16
-    - name: POL
-      description: CRC polynomial
-      byte_offset: 20
+  - name: DR
+    description: Data register
+    byte_offset: 0
+  - name: DR16
+    description: Data register - half-word sized
+    byte_offset: 0
+    bit_size: 16
+  - name: DR8
+    description: Data register - byte sized
+    byte_offset: 0
+    bit_size: 8
+  - name: IDR
+    description: Independent Data register
+    byte_offset: 4
+  - name: CR
+    description: Control register
+    byte_offset: 8
+    fieldset: CR
+  - name: INIT
+    description: Initial CRC value
+    byte_offset: 16
+  - name: POL
+    description: CRC polynomial
+    byte_offset: 20
 fieldset/CR:
  description: Control register
  fields:
-    - name: RESET
-      description: RESET bit
-      bit_offset: 0
-      bit_size: 1
-    - name: POLYSIZE
-      description: Polynomial size
-      bit_offset: 3
-      bit_size: 2
-      enum: POLYSIZE
-    - name: REV_IN
-      description: Reverse input data
-      bit_offset: 5
-      bit_size: 2
-      enum: REV_IN
-    - name: REV_OUT
-      description: Reverse output data
-      bit_offset: 7
-      bit_size: 1
-      enum: REV_OUT
+  - name: RESET
+    description: RESET bit
+    bit_offset: 0
+    bit_size: 1
+  - name: POLYSIZE
+    description: Polynomial size
+    bit_offset: 3
+    bit_size: 2
+    enum: POLYSIZE
+  - name: REV_IN
+    description: Reverse input data
+    bit_offset: 5
+    bit_size: 2
+    enum: REV_IN
+  - name: REV_OUT
+    description: Reverse output data
+    bit_offset: 7
+    bit_size: 1
+    enum: REV_OUT
 enum/POLYSIZE:
  bit_size: 2
  variants:
-    - name: Polysize32
-      description: 32-bit polynomial
-      value: 0
-    - name: Polysize16
-      description: 16-bit polynomial
-      value: 1
-    - name: Polysize8
-      description: 8-bit polynomial
-      value: 2
-    - name: Polysize7
-      description: 7-bit polynomial
-      value: 3
+  - name: Polysize32
+    description: 32-bit polynomial
+    value: 0
+  - name: Polysize16
+    description: 16-bit polynomial
+    value: 1
+  - name: Polysize8
+    description: 8-bit polynomial
+    value: 2
+  - name: Polysize7
+    description: 7-bit polynomial
+    value: 3
 enum/REV_IN:
  bit_size: 2
  variants:
-    - name: Normal
-      description: Bit order not affected
-      value: 0
-    - name: Byte
-      description: Bit reversal done by byte
-      value: 1
-    - name: HalfWord
-      description: Bit reversal done by half-word
-      value: 2
-    - name: Word
-      description: Bit reversal done by word
-      value: 3
+  - name: Normal
+    description: Bit order not affected
+    value: 0
+  - name: Byte
+    description: Bit reversal done by byte
+    value: 1
+  - name: HalfWord
+    description: Bit reversal done by half-word
+    value: 2
+  - name: Word
+    description: Bit reversal done by word
+    value: 3
 enum/REV_OUT:
  bit_size: 1
  variants:
-    - name: Normal
-      description: Bit order not affected
-      value: 0
-    - name: Reversed
-      description: Bit reversed output
-      value: 1
+  - name: Normal
+    description: Bit order not affected
+    value: 0
+  - name: Reversed
+    description: Bit reversed output
+    value: 1
--- a/data/registers/crs_v1.yaml
+++ b/data/registers/crs_v1.yaml
@ -1,150 +1,149 @@
---
 block/CRS:
  description: Clock recovery system
  items:
-    - name: CR
-      description: control register
-      byte_offset: 0
-      fieldset: CR
-    - name: CFGR
-      description: configuration register
-      byte_offset: 4
-      fieldset: CFGR
-    - name: ISR
-      description: interrupt and status register
-      byte_offset: 8
-      access: Read
-      fieldset: ISR
-    - name: ICR
-      description: interrupt flag clear register
-      byte_offset: 12
-      fieldset: ICR
+  - name: CR
+    description: control register
+    byte_offset: 0
+    fieldset: CR
+  - name: CFGR
+    description: configuration register
+    byte_offset: 4
+    fieldset: CFGR
+  - name: ISR
+    description: interrupt and status register
+    byte_offset: 8
+    access: Read
+    fieldset: ISR
+  - name: ICR
+    description: interrupt flag clear register
+    byte_offset: 12
+    fieldset: ICR
 fieldset/CFGR:
  description: configuration register
  fields:
-    - name: RELOAD
-      description: Counter reload value
-      bit_offset: 0
-      bit_size: 16
-    - name: FELIM
-      description: Frequency error limit
-      bit_offset: 16
-      bit_size: 8
-    - name: SYNCDIV
-      description: SYNC divider
-      bit_offset: 24
-      bit_size: 3
-    - name: SYNCSRC
-      description: SYNC signal source selection
-      bit_offset: 28
-      bit_size: 2
-      enum: SYNCSRC
-    - name: SYNCPOL
-      description: SYNC polarity selection
-      bit_offset: 31
-      bit_size: 1
+  - name: RELOAD
+    description: Counter reload value
+    bit_offset: 0
+    bit_size: 16
+  - name: FELIM
+    description: Frequency error limit
+    bit_offset: 16
+    bit_size: 8
+  - name: SYNCDIV
+    description: SYNC divider
+    bit_offset: 24
+    bit_size: 3
+  - name: SYNCSRC
+    description: SYNC signal source selection
+    bit_offset: 28
+    bit_size: 2
+    enum: SYNCSRC
+  - name: SYNCPOL
+    description: SYNC polarity selection
+    bit_offset: 31
+    bit_size: 1
 fieldset/CR:
  description: control register
  fields:
-    - name: SYNCOKIE
-      description: SYNC event OK interrupt enable
-      bit_offset: 0
-      bit_size: 1
-    - name: SYNCWARNIE
-      description: SYNC warning interrupt enable
-      bit_offset: 1
-      bit_size: 1
-    - name: ERRIE
-      description: Synchronization or trimming error interrupt enable
-      bit_offset: 2
-      bit_size: 1
-    - name: ESYNCIE
-      description: Expected SYNC interrupt enable
-      bit_offset: 3
-      bit_size: 1
-    - name: CEN
-      description: Frequency error counter enable
-      bit_offset: 5
-      bit_size: 1
-    - name: AUTOTRIMEN
-      description: Automatic trimming enable
-      bit_offset: 6
-      bit_size: 1
-    - name: SWSYNC
-      description: Generate software SYNC event
-      bit_offset: 7
-      bit_size: 1
-    - name: TRIM
-      description: HSI48 oscillator smooth trimming
-      bit_offset: 8
-      bit_size: 6
+  - name: SYNCOKIE
+    description: SYNC event OK interrupt enable
+    bit_offset: 0
+    bit_size: 1
+  - name: SYNCWARNIE
+    description: SYNC warning interrupt enable
+    bit_offset: 1
+    bit_size: 1
+  - name: ERRIE
+    description: Synchronization or trimming error interrupt enable
+    bit_offset: 2
+    bit_size: 1
+  - name: ESYNCIE
+    description: Expected SYNC interrupt enable
+    bit_offset: 3
+    bit_size: 1
+  - name: CEN
+    description: Frequency error counter enable
+    bit_offset: 5
+    bit_size: 1
+  - name: AUTOTRIMEN
+    description: Automatic trimming enable
+    bit_offset: 6
+    bit_size: 1
+  - name: SWSYNC
+    description: Generate software SYNC event
+    bit_offset: 7
+    bit_size: 1
+  - name: TRIM
+    description: HSI48 oscillator smooth trimming
+    bit_offset: 8
+    bit_size: 6
 fieldset/ICR:
  description: interrupt flag clear register
  fields:
-    - name: SYNCOKC
-      description: SYNC event OK clear flag
-      bit_offset: 0
-      bit_size: 1
-    - name: SYNCWARNC
-      description: SYNC warning clear flag
-      bit_offset: 1
-      bit_size: 1
-    - name: ERRC
-      description: Error clear flag
-      bit_offset: 2
-      bit_size: 1
-    - name: ESYNCC
-      description: Expected SYNC clear flag
-      bit_offset: 3
-      bit_size: 1
+  - name: SYNCOKC
+    description: SYNC event OK clear flag
+    bit_offset: 0
+    bit_size: 1
+  - name: SYNCWARNC
+    description: SYNC warning clear flag
+    bit_offset: 1
+    bit_size: 1
+  - name: ERRC
+    description: Error clear flag
+    bit_offset: 2
+    bit_size: 1
+  - name: ESYNCC
+    description: Expected SYNC clear flag
+    bit_offset: 3
+    bit_size: 1
 fieldset/ISR:
  description: interrupt and status register
  fields:
-    - name: SYNCOKF
-      description: SYNC event OK flag
-      bit_offset: 0
-      bit_size: 1
-    - name: SYNCWARNF
-      description: SYNC warning flag
-      bit_offset: 1
-      bit_size: 1
-    - name: ERRF
-      description: Error flag
-      bit_offset: 2
-      bit_size: 1
-    - name: ESYNCF
-      description: Expected SYNC flag
-      bit_offset: 3
-      bit_size: 1
-    - name: SYNCERR
-      description: SYNC error
-      bit_offset: 8
-      bit_size: 1
-    - name: SYNCMISS
-      description: SYNC missed
-      bit_offset: 9
-      bit_size: 1
-    - name: TRIMOVF
-      description: Trimming overflow or underflow
-      bit_offset: 10
-      bit_size: 1
-    - name: FEDIR
-      description: Frequency error direction
-      bit_offset: 15
-      bit_size: 1
-    - name: FECAP
-      description: Frequency error capture
-      bit_offset: 16
-      bit_size: 16
+  - name: SYNCOKF
+    description: SYNC event OK flag
+    bit_offset: 0
+    bit_size: 1
+  - name: SYNCWARNF
+    description: SYNC warning flag
+    bit_offset: 1
+    bit_size: 1
+  - name: ERRF
+    description: Error flag
+    bit_offset: 2
+    bit_size: 1
+  - name: ESYNCF
+    description: Expected SYNC flag
+    bit_offset: 3
+    bit_size: 1
+  - name: SYNCERR
+    description: SYNC error
+    bit_offset: 8
+    bit_size: 1
+  - name: SYNCMISS
+    description: SYNC missed
+    bit_offset: 9
+    bit_size: 1
+  - name: TRIMOVF
+    description: Trimming overflow or underflow
+    bit_offset: 10
+    bit_size: 1
+  - name: FEDIR
+    description: Frequency error direction
+    bit_offset: 15
+    bit_size: 1
+  - name: FECAP
+    description: Frequency error capture
+    bit_offset: 16
+    bit_size: 16
 enum/SYNCSRC:
  bit_size: 2
  variants:
-    - name: GPIO
-      description: GPIO selected as SYNC signal source
-      value: 0
-    - name: LSE
-      description: LSE selected as SYNC signal source
-      value: 1
-    - name: USB
-      description: USB SOF selected as SYNC signal source
-      value: 2
+  - name: GPIO
+    description: GPIO selected as SYNC signal source
+    value: 0
+  - name: LSE
+    description: LSE selected as SYNC signal source
+    value: 1
+  - name: USB
+    description: USB SOF selected as SYNC signal source
+    value: 2
--- a/data/registers/dac_v1.yaml
+++ b/data/registers/dac_v1.yaml
@ -1,262 +1,261 @@
---
 block/DAC:
  description: Digital-to-analog converter
  items:
-    - name: CR
-      description: control register
-      byte_offset: 0
-      fieldset: CR
-    - name: SWTRIGR
-      description: software trigger register
-      byte_offset: 4
-      access: Write
-      fieldset: SWTRIGR
-    - name: DHR12R
-      description: channel 12-bit right-aligned data holding register
-      array:
-        len: 2
-        stride: 12
-      byte_offset: 8
-      fieldset: DHR12R
-    - name: DHR12L
-      description: channel 12-bit left-aligned data holding register
-      array:
-        len: 2
-        stride: 12
-      byte_offset: 12
-      fieldset: DHR12L
-    - name: DHR8R
-      description: channel 8-bit right-aligned data holding register
-      array:
-        len: 2
-        stride: 12
-      byte_offset: 16
-      fieldset: DHR8R
-    - name: DHR12RD
-      description: Dual DAC 12-bit right-aligned data holding register
-      byte_offset: 32
-      fieldset: DHR12RD
-    - name: DHR12LD
-      description: DUAL DAC 12-bit left aligned data holding register
-      byte_offset: 36
-      fieldset: DHR12LD
-    - name: DHR8RD
-      description: DUAL DAC 8-bit right aligned data holding register
-      byte_offset: 40
-      fieldset: DHR8RD
-    - name: DOR
-      description: channel data output register
-      array:
-        len: 2
-        stride: 4
-      byte_offset: 44
-      access: Read
-      fieldset: DOR
-    - name: SR
-      description: status register
-      byte_offset: 52
-      fieldset: SR
+  - name: CR
+    description: control register
+    byte_offset: 0
+    fieldset: CR
+  - name: SWTRIGR
+    description: software trigger register
+    byte_offset: 4
+    access: Write
+    fieldset: SWTRIGR
+  - name: DHR12R
+    description: channel 12-bit right-aligned data holding register
+    array:
+      len: 2
+      stride: 12
+    byte_offset: 8
+    fieldset: DHR12R
+  - name: DHR12L
+    description: channel 12-bit left-aligned data holding register
+    array:
+      len: 2
+      stride: 12
+    byte_offset: 12
+    fieldset: DHR12L
+  - name: DHR8R
+    description: channel 8-bit right-aligned data holding register
+    array:
+      len: 2
+      stride: 12
+    byte_offset: 16
+    fieldset: DHR8R
+  - name: DHR12RD
+    description: Dual DAC 12-bit right-aligned data holding register
+    byte_offset: 32
+    fieldset: DHR12RD
+  - name: DHR12LD
+    description: DUAL DAC 12-bit left aligned data holding register
+    byte_offset: 36
+    fieldset: DHR12LD
+  - name: DHR8RD
+    description: DUAL DAC 8-bit right aligned data holding register
+    byte_offset: 40
+    fieldset: DHR8RD
+  - name: DOR
+    description: channel data output register
+    array:
+      len: 2
+      stride: 4
+    byte_offset: 44
+    access: Read
+    fieldset: DOR
+  - name: SR
+    description: status register
+    byte_offset: 52
+    fieldset: SR
 fieldset/CR:
  description: control register
  fields:
-    - name: EN
-      description: DAC channel enable
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 2
-        stride: 16
-    - name: BOFF
-      description: DAC channel output buffer disable
-      bit_offset: 1
-      bit_size: 1
-      array:
-        len: 2
-        stride: 16
-    - name: TEN
-      description: DAC channel trigger enable
-      bit_offset: 2
-      bit_size: 1
-      array:
-        len: 2
-        stride: 16
-    - name: TSEL1
-      description: DAC channel 1 trigger selection
-      bit_offset: 3
-      bit_size: 3
-      enum: TSEL1
-    - name: WAVE
-      description: DAC channel noise/triangle wave generation enable
-      bit_offset: 6
-      bit_size: 2
-      array:
-        len: 2
-        stride: 16
-      enum: WAVE
-    - name: MAMP
-      description: DAC channel mask/amplitude selector
-      bit_offset: 8
-      bit_size: 4
-      array:
-        len: 2
-        stride: 16
-    - name: DMAEN
-      description: DAC channel DMA enable
-      bit_offset: 12
-      bit_size: 1
-      array:
-        len: 2
-        stride: 16
-    - name: DMAUDRIE
-      description: DAC channel DMA Underrun Interrupt enable
-      bit_offset: 13
-      bit_size: 1
-      array:
-        len: 2
-        stride: 16
-    - name: TSEL2
-      description: DAC channel 2 trigger selection
-      bit_offset: 19
-      bit_size: 3
-      enum: TSEL2
+  - name: EN
+    description: DAC channel enable
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 2
+      stride: 16
+  - name: BOFF
+    description: DAC channel output buffer disable
+    bit_offset: 1
+    bit_size: 1
+    array:
+      len: 2
+      stride: 16
+  - name: TEN
+    description: DAC channel trigger enable
+    bit_offset: 2
+    bit_size: 1
+    array:
+      len: 2
+      stride: 16
+  - name: TSEL1
+    description: DAC channel 1 trigger selection
+    bit_offset: 3
+    bit_size: 3
+    enum: TSEL1
+  - name: WAVE
+    description: DAC channel noise/triangle wave generation enable
+    bit_offset: 6
+    bit_size: 2
+    array:
+      len: 2
+      stride: 16
+    enum: WAVE
+  - name: MAMP
+    description: DAC channel mask/amplitude selector
+    bit_offset: 8
+    bit_size: 4
+    array:
+      len: 2
+      stride: 16
+  - name: DMAEN
+    description: DAC channel DMA enable
+    bit_offset: 12
+    bit_size: 1
+    array:
+      len: 2
+      stride: 16
+  - name: DMAUDRIE
+    description: DAC channel DMA Underrun Interrupt enable
+    bit_offset: 13
+    bit_size: 1
+    array:
+      len: 2
+      stride: 16
+  - name: TSEL2
+    description: DAC channel 2 trigger selection
+    bit_offset: 19
+    bit_size: 3
+    enum: TSEL2
 fieldset/DHR12L:
  description: channel 12-bit left-aligned data holding register
  fields:
-    - name: DHR
-      description: DAC channel 12-bit left-aligned data
-      bit_offset: 4
-      bit_size: 12
+  - name: DHR
+    description: DAC channel 12-bit left-aligned data
+    bit_offset: 4
+    bit_size: 12
 fieldset/DHR12LD:
  description: DUAL DAC 12-bit left aligned data holding register
  fields:
-    - name: DHR
-      description: DAC channel 12-bit left-aligned data
-      bit_offset: 4
-      bit_size: 12
-      array:
-        len: 2
-        stride: 16
+  - name: DHR
+    description: DAC channel 12-bit left-aligned data
+    bit_offset: 4
+    bit_size: 12
+    array:
+      len: 2
+      stride: 16
 fieldset/DHR12R:
  description: channel 12-bit right-aligned data holding register
  fields:
-    - name: DHR
-      description: DAC channel 12-bit right-aligned data
-      bit_offset: 0
-      bit_size: 12
+  - name: DHR
+    description: DAC channel 12-bit right-aligned data
+    bit_offset: 0
+    bit_size: 12
 fieldset/DHR12RD:
  description: Dual DAC 12-bit right-aligned data holding register
  fields:
-    - name: DHR
-      description: DAC channel 12-bit right-aligned data
-      bit_offset: 0
-      bit_size: 12
-      array:
-        len: 2
-        stride: 16
+  - name: DHR
+    description: DAC channel 12-bit right-aligned data
+    bit_offset: 0
+    bit_size: 12
+    array:
+      len: 2
+      stride: 16
 fieldset/DHR8R:
  description: channel 8-bit right-aligned data holding register
  fields:
-    - name: DHR
-      description: DAC channel 8-bit right-aligned data
-      bit_offset: 0
-      bit_size: 8
+  - name: DHR
+    description: DAC channel 8-bit right-aligned data
+    bit_offset: 0
+    bit_size: 8
 fieldset/DHR8RD:
  description: DUAL DAC 8-bit right aligned data holding register
  fields:
-    - name: DHR
-      description: DAC channel 8-bit right-aligned data
-      bit_offset: 0
-      bit_size: 8
-      array:
-        len: 2
-        stride: 8
+  - name: DHR
+    description: DAC channel 8-bit right-aligned data
+    bit_offset: 0
+    bit_size: 8
+    array:
+      len: 2
+      stride: 8
 fieldset/DOR:
  description: channel data output register
  fields:
-    - name: DOR
-      description: DAC channel data output
-      bit_offset: 0
-      bit_size: 12
+  - name: DOR
+    description: DAC channel data output
+    bit_offset: 0
+    bit_size: 12
 fieldset/SR:
  description: status register
  fields:
-    - name: DMAUDR
-      description: DAC channel DMA underrun flag
-      bit_offset: 13
-      bit_size: 1
-      array:
-        len: 2
-        stride: 16
+  - name: DMAUDR
+    description: DAC channel DMA underrun flag
+    bit_offset: 13
+    bit_size: 1
+    array:
+      len: 2
+      stride: 16
 fieldset/SWTRIGR:
  description: software trigger register
  fields:
-    - name: SWTRIG
-      description: DAC channel software trigger
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 2
-        stride: 1
+  - name: SWTRIG
+    description: DAC channel software trigger
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 2
+      stride: 1
 enum/TSEL1:
  bit_size: 3
  variants:
-    - name: TIM6_TRGO
-      description: Timer 6 TRGO event
-      value: 0
-    - name: TIM3_TRGO
-      description: Timer 3 TRGO event
-      value: 1
-    - name: TIM7_TRGO
-      description: Timer 7 TRGO event
-      value: 2
-    - name: TIM15_TRGO
-      description: Timer 15 TRGO event
-      value: 3
-    - name: TIM2_TRGO
-      description: Timer 2 TRGO event
-      value: 4
-    - name: EXTI9
-      description: EXTI line9
-      value: 6
-    - name: SOFTWARE
-      description: Software trigger
-      value: 7
+  - name: TIM6_TRGO
+    description: Timer 6 TRGO event
+    value: 0
+  - name: TIM3_TRGO
+    description: Timer 3 TRGO event
+    value: 1
+  - name: TIM7_TRGO
+    description: Timer 7 TRGO event
+    value: 2
+  - name: TIM15_TRGO
+    description: Timer 15 TRGO event
+    value: 3
+  - name: TIM2_TRGO
+    description: Timer 2 TRGO event
+    value: 4
+  - name: EXTI9
+    description: EXTI line9
+    value: 6
+  - name: SOFTWARE
+    description: Software trigger
+    value: 7
 enum/TSEL2:
  bit_size: 3
  variants:
-    - name: TIM6_TRGO
-      description: Timer 6 TRGO event
-      value: 0
-    - name: TIM8_TRGO
-      description: Timer 8 TRGO event
-      value: 1
-    - name: TIM7_TRGO
-      description: Timer 7 TRGO event
-      value: 2
-    - name: TIM5_TRGO
-      description: Timer 5 TRGO event
-      value: 3
-    - name: TIM2_TRGO
-      description: Timer 2 TRGO event
-      value: 4
-    - name: TIM4_TRGO
-      description: Timer 4 TRGO event
-      value: 5
-    - name: EXTI9
-      description: EXTI line9
-      value: 6
-    - name: SOFTWARE
-      description: Software trigger
-      value: 7
+  - name: TIM6_TRGO
+    description: Timer 6 TRGO event
+    value: 0
+  - name: TIM8_TRGO
+    description: Timer 8 TRGO event
+    value: 1
+  - name: TIM7_TRGO
+    description: Timer 7 TRGO event
+    value: 2
+  - name: TIM5_TRGO
+    description: Timer 5 TRGO event
+    value: 3
+  - name: TIM2_TRGO
+    description: Timer 2 TRGO event
+    value: 4
+  - name: TIM4_TRGO
+    description: Timer 4 TRGO event
+    value: 5
+  - name: EXTI9
+    description: EXTI line9
+    value: 6
+  - name: SOFTWARE
+    description: Software trigger
+    value: 7
 enum/WAVE:
  bit_size: 2
  variants:
-    - name: Disabled
-      description: Wave generation disabled
-      value: 0
-    - name: Noise
-      description: Noise wave generation enabled
-      value: 1
-    - name: Triangle
-      description: Triangle wave generation enabled
-      value: 2
+  - name: Disabled
+    description: Wave generation disabled
+    value: 0
+  - name: Noise
+    description: Noise wave generation enabled
+    value: 1
+  - name: Triangle
+    description: Triangle wave generation enabled
+    value: 2
--- a/data/registers/dac_v2.yaml
+++ b/data/registers/dac_v2.yaml
@ -1,347 +1,346 @@
---
 block/DAC:
  description: Digital-to-analog converter
  items:
-    - name: CR
-      description: control register
-      byte_offset: 0
-      fieldset: CR
-    - name: SWTRIGR
-      description: software trigger register
-      byte_offset: 4
-      access: Write
-      fieldset: SWTRIGR
-    - name: DHR12R
-      description: channel 12-bit right-aligned data holding register
-      array:
-        len: 2
-        stride: 12
-      byte_offset: 8
-      fieldset: DHR12R
-    - name: DHR12L
-      description: channel 12-bit left-aligned data holding register
-      array:
-        len: 2
-        stride: 12
-      byte_offset: 12
-      fieldset: DHR12L
-    - name: DHR8R
-      description: channel 8-bit right-aligned data holding register
-      array:
-        len: 2
-        stride: 12
-      byte_offset: 16
-      fieldset: DHR8R
-    - name: DHR12RD
-      description: Dual DAC 12-bit right-aligned data holding register
-      byte_offset: 32
-      fieldset: DHR12RD
-    - name: DHR12LD
-      description: DUAL DAC 12-bit left aligned data holding register
-      byte_offset: 36
-      fieldset: DHR12LD
-    - name: DHR8RD
-      description: DUAL DAC 8-bit right aligned data holding register
-      byte_offset: 40
-      fieldset: DHR8RD
-    - name: DOR
-      description: channel data output register
-      array:
-        len: 2
-        stride: 4
-      byte_offset: 44
-      access: Read
-      fieldset: DOR
-    - name: SR
-      description: status register
-      byte_offset: 52
-      fieldset: SR
-    - name: CCR
-      description: calibration control register
-      byte_offset: 56
-      fieldset: CCR
-    - name: MCR
-      description: mode control register
-      byte_offset: 60
-      fieldset: MCR
-    - name: SHSR1
-      description: Sample and Hold sample time register
-      array:
-        len: 2
-        stride: 4
-      byte_offset: 64
-      fieldset: SHSR
-    - name: SHHR
-      description: Sample and Hold hold time register
-      byte_offset: 72
-      fieldset: SHHR
-    - name: SHRR
-      description: Sample and Hold refresh time register
-      byte_offset: 76
-      fieldset: SHRR
+  - name: CR
+    description: control register
+    byte_offset: 0
+    fieldset: CR
+  - name: SWTRIGR
+    description: software trigger register
+    byte_offset: 4
+    access: Write
+    fieldset: SWTRIGR
+  - name: DHR12R
+    description: channel 12-bit right-aligned data holding register
+    array:
+      len: 2
+      stride: 12
+    byte_offset: 8
+    fieldset: DHR12R
+  - name: DHR12L
+    description: channel 12-bit left-aligned data holding register
+    array:
+      len: 2
+      stride: 12
+    byte_offset: 12
+    fieldset: DHR12L
+  - name: DHR8R
+    description: channel 8-bit right-aligned data holding register
+    array:
+      len: 2
+      stride: 12
+    byte_offset: 16
+    fieldset: DHR8R
+  - name: DHR12RD
+    description: Dual DAC 12-bit right-aligned data holding register
+    byte_offset: 32
+    fieldset: DHR12RD
+  - name: DHR12LD
+    description: DUAL DAC 12-bit left aligned data holding register
+    byte_offset: 36
+    fieldset: DHR12LD
+  - name: DHR8RD
+    description: DUAL DAC 8-bit right aligned data holding register
+    byte_offset: 40
+    fieldset: DHR8RD
+  - name: DOR
+    description: channel data output register
+    array:
+      len: 2
+      stride: 4
+    byte_offset: 44
+    access: Read
+    fieldset: DOR
+  - name: SR
+    description: status register
+    byte_offset: 52
+    fieldset: SR
+  - name: CCR
+    description: calibration control register
+    byte_offset: 56
+    fieldset: CCR
+  - name: MCR
+    description: mode control register
+    byte_offset: 60
+    fieldset: MCR
+  - name: SHSR1
+    description: Sample and Hold sample time register
+    array:
+      len: 2
+      stride: 4
+    byte_offset: 64
+    fieldset: SHSR
+  - name: SHHR
+    description: Sample and Hold hold time register
+    byte_offset: 72
+    fieldset: SHHR
+  - name: SHRR
+    description: Sample and Hold refresh time register
+    byte_offset: 76
+    fieldset: SHRR
 fieldset/CCR:
  description: calibration control register
  fields:
-    - name: OTRIM1
-      description: DAC Channel 1 offset trimming value
-      bit_offset: 0
-      bit_size: 5
-    - name: OTRIM2
-      description: DAC Channel 2 offset trimming value
-      bit_offset: 16
-      bit_size: 5
+  - name: OTRIM1
+    description: DAC Channel 1 offset trimming value
+    bit_offset: 0
+    bit_size: 5
+  - name: OTRIM2
+    description: DAC Channel 2 offset trimming value
+    bit_offset: 16
+    bit_size: 5
 fieldset/CR:
  description: control register
  fields:
-    - name: EN
-      description: DAC channel enable
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 2
-        stride: 16
-    - name: TEN
-      description: DAC channel trigger enable
-      bit_offset: 2
-      bit_size: 1
-      array:
-        len: 2
-        stride: 16
-    - name: TSEL1
-      description: DAC channel 1 trigger selection
-      bit_offset: 3
-      bit_size: 3
-      enum: TSEL1
-    - name: WAVE
-      description: DAC channel noise/triangle wave generation enable
-      bit_offset: 6
-      bit_size: 2
-      array:
-        len: 2
-        stride: 16
-      enum: WAVE
-    - name: MAMP
-      description: DAC channel mask/amplitude selector
-      bit_offset: 8
-      bit_size: 4
-      array:
-        len: 2
-        stride: 16
-    - name: DMAEN
-      description: DAC channel DMA enable
-      bit_offset: 12
-      bit_size: 1
-      array:
-        len: 2
-        stride: 16
-    - name: DMAUDRIE
-      description: DAC channel DMA Underrun Interrupt enable
-      bit_offset: 13
-      bit_size: 1
-      array:
-        len: 2
-        stride: 16
-    - name: CEN
-      description: DAC channel calibration enable
-      bit_offset: 14
-      bit_size: 1
-      array:
-        len: 2
-        stride: 16
-    - name: TSEL2
-      description: DAC channel 2 trigger selection
-      bit_offset: 19
-      bit_size: 3
-      enum: TSEL2
+  - name: EN
+    description: DAC channel enable
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 2
+      stride: 16
+  - name: TEN
+    description: DAC channel trigger enable
+    bit_offset: 2
+    bit_size: 1
+    array:
+      len: 2
+      stride: 16
+  - name: TSEL1
+    description: DAC channel 1 trigger selection
+    bit_offset: 3
+    bit_size: 3
+    enum: TSEL1
+  - name: WAVE
+    description: DAC channel noise/triangle wave generation enable
+    bit_offset: 6
+    bit_size: 2
+    array:
+      len: 2
+      stride: 16
+    enum: WAVE
+  - name: MAMP
+    description: DAC channel mask/amplitude selector
+    bit_offset: 8
+    bit_size: 4
+    array:
+      len: 2
+      stride: 16
+  - name: DMAEN
+    description: DAC channel DMA enable
+    bit_offset: 12
+    bit_size: 1
+    array:
+      len: 2
+      stride: 16
+  - name: DMAUDRIE
+    description: DAC channel DMA Underrun Interrupt enable
+    bit_offset: 13
+    bit_size: 1
+    array:
+      len: 2
+      stride: 16
+  - name: CEN
+    description: DAC channel calibration enable
+    bit_offset: 14
+    bit_size: 1
+    array:
+      len: 2
+      stride: 16
+  - name: TSEL2
+    description: DAC channel 2 trigger selection
+    bit_offset: 19
+    bit_size: 3
+    enum: TSEL2
 fieldset/DHR12L:
  description: channel 12-bit left-aligned data holding register
  fields:
-    - name: DHR
-      description: DAC channel 12-bit left-aligned data
-      bit_offset: 4
-      bit_size: 12
+  - name: DHR
+    description: DAC channel 12-bit left-aligned data
+    bit_offset: 4
+    bit_size: 12
 fieldset/DHR12LD:
  description: DUAL DAC 12-bit left aligned data holding register
  fields:
-    - name: DHR
-      description: DAC channel 12-bit left-aligned data
-      bit_offset: 4
-      bit_size: 12
-      array:
-        len: 2
-        stride: 16
+  - name: DHR
+    description: DAC channel 12-bit left-aligned data
+    bit_offset: 4
+    bit_size: 12
+    array:
+      len: 2
+      stride: 16
 fieldset/DHR12R:
  description: channel 12-bit right-aligned data holding register
  fields:
-    - name: DHR
-      description: DAC channel 12-bit right-aligned data
-      bit_offset: 0
-      bit_size: 12
+  - name: DHR
+    description: DAC channel 12-bit right-aligned data
+    bit_offset: 0
+    bit_size: 12
 fieldset/DHR12RD:
  description: Dual DAC 12-bit right-aligned data holding register
  fields:
-    - name: DHR
-      description: DAC channel 12-bit right-aligned data
-      bit_offset: 0
-      bit_size: 12
-      array:
-        len: 2
-        stride: 16
+  - name: DHR
+    description: DAC channel 12-bit right-aligned data
+    bit_offset: 0
+    bit_size: 12
+    array:
+      len: 2
+      stride: 16
 fieldset/DHR8R:
  description: channel 8-bit right-aligned data holding register
  fields:
-    - name: DHR
-      description: DAC channel 8-bit right-aligned data
-      bit_offset: 0
-      bit_size: 8
+  - name: DHR
+    description: DAC channel 8-bit right-aligned data
+    bit_offset: 0
+    bit_size: 8
 fieldset/DHR8RD:
  description: DUAL DAC 8-bit right aligned data holding register
  fields:
-    - name: DHR
-      description: DAC channel 8-bit right-aligned data
-      bit_offset: 0
-      bit_size: 8
-      array:
-        len: 2
-        stride: 8
+  - name: DHR
+    description: DAC channel 8-bit right-aligned data
+    bit_offset: 0
+    bit_size: 8
+    array:
+      len: 2
+      stride: 8
 fieldset/DOR:
  description: channel data output register
  fields:
-    - name: DOR
-      description: DAC channel data output
-      bit_offset: 0
-      bit_size: 12
+  - name: DOR
+    description: DAC channel data output
+    bit_offset: 0
+    bit_size: 12
 fieldset/MCR:
  description: mode control register
  fields:
-    - name: MODE
-      description: DAC channel mode
-      bit_offset: 0
-      bit_size: 3
-      array:
-        len: 2
-        stride: 16
+  - name: MODE
+    description: DAC channel mode
+    bit_offset: 0
+    bit_size: 3
+    array:
+      len: 2
+      stride: 16
 fieldset/SHHR:
  description: Sample and Hold hold time register
  fields:
-    - name: THOLD
-      description: DAC channel hold Time
-      bit_offset: 0
-      bit_size: 10
-      array:
-        len: 2
-        stride: 16
+  - name: THOLD
+    description: DAC channel hold Time
+    bit_offset: 0
+    bit_size: 10
+    array:
+      len: 2
+      stride: 16
 fieldset/SHRR:
  description: Sample and Hold refresh time register
  fields:
-    - name: TREFRESH
-      description: DAC channel refresh Time
-      bit_offset: 0
-      bit_size: 8
-      array:
-        len: 2
-        stride: 16
+  - name: TREFRESH
+    description: DAC channel refresh Time
+    bit_offset: 0
+    bit_size: 8
+    array:
+      len: 2
+      stride: 16
 fieldset/SHSR:
  description: Sample and Hold sample time register
  fields:
-    - name: TSAMPLE
-      description: DAC channel sample Time
-      bit_offset: 0
-      bit_size: 10
+  - name: TSAMPLE
+    description: DAC channel sample Time
+    bit_offset: 0
+    bit_size: 10
 fieldset/SR:
  description: status register
  fields:
-    - name: DMAUDR
-      description: DAC channel DMA underrun flag
-      bit_offset: 13
-      bit_size: 1
-      array:
-        len: 2
-        stride: 16
-    - name: CAL_FLAG
-      description: DAC channel calibration offset status
-      bit_offset: 14
-      bit_size: 1
-      array:
-        len: 2
-        stride: 16
-    - name: BWST
-      description: DAC channel busy writing sample time flag
-      bit_offset: 15
-      bit_size: 1
-      array:
-        len: 2
-        stride: 16
+  - name: DMAUDR
+    description: DAC channel DMA underrun flag
+    bit_offset: 13
+    bit_size: 1
+    array:
+      len: 2
+      stride: 16
+  - name: CAL_FLAG
+    description: DAC channel calibration offset status
+    bit_offset: 14
+    bit_size: 1
+    array:
+      len: 2
+      stride: 16
+  - name: BWST
+    description: DAC channel busy writing sample time flag
+    bit_offset: 15
+    bit_size: 1
+    array:
+      len: 2
+      stride: 16
 fieldset/SWTRIGR:
  description: software trigger register
  fields:
-    - name: SWTRIG
-      description: DAC channel software trigger
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 2
-        stride: 1
+  - name: SWTRIG
+    description: DAC channel software trigger
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 2
+      stride: 1
 enum/TSEL1:
  bit_size: 3
  variants:
-    - name: TIM6_TRGO
-      description: Timer 6 TRGO event
-      value: 0
-    - name: TIM3_TRGO
-      description: Timer 3 TRGO event
-      value: 1
-    - name: TIM7_TRGO
-      description: Timer 7 TRGO event
-      value: 2
-    - name: TIM15_TRGO
-      description: Timer 15 TRGO event
-      value: 3
-    - name: TIM2_TRGO
-      description: Timer 2 TRGO event
-      value: 4
-    - name: EXTI9
-      description: EXTI line9
-      value: 6
-    - name: SOFTWARE
-      description: Software trigger
-      value: 7
+  - name: TIM6_TRGO
+    description: Timer 6 TRGO event
+    value: 0
+  - name: TIM3_TRGO
+    description: Timer 3 TRGO event
+    value: 1
+  - name: TIM7_TRGO
+    description: Timer 7 TRGO event
+    value: 2
+  - name: TIM15_TRGO
+    description: Timer 15 TRGO event
+    value: 3
+  - name: TIM2_TRGO
+    description: Timer 2 TRGO event
+    value: 4
+  - name: EXTI9
+    description: EXTI line9
+    value: 6
+  - name: SOFTWARE
+    description: Software trigger
+    value: 7
 enum/TSEL2:
  bit_size: 3
  variants:
-    - name: TIM6_TRGO
-      description: Timer 6 TRGO event
-      value: 0
-    - name: TIM8_TRGO
-      description: Timer 8 TRGO event
-      value: 1
-    - name: TIM7_TRGO
-      description: Timer 7 TRGO event
-      value: 2
-    - name: TIM5_TRGO
-      description: Timer 5 TRGO event
-      value: 3
-    - name: TIM2_TRGO
-      description: Timer 2 TRGO event
-      value: 4
-    - name: TIM4_TRGO
-      description: Timer 4 TRGO event
-      value: 5
-    - name: EXTI9
-      description: EXTI line9
-      value: 6
-    - name: SOFTWARE
-      description: Software trigger
-      value: 7
+  - name: TIM6_TRGO
+    description: Timer 6 TRGO event
+    value: 0
+  - name: TIM8_TRGO
+    description: Timer 8 TRGO event
+    value: 1
+  - name: TIM7_TRGO
+    description: Timer 7 TRGO event
+    value: 2
+  - name: TIM5_TRGO
+    description: Timer 5 TRGO event
+    value: 3
+  - name: TIM2_TRGO
+    description: Timer 2 TRGO event
+    value: 4
+  - name: TIM4_TRGO
+    description: Timer 4 TRGO event
+    value: 5
+  - name: EXTI9
+    description: EXTI line9
+    value: 6
+  - name: SOFTWARE
+    description: Software trigger
+    value: 7
 enum/WAVE:
  bit_size: 2
  variants:
-    - name: Disabled
-      description: Wave generation disabled
-      value: 0
-    - name: Noise
-      description: Noise wave generation enabled
-      value: 1
-    - name: Triangle
-      description: Triangle wave generation enabled
-      value: 2
+  - name: Disabled
+    description: Wave generation disabled
+    value: 0
+  - name: Noise
+    description: Noise wave generation enabled
+    value: 1
+  - name: Triangle
+    description: Triangle wave generation enabled
+    value: 2
--- a/data/registers/dac_v3.yaml
+++ b/data/registers/dac_v3.yaml
@ -1,394 +1,391 @@
---
 block/DAC:
  description: Digital-to-analog converter
  items:
-    - name: CR
-      description: control register
-      byte_offset: 0
-      fieldset: CR
-    - name: SWTRIGR
-      description: software trigger register
-      byte_offset: 4
-      access: Write
-      fieldset: SWTRIGR
-    - name: DHR12R
-      description: channel 12-bit right-aligned data holding register
-      array:
-        len: 2
-        stride: 12
-      byte_offset: 8
-      fieldset: DHR12R
-    - name: DHR12L
-      description: channel 12-bit left-aligned data holding register
-      array:
-        len: 2
-        stride: 12
-      byte_offset: 12
-      fieldset: DHR12L
-    - name: DHR8R
-      description: channel 8-bit right-aligned data holding register
-      array:
-        len: 2
-        stride: 12
-      byte_offset: 16
-      fieldset: DHR8R
-    - name: DHR12RD
-      description: Dual DAC 12-bit right-aligned data holding register
-      byte_offset: 32
-      fieldset: DHR12RD
-    - name: DHR12LD
-      description: DUAL DAC 12-bit left aligned data holding register
-      byte_offset: 36
-      fieldset: DHR12LD
-    - name: DHR8RD
-      description: DUAL DAC 8-bit right aligned data holding register
-      byte_offset: 40
-      fieldset: DHR8RD
-    - name: DOR
-      description: channel data output register
-      array:
-        len: 2
-        stride: 4
-      byte_offset: 44
-      access: Read
-      fieldset: DOR
-    - name: SR
-      description: status register
-      byte_offset: 52
-      fieldset: SR
-    - name: CCR
-      description: calibration control register
-      byte_offset: 56
-      fieldset: CCR
-    - name: MCR
-      description: mode control register
-      byte_offset: 60
-      fieldset: MCR
-    - name: SHSR1
-      description: Sample and Hold sample time register
-      array:
-        len: 2
-        stride: 4
-      byte_offset: 64
-      fieldset: SHSR
-    - name: SHHR
-      description: Sample and Hold hold time register
-      byte_offset: 72
-      fieldset: SHHR
-    - name: SHRR
-      description: Sample and Hold refresh time register
-      byte_offset: 76
-      fieldset: SHRR
+  - name: CR
+    description: control register
+    byte_offset: 0
+    fieldset: CR
+  - name: SWTRIGR
+    description: software trigger register
+    byte_offset: 4
+    access: Write
+    fieldset: SWTRIGR
+  - name: DHR12R
+    description: channel 12-bit right-aligned data holding register
+    array:
+      len: 2
+      stride: 12
+    byte_offset: 8
+    fieldset: DHR12R
+  - name: DHR12L
+    description: channel 12-bit left-aligned data holding register
+    array:
+      len: 2
+      stride: 12
+    byte_offset: 12
+    fieldset: DHR12L
+  - name: DHR8R
+    description: channel 8-bit right-aligned data holding register
+    array:
+      len: 2
+      stride: 12
+    byte_offset: 16
+    fieldset: DHR8R
+  - name: DHR12RD
+    description: Dual DAC 12-bit right-aligned data holding register
+    byte_offset: 32
+    fieldset: DHR12RD
+  - name: DHR12LD
+    description: DUAL DAC 12-bit left aligned data holding register
+    byte_offset: 36
+    fieldset: DHR12LD
+  - name: DHR8RD
+    description: DUAL DAC 8-bit right aligned data holding register
+    byte_offset: 40
+    fieldset: DHR8RD
+  - name: DOR
+    description: channel data output register
+    array:
+      len: 2
+      stride: 4
+    byte_offset: 44
+    access: Read
+    fieldset: DOR
+  - name: SR
+    description: status register
+    byte_offset: 52
+    fieldset: SR
+  - name: CCR
+    description: calibration control register
+    byte_offset: 56
+    fieldset: CCR
+  - name: MCR
+    description: mode control register
+    byte_offset: 60
+    fieldset: MCR
+  - name: SHSR1
+    description: Sample and Hold sample time register
+    array:
+      len: 2
+      stride: 4
+    byte_offset: 64
+    fieldset: SHSR
+  - name: SHHR
+    description: Sample and Hold hold time register
+    byte_offset: 72
+    fieldset: SHHR
+  - name: SHRR
+    description: Sample and Hold refresh time register
+    byte_offset: 76
+    fieldset: SHRR
 fieldset/CCR:
  description: calibration control register
  fields:
-    - name: OTRIM1
-      description: DAC Channel 1 offset trimming value
-      bit_offset: 0
-      bit_size: 5
-    - name: OTRIM2
-      description: DAC Channel 2 offset trimming value
-      bit_offset: 16
-      bit_size: 5
+  - name: OTRIM1
+    description: DAC Channel 1 offset trimming value
+    bit_offset: 0
+    bit_size: 5
+  - name: OTRIM2
+    description: DAC Channel 2 offset trimming value
+    bit_offset: 16
+    bit_size: 5
 fieldset/CR:
  description: control register
  fields:
-    - name: EN
-      description: DAC channel enable
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 2
-        stride: 16
-    - name: TEN
-      description: DAC channel trigger enable
-      bit_offset: 1
-      bit_size: 1
-      array:
-        len: 2
-        stride: 16
-    - name: TSEL1
-      description: DAC channel 1 trigger selection
-      bit_offset: 2
-      bit_size: 4
-      enum: TSEL1
-    - name: WAVE
-      description: DAC channel noise/triangle wave generation enable
-      bit_offset: 6
-      bit_size: 2
-      array:
-        len: 2
-        stride: 16
-      enum: WAVE
-    - name: MAMP
-      description: DAC channel mask/amplitude selector
-      bit_offset: 8
-      bit_size: 4
-      array:
-        len: 2
-        stride: 16
-    - name: DMAEN
-      description: DAC channel DMA enable
-      bit_offset: 12
-      bit_size: 1
-      array:
-        len: 2
-        stride: 16
-    - name: DMAUDRIE
-      description: DAC channel DMA Underrun Interrupt enable
-      bit_offset: 13
-      bit_size: 1
-      array:
-        len: 2
-        stride: 16
-    - name: CEN
-      description: DAC channel calibration enable
-      bit_offset: 14
-      bit_size: 1
-      array:
-        len: 2
-        stride: 16
-    - name: TSEL2
-      description: DAC channel 2 trigger selection
-      bit_offset: 18
-      bit_size: 4
-      enum: TSEL2
+  - name: EN
+    description: DAC channel enable
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 2
+      stride: 16
+  - name: TEN
+    description: DAC channel trigger enable
+    bit_offset: 1
+    bit_size: 1
+    array:
+      len: 2
+      stride: 16
+  - name: TSEL1
+    description: DAC channel 1 trigger selection
+    bit_offset: 2
+    bit_size: 4
+    enum: TSEL1
+  - name: WAVE
+    description: DAC channel noise/triangle wave generation enable
+    bit_offset: 6
+    bit_size: 2
+    array:
+      len: 2
+      stride: 16
+    enum: WAVE
+  - name: MAMP
+    description: DAC channel mask/amplitude selector
+    bit_offset: 8
+    bit_size: 4
+    array:
+      len: 2
+      stride: 16
+  - name: DMAEN
+    description: DAC channel DMA enable
+    bit_offset: 12
+    bit_size: 1
+    array:
+      len: 2
+      stride: 16
+  - name: DMAUDRIE
+    description: DAC channel DMA Underrun Interrupt enable
+    bit_offset: 13
+    bit_size: 1
+    array:
+      len: 2
+      stride: 16
+  - name: CEN
+    description: DAC channel calibration enable
+    bit_offset: 14
+    bit_size: 1
+    array:
+      len: 2
+      stride: 16
+  - name: TSEL2
+    description: DAC channel 2 trigger selection
+    bit_offset: 18
+    bit_size: 4
+    enum: TSEL2
 fieldset/DHR12L:
  description: channel 12-bit left-aligned data holding register
  fields:
-    - name: DHR
-      description: DAC channel 12-bit left-aligned data
-      bit_offset: 4
-      bit_size: 12
+  - name: DHR
+    description: DAC channel 12-bit left-aligned data
+    bit_offset: 4
+    bit_size: 12
 fieldset/DHR12LD:
  description: DUAL DAC 12-bit left aligned data holding register
  fields:
-    - name: DHR
-      description: DAC channel 12-bit left-aligned data
-      bit_offset: 4
-      bit_size: 12
-      array:
-        len: 2
-        stride: 16
+  - name: DHR
+    description: DAC channel 12-bit left-aligned data
+    bit_offset: 4
+    bit_size: 12
+    array:
+      len: 2
+      stride: 16
 fieldset/DHR12R:
  description: channel 12-bit right-aligned data holding register
  fields:
-    - name: DHR
-      description: DAC channel 12-bit right-aligned data
-      bit_offset: 0
-      bit_size: 12
+  - name: DHR
+    description: DAC channel 12-bit right-aligned data
+    bit_offset: 0
+    bit_size: 12
 fieldset/DHR12RD:
  description: Dual DAC 12-bit right-aligned data holding register
  fields:
-    - name: DHR
-      description: DAC channel 12-bit right-aligned data
-      bit_offset: 0
-      bit_size: 12
-      array:
-        len: 2
-        stride: 16
+  - name: DHR
+    description: DAC channel 12-bit right-aligned data
+    bit_offset: 0
+    bit_size: 12
+    array:
+      len: 2
+      stride: 16
 fieldset/DHR8R:
  description: channel 8-bit right-aligned data holding register
  fields:
-    - name: DHR
-      description: DAC channel 8-bit right-aligned data
-      bit_offset: 0
-      bit_size: 8
+  - name: DHR
+    description: DAC channel 8-bit right-aligned data
+    bit_offset: 0
+    bit_size: 8
 fieldset/DHR8RD:
  description: DUAL DAC 8-bit right aligned data holding register
  fields:
-    - name: DHR
-      description: DAC channel 8-bit right-aligned data
-      bit_offset: 0
-      bit_size: 8
-      array:
-        len: 2
-        stride: 8
+  - name: DHR
+    description: DAC channel 8-bit right-aligned data
+    bit_offset: 0
+    bit_size: 8
+    array:
+      len: 2
+      stride: 8
 fieldset/DOR:
  description: channel data output register
  fields:
-    - name: DOR
-      description: DAC channel data output
-      bit_offset: 0
-      bit_size: 12
+  - name: DOR
+    description: DAC channel data output
+    bit_offset: 0
+    bit_size: 12
 fieldset/MCR:
  description: mode control register
  fields:
-    - name: MODE
-      description: DAC channel mode
-      bit_offset: 0
-      bit_size: 3
-      array:
-        len: 2
-        stride: 16
+  - name: MODE
+    description: DAC channel mode
+    bit_offset: 0
+    bit_size: 3
+    array:
+      len: 2
+      stride: 16
 fieldset/SHHR:
  description: Sample and Hold hold time register
  fields:
-    - name: THOLD
-      description: DAC channel hold Time
-      bit_offset: 0
-      bit_size: 10
-      array:
-        len: 2
-        stride: 16
+  - name: THOLD
+    description: DAC channel hold Time
+    bit_offset: 0
+    bit_size: 10
+    array:
+      len: 2
+      stride: 16
 fieldset/SHRR:
  description: Sample and Hold refresh time register
  fields:
-    - name: TREFRESH
-      description: DAC channel refresh Time
-      bit_offset: 0
-      bit_size: 8
-      array:
-        len: 2
-        stride: 16
+  - name: TREFRESH
+    description: DAC channel refresh Time
+    bit_offset: 0
+    bit_size: 8
+    array:
+      len: 2
+      stride: 16
 fieldset/SHSR:
  description: Sample and Hold sample time register
  fields:
-    - name: TSAMPLE
-      description: DAC channel sample Time
-      bit_offset: 0
-      bit_size: 10
+  - name: TSAMPLE
+    description: DAC channel sample Time
+    bit_offset: 0
+    bit_size: 10
 fieldset/SR:
  description: status register
  fields:
-    - name: DMAUDR
-      description: DAC channel DMA underrun flag
-      bit_offset: 13
-      bit_size: 1
-      array:
-        len: 2
-        stride: 16
-    - name: CAL_FLAG
-      description: DAC channel calibration offset status
-      bit_offset: 14
-      bit_size: 1
-      array:
-        len: 2
-        stride: 16
-    - name: BWST
-      description: DAC channel busy writing sample time flag
-      bit_offset: 15
-      bit_size: 1
-      array:
-        len: 2
-        stride: 16
+  - name: DMAUDR
+    description: DAC channel DMA underrun flag
+    bit_offset: 13
+    bit_size: 1
+    array:
+      len: 2
+      stride: 16
+  - name: CAL_FLAG
+    description: DAC channel calibration offset status
+    bit_offset: 14
+    bit_size: 1
+    array:
+      len: 2
+      stride: 16
+  - name: BWST
+    description: DAC channel busy writing sample time flag
+    bit_offset: 15
+    bit_size: 1
+    array:
+      len: 2
+      stride: 16
 fieldset/SWTRIGR:
  description: software trigger register
  fields:
-    - name: SWTRIG
-      description: DAC channel software trigger
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 2
-        stride: 1
+  - name: SWTRIG
+    description: DAC channel software trigger
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 2
+      stride: 1
 enum/TSEL1:
  bit_size: 4
  variants:
-    - name: SOFTWARE
-      description: Software trigger
-      value: 0
-    - name: TIM1_TRGO
-      description: Timer 1 TRGO event
-      value: 1
-    - name: TIM2_TRGO
-      description: Timer 2 TRGO event
-      value: 2
-    - name: TIM4_TRGO
-      description: Timer 4 TRGO event
-      value: 3
-    - name: TIM5_TRGO
-      description: Timer 5 TRGO event
-      value: 4
-    - name: TIM6_TRGO
-      description: Timer 6 TRGO event
-      value: 5
-    - name: TIM7_TRGO
-      description: Timer 7 TRGO event
-      value: 6
-    - name: TIM8_TRGO
-      description: Timer 8 TRGO event
-      value: 7
-    - name: TIM15_TRGO
-      description: Timer 15 TRGO event
-      value: 8
-    - name: HRTIM1_DACTRG1
-      description: High resolution timer 1 DACTRG1 event
-      value: 9
-    - name: HRTIM1_DACTRG2
-      description: High resolution timer 1 DACTRG2 event
-      value: 10
-    - name: LPTIM1_OUT
-      description: Low-power timer 1 OUT event
-      value: 11
-    - name: LPTIM2_OUT
-      description: Low-power timer 2 OUT event
-      value: 12                                               
-    - name: EXTI9
-      description: EXTI line9
-      value: 13
-    - name: LPTIM3_OUT
-      description: Low-power timer 3 OUT event
-      value: 14
-
+  - name: SOFTWARE
+    description: Software trigger
+    value: 0
+  - name: TIM1_TRGO
+    description: Timer 1 TRGO event
+    value: 1
+  - name: TIM2_TRGO
+    description: Timer 2 TRGO event
+    value: 2
+  - name: TIM4_TRGO
+    description: Timer 4 TRGO event
+    value: 3
+  - name: TIM5_TRGO
+    description: Timer 5 TRGO event
+    value: 4
+  - name: TIM6_TRGO
+    description: Timer 6 TRGO event
+    value: 5
+  - name: TIM7_TRGO
+    description: Timer 7 TRGO event
+    value: 6
+  - name: TIM8_TRGO
+    description: Timer 8 TRGO event
+    value: 7
+  - name: TIM15_TRGO
+    description: Timer 15 TRGO event
+    value: 8
+  - name: HRTIM1_DACTRG1
+    description: High resolution timer 1 DACTRG1 event
+    value: 9
+  - name: HRTIM1_DACTRG2
+    description: High resolution timer 1 DACTRG2 event
+    value: 10
+  - name: LPTIM1_OUT
+    description: Low-power timer 1 OUT event
+    value: 11
+  - name: LPTIM2_OUT
+    description: Low-power timer 2 OUT event
+    value: 12
+  - name: EXTI9
+    description: EXTI line9
+    value: 13
+  - name: LPTIM3_OUT
+    description: Low-power timer 3 OUT event
+    value: 14
 enum/TSEL2:
  bit_size: 4
  variants:
-    - name: SOFTWARE
-      description: Software trigger
-      value: 0
-    - name: TIM1_TRGO
-      description: Timer 1 TRGO event
-      value: 1
-    - name: TIM2_TRGO
-      description: Timer 2 TRGO event
-      value: 2
-    - name: TIM4_TRGO
-      description: Timer 4 TRGO event
-      value: 3
-    - name: TIM5_TRGO
-      description: Timer 5 TRGO event
-      value: 4
-    - name: TIM6_TRGO
-      description: Timer 6 TRGO event
-      value: 5
-    - name: TIM7_TRGO
-      description: Timer 7 TRGO event
-      value: 6
-    - name: TIM8_TRGO
-      description: Timer 8 TRGO event
-      value: 7
-    - name: TIM15_TRGO
-      description: Timer 15 TRGO event
-      value: 8
-    - name: HRTIM1_DACTRG1
-      description: High resolution timer 1 DACTRG1 event
-      value: 9
-    - name: HRTIM1_DACTRG2
-      description: High resolution timer 1 DACTRG2 event
-      value: 10
-    - name: LPTIM1_OUT
-      description: Low-power timer 1 OUT event
-      value: 11
-    - name: LPTIM2_OUT
-      description: Low-power timer 2 OUT event
-      value: 12
-    - name: EXTI9
-      description: EXTI line9
-      value: 13
-    - name: LPTIM3_OUT
-      description: Low-power timer 3 OUT event
-      value: 14
-
+  - name: SOFTWARE
+    description: Software trigger
+    value: 0
+  - name: TIM1_TRGO
+    description: Timer 1 TRGO event
+    value: 1
+  - name: TIM2_TRGO
+    description: Timer 2 TRGO event
+    value: 2
+  - name: TIM4_TRGO
+    description: Timer 4 TRGO event
+    value: 3
+  - name: TIM5_TRGO
+    description: Timer 5 TRGO event
+    value: 4
+  - name: TIM6_TRGO
+    description: Timer 6 TRGO event
+    value: 5
+  - name: TIM7_TRGO
+    description: Timer 7 TRGO event
+    value: 6
+  - name: TIM8_TRGO
+    description: Timer 8 TRGO event
+    value: 7
+  - name: TIM15_TRGO
+    description: Timer 15 TRGO event
+    value: 8
+  - name: HRTIM1_DACTRG1
+    description: High resolution timer 1 DACTRG1 event
+    value: 9
+  - name: HRTIM1_DACTRG2
+    description: High resolution timer 1 DACTRG2 event
+    value: 10
+  - name: LPTIM1_OUT
+    description: Low-power timer 1 OUT event
+    value: 11
+  - name: LPTIM2_OUT
+    description: Low-power timer 2 OUT event
+    value: 12
+  - name: EXTI9
+    description: EXTI line9
+    value: 13
+  - name: LPTIM3_OUT
+    description: Low-power timer 3 OUT event
+    value: 14
 enum/WAVE:
  bit_size: 2
  variants:
-    - name: Disabled
-      description: Wave generation disabled
-      value: 0
-    - name: Noise
-      description: Noise wave generation enabled
-      value: 1
-    - name: Triangle
-      description: Triangle wave generation enabled
-      value: 2
+  - name: Disabled
+    description: Wave generation disabled
+    value: 0
+  - name: Noise
+    description: Noise wave generation enabled
+    value: 1
+  - name: Triangle
+    description: Triangle wave generation enabled
+    value: 2
--- a/data/registers/dbgmcu_c0.yaml
+++ b/data/registers/dbgmcu_c0.yaml
@ -1,85 +1,84 @@
---
 block/DBGMCU:
  description: Debug support
  items:
-    - name: IDCODE
-      description: MCU Device ID Code Register
-      byte_offset: 0
-      access: Read
-      fieldset: IDCODE
-    - name: CR
-      description: Debug MCU Configuration Register
-      byte_offset: 4
-      fieldset: CR
-    - name: APB1FZR
-      description: DBG APB freeze register 1
-      byte_offset: 8
-      fieldset: APB1FZR
-    - name: APB2FZR
-      description: DBG APB freeze register 2
-      byte_offset: 12
-      fieldset: APB2FZR
+  - name: IDCODE
+    description: MCU Device ID Code Register
+    byte_offset: 0
+    access: Read
+    fieldset: IDCODE
+  - name: CR
+    description: Debug MCU Configuration Register
+    byte_offset: 4
+    fieldset: CR
+  - name: APB1FZR
+    description: DBG APB freeze register 1
+    byte_offset: 8
+    fieldset: APB1FZR
+  - name: APB2FZR
+    description: DBG APB freeze register 2
+    byte_offset: 12
+    fieldset: APB2FZR
 fieldset/APB1FZR:
  description: DBG APB freeze register 1
  fields:
-    - name: TIM3
-      description: TIM3 counter stopped when core is halted
-      bit_offset: 1
-      bit_size: 1
-    - name: RTC
-      description: Debug RTC stopped when Core is halted
-      bit_offset: 10
-      bit_size: 1
-    - name: WWDG
-      description: Debug Window Wachdog stopped when Core is halted
-      bit_offset: 11
-      bit_size: 1
-    - name: IWDG
-      description: Debug Independent Wachdog stopped when Core is halted
-      bit_offset: 12
-      bit_size: 1
-    - name: I2C1
-      description: I2C1 SMBUS timeout mode stopped when core is halted
-      bit_offset: 21
-      bit_size: 1
+  - name: TIM3
+    description: TIM3 counter stopped when core is halted
+    bit_offset: 1
+    bit_size: 1
+  - name: RTC
+    description: Debug RTC stopped when Core is halted
+    bit_offset: 10
+    bit_size: 1
+  - name: WWDG
+    description: Debug Window Wachdog stopped when Core is halted
+    bit_offset: 11
+    bit_size: 1
+  - name: IWDG
+    description: Debug Independent Wachdog stopped when Core is halted
+    bit_offset: 12
+    bit_size: 1
+  - name: I2C1
+    description: I2C1 SMBUS timeout mode stopped when core is halted
+    bit_offset: 21
+    bit_size: 1
 fieldset/APB2FZR:
  description: DBG APB freeze register 2
  fields:
-    - name: TIM1
-      description: TIM1
-      bit_offset: 11
-      bit_size: 1
-    - name: TIM14
-      description: TIM14
-      bit_offset: 15
-      bit_size: 1
-    - name: TIM16
-      description: TIM16
-      bit_offset: 17
-      bit_size: 1
-    - name: TIM17
-      description: TIM17
-      bit_offset: 18
-      bit_size: 1
+  - name: TIM1
+    description: TIM1
+    bit_offset: 11
+    bit_size: 1
+  - name: TIM14
+    description: TIM14
+    bit_offset: 15
+    bit_size: 1
+  - name: TIM16
+    description: TIM16
+    bit_offset: 17
+    bit_size: 1
+  - name: TIM17
+    description: TIM17
+    bit_offset: 18
+    bit_size: 1
 fieldset/CR:
  description: Debug MCU Configuration Register
  fields:
-    - name: DBG_STOP
-      description: Debug Stop Mode
-      bit_offset: 1
-      bit_size: 1
-    - name: DBG_STANDBY
-      description: Debug Standby Mode
-      bit_offset: 2
-      bit_size: 1
+  - name: DBG_STOP
+    description: Debug Stop Mode
+    bit_offset: 1
+    bit_size: 1
+  - name: DBG_STANDBY
+    description: Debug Standby Mode
+    bit_offset: 2
+    bit_size: 1
 fieldset/IDCODE:
  description: MCU Device ID Code Register
  fields:
-    - name: DEV_ID
-      description: Device Identifier
-      bit_offset: 0
-      bit_size: 16
-    - name: REV_ID
-      description: Revision Identifier
-      bit_offset: 16
-      bit_size: 16
+  - name: DEV_ID
+    description: Device Identifier
+    bit_offset: 0
+    bit_size: 16
+  - name: REV_ID
+    description: Revision Identifier
+    bit_offset: 16
+    bit_size: 16
--- a/data/registers/dbgmcu_f0.yaml
+++ b/data/registers/dbgmcu_f0.yaml
@ -1,109 +1,108 @@
---
 block/DBGMCU:
  description: Debug support
  items:
-    - name: IDCODE
-      description: MCU Device ID Code Register
-      byte_offset: 0
-      access: Read
-      fieldset: IDCODE
-    - name: CR
-      description: Debug MCU Configuration Register
-      byte_offset: 4
-      fieldset: CR
-    - name: APB1_FZ
-      description: Debug MCU APB1 freeze register
-      byte_offset: 8
-      fieldset: APB1_FZ
-    - name: APB2_FZ
-      description: Debug MCU APB2 freeze register
-      byte_offset: 12
-      fieldset: APB2_FZ
+  - name: IDCODE
+    description: MCU Device ID Code Register
+    byte_offset: 0
+    access: Read
+    fieldset: IDCODE
+  - name: CR
+    description: Debug MCU Configuration Register
+    byte_offset: 4
+    fieldset: CR
+  - name: APB1_FZ
+    description: Debug MCU APB1 freeze register
+    byte_offset: 8
+    fieldset: APB1_FZ
+  - name: APB2_FZ
+    description: Debug MCU APB2 freeze register
+    byte_offset: 12
+    fieldset: APB2_FZ
 fieldset/APB1_FZ:
  description: Debug MCU APB1 freeze register
  fields:
-    - name: TIM2
-      description: TIM2 counter stopped when core is halted
-      bit_offset: 0
-      bit_size: 1
-    - name: TIM3
-      description: TIM3 counter stopped when core is halted
-      bit_offset: 1
-      bit_size: 1
-    - name: TIM6
-      description: TIM6 counter stopped when core is halted
-      bit_offset: 4
-      bit_size: 1
-    - name: TIM7
-      description: TIM7 counter stopped when core is halted
-      bit_offset: 5
-      bit_size: 1
-    - name: TIM14
-      description: TIM14 counter stopped when core is halted
-      bit_offset: 8
-      bit_size: 1
-    - name: RTC
-      description: Debug RTC stopped when core is halted
-      bit_offset: 10
-      bit_size: 1
-    - name: WWDG
-      description: Debug window watchdog stopped when core is halted
-      bit_offset: 11
-      bit_size: 1
-    - name: IWDG
-      description: Debug independent watchdog stopped when core is halted
-      bit_offset: 12
-      bit_size: 1
-    - name: DBG_I2C1_SMBUS_TIMEOUT
-      description: SMBUS timeout mode stopped when core is halted
-      bit_offset: 21
-      bit_size: 1
-    - name: CAN
-      description: CAN stopped when core is halted
-      bit_offset: 25
-      bit_size: 1
+  - name: TIM2
+    description: TIM2 counter stopped when core is halted
+    bit_offset: 0
+    bit_size: 1
+  - name: TIM3
+    description: TIM3 counter stopped when core is halted
+    bit_offset: 1
+    bit_size: 1
+  - name: TIM6
+    description: TIM6 counter stopped when core is halted
+    bit_offset: 4
+    bit_size: 1
+  - name: TIM7
+    description: TIM7 counter stopped when core is halted
+    bit_offset: 5
+    bit_size: 1
+  - name: TIM14
+    description: TIM14 counter stopped when core is halted
+    bit_offset: 8
+    bit_size: 1
+  - name: RTC
+    description: Debug RTC stopped when core is halted
+    bit_offset: 10
+    bit_size: 1
+  - name: WWDG
+    description: Debug window watchdog stopped when core is halted
+    bit_offset: 11
+    bit_size: 1
+  - name: IWDG
+    description: Debug independent watchdog stopped when core is halted
+    bit_offset: 12
+    bit_size: 1
+  - name: DBG_I2C1_SMBUS_TIMEOUT
+    description: SMBUS timeout mode stopped when core is halted
+    bit_offset: 21
+    bit_size: 1
+  - name: CAN
+    description: CAN stopped when core is halted
+    bit_offset: 25
+    bit_size: 1
 fieldset/APB2_FZ:
  description: Debug MCU APB2 freeze register
  fields:
-    - name: TIM1
-      description: TIM1 counter stopped when core is halted
-      bit_offset: 11
-      bit_size: 1
-    - name: TIM15
-      description: TIM15 counter stopped when core is halted
-      bit_offset: 16
-      bit_size: 1
-    - name: TIM16
-      description: TIM16 counter stopped when core is halted
-      bit_offset: 17
-      bit_size: 1
-    - name: TIM17
-      description: TIM17 counter stopped when core is halted
-      bit_offset: 18
-      bit_size: 1
+  - name: TIM1
+    description: TIM1 counter stopped when core is halted
+    bit_offset: 11
+    bit_size: 1
+  - name: TIM15
+    description: TIM15 counter stopped when core is halted
+    bit_offset: 16
+    bit_size: 1
+  - name: TIM16
+    description: TIM16 counter stopped when core is halted
+    bit_offset: 17
+    bit_size: 1
+  - name: TIM17
+    description: TIM17 counter stopped when core is halted
+    bit_offset: 18
+    bit_size: 1
 fieldset/CR:
  description: Debug MCU Configuration Register
  fields:
-    - name: DBG_STOP
-      description: Debug Stop Mode
-      bit_offset: 1
-      bit_size: 1
-    - name: DBG_STANDBY
-      description: Debug Standby Mode
-      bit_offset: 2
-      bit_size: 1
+  - name: DBG_STOP
+    description: Debug Stop Mode
+    bit_offset: 1
+    bit_size: 1
+  - name: DBG_STANDBY
+    description: Debug Standby Mode
+    bit_offset: 2
+    bit_size: 1
 fieldset/IDCODE:
  description: MCU Device ID Code Register
  fields:
-    - name: DEV_ID
-      description: Device Identifier
-      bit_offset: 0
-      bit_size: 12
-    - name: DIV_ID
-      description: Division Identifier
-      bit_offset: 12
-      bit_size: 4
-    - name: REV_ID
-      description: Revision Identifier
-      bit_offset: 16
-      bit_size: 16
+  - name: DEV_ID
+    description: Device Identifier
+    bit_offset: 0
+    bit_size: 12
+  - name: DIV_ID
+    description: Division Identifier
+    bit_offset: 12
+    bit_size: 4
+  - name: REV_ID
+    description: Revision Identifier
+    bit_offset: 16
+    bit_size: 16
--- a/data/registers/dbgmcu_f1.yaml
+++ b/data/registers/dbgmcu_f1.yaml
@ -1,127 +1,126 @@
---
 block/DBGMCU:
  description: Debug support
  items:
-    - name: IDCODE
-      description: DBGMCU_IDCODE
-      byte_offset: 0
-      access: Read
-      fieldset: IDCODE
-    - name: CR
-      description: DBGMCU_CR
-      byte_offset: 4
-      fieldset: CR
+  - name: IDCODE
+    description: DBGMCU_IDCODE
+    byte_offset: 0
+    access: Read
+    fieldset: IDCODE
+  - name: CR
+    description: DBGMCU_CR
+    byte_offset: 4
+    fieldset: CR
 fieldset/CR:
  description: DBGMCU_CR
  fields:
-    - name: DBG_SLEEP
-      description: DBG_SLEEP
-      bit_offset: 0
-      bit_size: 1
-    - name: DBG_STOP
-      description: DBG_STOP
-      bit_offset: 1
-      bit_size: 1
-    - name: DBG_STANDBY
-      description: DBG_STANDBY
-      bit_offset: 2
-      bit_size: 1
-    - name: TRACE_IOEN
-      description: TRACE_IOEN
-      bit_offset: 5
-      bit_size: 1
-    - name: TRACE_MODE
-      description: TRACE_MODE
-      bit_offset: 6
-      bit_size: 2
-    - name: IWDG
-      description: IWDG
-      bit_offset: 8
-      bit_size: 1
-    - name: WWDG
-      description: WWDG
-      bit_offset: 9
-      bit_size: 1
-    - name: TIM1
-      description: TIM1
-      bit_offset: 10
-      bit_size: 1
-    - name: TIM2
-      description: TIM2
-      bit_offset: 11
-      bit_size: 1
-    - name: TIM3
-      description: TIM3
-      bit_offset: 12
-      bit_size: 1
-    - name: TIM4
-      description: TIM4
-      bit_offset: 13
-      bit_size: 1
-    - name: CAN1
-      description: CAN1
-      bit_offset: 14
-      bit_size: 1
-    - name: DBG_I2C1_SMBUS_TIMEOUT
-      description: DBG_I2C1_SMBUS_TIMEOUT
-      bit_offset: 15
-      bit_size: 1
-    - name: DBG_I2C2_SMBUS_TIMEOUT
-      description: DBG_I2C2_SMBUS_TIMEOUT
-      bit_offset: 16
-      bit_size: 1
-    - name: TIM8
-      description: TIM8
-      bit_offset: 17
-      bit_size: 1
-    - name: TIM5
-      description: TIM5
-      bit_offset: 18
-      bit_size: 1
-    - name: TIM6
-      description: TIM6
-      bit_offset: 19
-      bit_size: 1
-    - name: TIM7
-      description: TIM7
-      bit_offset: 20
-      bit_size: 1
-    - name: CAN2
-      description: CAN2
-      bit_offset: 21
-      bit_size: 1
-    - name: TIM15
-      description: TIM15
-      bit_offset: 22
-      bit_size: 1
-    - name: TIM16
-      description: TIM16
-      bit_offset: 23
-      bit_size: 1
-    - name: TIM17
-      description: TIM17
-      bit_offset: 24
-      bit_size: 1
-    - name: TIM12
-      description: TIM12
-      bit_offset: 25
-      bit_size: 1
-    - name: TIM13
-      description: TIM13
-      bit_offset: 26
-      bit_size: 1
-    - name: TIM14
-      description: TIM14
-      bit_offset: 27
-      bit_size: 1
+  - name: DBG_SLEEP
+    description: DBG_SLEEP
+    bit_offset: 0
+    bit_size: 1
+  - name: DBG_STOP
+    description: DBG_STOP
+    bit_offset: 1
+    bit_size: 1
+  - name: DBG_STANDBY
+    description: DBG_STANDBY
+    bit_offset: 2
+    bit_size: 1
+  - name: TRACE_IOEN
+    description: TRACE_IOEN
+    bit_offset: 5
+    bit_size: 1
+  - name: TRACE_MODE
+    description: TRACE_MODE
+    bit_offset: 6
+    bit_size: 2
+  - name: IWDG
+    description: IWDG
+    bit_offset: 8
+    bit_size: 1
+  - name: WWDG
+    description: WWDG
+    bit_offset: 9
+    bit_size: 1
+  - name: TIM1
+    description: TIM1
+    bit_offset: 10
+    bit_size: 1
+  - name: TIM2
+    description: TIM2
+    bit_offset: 11
+    bit_size: 1
+  - name: TIM3
+    description: TIM3
+    bit_offset: 12
+    bit_size: 1
+  - name: TIM4
+    description: TIM4
+    bit_offset: 13
+    bit_size: 1
+  - name: CAN1
+    description: CAN1
+    bit_offset: 14
+    bit_size: 1
+  - name: DBG_I2C1_SMBUS_TIMEOUT
+    description: DBG_I2C1_SMBUS_TIMEOUT
+    bit_offset: 15
+    bit_size: 1
+  - name: DBG_I2C2_SMBUS_TIMEOUT
+    description: DBG_I2C2_SMBUS_TIMEOUT
+    bit_offset: 16
+    bit_size: 1
+  - name: TIM8
+    description: TIM8
+    bit_offset: 17
+    bit_size: 1
+  - name: TIM5
+    description: TIM5
+    bit_offset: 18
+    bit_size: 1
+  - name: TIM6
+    description: TIM6
+    bit_offset: 19
+    bit_size: 1
+  - name: TIM7
+    description: TIM7
+    bit_offset: 20
+    bit_size: 1
+  - name: CAN2
+    description: CAN2
+    bit_offset: 21
+    bit_size: 1
+  - name: TIM15
+    description: TIM15
+    bit_offset: 22
+    bit_size: 1
+  - name: TIM16
+    description: TIM16
+    bit_offset: 23
+    bit_size: 1
+  - name: TIM17
+    description: TIM17
+    bit_offset: 24
+    bit_size: 1
+  - name: TIM12
+    description: TIM12
+    bit_offset: 25
+    bit_size: 1
+  - name: TIM13
+    description: TIM13
+    bit_offset: 26
+    bit_size: 1
+  - name: TIM14
+    description: TIM14
+    bit_offset: 27
+    bit_size: 1
 fieldset/IDCODE:
  description: DBGMCU_IDCODE
  fields:
-    - name: DEV_ID
-      description: DEV_ID
-      bit_offset: 0
-      bit_size: 12
-    - name: REV_ID
-      description: REV_ID
-      bit_offset: 16
-      bit_size: 16
+  - name: DEV_ID
+    description: DEV_ID
+    bit_offset: 0
+    bit_size: 12
+  - name: REV_ID
+    description: REV_ID
+    bit_offset: 16
+    bit_size: 16
--- a/data/registers/dbgmcu_f2.yaml
+++ b/data/registers/dbgmcu_f2.yaml
@ -1,149 +1,148 @@
---
 block/DBGMCU:
  description: Debug support
  items:
-    - name: IDCODE
-      description: IDCODE
-      byte_offset: 0
-      access: Read
-      fieldset: IDCODE
-    - name: CR
-      description: Control Register
-      byte_offset: 4
-      fieldset: CR
-    - name: APB1_FZ
-      description: Debug MCU APB1 Freeze registe
-      byte_offset: 8
-      fieldset: APB1_FZ
-    - name: APB2_FZ
-      description: Debug MCU APB2 Freeze registe
-      byte_offset: 12
-      fieldset: APB2_FZ
+  - name: IDCODE
+    description: IDCODE
+    byte_offset: 0
+    access: Read
+    fieldset: IDCODE
+  - name: CR
+    description: Control Register
+    byte_offset: 4
+    fieldset: CR
+  - name: APB1_FZ
+    description: Debug MCU APB1 Freeze registe
+    byte_offset: 8
+    fieldset: APB1_FZ
+  - name: APB2_FZ
+    description: Debug MCU APB2 Freeze registe
+    byte_offset: 12
+    fieldset: APB2_FZ
 fieldset/APB1_FZ:
  description: Debug MCU APB1 Freeze registe
  fields:
-    - name: TIM2
-      description: TIM2
-      bit_offset: 0
-      bit_size: 1
-    - name: TIM3
-      description: TIM3
-      bit_offset: 1
-      bit_size: 1
-    - name: TIM4
-      description: TIM4
-      bit_offset: 2
-      bit_size: 1
-    - name: TIM5
-      description: TIM5
-      bit_offset: 3
-      bit_size: 1
-    - name: TIM6
-      description: TIM6
-      bit_offset: 4
-      bit_size: 1
-    - name: TIM7
-      description: TIM7
-      bit_offset: 5
-      bit_size: 1
-    - name: TIM12
-      description: TIM12
-      bit_offset: 6
-      bit_size: 1
-    - name: TIM13
-      description: TIM13
-      bit_offset: 7
-      bit_size: 1
-    - name: TIM14
-      description: TIM14
-      bit_offset: 8
-      bit_size: 1
-    - name: RTC
-      description: RTC
-      bit_offset: 10
-      bit_size: 1
-    - name: WWDG
-      description: WWDG
-      bit_offset: 11
-      bit_size: 1
-    - name: IWDG
-      description: IWDEG
-      bit_offset: 12
-      bit_size: 1
-    - name: I2C1_SMBUS_TIMEOUT
-      description: I2C1_SMBUS_TIMEOUT
-      bit_offset: 21
-      bit_size: 1
-    - name: I2C2_SMBUS_TIMEOUT
-      description: I2C2_SMBUS_TIMEOUT
-      bit_offset: 22
-      bit_size: 1
-    - name: I2C3_SMBUS_TIMEOUT
-      description: I2C3_SMBUS_TIMEOUT
-      bit_offset: 23
-      bit_size: 1
-    - name: CAN1
-      description: CAN1
-      bit_offset: 25
-      bit_size: 1
-    - name: CAN2
-      description: CAN2
-      bit_offset: 26
-      bit_size: 1
+  - name: TIM2
+    description: TIM2
+    bit_offset: 0
+    bit_size: 1
+  - name: TIM3
+    description: TIM3
+    bit_offset: 1
+    bit_size: 1
+  - name: TIM4
+    description: TIM4
+    bit_offset: 2
+    bit_size: 1
+  - name: TIM5
+    description: TIM5
+    bit_offset: 3
+    bit_size: 1
+  - name: TIM6
+    description: TIM6
+    bit_offset: 4
+    bit_size: 1
+  - name: TIM7
+    description: TIM7
+    bit_offset: 5
+    bit_size: 1
+  - name: TIM12
+    description: TIM12
+    bit_offset: 6
+    bit_size: 1
+  - name: TIM13
+    description: TIM13
+    bit_offset: 7
+    bit_size: 1
+  - name: TIM14
+    description: TIM14
+    bit_offset: 8
+    bit_size: 1
+  - name: RTC
+    description: RTC
+    bit_offset: 10
+    bit_size: 1
+  - name: WWDG
+    description: WWDG
+    bit_offset: 11
+    bit_size: 1
+  - name: IWDG
+    description: IWDEG
+    bit_offset: 12
+    bit_size: 1
+  - name: I2C1_SMBUS_TIMEOUT
+    description: I2C1_SMBUS_TIMEOUT
+    bit_offset: 21
+    bit_size: 1
+  - name: I2C2_SMBUS_TIMEOUT
+    description: I2C2_SMBUS_TIMEOUT
+    bit_offset: 22
+    bit_size: 1
+  - name: I2C3_SMBUS_TIMEOUT
+    description: I2C3_SMBUS_TIMEOUT
+    bit_offset: 23
+    bit_size: 1
+  - name: CAN1
+    description: CAN1
+    bit_offset: 25
+    bit_size: 1
+  - name: CAN2
+    description: CAN2
+    bit_offset: 26
+    bit_size: 1
 fieldset/APB2_FZ:
  description: Debug MCU APB2 Freeze registe
  fields:
-    - name: TIM1
-      description: TIM1 counter stopped when core is halted
-      bit_offset: 0
-      bit_size: 1
-    - name: TIM8
-      description: TIM8 counter stopped when core is halted
-      bit_offset: 1
-      bit_size: 1
-    - name: TIM9
-      description: TIM9 counter stopped when core is halted
-      bit_offset: 16
-      bit_size: 1
-    - name: TIM10
-      description: TIM10 counter stopped when core is halted
-      bit_offset: 17
-      bit_size: 1
-    - name: TIM11
-      description: TIM11 counter stopped when core is halted
-      bit_offset: 18
-      bit_size: 1
+  - name: TIM1
+    description: TIM1 counter stopped when core is halted
+    bit_offset: 0
+    bit_size: 1
+  - name: TIM8
+    description: TIM8 counter stopped when core is halted
+    bit_offset: 1
+    bit_size: 1
+  - name: TIM9
+    description: TIM9 counter stopped when core is halted
+    bit_offset: 16
+    bit_size: 1
+  - name: TIM10
+    description: TIM10 counter stopped when core is halted
+    bit_offset: 17
+    bit_size: 1
+  - name: TIM11
+    description: TIM11 counter stopped when core is halted
+    bit_offset: 18
+    bit_size: 1
 fieldset/CR:
  description: Control Register
  fields:
-    - name: DBG_SLEEP
-      description: DBG_SLEEP
-      bit_offset: 0
-      bit_size: 1
-    - name: DBG_STOP
-      description: DBG_STOP
-      bit_offset: 1
-      bit_size: 1
-    - name: DBG_STANDBY
-      description: DBG_STANDBY
-      bit_offset: 2
-      bit_size: 1
-    - name: TRACE_IOEN
-      description: TRACE_IOEN
-      bit_offset: 5
-      bit_size: 1
-    - name: TRACE_MODE
-      description: TRACE_MODE
-      bit_offset: 6
-      bit_size: 2
+  - name: DBG_SLEEP
+    description: DBG_SLEEP
+    bit_offset: 0
+    bit_size: 1
+  - name: DBG_STOP
+    description: DBG_STOP
+    bit_offset: 1
+    bit_size: 1
+  - name: DBG_STANDBY
+    description: DBG_STANDBY
+    bit_offset: 2
+    bit_size: 1
+  - name: TRACE_IOEN
+    description: TRACE_IOEN
+    bit_offset: 5
+    bit_size: 1
+  - name: TRACE_MODE
+    description: TRACE_MODE
+    bit_offset: 6
+    bit_size: 2
 fieldset/IDCODE:
  description: IDCODE
  fields:
-    - name: DEV_ID
-      description: DEV_ID
-      bit_offset: 0
-      bit_size: 12
-    - name: REV_ID
-      description: REV_ID
-      bit_offset: 16
-      bit_size: 16
+  - name: DEV_ID
+    description: DEV_ID
+    bit_offset: 0
+    bit_size: 12
+  - name: REV_ID
+    description: REV_ID
+    bit_offset: 16
+    bit_size: 16
--- a/data/registers/dbgmcu_f3.yaml
+++ b/data/registers/dbgmcu_f3.yaml
@ -1,141 +1,140 @@
---
 block/DBGMCU:
  description: Debug support
  items:
-    - name: IDCODE
-      description: MCU Device ID Code Register
-      byte_offset: 0
-      access: Read
-      fieldset: IDCODE
-    - name: CR
-      description: Debug MCU Configuration Register
-      byte_offset: 4
-      fieldset: CR
-    - name: APB1FZR
-      description: APB Low Freeze Register
-      byte_offset: 8
-      fieldset: APB1FZR
-    - name: APB2FZR
-      description: APB High Freeze Register
-      byte_offset: 12
-      fieldset: APB2FZR
+  - name: IDCODE
+    description: MCU Device ID Code Register
+    byte_offset: 0
+    access: Read
+    fieldset: IDCODE
+  - name: CR
+    description: Debug MCU Configuration Register
+    byte_offset: 4
+    fieldset: CR
+  - name: APB1FZR
+    description: APB Low Freeze Register
+    byte_offset: 8
+    fieldset: APB1FZR
+  - name: APB2FZR
+    description: APB High Freeze Register
+    byte_offset: 12
+    fieldset: APB2FZR
 fieldset/APB1FZR:
  description: APB Low Freeze Register
  fields:
-    - name: TIM2
-      description: Debug Timer 2 stopped when Core is halted
-      bit_offset: 0
-      bit_size: 1
-    - name: TIM3
-      description: Debug Timer 3 stopped when Core is halted
-      bit_offset: 1
-      bit_size: 1
-    - name: TIM4
-      description: Debug Timer 4 stopped when Core is halted
-      bit_offset: 2
-      bit_size: 1
-    - name: TIM5
-      description: Debug Timer 5 stopped when Core is halted
-      bit_offset: 3
-      bit_size: 1
-    - name: TIM6
-      description: Debug Timer 6 stopped when Core is halted
-      bit_offset: 4
-      bit_size: 1
-    - name: TIM7
-      description: Debug Timer 7 stopped when Core is halted
-      bit_offset: 5
-      bit_size: 1
-    - name: TIM12
-      description: Debug Timer 12 stopped when Core is halted
-      bit_offset: 6
-      bit_size: 1
-    - name: TIM13
-      description: Debug Timer 13 stopped when Core is halted
-      bit_offset: 7
-      bit_size: 1
-    - name: TIM14
-      description: Debug Timer 14 stopped when Core is halted
-      bit_offset: 8
-      bit_size: 1
-    - name: TIM18
-      description: Debug Timer 18 stopped when Core is halted
-      bit_offset: 9
-      bit_size: 1
-    - name: RTC
-      description: Debug RTC stopped when Core is halted
-      bit_offset: 10
-      bit_size: 1
-    - name: WWDG
-      description: Debug Window Wachdog stopped when Core is halted
-      bit_offset: 11
-      bit_size: 1
-    - name: IWDG
-      description: Debug Independent Wachdog stopped when Core is halted
-      bit_offset: 12
-      bit_size: 1
-    - name: I2C1_SMBUS_TIMEOUT
-      description: SMBUS timeout mode stopped when Core is halted
-      bit_offset: 21
-      bit_size: 1
-    - name: I2C2_SMBUS_TIMEOUT
-      description: SMBUS timeout mode stopped when Core is halted
-      bit_offset: 22
-      bit_size: 1
-    - name: CAN
-      description: Debug CAN stopped when core is halted
-      bit_offset: 25
-      bit_size: 1
+  - name: TIM2
+    description: Debug Timer 2 stopped when Core is halted
+    bit_offset: 0
+    bit_size: 1
+  - name: TIM3
+    description: Debug Timer 3 stopped when Core is halted
+    bit_offset: 1
+    bit_size: 1
+  - name: TIM4
+    description: Debug Timer 4 stopped when Core is halted
+    bit_offset: 2
+    bit_size: 1
+  - name: TIM5
+    description: Debug Timer 5 stopped when Core is halted
+    bit_offset: 3
+    bit_size: 1
+  - name: TIM6
+    description: Debug Timer 6 stopped when Core is halted
+    bit_offset: 4
+    bit_size: 1
+  - name: TIM7
+    description: Debug Timer 7 stopped when Core is halted
+    bit_offset: 5
+    bit_size: 1
+  - name: TIM12
+    description: Debug Timer 12 stopped when Core is halted
+    bit_offset: 6
+    bit_size: 1
+  - name: TIM13
+    description: Debug Timer 13 stopped when Core is halted
+    bit_offset: 7
+    bit_size: 1
+  - name: TIM14
+    description: Debug Timer 14 stopped when Core is halted
+    bit_offset: 8
+    bit_size: 1
+  - name: TIM18
+    description: Debug Timer 18 stopped when Core is halted
+    bit_offset: 9
+    bit_size: 1
+  - name: RTC
+    description: Debug RTC stopped when Core is halted
+    bit_offset: 10
+    bit_size: 1
+  - name: WWDG
+    description: Debug Window Wachdog stopped when Core is halted
+    bit_offset: 11
+    bit_size: 1
+  - name: IWDG
+    description: Debug Independent Wachdog stopped when Core is halted
+    bit_offset: 12
+    bit_size: 1
+  - name: I2C1_SMBUS_TIMEOUT
+    description: SMBUS timeout mode stopped when Core is halted
+    bit_offset: 21
+    bit_size: 1
+  - name: I2C2_SMBUS_TIMEOUT
+    description: SMBUS timeout mode stopped when Core is halted
+    bit_offset: 22
+    bit_size: 1
+  - name: CAN
+    description: Debug CAN stopped when core is halted
+    bit_offset: 25
+    bit_size: 1
 fieldset/APB2FZR:
  description: APB High Freeze Register
  fields:
-    - name: TIM15
-      description: Debug Timer 15 stopped when Core is halted
-      bit_offset: 2
-      bit_size: 1
-    - name: TIM16
-      description: Debug Timer 16 stopped when Core is halted
-      bit_offset: 3
-      bit_size: 1
-    - name: TIM17
-      description: Debug Timer 17 stopped when Core is halted
-      bit_offset: 4
-      bit_size: 1
-    - name: TIM19
-      description: Debug Timer 19 stopped when Core is halted
-      bit_offset: 5
-      bit_size: 1
+  - name: TIM15
+    description: Debug Timer 15 stopped when Core is halted
+    bit_offset: 2
+    bit_size: 1
+  - name: TIM16
+    description: Debug Timer 16 stopped when Core is halted
+    bit_offset: 3
+    bit_size: 1
+  - name: TIM17
+    description: Debug Timer 17 stopped when Core is halted
+    bit_offset: 4
+    bit_size: 1
+  - name: TIM19
+    description: Debug Timer 19 stopped when Core is halted
+    bit_offset: 5
+    bit_size: 1
 fieldset/CR:
  description: Debug MCU Configuration Register
  fields:
-    - name: DBG_SLEEP
-      description: Debug Sleep mode
-      bit_offset: 0
-      bit_size: 1
-    - name: DBG_STOP
-      description: Debug Stop Mode
-      bit_offset: 1
-      bit_size: 1
-    - name: DBG_STANDBY
-      description: Debug Standby Mode
-      bit_offset: 2
-      bit_size: 1
-    - name: TRACE_IOEN
-      description: Trace pin assignment control
-      bit_offset: 5
-      bit_size: 1
-    - name: TRACE_MODE
-      description: Trace pin assignment control
-      bit_offset: 6
-      bit_size: 2
+  - name: DBG_SLEEP
+    description: Debug Sleep mode
+    bit_offset: 0
+    bit_size: 1
+  - name: DBG_STOP
+    description: Debug Stop Mode
+    bit_offset: 1
+    bit_size: 1
+  - name: DBG_STANDBY
+    description: Debug Standby Mode
+    bit_offset: 2
+    bit_size: 1
+  - name: TRACE_IOEN
+    description: Trace pin assignment control
+    bit_offset: 5
+    bit_size: 1
+  - name: TRACE_MODE
+    description: Trace pin assignment control
+    bit_offset: 6
+    bit_size: 2
 fieldset/IDCODE:
  description: MCU Device ID Code Register
  fields:
-    - name: DEV_ID
-      description: Device Identifier
-      bit_offset: 0
-      bit_size: 12
-    - name: REV_ID
-      description: Revision Identifier
-      bit_offset: 16
-      bit_size: 16
+  - name: DEV_ID
+    description: Device Identifier
+    bit_offset: 0
+    bit_size: 12
+  - name: REV_ID
+    description: Revision Identifier
+    bit_offset: 16
+    bit_size: 16
--- a/data/registers/dbgmcu_f4.yaml
+++ b/data/registers/dbgmcu_f4.yaml
@ -1,153 +1,152 @@
---
 block/DBGMCU:
  description: Debug support
  items:
-    - name: IDCODE
-      description: IDCODE
-      byte_offset: 0
-      access: Read
-      fieldset: IDCODE
-    - name: CR
-      description: Control Register
-      byte_offset: 4
-      fieldset: CR
-    - name: APB1FZR
-      description: Debug MCU APB1 Freeze registe
-      byte_offset: 8
-      fieldset: APB1FZR
-    - name: APB2FZR
-      description: Debug MCU APB2 Freeze registe
-      byte_offset: 12
-      fieldset: APB2FZR
+  - name: IDCODE
+    description: IDCODE
+    byte_offset: 0
+    access: Read
+    fieldset: IDCODE
+  - name: CR
+    description: Control Register
+    byte_offset: 4
+    fieldset: CR
+  - name: APB1FZR
+    description: Debug MCU APB1 Freeze registe
+    byte_offset: 8
+    fieldset: APB1FZR
+  - name: APB2FZR
+    description: Debug MCU APB2 Freeze registe
+    byte_offset: 12
+    fieldset: APB2FZR
 fieldset/APB1FZR:
  description: Debug MCU APB1 Freeze registe
  fields:
-    - name: TIM2
-      description: TIM2
-      bit_offset: 0
-      bit_size: 1
-    - name: TIM3
-      description: TIM3
-      bit_offset: 1
-      bit_size: 1
-    - name: TIM4
-      description: TIM4
-      bit_offset: 2
-      bit_size: 1
-    - name: TIM5
-      description: TIM5
-      bit_offset: 3
-      bit_size: 1
-    - name: TIM6
-      description: TIM6
-      bit_offset: 4
-      bit_size: 1
-    - name: TIM7
-      description: TIM7
-      bit_offset: 5
-      bit_size: 1
-    - name: TIM12
-      description: TIM12
-      bit_offset: 6
-      bit_size: 1
-    - name: TIM13
-      description: TIM13
-      bit_offset: 7
-      bit_size: 1
-    - name: TIM14
-      description: TIM14
-      bit_offset: 8
-      bit_size: 1
-    - name: RTC
-      description: RTC stopped when Core is halted
-      bit_offset: 10
-      bit_size: 1
-    - name: WWDG
-      description: WWDG
-      bit_offset: 11
-      bit_size: 1
-    - name: IWDG
-      description: IWDEG
-      bit_offset: 12
-      bit_size: 1
-    - name: I2C1_SMBUS_TIMEOUT
-      description: I2C1_SMBUS_TIMEOUT
-      bit_offset: 21
-      bit_size: 1
-    - name: I2C2_SMBUS_TIMEOUT
-      description: I2C2_SMBUS_TIMEOUT
-      bit_offset: 22
-      bit_size: 1
-    - name: I2C3_SMBUS_TIMEOUT
-      description: I2C3SMBUS_TIMEOUT
-      bit_offset: 23
-      bit_size: 1
-    - name: I2CFMP_SMBUS_TIMEOUT
-      description: SMBUS timeout mode stopped when Core is halted
-      bit_offset: 24
-      bit_size: 1
-    - name: CAN1
-      description: CAN1
-      bit_offset: 25
-      bit_size: 1
-    - name: CAN2
-      description: CAN2
-      bit_offset: 26
-      bit_size: 1
+  - name: TIM2
+    description: TIM2
+    bit_offset: 0
+    bit_size: 1
+  - name: TIM3
+    description: TIM3
+    bit_offset: 1
+    bit_size: 1
+  - name: TIM4
+    description: TIM4
+    bit_offset: 2
+    bit_size: 1
+  - name: TIM5
+    description: TIM5
+    bit_offset: 3
+    bit_size: 1
+  - name: TIM6
+    description: TIM6
+    bit_offset: 4
+    bit_size: 1
+  - name: TIM7
+    description: TIM7
+    bit_offset: 5
+    bit_size: 1
+  - name: TIM12
+    description: TIM12
+    bit_offset: 6
+    bit_size: 1
+  - name: TIM13
+    description: TIM13
+    bit_offset: 7
+    bit_size: 1
+  - name: TIM14
+    description: TIM14
+    bit_offset: 8
+    bit_size: 1
+  - name: RTC
+    description: RTC stopped when Core is halted
+    bit_offset: 10
+    bit_size: 1
+  - name: WWDG
+    description: WWDG
+    bit_offset: 11
+    bit_size: 1
+  - name: IWDG
+    description: IWDEG
+    bit_offset: 12
+    bit_size: 1
+  - name: I2C1_SMBUS_TIMEOUT
+    description: I2C1_SMBUS_TIMEOUT
+    bit_offset: 21
+    bit_size: 1
+  - name: I2C2_SMBUS_TIMEOUT
+    description: I2C2_SMBUS_TIMEOUT
+    bit_offset: 22
+    bit_size: 1
+  - name: I2C3_SMBUS_TIMEOUT
+    description: I2C3SMBUS_TIMEOUT
+    bit_offset: 23
+    bit_size: 1
+  - name: I2CFMP_SMBUS_TIMEOUT
+    description: SMBUS timeout mode stopped when Core is halted
+    bit_offset: 24
+    bit_size: 1
+  - name: CAN1
+    description: CAN1
+    bit_offset: 25
+    bit_size: 1
+  - name: CAN2
+    description: CAN2
+    bit_offset: 26
+    bit_size: 1
 fieldset/APB2FZR:
  description: Debug MCU APB2 Freeze registe
  fields:
-    - name: TIM1
-      description: TIM1 counter stopped when core is halted
-      bit_offset: 0
-      bit_size: 1
-    - name: TIM8
-      description: TIM8 counter stopped when core is halted
-      bit_offset: 1
-      bit_size: 1
-    - name: TIM9
-      description: TIM9 counter stopped when core is halted
-      bit_offset: 16
-      bit_size: 1
-    - name: TIM10
-      description: TIM10 counter stopped when core is halted
-      bit_offset: 17
-      bit_size: 1
-    - name: TIM11
-      description: TIM11 counter stopped when core is halted
-      bit_offset: 18
-      bit_size: 1
+  - name: TIM1
+    description: TIM1 counter stopped when core is halted
+    bit_offset: 0
+    bit_size: 1
+  - name: TIM8
+    description: TIM8 counter stopped when core is halted
+    bit_offset: 1
+    bit_size: 1
+  - name: TIM9
+    description: TIM9 counter stopped when core is halted
+    bit_offset: 16
+    bit_size: 1
+  - name: TIM10
+    description: TIM10 counter stopped when core is halted
+    bit_offset: 17
+    bit_size: 1
+  - name: TIM11
+    description: TIM11 counter stopped when core is halted
+    bit_offset: 18
+    bit_size: 1
 fieldset/CR:
  description: Control Register
  fields:
-    - name: DBG_SLEEP
-      description: DBG_SLEEP
-      bit_offset: 0
-      bit_size: 1
-    - name: DBG_STOP
-      description: DBG_STOP
-      bit_offset: 1
-      bit_size: 1
-    - name: DBG_STANDBY
-      description: DBG_STANDBY
-      bit_offset: 2
-      bit_size: 1
-    - name: TRACE_IOEN
-      description: TRACE_IOEN
-      bit_offset: 5
-      bit_size: 1
-    - name: TRACE_MODE
-      description: TRACE_MODE
-      bit_offset: 6
-      bit_size: 2
+  - name: DBG_SLEEP
+    description: DBG_SLEEP
+    bit_offset: 0
+    bit_size: 1
+  - name: DBG_STOP
+    description: DBG_STOP
+    bit_offset: 1
+    bit_size: 1
+  - name: DBG_STANDBY
+    description: DBG_STANDBY
+    bit_offset: 2
+    bit_size: 1
+  - name: TRACE_IOEN
+    description: TRACE_IOEN
+    bit_offset: 5
+    bit_size: 1
+  - name: TRACE_MODE
+    description: TRACE_MODE
+    bit_offset: 6
+    bit_size: 2
 fieldset/IDCODE:
  description: IDCODE
  fields:
-    - name: DEV_ID
-      description: DEV_ID
-      bit_offset: 0
-      bit_size: 12
-    - name: REV_ID
-      description: REV_ID
-      bit_offset: 16
-      bit_size: 16
+  - name: DEV_ID
+    description: DEV_ID
+    bit_offset: 0
+    bit_size: 12
+  - name: REV_ID
+    description: REV_ID
+    bit_offset: 16
+    bit_size: 16
--- a/data/registers/dbgmcu_f7.yaml
+++ b/data/registers/dbgmcu_f7.yaml
@ -1,161 +1,160 @@
---
 block/DBGMCU:
  description: Debug support
  items:
-    - name: IDCODE
-      description: IDCODE
-      byte_offset: 0
-      access: Read
-      fieldset: IDCODE
-    - name: CR
-      description: Control Register
-      byte_offset: 4
-      fieldset: CR
-    - name: APB1FZR
-      description: Debug MCU APB1 Freeze register
-      byte_offset: 8
-      fieldset: APB1FZR
-    - name: APB2FZR
-      description: Debug MCU APB2 Freeze register
-      byte_offset: 12
-      fieldset: APB2FZR
+  - name: IDCODE
+    description: IDCODE
+    byte_offset: 0
+    access: Read
+    fieldset: IDCODE
+  - name: CR
+    description: Control Register
+    byte_offset: 4
+    fieldset: CR
+  - name: APB1FZR
+    description: Debug MCU APB1 Freeze register
+    byte_offset: 8
+    fieldset: APB1FZR
+  - name: APB2FZR
+    description: Debug MCU APB2 Freeze register
+    byte_offset: 12
+    fieldset: APB2FZR
 fieldset/APB1FZR:
  description: Debug MCU APB1 Freeze register
  fields:
-    - name: TIM2
-      description: TIM2
-      bit_offset: 0
-      bit_size: 1
-    - name: TIM3
-      description: TIM3
-      bit_offset: 1
-      bit_size: 1
-    - name: TIM4
-      description: TIM4
-      bit_offset: 2
-      bit_size: 1
-    - name: TIM5
-      description: TIM5
-      bit_offset: 3
-      bit_size: 1
-    - name: TIM6
-      description: TIM6
-      bit_offset: 4
-      bit_size: 1
-    - name: TIM7
-      description: TIM7
-      bit_offset: 5
-      bit_size: 1
-    - name: TIM12
-      description: TIM12
-      bit_offset: 6
-      bit_size: 1
-    - name: TIM13
-      description: TIM13
-      bit_offset: 7
-      bit_size: 1
-    - name: TIM14
-      description: TIM14
-      bit_offset: 8
-      bit_size: 1
-    - name: LPTIM1
-      description: LPTIM1
-      bit_offset: 9
-      bit_size: 1
-    - name: RTC
-      description: RTC
-      bit_offset: 10
-      bit_size: 1
-    - name: WWDG
-      description: WWDG
-      bit_offset: 11
-      bit_size: 1
-    - name: IWDG
-      description: IWDG
-      bit_offset: 12
-      bit_size: 1
-    - name: CAN3
-      description: CAN3
-      bit_offset: 13
-      bit_size: 1
-    - name: DBG_I2C1_SMBUS_TIMEOUT
-      description: DBG_I2C1_SMBUS_TIMEOUT
-      bit_offset: 21
-      bit_size: 1
-    - name: DBG_I2C2_SMBUS_TIMEOUT
-      description: DBG_I2C2_SMBUS_TIMEOUT
-      bit_offset: 22
-      bit_size: 1
-    - name: DBG_I2C3_SMBUS_TIMEOUT
-      description: DBG_I2C3_SMBUS_TIMEOUT
-      bit_offset: 23
-      bit_size: 1
-    - name: DBG_I2C4_SMBUS_TIMEOUT
-      description: DBG_I2C4SMBUS_TIMEOUT
-      bit_offset: 24
-      bit_size: 1
-    - name: CAN1
-      description: CAN1
-      bit_offset: 25
-      bit_size: 1
-    - name: CAN2
-      description: CAN2
-      bit_offset: 26
-      bit_size: 1
+  - name: TIM2
+    description: TIM2
+    bit_offset: 0
+    bit_size: 1
+  - name: TIM3
+    description: TIM3
+    bit_offset: 1
+    bit_size: 1
+  - name: TIM4
+    description: TIM4
+    bit_offset: 2
+    bit_size: 1
+  - name: TIM5
+    description: TIM5
+    bit_offset: 3
+    bit_size: 1
+  - name: TIM6
+    description: TIM6
+    bit_offset: 4
+    bit_size: 1
+  - name: TIM7
+    description: TIM7
+    bit_offset: 5
+    bit_size: 1
+  - name: TIM12
+    description: TIM12
+    bit_offset: 6
+    bit_size: 1
+  - name: TIM13
+    description: TIM13
+    bit_offset: 7
+    bit_size: 1
+  - name: TIM14
+    description: TIM14
+    bit_offset: 8
+    bit_size: 1
+  - name: LPTIM1
+    description: LPTIM1
+    bit_offset: 9
+    bit_size: 1
+  - name: RTC
+    description: RTC
+    bit_offset: 10
+    bit_size: 1
+  - name: WWDG
+    description: WWDG
+    bit_offset: 11
+    bit_size: 1
+  - name: IWDG
+    description: IWDG
+    bit_offset: 12
+    bit_size: 1
+  - name: CAN3
+    description: CAN3
+    bit_offset: 13
+    bit_size: 1
+  - name: DBG_I2C1_SMBUS_TIMEOUT
+    description: DBG_I2C1_SMBUS_TIMEOUT
+    bit_offset: 21
+    bit_size: 1
+  - name: DBG_I2C2_SMBUS_TIMEOUT
+    description: DBG_I2C2_SMBUS_TIMEOUT
+    bit_offset: 22
+    bit_size: 1
+  - name: DBG_I2C3_SMBUS_TIMEOUT
+    description: DBG_I2C3_SMBUS_TIMEOUT
+    bit_offset: 23
+    bit_size: 1
+  - name: DBG_I2C4_SMBUS_TIMEOUT
+    description: DBG_I2C4SMBUS_TIMEOUT
+    bit_offset: 24
+    bit_size: 1
+  - name: CAN1
+    description: CAN1
+    bit_offset: 25
+    bit_size: 1
+  - name: CAN2
+    description: CAN2
+    bit_offset: 26
+    bit_size: 1
 fieldset/APB2FZR:
  description: Debug MCU APB2 Freeze register
  fields:
-    - name: TIM1
-      description: TIM1 counter stopped when core is halted
-      bit_offset: 0
-      bit_size: 1
-    - name: TIM8
-      description: TIM8 counter stopped when core is halted
-      bit_offset: 1
-      bit_size: 1
-    - name: TIM9
-      description: TIM9 counter stopped when core is halted
-      bit_offset: 16
-      bit_size: 1
-    - name: TIM10
-      description: TIM10 counter stopped when core is halted
-      bit_offset: 17
-      bit_size: 1
-    - name: TIM11
-      description: TIM11 counter stopped when core is halted
-      bit_offset: 18
-      bit_size: 1
+  - name: TIM1
+    description: TIM1 counter stopped when core is halted
+    bit_offset: 0
+    bit_size: 1
+  - name: TIM8
+    description: TIM8 counter stopped when core is halted
+    bit_offset: 1
+    bit_size: 1
+  - name: TIM9
+    description: TIM9 counter stopped when core is halted
+    bit_offset: 16
+    bit_size: 1
+  - name: TIM10
+    description: TIM10 counter stopped when core is halted
+    bit_offset: 17
+    bit_size: 1
+  - name: TIM11
+    description: TIM11 counter stopped when core is halted
+    bit_offset: 18
+    bit_size: 1
 fieldset/CR:
  description: Control Register
  fields:
-    - name: DBG_SLEEP
-      description: DBG_SLEEP
-      bit_offset: 0
-      bit_size: 1
-    - name: DBG_STOP
-      description: DBG_STOP
-      bit_offset: 1
-      bit_size: 1
-    - name: DBG_STANDBY
-      description: DBG_STANDBY
-      bit_offset: 2
-      bit_size: 1
-    - name: TRACE_IOEN
-      description: TRACE_IOEN
-      bit_offset: 5
-      bit_size: 1
-    - name: TRACE_MODE
-      description: TRACE_MODE
-      bit_offset: 6
-      bit_size: 2
+  - name: DBG_SLEEP
+    description: DBG_SLEEP
+    bit_offset: 0
+    bit_size: 1
+  - name: DBG_STOP
+    description: DBG_STOP
+    bit_offset: 1
+    bit_size: 1
+  - name: DBG_STANDBY
+    description: DBG_STANDBY
+    bit_offset: 2
+    bit_size: 1
+  - name: TRACE_IOEN
+    description: TRACE_IOEN
+    bit_offset: 5
+    bit_size: 1
+  - name: TRACE_MODE
+    description: TRACE_MODE
+    bit_offset: 6
+    bit_size: 2
 fieldset/IDCODE:
  description: IDCODE
  fields:
-    - name: DEV_ID
-      description: DEV_ID
-      bit_offset: 0
-      bit_size: 12
-    - name: REV_ID
-      description: REV_ID
-      bit_offset: 16
-      bit_size: 16
+  - name: DEV_ID
+    description: DEV_ID
+    bit_offset: 0
+    bit_size: 12
+  - name: REV_ID
+    description: REV_ID
+    bit_offset: 16
+    bit_size: 16
--- a/data/registers/dbgmcu_g0.yaml
+++ b/data/registers/dbgmcu_g0.yaml
@ -1,109 +1,108 @@
---
 block/DBGMCU:
  description: Debug support
  items:
-    - name: IDCODE
-      description: MCU Device ID Code Register
-      byte_offset: 0
-      access: Read
-      fieldset: IDCODE
-    - name: CR
-      description: Debug MCU Configuration Register
-      byte_offset: 4
-      fieldset: CR
-    - name: APB1FZR
-      description: DBG APB freeze register 1
-      byte_offset: 8
-      fieldset: APB1FZR
-    - name: APB2FZR
-      description: DBG APB freeze register 2
-      byte_offset: 12
-      fieldset: APB2FZR
+  - name: IDCODE
+    description: MCU Device ID Code Register
+    byte_offset: 0
+    access: Read
+    fieldset: IDCODE
+  - name: CR
+    description: Debug MCU Configuration Register
+    byte_offset: 4
+    fieldset: CR
+  - name: APB1FZR
+    description: DBG APB freeze register 1
+    byte_offset: 8
+    fieldset: APB1FZR
+  - name: APB2FZR
+    description: DBG APB freeze register 2
+    byte_offset: 12
+    fieldset: APB2FZR
 fieldset/APB1FZR:
  description: DBG APB freeze register 1
  fields:
-    - name: TIM2
-      description: Debug Timer 2 stopped when Core is halted
-      bit_offset: 0
-      bit_size: 1
-    - name: TIM3
-      description: TIM3 counter stopped when core is halted
-      bit_offset: 1
-      bit_size: 1
-    - name: TIM6
-      description: Debug Timer 6 stopped when Core is halted
-      bit_offset: 4
-      bit_size: 1
-    - name: TIM7
-      description: TIM7 counter stopped when core is halted
-      bit_offset: 5
-      bit_size: 1
-    - name: RTC
-      description: Debug RTC stopped when Core is halted
-      bit_offset: 10
-      bit_size: 1
-    - name: WWDG
-      description: Debug Window Wachdog stopped when Core is halted
-      bit_offset: 11
-      bit_size: 1
-    - name: IWDG
-      description: Debug Independent Wachdog stopped when Core is halted
-      bit_offset: 12
-      bit_size: 1
-    - name: I2C1
-      description: I2C1 SMBUS timeout mode stopped when core is halted
-      bit_offset: 21
-      bit_size: 1
-    - name: LPTIM2
-      description: Clocking of LPTIMER2 counter when the core is halted
-      bit_offset: 30
-      bit_size: 1
-    - name: LPTIM1
-      description: Clocking of LPTIMER1 counter when the core is halted
-      bit_offset: 31
-      bit_size: 1
+  - name: TIM2
+    description: Debug Timer 2 stopped when Core is halted
+    bit_offset: 0
+    bit_size: 1
+  - name: TIM3
+    description: TIM3 counter stopped when core is halted
+    bit_offset: 1
+    bit_size: 1
+  - name: TIM6
+    description: Debug Timer 6 stopped when Core is halted
+    bit_offset: 4
+    bit_size: 1
+  - name: TIM7
+    description: TIM7 counter stopped when core is halted
+    bit_offset: 5
+    bit_size: 1
+  - name: RTC
+    description: Debug RTC stopped when Core is halted
+    bit_offset: 10
+    bit_size: 1
+  - name: WWDG
+    description: Debug Window Wachdog stopped when Core is halted
+    bit_offset: 11
+    bit_size: 1
+  - name: IWDG
+    description: Debug Independent Wachdog stopped when Core is halted
+    bit_offset: 12
+    bit_size: 1
+  - name: I2C1
+    description: I2C1 SMBUS timeout mode stopped when core is halted
+    bit_offset: 21
+    bit_size: 1
+  - name: LPTIM2
+    description: Clocking of LPTIMER2 counter when the core is halted
+    bit_offset: 30
+    bit_size: 1
+  - name: LPTIM1
+    description: Clocking of LPTIMER1 counter when the core is halted
+    bit_offset: 31
+    bit_size: 1
 fieldset/APB2FZR:
  description: DBG APB freeze register 2
  fields:
-    - name: TIM1
-      description: TIM1
-      bit_offset: 11
-      bit_size: 1
-    - name: TIM14
-      description: TIM14
-      bit_offset: 15
-      bit_size: 1
-    - name: TIM15
-      description: TIM15
-      bit_offset: 16
-      bit_size: 1
-    - name: TIM16
-      description: TIM16
-      bit_offset: 17
-      bit_size: 1
-    - name: TIM17
-      description: TIM17
-      bit_offset: 18
-      bit_size: 1
+  - name: TIM1
+    description: TIM1
+    bit_offset: 11
+    bit_size: 1
+  - name: TIM14
+    description: TIM14
+    bit_offset: 15
+    bit_size: 1
+  - name: TIM15
+    description: TIM15
+    bit_offset: 16
+    bit_size: 1
+  - name: TIM16
+    description: TIM16
+    bit_offset: 17
+    bit_size: 1
+  - name: TIM17
+    description: TIM17
+    bit_offset: 18
+    bit_size: 1
 fieldset/CR:
  description: Debug MCU Configuration Register
  fields:
-    - name: DBG_STOP
-      description: Debug Stop Mode
-      bit_offset: 1
-      bit_size: 1
-    - name: DBG_STANDBY
-      description: Debug Standby Mode
-      bit_offset: 2
-      bit_size: 1
+  - name: DBG_STOP
+    description: Debug Stop Mode
+    bit_offset: 1
+    bit_size: 1
+  - name: DBG_STANDBY
+    description: Debug Standby Mode
+    bit_offset: 2
+    bit_size: 1
 fieldset/IDCODE:
  description: MCU Device ID Code Register
  fields:
-    - name: DEV_ID
-      description: Device Identifier
-      bit_offset: 0
-      bit_size: 16
-    - name: REV_ID
-      description: Revision Identifier
-      bit_offset: 16
-      bit_size: 16
+  - name: DEV_ID
+    description: Device Identifier
+    bit_offset: 0
+    bit_size: 16
+  - name: REV_ID
+    description: Revision Identifier
+    bit_offset: 16
+    bit_size: 16
--- a/data/registers/dbgmcu_g4.yaml
+++ b/data/registers/dbgmcu_g4.yaml
@ -1,164 +1,163 @@
---
 block/DBGMCU:
  description: Debug support
  items:
-    - name: IDCODE
-      description: MCU Device ID Code Register
-      byte_offset: 0
-      access: Read
-      fieldset: IDCODE
-    - name: CR
-      description: Debug MCU Configuration Register
-      byte_offset: 4
-      fieldset: CR
-    - name: APB1LFZR
-      description: APB Low Freeze Register 1
-      byte_offset: 8
-      fieldset: APB1LFZR
-    - name: APB1HFZR
-      description: APB Low Freeze Register 2
-      byte_offset: 12
-      fieldset: APB1HFZR
-    - name: APB2FZR
-      description: APB High Freeze Register
-      byte_offset: 16
-      fieldset: APB2FZR
+  - name: IDCODE
+    description: MCU Device ID Code Register
+    byte_offset: 0
+    access: Read
+    fieldset: IDCODE
+  - name: CR
+    description: Debug MCU Configuration Register
+    byte_offset: 4
+    fieldset: CR
+  - name: APB1LFZR
+    description: APB Low Freeze Register 1
+    byte_offset: 8
+    fieldset: APB1LFZR
+  - name: APB1HFZR
+    description: APB Low Freeze Register 2
+    byte_offset: 12
+    fieldset: APB1HFZR
+  - name: APB2FZR
+    description: APB High Freeze Register
+    byte_offset: 16
+    fieldset: APB2FZR
 fieldset/APB1HFZR:
  description: APB Low Freeze Register 2
  fields:
-    - name: I2C4
-      description: I2C4
-      bit_offset: 1
-      bit_size: 1
+  - name: I2C4
+    description: I2C4
+    bit_offset: 1
+    bit_size: 1
 fieldset/APB1LFZR:
  description: APB Low Freeze Register 1
  fields:
-    - name: TIM2
-      description: Debug Timer 2 stopped when Core is halted
-      bit_offset: 0
-      bit_size: 1
-    - name: TIM3
-      description: TIM3 counter stopped when core is halted
-      bit_offset: 1
-      bit_size: 1
-    - name: TIM4
-      description: TIM4 counter stopped when core is halted
-      bit_offset: 2
-      bit_size: 1
-    - name: TIM5
-      description: TIM5 counter stopped when core is halted
-      bit_offset: 3
-      bit_size: 1
-    - name: TIM6
-      description: Debug Timer 6 stopped when Core is halted
-      bit_offset: 4
-      bit_size: 1
-    - name: TIM7
-      description: TIM7 counter stopped when core is halted
-      bit_offset: 5
-      bit_size: 1
-    - name: RTC
-      description: Debug RTC stopped when Core is halted
-      bit_offset: 10
-      bit_size: 1
-    - name: WWDG
-      description: Debug Window Wachdog stopped when Core is halted
-      bit_offset: 11
-      bit_size: 1
-    - name: IWDG
-      description: Debug Independent Wachdog stopped when Core is halted
-      bit_offset: 12
-      bit_size: 1
-    - name: I2C1
-      description: I2C1 SMBUS timeout mode stopped when core is halted
-      bit_offset: 21
-      bit_size: 1
-    - name: I2C2
-      description: I2C2 SMBUS timeout mode stopped when core is halted
-      bit_offset: 22
-      bit_size: 1
-    - name: I2C3
-      description: I2C3 SMBUS timeout mode stopped when core is halted
-      bit_offset: 30
-      bit_size: 1
-    - name: LPTIMER
-      description: LPTIM1 counter stopped when core is halted
-      bit_offset: 31
-      bit_size: 1
+  - name: TIM2
+    description: Debug Timer 2 stopped when Core is halted
+    bit_offset: 0
+    bit_size: 1
+  - name: TIM3
+    description: TIM3 counter stopped when core is halted
+    bit_offset: 1
+    bit_size: 1
+  - name: TIM4
+    description: TIM4 counter stopped when core is halted
+    bit_offset: 2
+    bit_size: 1
+  - name: TIM5
+    description: TIM5 counter stopped when core is halted
+    bit_offset: 3
+    bit_size: 1
+  - name: TIM6
+    description: Debug Timer 6 stopped when Core is halted
+    bit_offset: 4
+    bit_size: 1
+  - name: TIM7
+    description: TIM7 counter stopped when core is halted
+    bit_offset: 5
+    bit_size: 1
+  - name: RTC
+    description: Debug RTC stopped when Core is halted
+    bit_offset: 10
+    bit_size: 1
+  - name: WWDG
+    description: Debug Window Wachdog stopped when Core is halted
+    bit_offset: 11
+    bit_size: 1
+  - name: IWDG
+    description: Debug Independent Wachdog stopped when Core is halted
+    bit_offset: 12
+    bit_size: 1
+  - name: I2C1
+    description: I2C1 SMBUS timeout mode stopped when core is halted
+    bit_offset: 21
+    bit_size: 1
+  - name: I2C2
+    description: I2C2 SMBUS timeout mode stopped when core is halted
+    bit_offset: 22
+    bit_size: 1
+  - name: I2C3
+    description: I2C3 SMBUS timeout mode stopped when core is halted
+    bit_offset: 30
+    bit_size: 1
+  - name: LPTIMER
+    description: LPTIM1 counter stopped when core is halted
+    bit_offset: 31
+    bit_size: 1
 fieldset/APB2FZR:
  description: APB High Freeze Register
  fields:
-    - name: TIM1
-      description: TIM1 counter stopped when core is halted
-      bit_offset: 11
-      bit_size: 1
-    - name: TIM8
-      description: TIM8 counter stopped when core is halted
-      bit_offset: 13
-      bit_size: 1
-    - name: TIM15
-      description: TIM15 counter stopped when core is halted
-      bit_offset: 16
-      bit_size: 1
-    - name: TIM16
-      description: TIM16 counter stopped when core is halted
-      bit_offset: 17
-      bit_size: 1
-    - name: TIM17
-      description: TIM17 counter stopped when core is halted
-      bit_offset: 18
-      bit_size: 1
-    - name: TIM20
-      description: TIM20counter stopped when core is halted
-      bit_offset: 20
-      bit_size: 1
-    - name: HRTIM0
-      description: HRTIM0
-      bit_offset: 26
-      bit_size: 1
-    - name: HRTIM1
-      description: HRTIM0
-      bit_offset: 27
-      bit_size: 1
-    - name: HRTIM2
-      description: HRTIM0
-      bit_offset: 28
-      bit_size: 1
-    - name: HRTIM3
-      description: HRTIM0
-      bit_offset: 29
-      bit_size: 1
+  - name: TIM1
+    description: TIM1 counter stopped when core is halted
+    bit_offset: 11
+    bit_size: 1
+  - name: TIM8
+    description: TIM8 counter stopped when core is halted
+    bit_offset: 13
+    bit_size: 1
+  - name: TIM15
+    description: TIM15 counter stopped when core is halted
+    bit_offset: 16
+    bit_size: 1
+  - name: TIM16
+    description: TIM16 counter stopped when core is halted
+    bit_offset: 17
+    bit_size: 1
+  - name: TIM17
+    description: TIM17 counter stopped when core is halted
+    bit_offset: 18
+    bit_size: 1
+  - name: TIM20
+    description: TIM20counter stopped when core is halted
+    bit_offset: 20
+    bit_size: 1
+  - name: HRTIM0
+    description: HRTIM0
+    bit_offset: 26
+    bit_size: 1
+  - name: HRTIM1
+    description: HRTIM0
+    bit_offset: 27
+    bit_size: 1
+  - name: HRTIM2
+    description: HRTIM0
+    bit_offset: 28
+    bit_size: 1
+  - name: HRTIM3
+    description: HRTIM0
+    bit_offset: 29
+    bit_size: 1
 fieldset/CR:
  description: Debug MCU Configuration Register
  fields:
-    - name: DBG_SLEEP
-      description: Debug Sleep Mode
-      bit_offset: 0
-      bit_size: 1
-    - name: DBG_STOP
-      description: Debug Stop Mode
-      bit_offset: 1
-      bit_size: 1
-    - name: DBG_STANDBY
-      description: Debug Standby Mode
-      bit_offset: 2
-      bit_size: 1
-    - name: TRACE_IOEN
-      description: Trace pin assignment control
-      bit_offset: 5
-      bit_size: 1
-    - name: TRACE_MODE
-      description: Trace pin assignment control
-      bit_offset: 6
-      bit_size: 2
+  - name: DBG_SLEEP
+    description: Debug Sleep Mode
+    bit_offset: 0
+    bit_size: 1
+  - name: DBG_STOP
+    description: Debug Stop Mode
+    bit_offset: 1
+    bit_size: 1
+  - name: DBG_STANDBY
+    description: Debug Standby Mode
+    bit_offset: 2
+    bit_size: 1
+  - name: TRACE_IOEN
+    description: Trace pin assignment control
+    bit_offset: 5
+    bit_size: 1
+  - name: TRACE_MODE
+    description: Trace pin assignment control
+    bit_offset: 6
+    bit_size: 2
 fieldset/IDCODE:
  description: MCU Device ID Code Register
  fields:
-    - name: DEV_ID
-      description: Device Identifier
-      bit_offset: 0
-      bit_size: 16
-    - name: REV_ID
-      description: Revision Identifier
-      bit_offset: 16
-      bit_size: 16
+  - name: DEV_ID
+    description: Device Identifier
+    bit_offset: 0
+    bit_size: 16
+  - name: REV_ID
+    description: Revision Identifier
+    bit_offset: 16
+    bit_size: 16
--- a/data/registers/dbgmcu_h7.yaml
+++ b/data/registers/dbgmcu_h7.yaml
@ -1,191 +1,190 @@
---
 block/DBGMCU:
  description: Debug support
  items:
-    - name: IDC
-      description: Identity code
-      byte_offset: 0
-      access: Read
-      fieldset: IDC
-    - name: CR
-      description: Configuration register
-      byte_offset: 4
-      fieldset: CR
-    - name: APB3FZR1
-      description: APB3 peripheral freeze register
-      byte_offset: 52
-      fieldset: APB3FZR1
-    - name: APB1LFZR1
-      description: APB1L peripheral freeze register
-      byte_offset: 60
-      fieldset: APB1LFZR1
-    - name: APB2FZR1
-      description: APB2 peripheral freeze register
-      byte_offset: 76
-      fieldset: APB2FZR1
-    - name: APB4FZR1
-      description: APB4 peripheral freeze register
-      byte_offset: 84
-      fieldset: APB4FZR1
+  - name: IDC
+    description: Identity code
+    byte_offset: 0
+    access: Read
+    fieldset: IDC
+  - name: CR
+    description: Configuration register
+    byte_offset: 4
+    fieldset: CR
+  - name: APB3FZR1
+    description: APB3 peripheral freeze register
+    byte_offset: 52
+    fieldset: APB3FZR1
+  - name: APB1LFZR1
+    description: APB1L peripheral freeze register
+    byte_offset: 60
+    fieldset: APB1LFZR1
+  - name: APB2FZR1
+    description: APB2 peripheral freeze register
+    byte_offset: 76
+    fieldset: APB2FZR1
+  - name: APB4FZR1
+    description: APB4 peripheral freeze register
+    byte_offset: 84
+    fieldset: APB4FZR1
 fieldset/APB1LFZR1:
  description: APB1L peripheral freeze register
  fields:
-    - name: TIM2
-      description: TIM2 stop in debug mode
-      bit_offset: 0
-      bit_size: 1
-    - name: TIM3
-      description: TIM3 stop in debug mode
-      bit_offset: 1
-      bit_size: 1
-    - name: TIM4
-      description: TIM4 stop in debug mode
-      bit_offset: 2
-      bit_size: 1
-    - name: TIM5
-      description: TIM5 stop in debug mode
-      bit_offset: 3
-      bit_size: 1
-    - name: TIM6
-      description: TIM6 stop in debug mode
-      bit_offset: 4
-      bit_size: 1
-    - name: TIM7
-      description: TIM7 stop in debug mode
-      bit_offset: 5
-      bit_size: 1
-    - name: TIM12
-      description: TIM12 stop in debug mode
-      bit_offset: 6
-      bit_size: 1
-    - name: TIM13
-      description: TIM13 stop in debug mode
-      bit_offset: 7
-      bit_size: 1
-    - name: TIM14
-      description: TIM14 stop in debug mode
-      bit_offset: 8
-      bit_size: 1
-    - name: LPTIM1
-      description: LPTIM1 stop in debug mode
-      bit_offset: 9
-      bit_size: 1
-    - name: I2C1
-      description: I2C1 SMBUS timeout stop in debug mode
-      bit_offset: 21
-      bit_size: 1
-    - name: I2C2
-      description: I2C2 SMBUS timeout stop in debug mode
-      bit_offset: 22
-      bit_size: 1
-    - name: I2C3
-      description: I2C3 SMBUS timeout stop in debug mode
-      bit_offset: 23
-      bit_size: 1
+  - name: TIM2
+    description: TIM2 stop in debug mode
+    bit_offset: 0
+    bit_size: 1
+  - name: TIM3
+    description: TIM3 stop in debug mode
+    bit_offset: 1
+    bit_size: 1
+  - name: TIM4
+    description: TIM4 stop in debug mode
+    bit_offset: 2
+    bit_size: 1
+  - name: TIM5
+    description: TIM5 stop in debug mode
+    bit_offset: 3
+    bit_size: 1
+  - name: TIM6
+    description: TIM6 stop in debug mode
+    bit_offset: 4
+    bit_size: 1
+  - name: TIM7
+    description: TIM7 stop in debug mode
+    bit_offset: 5
+    bit_size: 1
+  - name: TIM12
+    description: TIM12 stop in debug mode
+    bit_offset: 6
+    bit_size: 1
+  - name: TIM13
+    description: TIM13 stop in debug mode
+    bit_offset: 7
+    bit_size: 1
+  - name: TIM14
+    description: TIM14 stop in debug mode
+    bit_offset: 8
+    bit_size: 1
+  - name: LPTIM1
+    description: LPTIM1 stop in debug mode
+    bit_offset: 9
+    bit_size: 1
+  - name: I2C1
+    description: I2C1 SMBUS timeout stop in debug mode
+    bit_offset: 21
+    bit_size: 1
+  - name: I2C2
+    description: I2C2 SMBUS timeout stop in debug mode
+    bit_offset: 22
+    bit_size: 1
+  - name: I2C3
+    description: I2C3 SMBUS timeout stop in debug mode
+    bit_offset: 23
+    bit_size: 1
 fieldset/APB2FZR1:
  description: APB2 peripheral freeze register
  fields:
-    - name: TIM1
-      description: TIM1 stop in debug mode
-      bit_offset: 0
-      bit_size: 1
-    - name: TIM8
-      description: TIM8 stop in debug mode
-      bit_offset: 1
-      bit_size: 1
-    - name: TIM15
-      description: TIM15 stop in debug mode
-      bit_offset: 16
-      bit_size: 1
-    - name: TIM16
-      description: TIM16 stop in debug mode
-      bit_offset: 17
-      bit_size: 1
-    - name: TIM17
-      description: TIM17 stop in debug mode
-      bit_offset: 18
-      bit_size: 1
-    - name: HRTIM
-      description: HRTIM stop in debug mode
-      bit_offset: 29
-      bit_size: 1
+  - name: TIM1
+    description: TIM1 stop in debug mode
+    bit_offset: 0
+    bit_size: 1
+  - name: TIM8
+    description: TIM8 stop in debug mode
+    bit_offset: 1
+    bit_size: 1
+  - name: TIM15
+    description: TIM15 stop in debug mode
+    bit_offset: 16
+    bit_size: 1
+  - name: TIM16
+    description: TIM16 stop in debug mode
+    bit_offset: 17
+    bit_size: 1
+  - name: TIM17
+    description: TIM17 stop in debug mode
+    bit_offset: 18
+    bit_size: 1
+  - name: HRTIM
+    description: HRTIM stop in debug mode
+    bit_offset: 29
+    bit_size: 1
 fieldset/APB3FZR1:
  description: APB3 peripheral freeze register
  fields:
-    - name: WWDG1
-      description: WWDG1 stop in debug mode
-      bit_offset: 6
-      bit_size: 1
+  - name: WWDG1
+    description: WWDG1 stop in debug mode
+    bit_offset: 6
+    bit_size: 1
 fieldset/APB4FZR1:
  description: APB4 peripheral freeze register
  fields:
-    - name: I2C4
-      description: I2C4 SMBUS timeout stop in debug mode
-      bit_offset: 7
-      bit_size: 1
-    - name: LPTIM2
-      description: LPTIM2 stop in debug mode
-      bit_offset: 9
-      bit_size: 1
-    - name: LPTIM3
-      description: LPTIM3 stop in debug mode
-      bit_offset: 10
-      bit_size: 1
-    - name: LPTIM4
-      description: LPTIM4 stop in debug mode
-      bit_offset: 11
-      bit_size: 1
-    - name: LPTIM5
-      description: LPTIM5 stop in debug mode
-      bit_offset: 12
-      bit_size: 1
-    - name: RTC
-      description: RTC stop in debug mode
-      bit_offset: 16
-      bit_size: 1
-    - name: IWDG1
-      description: Independent watchdog for D1 stop in debug mode
-      bit_offset: 18
-      bit_size: 1
+  - name: I2C4
+    description: I2C4 SMBUS timeout stop in debug mode
+    bit_offset: 7
+    bit_size: 1
+  - name: LPTIM2
+    description: LPTIM2 stop in debug mode
+    bit_offset: 9
+    bit_size: 1
+  - name: LPTIM3
+    description: LPTIM3 stop in debug mode
+    bit_offset: 10
+    bit_size: 1
+  - name: LPTIM4
+    description: LPTIM4 stop in debug mode
+    bit_offset: 11
+    bit_size: 1
+  - name: LPTIM5
+    description: LPTIM5 stop in debug mode
+    bit_offset: 12
+    bit_size: 1
+  - name: RTC
+    description: RTC stop in debug mode
+    bit_offset: 16
+    bit_size: 1
+  - name: IWDG1
+    description: Independent watchdog for D1 stop in debug mode
+    bit_offset: 18
+    bit_size: 1
 fieldset/CR:
  description: Configuration register
  fields:
-    - name: DBGSLEEP_D1
-      description: Allow debug in D1 Sleep mode
-      bit_offset: 0
-      bit_size: 1
-    - name: DBGSTOP_D1
-      description: Allow debug in D1 Stop mode
-      bit_offset: 1
-      bit_size: 1
-    - name: DBGSTBY_D1
-      description: Allow debug in D1 Standby mode
-      bit_offset: 2
-      bit_size: 1
-    - name: TRACECLKEN
-      description: Trace clock enable enable
-      bit_offset: 20
-      bit_size: 1
-    - name: D1DBGCKEN
-      description: D1 debug clock enable enable
-      bit_offset: 21
-      bit_size: 1
-    - name: D3DBGCKEN
-      description: D3 debug clock enable enable
-      bit_offset: 22
-      bit_size: 1
-    - name: TRGOEN
-      description: External trigger output enable
-      bit_offset: 28
-      bit_size: 1
+  - name: DBGSLEEP_D1
+    description: Allow debug in D1 Sleep mode
+    bit_offset: 0
+    bit_size: 1
+  - name: DBGSTOP_D1
+    description: Allow debug in D1 Stop mode
+    bit_offset: 1
+    bit_size: 1
+  - name: DBGSTBY_D1
+    description: Allow debug in D1 Standby mode
+    bit_offset: 2
+    bit_size: 1
+  - name: TRACECLKEN
+    description: Trace clock enable enable
+    bit_offset: 20
+    bit_size: 1
+  - name: D1DBGCKEN
+    description: D1 debug clock enable enable
+    bit_offset: 21
+    bit_size: 1
+  - name: D3DBGCKEN
+    description: D3 debug clock enable enable
+    bit_offset: 22
+    bit_size: 1
+  - name: TRGOEN
+    description: External trigger output enable
+    bit_offset: 28
+    bit_size: 1
 fieldset/IDC:
  description: Identity code
  fields:
-    - name: DEV_ID
-      description: Device ID
-      bit_offset: 0
-      bit_size: 12
-    - name: REV_ID
-      description: Revision ID
-      bit_offset: 16
-      bit_size: 16
+  - name: DEV_ID
+    description: Device ID
+    bit_offset: 0
+    bit_size: 12
+  - name: REV_ID
+    description: Revision ID
+    bit_offset: 16
+    bit_size: 16
--- a/data/registers/dbgmcu_l0.yaml
+++ b/data/registers/dbgmcu_l0.yaml
@ -1,93 +1,92 @@
---
 block/DBGMCU:
  description: Debug support
  items:
-    - name: IDCODE
-      description: MCU Device ID Code Register
-      byte_offset: 0
-      access: Read
-      fieldset: IDCODE
-    - name: CR
-      description: Debug MCU Configuration Register
-      byte_offset: 4
-      fieldset: CR
-    - name: APB1FZR
-      description: APB Low Freeze Register
-      byte_offset: 8
-      fieldset: APB1FZR
-    - name: APB2FZR
-      description: APB High Freeze Register
-      byte_offset: 12
-      fieldset: APB2FZR
+  - name: IDCODE
+    description: MCU Device ID Code Register
+    byte_offset: 0
+    access: Read
+    fieldset: IDCODE
+  - name: CR
+    description: Debug MCU Configuration Register
+    byte_offset: 4
+    fieldset: CR
+  - name: APB1FZR
+    description: APB Low Freeze Register
+    byte_offset: 8
+    fieldset: APB1FZR
+  - name: APB2FZR
+    description: APB High Freeze Register
+    byte_offset: 12
+    fieldset: APB2FZR
 fieldset/APB1FZR:
  description: APB Low Freeze Register
  fields:
-    - name: TIM2
-      description: Debug Timer 2 stopped when Core is halted
-      bit_offset: 0
-      bit_size: 1
-    - name: TIM6
-      description: Debug Timer 6 stopped when Core is halted
-      bit_offset: 4
-      bit_size: 1
-    - name: RTC
-      description: Debug RTC stopped when Core is halted
-      bit_offset: 10
-      bit_size: 1
-    - name: WWDG
-      description: Debug Window Wachdog stopped when Core is halted
-      bit_offset: 11
-      bit_size: 1
-    - name: IWDG
-      description: Debug Independent Wachdog stopped when Core is halted
-      bit_offset: 12
-      bit_size: 1
-    - name: I2C1
-      description: I2C1 SMBUS timeout mode stopped when core is halted
-      bit_offset: 21
-      bit_size: 1
-    - name: I2C2
-      description: I2C2 SMBUS timeout mode stopped when core is halted
-      bit_offset: 22
-      bit_size: 1
-    - name: LPTIM
-      description: LPTIM1 counter stopped when core is halted
-      bit_offset: 31
-      bit_size: 1
+  - name: TIM2
+    description: Debug Timer 2 stopped when Core is halted
+    bit_offset: 0
+    bit_size: 1
+  - name: TIM6
+    description: Debug Timer 6 stopped when Core is halted
+    bit_offset: 4
+    bit_size: 1
+  - name: RTC
+    description: Debug RTC stopped when Core is halted
+    bit_offset: 10
+    bit_size: 1
+  - name: WWDG
+    description: Debug Window Wachdog stopped when Core is halted
+    bit_offset: 11
+    bit_size: 1
+  - name: IWDG
+    description: Debug Independent Wachdog stopped when Core is halted
+    bit_offset: 12
+    bit_size: 1
+  - name: I2C1
+    description: I2C1 SMBUS timeout mode stopped when core is halted
+    bit_offset: 21
+    bit_size: 1
+  - name: I2C2
+    description: I2C2 SMBUS timeout mode stopped when core is halted
+    bit_offset: 22
+    bit_size: 1
+  - name: LPTIM
+    description: LPTIM1 counter stopped when core is halted
+    bit_offset: 31
+    bit_size: 1
 fieldset/APB2FZR:
  description: APB High Freeze Register
  fields:
-    - name: TIM21
-      description: Debug Timer 21 stopped when Core is halted
-      bit_offset: 2
-      bit_size: 1
-    - name: TIM22
-      description: Debug Timer 22 stopped when Core is halted
-      bit_offset: 6
-      bit_size: 1
+  - name: TIM21
+    description: Debug Timer 21 stopped when Core is halted
+    bit_offset: 2
+    bit_size: 1
+  - name: TIM22
+    description: Debug Timer 22 stopped when Core is halted
+    bit_offset: 6
+    bit_size: 1
 fieldset/CR:
  description: Debug MCU Configuration Register
  fields:
-    - name: DBG_SLEEP
-      description: Debug Sleep Mode
-      bit_offset: 0
-      bit_size: 1
-    - name: DBG_STOP
-      description: Debug Stop Mode
-      bit_offset: 1
-      bit_size: 1
-    - name: DBG_STANDBY
-      description: Debug Standby Mode
-      bit_offset: 2
-      bit_size: 1
+  - name: DBG_SLEEP
+    description: Debug Sleep Mode
+    bit_offset: 0
+    bit_size: 1
+  - name: DBG_STOP
+    description: Debug Stop Mode
+    bit_offset: 1
+    bit_size: 1
+  - name: DBG_STANDBY
+    description: Debug Standby Mode
+    bit_offset: 2
+    bit_size: 1
 fieldset/IDCODE:
  description: MCU Device ID Code Register
  fields:
-    - name: DEV_ID
-      description: Device Identifier
-      bit_offset: 0
-      bit_size: 12
-    - name: REV_ID
-      description: Revision Identifier
-      bit_offset: 16
-      bit_size: 16
+  - name: DEV_ID
+    description: Device Identifier
+    bit_offset: 0
+    bit_size: 12
+  - name: REV_ID
+    description: Revision Identifier
+    bit_offset: 16
+    bit_size: 16
--- a/data/registers/dbgmcu_l1.yaml
+++ b/data/registers/dbgmcu_l1.yaml
@ -1,117 +1,116 @@
---
 block/DBGMCU:
  description: debug support
  items:
-    - name: IDCODE
-      description: DBGMCU_IDCODE
-      byte_offset: 0
-      access: Read
-      fieldset: IDCODE
-    - name: CR
-      description: Debug MCU configuration register
-      byte_offset: 4
-      fieldset: CR
-    - name: APB1_FZ
-      description: Debug MCU APB1 freeze register1
-      byte_offset: 8
-      fieldset: APB1_FZ
-    - name: APB2_FZ
-      description: Debug MCU APB1 freeze register 2
-      byte_offset: 12
-      fieldset: APB2_FZ
+  - name: IDCODE
+    description: DBGMCU_IDCODE
+    byte_offset: 0
+    access: Read
+    fieldset: IDCODE
+  - name: CR
+    description: Debug MCU configuration register
+    byte_offset: 4
+    fieldset: CR
+  - name: APB1_FZ
+    description: Debug MCU APB1 freeze register1
+    byte_offset: 8
+    fieldset: APB1_FZ
+  - name: APB2_FZ
+    description: Debug MCU APB1 freeze register 2
+    byte_offset: 12
+    fieldset: APB2_FZ
 fieldset/APB1_FZ:
  description: Debug MCU APB1 freeze register1
  fields:
-    - name: DBG_TIM2_STOP
-      description: TIM2 counter stopped when core is halted
-      bit_offset: 0
-      bit_size: 1
-    - name: DBG_TIM3_STOP
-      description: TIM3 counter stopped when core is halted
-      bit_offset: 1
-      bit_size: 1
-    - name: DBG_TIM4_STOP
-      description: TIM4 counter stopped when core is halted
-      bit_offset: 2
-      bit_size: 1
-    - name: DBG_TIM5_STOP
-      description: TIM5 counter stopped when core is halted
-      bit_offset: 3
-      bit_size: 1
-    - name: DBG_TIM6_STOP
-      description: TIM6 counter stopped when core is halted
-      bit_offset: 4
-      bit_size: 1
-    - name: DBG_TIM7_STOP
-      description: TIM7 counter stopped when core is halted
-      bit_offset: 5
-      bit_size: 1
-    - name: DBG_RTC_STOP
-      description: Debug RTC stopped when core is halted
-      bit_offset: 10
-      bit_size: 1
-    - name: DBG_WWDG_STOP
-      description: Debug window watchdog stopped when core is halted
-      bit_offset: 11
-      bit_size: 1
-    - name: DBG_IWDG_STOP
-      description: Debug independent watchdog stopped when core is halted
-      bit_offset: 12
-      bit_size: 1
-    - name: DBG_I2C1_SMBUS_TIMEOUT
-      description: SMBUS timeout mode stopped when core is halted
-      bit_offset: 21
-      bit_size: 1
-    - name: DBG_I2C2_SMBUS_TIMEOUT
-      description: SMBUS timeout mode stopped when core is halted
-      bit_offset: 22
-      bit_size: 1
+  - name: DBG_TIM2_STOP
+    description: TIM2 counter stopped when core is halted
+    bit_offset: 0
+    bit_size: 1
+  - name: DBG_TIM3_STOP
+    description: TIM3 counter stopped when core is halted
+    bit_offset: 1
+    bit_size: 1
+  - name: DBG_TIM4_STOP
+    description: TIM4 counter stopped when core is halted
+    bit_offset: 2
+    bit_size: 1
+  - name: DBG_TIM5_STOP
+    description: TIM5 counter stopped when core is halted
+    bit_offset: 3
+    bit_size: 1
+  - name: DBG_TIM6_STOP
+    description: TIM6 counter stopped when core is halted
+    bit_offset: 4
+    bit_size: 1
+  - name: DBG_TIM7_STOP
+    description: TIM7 counter stopped when core is halted
+    bit_offset: 5
+    bit_size: 1
+  - name: DBG_RTC_STOP
+    description: Debug RTC stopped when core is halted
+    bit_offset: 10
+    bit_size: 1
+  - name: DBG_WWDG_STOP
+    description: Debug window watchdog stopped when core is halted
+    bit_offset: 11
+    bit_size: 1
+  - name: DBG_IWDG_STOP
+    description: Debug independent watchdog stopped when core is halted
+    bit_offset: 12
+    bit_size: 1
+  - name: DBG_I2C1_SMBUS_TIMEOUT
+    description: SMBUS timeout mode stopped when core is halted
+    bit_offset: 21
+    bit_size: 1
+  - name: DBG_I2C2_SMBUS_TIMEOUT
+    description: SMBUS timeout mode stopped when core is halted
+    bit_offset: 22
+    bit_size: 1
 fieldset/APB2_FZ:
  description: Debug MCU APB1 freeze register 2
  fields:
-    - name: DBG_TIM9_STOP
-      description: TIM counter stopped when core is halted
-      bit_offset: 2
-      bit_size: 1
-    - name: DBG_TIM10_STOP
-      description: TIM counter stopped when core is halted
-      bit_offset: 3
-      bit_size: 1
-    - name: DBG_TIM11_STOP
-      description: TIM counter stopped when core is halted
-      bit_offset: 4
-      bit_size: 1
+  - name: DBG_TIM9_STOP
+    description: TIM counter stopped when core is halted
+    bit_offset: 2
+    bit_size: 1
+  - name: DBG_TIM10_STOP
+    description: TIM counter stopped when core is halted
+    bit_offset: 3
+    bit_size: 1
+  - name: DBG_TIM11_STOP
+    description: TIM counter stopped when core is halted
+    bit_offset: 4
+    bit_size: 1
 fieldset/CR:
  description: Debug MCU configuration register
  fields:
-    - name: DBG_SLEEP
-      description: Debug Sleep mode
-      bit_offset: 0
-      bit_size: 1
-    - name: DBG_STOP
-      description: Debug Stop mode
-      bit_offset: 1
-      bit_size: 1
-    - name: DBG_STANDBY
-      description: Debug Standby mode
-      bit_offset: 2
-      bit_size: 1
-    - name: TRACE_IOEN
-      description: Trace pin assignment control
-      bit_offset: 5
-      bit_size: 1
-    - name: TRACE_MODE
-      description: Trace pin assignment control
-      bit_offset: 6
-      bit_size: 2
+  - name: DBG_SLEEP
+    description: Debug Sleep mode
+    bit_offset: 0
+    bit_size: 1
+  - name: DBG_STOP
+    description: Debug Stop mode
+    bit_offset: 1
+    bit_size: 1
+  - name: DBG_STANDBY
+    description: Debug Standby mode
+    bit_offset: 2
+    bit_size: 1
+  - name: TRACE_IOEN
+    description: Trace pin assignment control
+    bit_offset: 5
+    bit_size: 1
+  - name: TRACE_MODE
+    description: Trace pin assignment control
+    bit_offset: 6
+    bit_size: 2
 fieldset/IDCODE:
  description: DBGMCU_IDCODE
  fields:
-    - name: DEV_ID
-      description: Device identifier
-      bit_offset: 0
-      bit_size: 12
-    - name: REV_ID
-      description: Revision identifie
-      bit_offset: 16
-      bit_size: 16
+  - name: DEV_ID
+    description: Device identifier
+    bit_offset: 0
+    bit_size: 12
+  - name: REV_ID
+    description: Revision identifie
+    bit_offset: 16
+    bit_size: 16
--- a/data/registers/dbgmcu_l4.yaml
+++ b/data/registers/dbgmcu_l4.yaml
@ -1,148 +1,147 @@
---
 block/DBGMCU:
  description: MCU debug component
  items:
-    - name: IDCODE
-      description: DBGMCU_IDCODE
-      byte_offset: 0
-      access: Read
-      fieldset: IDCODE
-    - name: CR
-      description: Debug MCU configuration register
-      byte_offset: 4
-      fieldset: CR
-    - name: APB1FZR1
-      description: Debug MCU APB1 freeze register1
-      byte_offset: 8
-      fieldset: APB1FZR1
-    - name: APB1FZR2
-      description: Debug MCU APB1 freeze register 2
-      byte_offset: 12
-      fieldset: APB1FZR2
-    - name: APB2FZR
-      description: Debug MCU APB2 freeze register
-      byte_offset: 16
-      fieldset: APB2FZR
+  - name: IDCODE
+    description: DBGMCU_IDCODE
+    byte_offset: 0
+    access: Read
+    fieldset: IDCODE
+  - name: CR
+    description: Debug MCU configuration register
+    byte_offset: 4
+    fieldset: CR
+  - name: APB1FZR1
+    description: Debug MCU APB1 freeze register1
+    byte_offset: 8
+    fieldset: APB1FZR1
+  - name: APB1FZR2
+    description: Debug MCU APB1 freeze register 2
+    byte_offset: 12
+    fieldset: APB1FZR2
+  - name: APB2FZR
+    description: Debug MCU APB2 freeze register
+    byte_offset: 16
+    fieldset: APB2FZR
 fieldset/APB1FZR1:
  description: Debug MCU APB1 freeze register1
  fields:
-    - name: TIM2
-      description: TIM2 counter stopped when core is halted
-      bit_offset: 0
-      bit_size: 1
-    - name: TIM3
-      description: TIM3 counter stopped when core is halted
-      bit_offset: 1
-      bit_size: 1
-    - name: TIM4
-      description: TIM4 counter stopped when core is halted
-      bit_offset: 2
-      bit_size: 1
-    - name: TIM5
-      description: TIM5 counter stopped when core is halted
-      bit_offset: 3
-      bit_size: 1
-    - name: TIM6
-      description: TIM6 counter stopped when core is halted
-      bit_offset: 4
-      bit_size: 1
-    - name: TIM7
-      description: TIM7 counter stopped when core is halted
-      bit_offset: 5
-      bit_size: 1
-    - name: RTC
-      description: RTC counter stopped when core is halted
-      bit_offset: 10
-      bit_size: 1
-    - name: WWDG
-      description: Window watchdog counter stopped when core is halted
-      bit_offset: 11
-      bit_size: 1
-    - name: IWDG
-      description: Independent watchdog counter stopped when core is halted
-      bit_offset: 12
-      bit_size: 1
-    - name: I2C1
-      description: I2C1 SMBUS timeout counter stopped when core is halted
-      bit_offset: 21
-      bit_size: 1
-    - name: I2C2
-      description: I2C2 SMBUS timeout counter stopped when core is halted
-      bit_offset: 22
-      bit_size: 1
-    - name: I2C3
-      description: I2C3 SMBUS timeout counter stopped when core is halted
-      bit_offset: 23
-      bit_size: 1
-    - name: CAN
-      description: bxCAN stopped when core is halted
-      bit_offset: 25
-      bit_size: 1
-    - name: LPTIM1
-      description: LPTIM1 counter stopped when core is halted
-      bit_offset: 31
-      bit_size: 1
+  - name: TIM2
+    description: TIM2 counter stopped when core is halted
+    bit_offset: 0
+    bit_size: 1
+  - name: TIM3
+    description: TIM3 counter stopped when core is halted
+    bit_offset: 1
+    bit_size: 1
+  - name: TIM4
+    description: TIM4 counter stopped when core is halted
+    bit_offset: 2
+    bit_size: 1
+  - name: TIM5
+    description: TIM5 counter stopped when core is halted
+    bit_offset: 3
+    bit_size: 1
+  - name: TIM6
+    description: TIM6 counter stopped when core is halted
+    bit_offset: 4
+    bit_size: 1
+  - name: TIM7
+    description: TIM7 counter stopped when core is halted
+    bit_offset: 5
+    bit_size: 1
+  - name: RTC
+    description: RTC counter stopped when core is halted
+    bit_offset: 10
+    bit_size: 1
+  - name: WWDG
+    description: Window watchdog counter stopped when core is halted
+    bit_offset: 11
+    bit_size: 1
+  - name: IWDG
+    description: Independent watchdog counter stopped when core is halted
+    bit_offset: 12
+    bit_size: 1
+  - name: I2C1
+    description: I2C1 SMBUS timeout counter stopped when core is halted
+    bit_offset: 21
+    bit_size: 1
+  - name: I2C2
+    description: I2C2 SMBUS timeout counter stopped when core is halted
+    bit_offset: 22
+    bit_size: 1
+  - name: I2C3
+    description: I2C3 SMBUS timeout counter stopped when core is halted
+    bit_offset: 23
+    bit_size: 1
+  - name: CAN
+    description: bxCAN stopped when core is halted
+    bit_offset: 25
+    bit_size: 1
+  - name: LPTIM1
+    description: LPTIM1 counter stopped when core is halted
+    bit_offset: 31
+    bit_size: 1
 fieldset/APB1FZR2:
  description: Debug MCU APB1 freeze register 2
  fields:
-    - name: LPTIM2
-      description: LPTIM2 counter stopped when core is halted
-      bit_offset: 5
-      bit_size: 1
+  - name: LPTIM2
+    description: LPTIM2 counter stopped when core is halted
+    bit_offset: 5
+    bit_size: 1
 fieldset/APB2FZR:
  description: Debug MCU APB2 freeze register
  fields:
-    - name: TIM1
-      description: TIM1 counter stopped when core is halted
-      bit_offset: 11
-      bit_size: 1
-    - name: TIM8
-      description: TIM8 counter stopped when core is halted
-      bit_offset: 13
-      bit_size: 1
-    - name: TIM15
-      description: TIM15 counter stopped when core is halted
-      bit_offset: 16
-      bit_size: 1
-    - name: TIM16
-      description: TIM16 counter stopped when core is halted
-      bit_offset: 17
-      bit_size: 1
-    - name: TIM17
-      description: TIM17 counter stopped when core is halted
-      bit_offset: 18
-      bit_size: 1
+  - name: TIM1
+    description: TIM1 counter stopped when core is halted
+    bit_offset: 11
+    bit_size: 1
+  - name: TIM8
+    description: TIM8 counter stopped when core is halted
+    bit_offset: 13
+    bit_size: 1
+  - name: TIM15
+    description: TIM15 counter stopped when core is halted
+    bit_offset: 16
+    bit_size: 1
+  - name: TIM16
+    description: TIM16 counter stopped when core is halted
+    bit_offset: 17
+    bit_size: 1
+  - name: TIM17
+    description: TIM17 counter stopped when core is halted
+    bit_offset: 18
+    bit_size: 1
 fieldset/CR:
  description: Debug MCU configuration register
  fields:
-    - name: DBG_SLEEP
-      description: Debug Sleep mode
-      bit_offset: 0
-      bit_size: 1
-    - name: DBG_STOP
-      description: Debug Stop mode
-      bit_offset: 1
-      bit_size: 1
-    - name: DBG_STANDBY
-      description: Debug Standby mode
-      bit_offset: 2
-      bit_size: 1
-    - name: TRACE_IOEN
-      description: Trace pin assignment control
-      bit_offset: 5
-      bit_size: 1
-    - name: TRACE_MODE
-      description: Trace pin assignment control
-      bit_offset: 6
-      bit_size: 2
+  - name: DBG_SLEEP
+    description: Debug Sleep mode
+    bit_offset: 0
+    bit_size: 1
+  - name: DBG_STOP
+    description: Debug Stop mode
+    bit_offset: 1
+    bit_size: 1
+  - name: DBG_STANDBY
+    description: Debug Standby mode
+    bit_offset: 2
+    bit_size: 1
+  - name: TRACE_IOEN
+    description: Trace pin assignment control
+    bit_offset: 5
+    bit_size: 1
+  - name: TRACE_MODE
+    description: Trace pin assignment control
+    bit_offset: 6
+    bit_size: 2
 fieldset/IDCODE:
  description: DBGMCU_IDCODE
  fields:
-    - name: DEV_ID
-      description: Device identifier
-      bit_offset: 0
-      bit_size: 16
-    - name: REV_ID
-      description: Revision identifie
-      bit_offset: 16
-      bit_size: 16
+  - name: DEV_ID
+    description: Device identifier
+    bit_offset: 0
+    bit_size: 16
+  - name: REV_ID
+    description: Revision identifie
+    bit_offset: 16
+    bit_size: 16
--- a/data/registers/dbgmcu_u5.yaml
+++ b/data/registers/dbgmcu_u5.yaml
@ -1,429 +1,428 @@
---
 block/DBGMCU:
  description: MCU debug component
  items:
-    - name: IDCODE
-      description: DBGMCU_IDCODE
-      byte_offset: 0
-      access: Read
-      fieldset: IDCODE
-    - name: CR
-      description: "Debug MCU configuration\r register"
-      byte_offset: 4
-      fieldset: CR
-    - name: APB1LFZR
-      description: "Debug MCU APB1L peripheral freeze\r register"
-      byte_offset: 8
-      fieldset: APB1LFZR
-    - name: APB1HFZR
-      description: Debug MCU APB1H peripheral freeze register
-      byte_offset: 12
-      fieldset: APB1HFZR
-    - name: APB2FZR
-      description: Debug MCU APB2 peripheral freeze register
-      byte_offset: 16
-      fieldset: APB2FZR
-    - name: APB3FZR
-      description: Debug MCU APB3 peripheral freeze register
-      byte_offset: 20
-      fieldset: APB3FZR
-    - name: AHB1FZR
-      description: Debug MCU AHB1 peripheral freeze register
-      byte_offset: 32
-      fieldset: AHB1FZR
-    - name: AHB3FZR
-      description: Debug MCU AHB3 peripheral freeze register
-      byte_offset: 40
-      fieldset: AHB3FZR
-    - name: DBGMCU_SR
-      description: DBGMCU status register
-      byte_offset: 252
-      access: Read
-      fieldset: DBGMCU_SR
-    - name: DBGMCU_DBG_AUTH_HOST
-      description: DBGMCU debug host authentication register
-      byte_offset: 256
-      access: Read
-      fieldset: DBGMCU_DBG_AUTH_HOST
-    - name: DBGMCU_DBG_AUTH_DEVICE
-      description: DBGMCU debug device authentication register
-      byte_offset: 260
-      access: Read
-      fieldset: DBGMCU_DBG_AUTH_DEVICE
-    - name: PIDR4
-      description: Debug MCU CoreSight peripheral identity register 4
-      byte_offset: 4048
-      access: Read
-      fieldset: PIDR4
-    - name: PIDR0
-      description: Debug MCU CoreSight peripheral identity register 0
-      byte_offset: 4064
-      access: Read
-      fieldset: PIDR0
-    - name: PIDR1
-      description: Debug MCU CoreSight peripheral identity register 1
-      byte_offset: 4068
-      access: Read
-      fieldset: PIDR1
-    - name: PIDR2
-      description: Debug MCU CoreSight peripheral identity register 2
-      byte_offset: 4072
-      access: Read
-      fieldset: PIDR2
-    - name: PIDR3
-      description: Debug MCU CoreSight peripheral identity register 3
-      byte_offset: 4076
-      access: Read
-      fieldset: PIDR3
-    - name: CIDR0
-      description: Debug MCU CoreSight component identity register 0
-      byte_offset: 4080
-      access: Read
-      fieldset: CIDR0
-    - name: CIDR1
-      description: Debug MCU CoreSight component identity register 1
-      byte_offset: 4084
-      access: Read
-      fieldset: CIDR1
-    - name: CIDR2
-      description: Debug MCU CoreSight component identity register 2
-      byte_offset: 4088
-      access: Read
-      fieldset: CIDR2
-    - name: CIDR3
-      description: Debug MCU CoreSight component identity register 3
-      byte_offset: 4092
-      access: Read
-      fieldset: CIDR3
+  - name: IDCODE
+    description: DBGMCU_IDCODE
+    byte_offset: 0
+    access: Read
+    fieldset: IDCODE
+  - name: CR
+    description: "Debug MCU configuration\r register"
+    byte_offset: 4
+    fieldset: CR
+  - name: APB1LFZR
+    description: "Debug MCU APB1L peripheral freeze\r register"
+    byte_offset: 8
+    fieldset: APB1LFZR
+  - name: APB1HFZR
+    description: Debug MCU APB1H peripheral freeze register
+    byte_offset: 12
+    fieldset: APB1HFZR
+  - name: APB2FZR
+    description: Debug MCU APB2 peripheral freeze register
+    byte_offset: 16
+    fieldset: APB2FZR
+  - name: APB3FZR
+    description: Debug MCU APB3 peripheral freeze register
+    byte_offset: 20
+    fieldset: APB3FZR
+  - name: AHB1FZR
+    description: Debug MCU AHB1 peripheral freeze register
+    byte_offset: 32
+    fieldset: AHB1FZR
+  - name: AHB3FZR
+    description: Debug MCU AHB3 peripheral freeze register
+    byte_offset: 40
+    fieldset: AHB3FZR
+  - name: DBGMCU_SR
+    description: DBGMCU status register
+    byte_offset: 252
+    access: Read
+    fieldset: DBGMCU_SR
+  - name: DBGMCU_DBG_AUTH_HOST
+    description: DBGMCU debug host authentication register
+    byte_offset: 256
+    access: Read
+    fieldset: DBGMCU_DBG_AUTH_HOST
+  - name: DBGMCU_DBG_AUTH_DEVICE
+    description: DBGMCU debug device authentication register
+    byte_offset: 260
+    access: Read
+    fieldset: DBGMCU_DBG_AUTH_DEVICE
+  - name: PIDR4
+    description: Debug MCU CoreSight peripheral identity register 4
+    byte_offset: 4048
+    access: Read
+    fieldset: PIDR4
+  - name: PIDR0
+    description: Debug MCU CoreSight peripheral identity register 0
+    byte_offset: 4064
+    access: Read
+    fieldset: PIDR0
+  - name: PIDR1
+    description: Debug MCU CoreSight peripheral identity register 1
+    byte_offset: 4068
+    access: Read
+    fieldset: PIDR1
+  - name: PIDR2
+    description: Debug MCU CoreSight peripheral identity register 2
+    byte_offset: 4072
+    access: Read
+    fieldset: PIDR2
+  - name: PIDR3
+    description: Debug MCU CoreSight peripheral identity register 3
+    byte_offset: 4076
+    access: Read
+    fieldset: PIDR3
+  - name: CIDR0
+    description: Debug MCU CoreSight component identity register 0
+    byte_offset: 4080
+    access: Read
+    fieldset: CIDR0
+  - name: CIDR1
+    description: Debug MCU CoreSight component identity register 1
+    byte_offset: 4084
+    access: Read
+    fieldset: CIDR1
+  - name: CIDR2
+    description: Debug MCU CoreSight component identity register 2
+    byte_offset: 4088
+    access: Read
+    fieldset: CIDR2
+  - name: CIDR3
+    description: Debug MCU CoreSight component identity register 3
+    byte_offset: 4092
+    access: Read
+    fieldset: CIDR3
 fieldset/AHB1FZR:
  description: Debug MCU AHB1 peripheral freeze register
  fields:
-    - name: DBG_GPDMA0_STOP
-      description: GPDMA channel 0 stop in debug
-      bit_offset: 0
-      bit_size: 1
-    - name: DBG_GPDMA1_STOP
-      description: GPDMA channel 1 stop in debug
-      bit_offset: 1
-      bit_size: 1
-    - name: DBG_GPDMA2_STOP
-      description: GPDMA channel 2 stop in debug
-      bit_offset: 2
-      bit_size: 1
-    - name: DBG_GPDMA3_STOP
-      description: GPDMA channel 3 stop in debug
-      bit_offset: 3
-      bit_size: 1
-    - name: DBG_GPDMA4_STOP
-      description: GPDMA channel 4 stop in debug
-      bit_offset: 4
-      bit_size: 1
-    - name: DBG_GPDMA5_STOP
-      description: GPDMA channel 5 stop in debug
-      bit_offset: 5
-      bit_size: 1
-    - name: DBG_GPDMA6_STOP
-      description: GPDMA channel 6 stop in debug
-      bit_offset: 6
-      bit_size: 1
-    - name: DBG_GPDMA7_STOP
-      description: GPDMA channel 7 stop in debug
-      bit_offset: 7
-      bit_size: 1
-    - name: DBG_GPDMA8_STOP
-      description: GPDMA channel 8 stop in debug
-      bit_offset: 8
-      bit_size: 1
-    - name: DBG_GPDMA9_STOP
-      description: GPDMA channel 9 stop in debug
-      bit_offset: 9
-      bit_size: 1
-    - name: DBG_GPDMA10_STOP
-      description: GPDMA channel 10 stop in debug
-      bit_offset: 10
-      bit_size: 1
-    - name: DBG_GPDMA11_STOP
-      description: GPDMA channel 11 stop in debug
-      bit_offset: 11
-      bit_size: 1
-    - name: DBG_GPDMA12_STOP
-      description: GPDMA channel 12 stop in debug
-      bit_offset: 12
-      bit_size: 1
-    - name: DBG_GPDMA13_STOP
-      description: GPDMA channel 13 stop in debug
-      bit_offset: 13
-      bit_size: 1
-    - name: DBG_GPDMA14_STOP
-      description: GPDMA channel 14 stop in debug
-      bit_offset: 14
-      bit_size: 1
-    - name: DBG_GPDMA15_STOP
-      description: GPDMA channel 15 stop in debug
-      bit_offset: 15
-      bit_size: 1
+  - name: DBG_GPDMA0_STOP
+    description: GPDMA channel 0 stop in debug
+    bit_offset: 0
+    bit_size: 1
+  - name: DBG_GPDMA1_STOP
+    description: GPDMA channel 1 stop in debug
+    bit_offset: 1
+    bit_size: 1
+  - name: DBG_GPDMA2_STOP
+    description: GPDMA channel 2 stop in debug
+    bit_offset: 2
+    bit_size: 1
+  - name: DBG_GPDMA3_STOP
+    description: GPDMA channel 3 stop in debug
+    bit_offset: 3
+    bit_size: 1
+  - name: DBG_GPDMA4_STOP
+    description: GPDMA channel 4 stop in debug
+    bit_offset: 4
+    bit_size: 1
+  - name: DBG_GPDMA5_STOP
+    description: GPDMA channel 5 stop in debug
+    bit_offset: 5
+    bit_size: 1
+  - name: DBG_GPDMA6_STOP
+    description: GPDMA channel 6 stop in debug
+    bit_offset: 6
+    bit_size: 1
+  - name: DBG_GPDMA7_STOP
+    description: GPDMA channel 7 stop in debug
+    bit_offset: 7
+    bit_size: 1
+  - name: DBG_GPDMA8_STOP
+    description: GPDMA channel 8 stop in debug
+    bit_offset: 8
+    bit_size: 1
+  - name: DBG_GPDMA9_STOP
+    description: GPDMA channel 9 stop in debug
+    bit_offset: 9
+    bit_size: 1
+  - name: DBG_GPDMA10_STOP
+    description: GPDMA channel 10 stop in debug
+    bit_offset: 10
+    bit_size: 1
+  - name: DBG_GPDMA11_STOP
+    description: GPDMA channel 11 stop in debug
+    bit_offset: 11
+    bit_size: 1
+  - name: DBG_GPDMA12_STOP
+    description: GPDMA channel 12 stop in debug
+    bit_offset: 12
+    bit_size: 1
+  - name: DBG_GPDMA13_STOP
+    description: GPDMA channel 13 stop in debug
+    bit_offset: 13
+    bit_size: 1
+  - name: DBG_GPDMA14_STOP
+    description: GPDMA channel 14 stop in debug
+    bit_offset: 14
+    bit_size: 1
+  - name: DBG_GPDMA15_STOP
+    description: GPDMA channel 15 stop in debug
+    bit_offset: 15
+    bit_size: 1
 fieldset/AHB3FZR:
  description: Debug MCU AHB3 peripheral freeze register
  fields:
-    - name: DBG_LPDMA0_STOP
-      description: LPDMA channel 0 stop in debug
-      bit_offset: 0
-      bit_size: 1
-    - name: DBG_LPDMA1_STOP
-      description: LPDMA channel 1 stop in debug
-      bit_offset: 1
-      bit_size: 1
-    - name: DBG_LPDMA2_STOP
-      description: LPDMA channel 2 stop in debug
-      bit_offset: 2
-      bit_size: 1
-    - name: DBG_LPDMA3_STOP
-      description: LPDMA channel 3 stop in debug
-      bit_offset: 3
-      bit_size: 1
+  - name: DBG_LPDMA0_STOP
+    description: LPDMA channel 0 stop in debug
+    bit_offset: 0
+    bit_size: 1
+  - name: DBG_LPDMA1_STOP
+    description: LPDMA channel 1 stop in debug
+    bit_offset: 1
+    bit_size: 1
+  - name: DBG_LPDMA2_STOP
+    description: LPDMA channel 2 stop in debug
+    bit_offset: 2
+    bit_size: 1
+  - name: DBG_LPDMA3_STOP
+    description: LPDMA channel 3 stop in debug
+    bit_offset: 3
+    bit_size: 1
 fieldset/APB1HFZR:
  description: Debug MCU APB1H peripheral freeze register
  fields:
-    - name: DBG_I2C4_STOP
-      description: I2C4 stop in debug
-      bit_offset: 1
-      bit_size: 1
-    - name: DBG_LPTIM2_STOP
-      description: LPTIM2 stop in debug
-      bit_offset: 5
-      bit_size: 1
+  - name: DBG_I2C4_STOP
+    description: I2C4 stop in debug
+    bit_offset: 1
+    bit_size: 1
+  - name: DBG_LPTIM2_STOP
+    description: LPTIM2 stop in debug
+    bit_offset: 5
+    bit_size: 1
 fieldset/APB1LFZR:
  description: "Debug MCU APB1L peripheral freeze\r register"
  fields:
-    - name: DBG_TIM2_STOP
-      description: TIM2 stop in debug
-      bit_offset: 0
-      bit_size: 1
-    - name: DBG_TIM3_STOP
-      description: TIM3 stop in debug
-      bit_offset: 1
-      bit_size: 1
-    - name: DBG_TIM4_STOP
-      description: TIM4 stop in debug
-      bit_offset: 2
-      bit_size: 1
-    - name: DBG_TIM5_STOP
-      description: TIM5 stop in debug
-      bit_offset: 3
-      bit_size: 1
-    - name: DBG_TIM6_STOP
-      description: TIM6 stop in debug
-      bit_offset: 4
-      bit_size: 1
-    - name: DBG_TIM7_STOP
-      description: TIM7 stop in debug
-      bit_offset: 5
-      bit_size: 1
-    - name: DBG_WWDG_STOP
-      description: Window watchdog counter stop in debug
-      bit_offset: 11
-      bit_size: 1
-    - name: DBG_IWDG_STOP
-      description: Independent watchdog counter stop in debug
-      bit_offset: 12
-      bit_size: 1
-    - name: DBG_I2C1_STOP
-      description: I2C1 SMBUS timeout stop in debug
-      bit_offset: 21
-      bit_size: 1
-    - name: DBG_I2C2_STOP
-      description: I2C2 SMBUS timeout stop in debug
-      bit_offset: 22
-      bit_size: 1
+  - name: DBG_TIM2_STOP
+    description: TIM2 stop in debug
+    bit_offset: 0
+    bit_size: 1
+  - name: DBG_TIM3_STOP
+    description: TIM3 stop in debug
+    bit_offset: 1
+    bit_size: 1
+  - name: DBG_TIM4_STOP
+    description: TIM4 stop in debug
+    bit_offset: 2
+    bit_size: 1
+  - name: DBG_TIM5_STOP
+    description: TIM5 stop in debug
+    bit_offset: 3
+    bit_size: 1
+  - name: DBG_TIM6_STOP
+    description: TIM6 stop in debug
+    bit_offset: 4
+    bit_size: 1
+  - name: DBG_TIM7_STOP
+    description: TIM7 stop in debug
+    bit_offset: 5
+    bit_size: 1
+  - name: DBG_WWDG_STOP
+    description: Window watchdog counter stop in debug
+    bit_offset: 11
+    bit_size: 1
+  - name: DBG_IWDG_STOP
+    description: Independent watchdog counter stop in debug
+    bit_offset: 12
+    bit_size: 1
+  - name: DBG_I2C1_STOP
+    description: I2C1 SMBUS timeout stop in debug
+    bit_offset: 21
+    bit_size: 1
+  - name: DBG_I2C2_STOP
+    description: I2C2 SMBUS timeout stop in debug
+    bit_offset: 22
+    bit_size: 1
 fieldset/APB2FZR:
  description: Debug MCU APB2 peripheral freeze register
  fields:
-    - name: DBG_TIM1_STOP
-      description: "TIM1 counter stopped when core is\r halted"
-      bit_offset: 11
-      bit_size: 1
-    - name: DBG_TIM8_STOP
-      description: TIM8 stop in debug
-      bit_offset: 13
-      bit_size: 1
-    - name: DBG_TIM15_STOP
-      description: "TIM15 counter stopped when core is\r halted"
-      bit_offset: 16
-      bit_size: 1
-    - name: DBG_TIM16_STOP
-      description: "TIM16 counter stopped when core is\r halted"
-      bit_offset: 17
-      bit_size: 1
-    - name: DBG_TIM17_STOP
-      description: DBG_TIM17_STOP
-      bit_offset: 18
-      bit_size: 1
+  - name: DBG_TIM1_STOP
+    description: "TIM1 counter stopped when core is\r halted"
+    bit_offset: 11
+    bit_size: 1
+  - name: DBG_TIM8_STOP
+    description: TIM8 stop in debug
+    bit_offset: 13
+    bit_size: 1
+  - name: DBG_TIM15_STOP
+    description: "TIM15 counter stopped when core is\r halted"
+    bit_offset: 16
+    bit_size: 1
+  - name: DBG_TIM16_STOP
+    description: "TIM16 counter stopped when core is\r halted"
+    bit_offset: 17
+    bit_size: 1
+  - name: DBG_TIM17_STOP
+    description: DBG_TIM17_STOP
+    bit_offset: 18
+    bit_size: 1
 fieldset/APB3FZR:
  description: Debug MCU APB3 peripheral freeze register
  fields:
-    - name: DBG_I2C3_STOP
-      description: I2C3 stop in debug
-      bit_offset: 10
-      bit_size: 1
-    - name: DBG_LPTIM1_STOP
-      description: LPTIM1 stop in debug
-      bit_offset: 17
-      bit_size: 1
-    - name: DBG_LPTIM3_STOP
-      description: LPTIM3 stop in debug
-      bit_offset: 18
-      bit_size: 1
-    - name: DBG_LPTIM4_STOP
-      description: LPTIM4 stop in debug
-      bit_offset: 19
-      bit_size: 1
-    - name: DBG_RTC_STOP
-      description: RTC stop in debug
-      bit_offset: 30
-      bit_size: 1
+  - name: DBG_I2C3_STOP
+    description: I2C3 stop in debug
+    bit_offset: 10
+    bit_size: 1
+  - name: DBG_LPTIM1_STOP
+    description: LPTIM1 stop in debug
+    bit_offset: 17
+    bit_size: 1
+  - name: DBG_LPTIM3_STOP
+    description: LPTIM3 stop in debug
+    bit_offset: 18
+    bit_size: 1
+  - name: DBG_LPTIM4_STOP
+    description: LPTIM4 stop in debug
+    bit_offset: 19
+    bit_size: 1
+  - name: DBG_RTC_STOP
+    description: RTC stop in debug
+    bit_offset: 30
+    bit_size: 1
 fieldset/CIDR0:
  description: Debug MCU CoreSight component identity register 0
  fields:
-    - name: PREAMBLE
-      description: "component identification bits [7:0]"
-      bit_offset: 0
-      bit_size: 8
+  - name: PREAMBLE
+    description: component identification bits [7:0]
+    bit_offset: 0
+    bit_size: 8
 fieldset/CIDR1:
  description: Debug MCU CoreSight component identity register 1
  fields:
-    - name: PREAMBLE
-      description: "component identification bits [11:8]"
-      bit_offset: 0
-      bit_size: 4
-    - name: CLASS
-      description: "component identification bits [15:12] - component class"
-      bit_offset: 4
-      bit_size: 4
+  - name: PREAMBLE
+    description: component identification bits [11:8]
+    bit_offset: 0
+    bit_size: 4
+  - name: CLASS
+    description: component identification bits [15:12] - component class
+    bit_offset: 4
+    bit_size: 4
 fieldset/CIDR2:
  description: Debug MCU CoreSight component identity register 2
  fields:
-    - name: PREAMBLE
-      description: "component identification bits [23:16]"
-      bit_offset: 0
-      bit_size: 8
+  - name: PREAMBLE
+    description: component identification bits [23:16]
+    bit_offset: 0
+    bit_size: 8
 fieldset/CIDR3:
  description: Debug MCU CoreSight component identity register 3
  fields:
-    - name: PREAMBLE
-      description: "component identification bits [31:24]"
-      bit_offset: 0
-      bit_size: 8
+  - name: PREAMBLE
+    description: component identification bits [31:24]
+    bit_offset: 0
+    bit_size: 8
 fieldset/CR:
  description: "Debug MCU configuration\r register"
  fields:
-    - name: DBG_STOP
-      description: Debug Stop mode
-      bit_offset: 1
-      bit_size: 1
-    - name: DBG_STANDBY
-      description: Debug Standby mode
-      bit_offset: 2
-      bit_size: 1
-    - name: TRACE_IOEN
-      description: "Trace pin assignment\r control"
-      bit_offset: 4
-      bit_size: 1
-    - name: TRACE_EN
-      description: "trace port and clock\r enable"
-      bit_offset: 5
-      bit_size: 1
-    - name: TRACE_MODE
-      description: "Trace pin assignment\r control"
-      bit_offset: 6
-      bit_size: 2
+  - name: DBG_STOP
+    description: Debug Stop mode
+    bit_offset: 1
+    bit_size: 1
+  - name: DBG_STANDBY
+    description: Debug Standby mode
+    bit_offset: 2
+    bit_size: 1
+  - name: TRACE_IOEN
+    description: "Trace pin assignment\r control"
+    bit_offset: 4
+    bit_size: 1
+  - name: TRACE_EN
+    description: "trace port and clock\r enable"
+    bit_offset: 5
+    bit_size: 1
+  - name: TRACE_MODE
+    description: "Trace pin assignment\r control"
+    bit_offset: 6
+    bit_size: 2
 fieldset/DBGMCU_DBG_AUTH_DEVICE:
  description: DBGMCU debug device authentication register
  fields:
-    - name: AUTH_ID
-      description: "Device specific ID\r \tDevice specific ID used for RDP regression."
-      bit_offset: 0
-      bit_size: 32
+  - name: AUTH_ID
+    description: "Device specific ID\r \tDevice specific ID used for RDP regression."
+    bit_offset: 0
+    bit_size: 32
 fieldset/DBGMCU_DBG_AUTH_HOST:
  description: DBGMCU debug host authentication register
  fields:
-    - name: AUTH_KEY
-      description: "Device authentication key\r \tThe device specific 64-bit authentication key (OEM key) must be written to this register (in two successive 32-bit writes, least significant word first) to permit RDP regression. Writing a wrong key locks access to the device and prevent code execution from the Flash memory."
-      bit_offset: 0
-      bit_size: 32
+  - name: AUTH_KEY
+    description: "Device authentication key\r \tThe device specific 64-bit authentication key (OEM key) must be written to this register (in two successive 32-bit writes, least significant word first) to permit RDP regression. Writing a wrong key locks access to the device and prevent code execution from the Flash memory."
+    bit_offset: 0
+    bit_size: 32
 fieldset/DBGMCU_SR:
  description: DBGMCU status register
  fields:
-    - name: AP_PRESENT
-      description: "Bit n identifies whether access port AP n is present in device\r \tBit n = 0: APn absent\r \tBit n = 1: APn present"
-      bit_offset: 0
-      bit_size: 8
-    - name: AP_LOCKED
-      description: "DECLARATION TO BE CONFIRMED by PRODUCT OWNER! Bit n identifies whether access port AP n is open (can be accessed via the debug port) or locked (debug access to the AP is blocked)\r \tBit n = 0: APn locked\r \tBit n = 1: APn enabled"
-      bit_offset: 8
-      bit_size: 8
+  - name: AP_PRESENT
+    description: "Bit n identifies whether access port AP n is present in device\r \tBit n = 0: APn absent\r \tBit n = 1: APn present"
+    bit_offset: 0
+    bit_size: 8
+  - name: AP_LOCKED
+    description: "DECLARATION TO BE CONFIRMED by PRODUCT OWNER! Bit n identifies whether access port AP n is open (can be accessed via the debug port) or locked (debug access to the AP is blocked)\r \tBit n = 0: APn locked\r \tBit n = 1: APn enabled"
+    bit_offset: 8
+    bit_size: 8
 fieldset/IDCODE:
  description: DBGMCU_IDCODE
  fields:
-    - name: DEV_ID
-      description: Device dentification
-      bit_offset: 0
-      bit_size: 12
-    - name: REV_ID
-      description: Revision
-      bit_offset: 16
-      bit_size: 16
+  - name: DEV_ID
+    description: Device dentification
+    bit_offset: 0
+    bit_size: 12
+  - name: REV_ID
+    description: Revision
+    bit_offset: 16
+    bit_size: 16
 fieldset/PIDR0:
  description: Debug MCU CoreSight peripheral identity register 0
  fields:
-    - name: PARTNUM
-      description: "part number bits [7:0]"
-      bit_offset: 0
-      bit_size: 8
+  - name: PARTNUM
+    description: part number bits [7:0]
+    bit_offset: 0
+    bit_size: 8
 fieldset/PIDR1:
  description: Debug MCU CoreSight peripheral identity register 1
  fields:
-    - name: PARTNUM
-      description: "part number bits [11:8]"
-      bit_offset: 0
-      bit_size: 4
-    - name: JEP106ID
-      description: "JEP106 identity code bits [3:0]"
-      bit_offset: 4
-      bit_size: 4
+  - name: PARTNUM
+    description: part number bits [11:8]
+    bit_offset: 0
+    bit_size: 4
+  - name: JEP106ID
+    description: JEP106 identity code bits [3:0]
+    bit_offset: 4
+    bit_size: 4
 fieldset/PIDR2:
  description: Debug MCU CoreSight peripheral identity register 2
  fields:
-    - name: JEP106ID
-      description: "JEP106 identity code bits [6:4]"
-      bit_offset: 0
-      bit_size: 3
-    - name: JEDEC
-      description: JEDEC assigned value
-      bit_offset: 3
-      bit_size: 1
-    - name: REVISION
-      description: component revision number
-      bit_offset: 4
-      bit_size: 4
+  - name: JEP106ID
+    description: JEP106 identity code bits [6:4]
+    bit_offset: 0
+    bit_size: 3
+  - name: JEDEC
+    description: JEDEC assigned value
+    bit_offset: 3
+    bit_size: 1
+  - name: REVISION
+    description: component revision number
+    bit_offset: 4
+    bit_size: 4
 fieldset/PIDR3:
  description: Debug MCU CoreSight peripheral identity register 3
  fields:
-    - name: CMOD
-      description: customer modified
-      bit_offset: 0
-      bit_size: 4
-    - name: REVAND
-      description: metal fix version
-      bit_offset: 4
-      bit_size: 4
+  - name: CMOD
+    description: customer modified
+    bit_offset: 0
+    bit_size: 4
+  - name: REVAND
+    description: metal fix version
+    bit_offset: 4
+    bit_size: 4
 fieldset/PIDR4:
  description: Debug MCU CoreSight peripheral identity register 4
  fields:
-    - name: JEP106CON
-      description: JEP106 continuation code
-      bit_offset: 0
-      bit_size: 4
-    - name: KCOUNT_4
-      description: register file size
-      bit_offset: 4
-      bit_size: 4
+  - name: JEP106CON
+    description: JEP106 continuation code
+    bit_offset: 0
+    bit_size: 4
+  - name: KCOUNT_4
+    description: register file size
+    bit_offset: 4
+    bit_size: 4
--- a/data/registers/dbgmcu_wb.yaml
+++ b/data/registers/dbgmcu_wb.yaml
@ -1,173 +1,172 @@
---
 block/DBGMCU:
  description: Debug support
  items:
-    - name: IDCODE
-      description: MCU Device ID Code Register
-      byte_offset: 0
-      access: Read
-      fieldset: IDCODE
-    - name: CR
-      description: Debug MCU Configuration Register
-      byte_offset: 4
-      fieldset: CR
-    - name: APB1FZR1
-      description: APB1 Low Freeze Register CPU1
-      byte_offset: 60
-      fieldset: APB1FZR1
-    - name: C2AP_B1FZR1
-      description: APB1 Low Freeze Register CPU2
-      byte_offset: 64
-      fieldset: C2AP_B1FZR1
-    - name: APB1FZR2
-      description: APB1 High Freeze Register CPU1
-      byte_offset: 68
-      fieldset: APB1FZR2
-    - name: C2APB1FZR2
-      description: APB1 High Freeze Register CPU2
-      byte_offset: 72
-      fieldset: C2APB1FZR2
-    - name: C2APB2FZR
-      description: APB2 Freeze Register CPU2
-      byte_offset: 72
-      fieldset: C2APB2FZR
-    - name: APB2FZR
-      description: APB2 Freeze Register CPU1
-      byte_offset: 76
-      fieldset: APB2FZR
+  - name: IDCODE
+    description: MCU Device ID Code Register
+    byte_offset: 0
+    access: Read
+    fieldset: IDCODE
+  - name: CR
+    description: Debug MCU Configuration Register
+    byte_offset: 4
+    fieldset: CR
+  - name: APB1FZR1
+    description: APB1 Low Freeze Register CPU1
+    byte_offset: 60
+    fieldset: APB1FZR1
+  - name: C2AP_B1FZR1
+    description: APB1 Low Freeze Register CPU2
+    byte_offset: 64
+    fieldset: C2AP_B1FZR1
+  - name: APB1FZR2
+    description: APB1 High Freeze Register CPU1
+    byte_offset: 68
+    fieldset: APB1FZR2
+  - name: C2APB1FZR2
+    description: APB1 High Freeze Register CPU2
+    byte_offset: 72
+    fieldset: C2APB1FZR2
+  - name: C2APB2FZR
+    description: APB2 Freeze Register CPU2
+    byte_offset: 72
+    fieldset: C2APB2FZR
+  - name: APB2FZR
+    description: APB2 Freeze Register CPU1
+    byte_offset: 76
+    fieldset: APB2FZR
 fieldset/APB1FZR1:
  description: APB1 Low Freeze Register CPU1
  fields:
-    - name: TIM2
-      description: Debug Timer 2 stopped when Core is halted
-      bit_offset: 0
-      bit_size: 1
-    - name: RTC
-      description: RTC counter stopped when core is halted
-      bit_offset: 10
-      bit_size: 1
-    - name: WWDG
-      description: WWDG counter stopped when core is halted
-      bit_offset: 11
-      bit_size: 1
-    - name: IWDG
-      description: IWDG counter stopped when core is halted
-      bit_offset: 12
-      bit_size: 1
-    - name: I2C1
-      description: Debug I2C1 SMBUS timeout stopped when Core is halted
-      bit_offset: 21
-      bit_size: 1
-    - name: I2C3
-      description: Debug I2C3 SMBUS timeout stopped when core is halted
-      bit_offset: 23
-      bit_size: 1
-    - name: LPTIM1
-      description: Debug LPTIM1 stopped when Core is halted
-      bit_offset: 31
-      bit_size: 1
+  - name: TIM2
+    description: Debug Timer 2 stopped when Core is halted
+    bit_offset: 0
+    bit_size: 1
+  - name: RTC
+    description: RTC counter stopped when core is halted
+    bit_offset: 10
+    bit_size: 1
+  - name: WWDG
+    description: WWDG counter stopped when core is halted
+    bit_offset: 11
+    bit_size: 1
+  - name: IWDG
+    description: IWDG counter stopped when core is halted
+    bit_offset: 12
+    bit_size: 1
+  - name: I2C1
+    description: Debug I2C1 SMBUS timeout stopped when Core is halted
+    bit_offset: 21
+    bit_size: 1
+  - name: I2C3
+    description: Debug I2C3 SMBUS timeout stopped when core is halted
+    bit_offset: 23
+    bit_size: 1
+  - name: LPTIM1
+    description: Debug LPTIM1 stopped when Core is halted
+    bit_offset: 31
+    bit_size: 1
 fieldset/APB1FZR2:
  description: APB1 High Freeze Register CPU1
  fields:
-    - name: LPTIM2
-      description: LPTIM2 counter stopped when core is halted
-      bit_offset: 5
-      bit_size: 1
+  - name: LPTIM2
+    description: LPTIM2 counter stopped when core is halted
+    bit_offset: 5
+    bit_size: 1
 fieldset/APB2FZR:
  description: APB2 Freeze Register CPU1
  fields:
-    - name: TIM1
-      description: TIM1 counter stopped when core is halted
-      bit_offset: 11
-      bit_size: 1
-    - name: TIM16
-      description: TIM16 counter stopped when core is halted
-      bit_offset: 17
-      bit_size: 1
-    - name: TIM17
-      description: TIM17 counter stopped when core is halted
-      bit_offset: 18
-      bit_size: 1
+  - name: TIM1
+    description: TIM1 counter stopped when core is halted
+    bit_offset: 11
+    bit_size: 1
+  - name: TIM16
+    description: TIM16 counter stopped when core is halted
+    bit_offset: 17
+    bit_size: 1
+  - name: TIM17
+    description: TIM17 counter stopped when core is halted
+    bit_offset: 18
+    bit_size: 1
 fieldset/C2APB1FZR2:
  description: APB1 High Freeze Register CPU2
  fields:
-    - name: LPTIM2
-      description: LPTIM2 counter stopped when core is halted
-      bit_offset: 5
-      bit_size: 1
+  - name: LPTIM2
+    description: LPTIM2 counter stopped when core is halted
+    bit_offset: 5
+    bit_size: 1
 fieldset/C2APB2FZR:
  description: APB2 Freeze Register CPU2
  fields:
-    - name: TIM1
-      description: TIM1 counter stopped when core is halted
-      bit_offset: 11
-      bit_size: 1
-    - name: TIM16
-      description: TIM16 counter stopped when core is halted
-      bit_offset: 17
-      bit_size: 1
-    - name: TIM17
-      description: TIM17 counter stopped when core is halted
-      bit_offset: 18
-      bit_size: 1
+  - name: TIM1
+    description: TIM1 counter stopped when core is halted
+    bit_offset: 11
+    bit_size: 1
+  - name: TIM16
+    description: TIM16 counter stopped when core is halted
+    bit_offset: 17
+    bit_size: 1
+  - name: TIM17
+    description: TIM17 counter stopped when core is halted
+    bit_offset: 18
+    bit_size: 1
 fieldset/C2AP_B1FZR1:
  description: APB1 Low Freeze Register CPU2
  fields:
-    - name: LPTIM2
-      description: LPTIM2 counter stopped when core is halted
-      bit_offset: 0
-      bit_size: 1
-    - name: RTC
-      description: RTC counter stopped when core is halted
-      bit_offset: 10
-      bit_size: 1
-    - name: IWDG
-      description: IWDG stopped when core is halted
-      bit_offset: 12
-      bit_size: 1
-    - name: I2C1
-      description: I2C1 SMBUS timeout stopped when core is halted
-      bit_offset: 21
-      bit_size: 1
-    - name: I2C3
-      description: I2C3 SMBUS timeout stopped when core is halted
-      bit_offset: 23
-      bit_size: 1
-    - name: LPTIM1
-      description: LPTIM1 counter stopped when core is halted
-      bit_offset: 31
-      bit_size: 1
+  - name: LPTIM2
+    description: LPTIM2 counter stopped when core is halted
+    bit_offset: 0
+    bit_size: 1
+  - name: RTC
+    description: RTC counter stopped when core is halted
+    bit_offset: 10
+    bit_size: 1
+  - name: IWDG
+    description: IWDG stopped when core is halted
+    bit_offset: 12
+    bit_size: 1
+  - name: I2C1
+    description: I2C1 SMBUS timeout stopped when core is halted
+    bit_offset: 21
+    bit_size: 1
+  - name: I2C3
+    description: I2C3 SMBUS timeout stopped when core is halted
+    bit_offset: 23
+    bit_size: 1
+  - name: LPTIM1
+    description: LPTIM1 counter stopped when core is halted
+    bit_offset: 31
+    bit_size: 1
 fieldset/CR:
  description: Debug MCU Configuration Register
  fields:
-    - name: DBG_SLEEP
-      description: Debug Sleep Mode
-      bit_offset: 0
-      bit_size: 1
-    - name: DBG_STOP
-      description: Debug Stop Mode
-      bit_offset: 1
-      bit_size: 1
-    - name: DBG_STANDBY
-      description: Debug Standby Mode
-      bit_offset: 2
-      bit_size: 1
-    - name: TRACE_IOEN
-      description: Trace port and clock enable
-      bit_offset: 5
-      bit_size: 1
-    - name: TRGOEN
-      description: External trigger output enable
-      bit_offset: 28
-      bit_size: 1
+  - name: DBG_SLEEP
+    description: Debug Sleep Mode
+    bit_offset: 0
+    bit_size: 1
+  - name: DBG_STOP
+    description: Debug Stop Mode
+    bit_offset: 1
+    bit_size: 1
+  - name: DBG_STANDBY
+    description: Debug Standby Mode
+    bit_offset: 2
+    bit_size: 1
+  - name: TRACE_IOEN
+    description: Trace port and clock enable
+    bit_offset: 5
+    bit_size: 1
+  - name: TRGOEN
+    description: External trigger output enable
+    bit_offset: 28
+    bit_size: 1
 fieldset/IDCODE:
  description: MCU Device ID Code Register
  fields:
-    - name: DEV_ID
-      description: Device Identifier
-      bit_offset: 0
-      bit_size: 12
-    - name: REV_ID
-      description: Revision Identifier
-      bit_offset: 16
-      bit_size: 16
+  - name: DEV_ID
+    description: Device Identifier
+    bit_offset: 0
+    bit_size: 12
+  - name: REV_ID
+    description: Revision Identifier
+    bit_offset: 16
+    bit_size: 16
--- a/data/registers/dbgmcu_wl.yaml
+++ b/data/registers/dbgmcu_wl.yaml
@ -1,181 +1,180 @@
---
 block/DBGMCU:
  description: Microcontroller Debug Unit
  items:
-    - name: IDCODER
-      description: Identity Code Register
-      byte_offset: 0
-      access: Read
-      fieldset: IDCODER
-    - name: CR
-      description: Configuration Register
-      byte_offset: 4
-      fieldset: CR
-    - name: APB1FZR1
-      description: CPU1 APB1 Peripheral Freeze Register 1
-      byte_offset: 60
-      fieldset: APB1FZR1
-    - name: C2APB1FZR1
-      description: "CPU2 APB1 Peripheral Freeze Register 1 [dual core device"
-      byte_offset: 64
-      fieldset: C2APB1FZR1
-    - name: APB1FZR2
-      description: CPU1 APB1 Peripheral Freeze Register 2
-      byte_offset: 68
-      fieldset: APB1FZR2
-    - name: C2APB1FZR2
-      description: "CPU2 APB1 Peripheral Freeze Register 2 [dual core device"
-      byte_offset: 72
-      fieldset: C2APB1FZR2
-    - name: APB2FZR
-      description: CPU1 APB2 Peripheral Freeze Register
-      byte_offset: 76
-      fieldset: APB2FZR
-    - name: C2APB2FZR
-      description: "CPU2 APB2 Peripheral Freeze Register [dual core device"
-      byte_offset: 80
-      fieldset: C2APB2FZR
+  - name: IDCODER
+    description: Identity Code Register
+    byte_offset: 0
+    access: Read
+    fieldset: IDCODER
+  - name: CR
+    description: Configuration Register
+    byte_offset: 4
+    fieldset: CR
+  - name: APB1FZR1
+    description: CPU1 APB1 Peripheral Freeze Register 1
+    byte_offset: 60
+    fieldset: APB1FZR1
+  - name: C2APB1FZR1
+    description: CPU2 APB1 Peripheral Freeze Register 1 [dual core device
+    byte_offset: 64
+    fieldset: C2APB1FZR1
+  - name: APB1FZR2
+    description: CPU1 APB1 Peripheral Freeze Register 2
+    byte_offset: 68
+    fieldset: APB1FZR2
+  - name: C2APB1FZR2
+    description: CPU2 APB1 Peripheral Freeze Register 2 [dual core device
+    byte_offset: 72
+    fieldset: C2APB1FZR2
+  - name: APB2FZR
+    description: CPU1 APB2 Peripheral Freeze Register
+    byte_offset: 76
+    fieldset: APB2FZR
+  - name: C2APB2FZR
+    description: CPU2 APB2 Peripheral Freeze Register [dual core device
+    byte_offset: 80
+    fieldset: C2APB2FZR
 fieldset/APB1FZR1:
  description: CPU1 APB1 Peripheral Freeze Register 1
  fields:
-    - name: TIM2
-      description: TIM2 stop in CPU1 debug
-      bit_offset: 0
-      bit_size: 1
-    - name: RTC
-      description: RTC stop in CPU1 debug
-      bit_offset: 10
-      bit_size: 1
-    - name: WWDG
-      description: WWDG stop in CPU1 debug
-      bit_offset: 11
-      bit_size: 1
-    - name: IWDG
-      description: IWDG stop in CPU1 debug
-      bit_offset: 12
-      bit_size: 1
-    - name: I2C1
-      description: I2C1 SMBUS timeout stop in CPU1 debug
-      bit_offset: 21
-      bit_size: 1
-    - name: I2C2
-      description: I2C2 SMBUS timeout stop in CPU1 debug
-      bit_offset: 22
-      bit_size: 1
-    - name: I2C3
-      description: I2C3 SMBUS timeout stop in CPU1 debug
-      bit_offset: 23
-      bit_size: 1
-    - name: LPTIM1
-      description: LPTIM1 stop in CPU1 debug
-      bit_offset: 31
-      bit_size: 1
+  - name: TIM2
+    description: TIM2 stop in CPU1 debug
+    bit_offset: 0
+    bit_size: 1
+  - name: RTC
+    description: RTC stop in CPU1 debug
+    bit_offset: 10
+    bit_size: 1
+  - name: WWDG
+    description: WWDG stop in CPU1 debug
+    bit_offset: 11
+    bit_size: 1
+  - name: IWDG
+    description: IWDG stop in CPU1 debug
+    bit_offset: 12
+    bit_size: 1
+  - name: I2C1
+    description: I2C1 SMBUS timeout stop in CPU1 debug
+    bit_offset: 21
+    bit_size: 1
+  - name: I2C2
+    description: I2C2 SMBUS timeout stop in CPU1 debug
+    bit_offset: 22
+    bit_size: 1
+  - name: I2C3
+    description: I2C3 SMBUS timeout stop in CPU1 debug
+    bit_offset: 23
+    bit_size: 1
+  - name: LPTIM1
+    description: LPTIM1 stop in CPU1 debug
+    bit_offset: 31
+    bit_size: 1
 fieldset/APB1FZR2:
  description: CPU1 APB1 Peripheral Freeze Register 2
  fields:
-    - name: LPTIM2
-      description: LPTIM2
-      bit_offset: 5
-      bit_size: 1
-    - name: LPTIM3
-      description: LPTIM3
-      bit_offset: 6
-      bit_size: 1
+  - name: LPTIM2
+    description: LPTIM2
+    bit_offset: 5
+    bit_size: 1
+  - name: LPTIM3
+    description: LPTIM3
+    bit_offset: 6
+    bit_size: 1
 fieldset/APB2FZR:
  description: CPU1 APB2 Peripheral Freeze Register
  fields:
-    - name: TIM1
-      description: TIM1
-      bit_offset: 11
-      bit_size: 1
-    - name: TIM16
-      description: TIM16
-      bit_offset: 17
-      bit_size: 1
-    - name: TIM17
-      description: TIM17
-      bit_offset: 18
-      bit_size: 1
+  - name: TIM1
+    description: TIM1
+    bit_offset: 11
+    bit_size: 1
+  - name: TIM16
+    description: TIM16
+    bit_offset: 17
+    bit_size: 1
+  - name: TIM17
+    description: TIM17
+    bit_offset: 18
+    bit_size: 1
 fieldset/C2APB1FZR1:
-  description: "CPU2 APB1 Peripheral Freeze Register 1 [dual core device"
+  description: CPU2 APB1 Peripheral Freeze Register 1 [dual core device
  fields:
-    - name: TIM2
-      description: TIM2
-      bit_offset: 0
-      bit_size: 1
-    - name: RTC
-      description: RTC
-      bit_offset: 10
-      bit_size: 1
-    - name: IWDG
-      description: IWDG
-      bit_offset: 12
-      bit_size: 1
-    - name: I2C1
-      description: I2C1
-      bit_offset: 21
-      bit_size: 1
-    - name: I2C2
-      description: I2C2
-      bit_offset: 22
-      bit_size: 1
-    - name: I2C3
-      description: I2C3
-      bit_offset: 23
-      bit_size: 1
-    - name: LPTIM1
-      description: LPTIM1
-      bit_offset: 31
-      bit_size: 1
+  - name: TIM2
+    description: TIM2
+    bit_offset: 0
+    bit_size: 1
+  - name: RTC
+    description: RTC
+    bit_offset: 10
+    bit_size: 1
+  - name: IWDG
+    description: IWDG
+    bit_offset: 12
+    bit_size: 1
+  - name: I2C1
+    description: I2C1
+    bit_offset: 21
+    bit_size: 1
+  - name: I2C2
+    description: I2C2
+    bit_offset: 22
+    bit_size: 1
+  - name: I2C3
+    description: I2C3
+    bit_offset: 23
+    bit_size: 1
+  - name: LPTIM1
+    description: LPTIM1
+    bit_offset: 31
+    bit_size: 1
 fieldset/C2APB1FZR2:
-  description: "CPU2 APB1 Peripheral Freeze Register 2 [dual core device"
+  description: CPU2 APB1 Peripheral Freeze Register 2 [dual core device
  fields:
-    - name: LPTIM2
-      description: LPTIM2
-      bit_offset: 5
-      bit_size: 1
-    - name: LPTIM3
-      description: LPTIM3
-      bit_offset: 6
-      bit_size: 1
+  - name: LPTIM2
+    description: LPTIM2
+    bit_offset: 5
+    bit_size: 1
+  - name: LPTIM3
+    description: LPTIM3
+    bit_offset: 6
+    bit_size: 1
 fieldset/C2APB2FZR:
-  description: "CPU2 APB2 Peripheral Freeze Register [dual core device"
+  description: CPU2 APB2 Peripheral Freeze Register [dual core device
  fields:
-    - name: TIM1
-      description: TIM1
-      bit_offset: 11
-      bit_size: 1
-    - name: TIM16
-      description: TIM16
-      bit_offset: 17
-      bit_size: 1
-    - name: TIM17
-      description: TIM17
-      bit_offset: 18
-      bit_size: 1
+  - name: TIM1
+    description: TIM1
+    bit_offset: 11
+    bit_size: 1
+  - name: TIM16
+    description: TIM16
+    bit_offset: 17
+    bit_size: 1
+  - name: TIM17
+    description: TIM17
+    bit_offset: 18
+    bit_size: 1
 fieldset/CR:
  description: Configuration Register
  fields:
-    - name: DBG_SLEEP
-      description: Allow debug in SLEEP mode
-      bit_offset: 0
-      bit_size: 1
-    - name: DBG_STOP
-      description: Allow debug in STOP mode
-      bit_offset: 1
-      bit_size: 1
-    - name: DBG_STANDBY
-      description: Allow debug in STANDBY mode
-      bit_offset: 2
-      bit_size: 1
+  - name: DBG_SLEEP
+    description: Allow debug in SLEEP mode
+    bit_offset: 0
+    bit_size: 1
+  - name: DBG_STOP
+    description: Allow debug in STOP mode
+    bit_offset: 1
+    bit_size: 1
+  - name: DBG_STANDBY
+    description: Allow debug in STANDBY mode
+    bit_offset: 2
+    bit_size: 1
 fieldset/IDCODER:
  description: Identity Code Register
  fields:
-    - name: DEV_ID
-      description: Device ID
-      bit_offset: 0
-      bit_size: 12
-    - name: REV_ID
-      description: Revision
-      bit_offset: 16
-      bit_size: 16
+  - name: DEV_ID
+    description: Device ID
+    bit_offset: 0
+    bit_size: 12
+  - name: REV_ID
+    description: Revision
+    bit_offset: 16
+    bit_size: 16
--- a/data/registers/dcmi_v1.yaml
+++ b/data/registers/dcmi_v1.yaml
@ -1,286 +1,285 @@
---
 block/DCMI:
  description: Digital camera interface
  items:
-    - name: CR
-      description: control register 1
-      byte_offset: 0
-      fieldset: CR
-    - name: SR
-      description: status register
-      byte_offset: 4
-      access: Read
-      fieldset: SR
-    - name: RIS
-      description: raw interrupt status register
-      byte_offset: 8
-      access: Read
-      fieldset: RIS
-    - name: IER
-      description: interrupt enable register
-      byte_offset: 12
-      fieldset: IER
-    - name: MIS
-      description: masked interrupt status register
-      byte_offset: 16
-      access: Read
-      fieldset: MIS
-    - name: ICR
-      description: interrupt clear register
-      byte_offset: 20
-      access: Write
-      fieldset: ICR
-    - name: ESCR
-      description: embedded synchronization code register
-      byte_offset: 24
-      fieldset: ESCR
-    - name: ESUR
-      description: embedded synchronization unmask register
-      byte_offset: 28
-      fieldset: ESUR
-    - name: CWSTRT
-      description: crop window start
-      byte_offset: 32
-      fieldset: CWSTRT
-    - name: CWSIZE
-      description: crop window size
-      byte_offset: 36
-      fieldset: CWSIZE
-    - name: DR
-      description: data register
-      byte_offset: 40
-      access: Read
-      fieldset: DR
+  - name: CR
+    description: control register 1
+    byte_offset: 0
+    fieldset: CR
+  - name: SR
+    description: status register
+    byte_offset: 4
+    access: Read
+    fieldset: SR
+  - name: RIS
+    description: raw interrupt status register
+    byte_offset: 8
+    access: Read
+    fieldset: RIS
+  - name: IER
+    description: interrupt enable register
+    byte_offset: 12
+    fieldset: IER
+  - name: MIS
+    description: masked interrupt status register
+    byte_offset: 16
+    access: Read
+    fieldset: MIS
+  - name: ICR
+    description: interrupt clear register
+    byte_offset: 20
+    access: Write
+    fieldset: ICR
+  - name: ESCR
+    description: embedded synchronization code register
+    byte_offset: 24
+    fieldset: ESCR
+  - name: ESUR
+    description: embedded synchronization unmask register
+    byte_offset: 28
+    fieldset: ESUR
+  - name: CWSTRT
+    description: crop window start
+    byte_offset: 32
+    fieldset: CWSTRT
+  - name: CWSIZE
+    description: crop window size
+    byte_offset: 36
+    fieldset: CWSIZE
+  - name: DR
+    description: data register
+    byte_offset: 40
+    access: Read
+    fieldset: DR
 fieldset/CR:
  description: control register 1
  fields:
-    - name: CAPTURE
-      description: Capture enable
-      bit_offset: 0
-      bit_size: 1
-    - name: CM
-      description: Capture mode
-      bit_offset: 1
-      bit_size: 1
-    - name: CROP
-      description: Crop feature
-      bit_offset: 2
-      bit_size: 1
-    - name: JPEG
-      description: JPEG format
-      bit_offset: 3
-      bit_size: 1
-    - name: ESS
-      description: Embedded synchronization select
-      bit_offset: 4
-      bit_size: 1
-    - name: PCKPOL
-      description: Pixel clock polarity
-      bit_offset: 5
-      bit_size: 1
-    - name: HSPOL
-      description: Horizontal synchronization polarity
-      bit_offset: 6
-      bit_size: 1
-    - name: VSPOL
-      description: Vertical synchronization polarity
-      bit_offset: 7
-      bit_size: 1
-    - name: FCRC
-      description: Frame capture rate control
-      bit_offset: 8
-      bit_size: 2
-    - name: EDM
-      description: Extended data mode
-      bit_offset: 10
-      bit_size: 2
-    - name: ENABLE
-      description: DCMI enable
-      bit_offset: 14
-      bit_size: 1
+  - name: CAPTURE
+    description: Capture enable
+    bit_offset: 0
+    bit_size: 1
+  - name: CM
+    description: Capture mode
+    bit_offset: 1
+    bit_size: 1
+  - name: CROP
+    description: Crop feature
+    bit_offset: 2
+    bit_size: 1
+  - name: JPEG
+    description: JPEG format
+    bit_offset: 3
+    bit_size: 1
+  - name: ESS
+    description: Embedded synchronization select
+    bit_offset: 4
+    bit_size: 1
+  - name: PCKPOL
+    description: Pixel clock polarity
+    bit_offset: 5
+    bit_size: 1
+  - name: HSPOL
+    description: Horizontal synchronization polarity
+    bit_offset: 6
+    bit_size: 1
+  - name: VSPOL
+    description: Vertical synchronization polarity
+    bit_offset: 7
+    bit_size: 1
+  - name: FCRC
+    description: Frame capture rate control
+    bit_offset: 8
+    bit_size: 2
+  - name: EDM
+    description: Extended data mode
+    bit_offset: 10
+    bit_size: 2
+  - name: ENABLE
+    description: DCMI enable
+    bit_offset: 14
+    bit_size: 1
 fieldset/CWSIZE:
  description: crop window size
  fields:
-    - name: CAPCNT
-      description: Capture count
-      bit_offset: 0
-      bit_size: 14
-    - name: VLINE
-      description: Vertical line count
-      bit_offset: 16
-      bit_size: 14
+  - name: CAPCNT
+    description: Capture count
+    bit_offset: 0
+    bit_size: 14
+  - name: VLINE
+    description: Vertical line count
+    bit_offset: 16
+    bit_size: 14
 fieldset/CWSTRT:
  description: crop window start
  fields:
-    - name: HOFFCNT
-      description: Horizontal offset count
-      bit_offset: 0
-      bit_size: 14
-    - name: VST
-      description: Vertical start line count
-      bit_offset: 16
-      bit_size: 13
+  - name: HOFFCNT
+    description: Horizontal offset count
+    bit_offset: 0
+    bit_size: 14
+  - name: VST
+    description: Vertical start line count
+    bit_offset: 16
+    bit_size: 13
 fieldset/DR:
  description: data register
  fields:
-    - name: Byte0
-      description: Data byte 0
-      bit_offset: 0
-      bit_size: 8
-    - name: Byte1
-      description: Data byte 1
-      bit_offset: 8
-      bit_size: 8
-    - name: Byte2
-      description: Data byte 2
-      bit_offset: 16
-      bit_size: 8
-    - name: Byte3
-      description: Data byte 3
-      bit_offset: 24
-      bit_size: 8
+  - name: Byte0
+    description: Data byte 0
+    bit_offset: 0
+    bit_size: 8
+  - name: Byte1
+    description: Data byte 1
+    bit_offset: 8
+    bit_size: 8
+  - name: Byte2
+    description: Data byte 2
+    bit_offset: 16
+    bit_size: 8
+  - name: Byte3
+    description: Data byte 3
+    bit_offset: 24
+    bit_size: 8
 fieldset/ESCR:
  description: embedded synchronization code register
  fields:
-    - name: FSC
-      description: Frame start delimiter code
-      bit_offset: 0
-      bit_size: 8
-    - name: LSC
-      description: Line start delimiter code
-      bit_offset: 8
-      bit_size: 8
-    - name: LEC
-      description: Line end delimiter code
-      bit_offset: 16
-      bit_size: 8
-    - name: FEC
-      description: Frame end delimiter code
-      bit_offset: 24
-      bit_size: 8
+  - name: FSC
+    description: Frame start delimiter code
+    bit_offset: 0
+    bit_size: 8
+  - name: LSC
+    description: Line start delimiter code
+    bit_offset: 8
+    bit_size: 8
+  - name: LEC
+    description: Line end delimiter code
+    bit_offset: 16
+    bit_size: 8
+  - name: FEC
+    description: Frame end delimiter code
+    bit_offset: 24
+    bit_size: 8
 fieldset/ESUR:
  description: embedded synchronization unmask register
  fields:
-    - name: FSU
-      description: Frame start delimiter unmask
-      bit_offset: 0
-      bit_size: 8
-    - name: LSU
-      description: Line start delimiter unmask
-      bit_offset: 8
-      bit_size: 8
-    - name: LEU
-      description: Line end delimiter unmask
-      bit_offset: 16
-      bit_size: 8
-    - name: FEU
-      description: Frame end delimiter unmask
-      bit_offset: 24
-      bit_size: 8
+  - name: FSU
+    description: Frame start delimiter unmask
+    bit_offset: 0
+    bit_size: 8
+  - name: LSU
+    description: Line start delimiter unmask
+    bit_offset: 8
+    bit_size: 8
+  - name: LEU
+    description: Line end delimiter unmask
+    bit_offset: 16
+    bit_size: 8
+  - name: FEU
+    description: Frame end delimiter unmask
+    bit_offset: 24
+    bit_size: 8
 fieldset/ICR:
  description: interrupt clear register
  fields:
-    - name: FRAME_ISC
-      description: Capture complete interrupt status clear
-      bit_offset: 0
-      bit_size: 1
-    - name: OVR_ISC
-      description: Overrun interrupt status clear
-      bit_offset: 1
-      bit_size: 1
-    - name: ERR_ISC
-      description: Synchronization error interrupt status clear
-      bit_offset: 2
-      bit_size: 1
-    - name: VSYNC_ISC
-      description: Vertical synch interrupt status clear
-      bit_offset: 3
-      bit_size: 1
-    - name: LINE_ISC
-      description: line interrupt status clear
-      bit_offset: 4
-      bit_size: 1
+  - name: FRAME_ISC
+    description: Capture complete interrupt status clear
+    bit_offset: 0
+    bit_size: 1
+  - name: OVR_ISC
+    description: Overrun interrupt status clear
+    bit_offset: 1
+    bit_size: 1
+  - name: ERR_ISC
+    description: Synchronization error interrupt status clear
+    bit_offset: 2
+    bit_size: 1
+  - name: VSYNC_ISC
+    description: Vertical synch interrupt status clear
+    bit_offset: 3
+    bit_size: 1
+  - name: LINE_ISC
+    description: line interrupt status clear
+    bit_offset: 4
+    bit_size: 1
 fieldset/IER:
  description: interrupt enable register
  fields:
-    - name: FRAME_IE
-      description: Capture complete interrupt enable
-      bit_offset: 0
-      bit_size: 1
-    - name: OVR_IE
-      description: Overrun interrupt enable
-      bit_offset: 1
-      bit_size: 1
-    - name: ERR_IE
-      description: Synchronization error interrupt enable
-      bit_offset: 2
-      bit_size: 1
-    - name: VSYNC_IE
-      description: VSYNC interrupt enable
-      bit_offset: 3
-      bit_size: 1
-    - name: LINE_IE
-      description: Line interrupt enable
-      bit_offset: 4
-      bit_size: 1
+  - name: FRAME_IE
+    description: Capture complete interrupt enable
+    bit_offset: 0
+    bit_size: 1
+  - name: OVR_IE
+    description: Overrun interrupt enable
+    bit_offset: 1
+    bit_size: 1
+  - name: ERR_IE
+    description: Synchronization error interrupt enable
+    bit_offset: 2
+    bit_size: 1
+  - name: VSYNC_IE
+    description: VSYNC interrupt enable
+    bit_offset: 3
+    bit_size: 1
+  - name: LINE_IE
+    description: Line interrupt enable
+    bit_offset: 4
+    bit_size: 1
 fieldset/MIS:
  description: masked interrupt status register
  fields:
-    - name: FRAME_MIS
-      description: Capture complete masked interrupt status
-      bit_offset: 0
-      bit_size: 1
-    - name: OVR_MIS
-      description: Overrun masked interrupt status
-      bit_offset: 1
-      bit_size: 1
-    - name: ERR_MIS
-      description: Synchronization error masked interrupt status
-      bit_offset: 2
-      bit_size: 1
-    - name: VSYNC_MIS
-      description: VSYNC masked interrupt status
-      bit_offset: 3
-      bit_size: 1
-    - name: LINE_MIS
-      description: Line masked interrupt status
-      bit_offset: 4
-      bit_size: 1
+  - name: FRAME_MIS
+    description: Capture complete masked interrupt status
+    bit_offset: 0
+    bit_size: 1
+  - name: OVR_MIS
+    description: Overrun masked interrupt status
+    bit_offset: 1
+    bit_size: 1
+  - name: ERR_MIS
+    description: Synchronization error masked interrupt status
+    bit_offset: 2
+    bit_size: 1
+  - name: VSYNC_MIS
+    description: VSYNC masked interrupt status
+    bit_offset: 3
+    bit_size: 1
+  - name: LINE_MIS
+    description: Line masked interrupt status
+    bit_offset: 4
+    bit_size: 1
 fieldset/RIS:
  description: raw interrupt status register
  fields:
-    - name: FRAME_RIS
-      description: Capture complete raw interrupt status
-      bit_offset: 0
-      bit_size: 1
-    - name: OVR_RIS
-      description: Overrun raw interrupt status
-      bit_offset: 1
-      bit_size: 1
-    - name: ERR_RIS
-      description: Synchronization error raw interrupt status
-      bit_offset: 2
-      bit_size: 1
-    - name: VSYNC_RIS
-      description: VSYNC raw interrupt status
-      bit_offset: 3
-      bit_size: 1
-    - name: LINE_RIS
-      description: Line raw interrupt status
-      bit_offset: 4
-      bit_size: 1
+  - name: FRAME_RIS
+    description: Capture complete raw interrupt status
+    bit_offset: 0
+    bit_size: 1
+  - name: OVR_RIS
+    description: Overrun raw interrupt status
+    bit_offset: 1
+    bit_size: 1
+  - name: ERR_RIS
+    description: Synchronization error raw interrupt status
+    bit_offset: 2
+    bit_size: 1
+  - name: VSYNC_RIS
+    description: VSYNC raw interrupt status
+    bit_offset: 3
+    bit_size: 1
+  - name: LINE_RIS
+    description: Line raw interrupt status
+    bit_offset: 4
+    bit_size: 1
 fieldset/SR:
  description: status register
  fields:
-    - name: HSYNC
-      description: HSYNC
-      bit_offset: 0
-      bit_size: 1
-    - name: VSYNC
-      description: VSYNC
-      bit_offset: 1
-      bit_size: 1
-    - name: FNE
-      description: FIFO not empty
-      bit_offset: 2
-      bit_size: 1
+  - name: HSYNC
+    description: HSYNC
+    bit_offset: 0
+    bit_size: 1
+  - name: VSYNC
+    description: VSYNC
+    bit_offset: 1
+    bit_size: 1
+  - name: FNE
+    description: FIFO not empty
+    bit_offset: 2
+    bit_size: 1
--- a/data/registers/dma2d_v1.yaml
+++ b/data/registers/dma2d_v1.yaml
--- a/data/registers/dma2d_v2.yaml
+++ b/data/registers/dma2d_v2.yaml
--- a/data/registers/dma_v1.yaml
+++ b/data/registers/dma_v1.yaml
@ -1,378 +1,377 @@
---
 block/DMA:
  description: DMA controller
  items:
-    - name: ISR
-      description: low interrupt status register
-      array:
-        len: 2
-        stride: 4
-      byte_offset: 0
-      access: Read
-      fieldset: IXR
-    - name: IFCR
-      description: low interrupt flag clear register
-      array:
-        len: 2
-        stride: 4
-      byte_offset: 8
-      access: Write
-      fieldset: IXR
-    - name: ST
-      description: "Stream cluster: S?CR, S?NDTR, S?M0AR, S?M1AR and S?FCR registers"
-      array:
-        len: 8
-        stride: 24
-      byte_offset: 16
-      block: ST
+  - name: ISR
+    description: low interrupt status register
+    array:
+      len: 2
+      stride: 4
+    byte_offset: 0
+    access: Read
+    fieldset: IXR
+  - name: IFCR
+    description: low interrupt flag clear register
+    array:
+      len: 2
+      stride: 4
+    byte_offset: 8
+    access: Write
+    fieldset: IXR
+  - name: ST
+    description: 'Stream cluster: S?CR, S?NDTR, S?M0AR, S?M1AR and S?FCR registers'
+    array:
+      len: 8
+      stride: 24
+    byte_offset: 16
+    block: ST
 block/ST:
-  description: "Stream cluster: S?CR, S?NDTR, S?M0AR, S?M1AR and S?FCR registers"
+  description: 'Stream cluster: S?CR, S?NDTR, S?M0AR, S?M1AR and S?FCR registers'
  items:
-    - name: CR
-      description: stream x configuration register
-      byte_offset: 0
-      fieldset: CR
-    - name: NDTR
-      description: stream x number of data register
-      byte_offset: 4
-      fieldset: NDTR
-    - name: PAR
-      description: stream x peripheral address register
-      byte_offset: 8
-    - name: M0AR
-      description: stream x memory 0 address register
-      byte_offset: 12
-    - name: M1AR
-      description: stream x memory 1 address register
-      byte_offset: 16
-    - name: FCR
-      description: stream x FIFO control register
-      byte_offset: 20
-      fieldset: FCR
+  - name: CR
+    description: stream x configuration register
+    byte_offset: 0
+    fieldset: CR
+  - name: NDTR
+    description: stream x number of data register
+    byte_offset: 4
+    fieldset: NDTR
+  - name: PAR
+    description: stream x peripheral address register
+    byte_offset: 8
+  - name: M0AR
+    description: stream x memory 0 address register
+    byte_offset: 12
+  - name: M1AR
+    description: stream x memory 1 address register
+    byte_offset: 16
+  - name: FCR
+    description: stream x FIFO control register
+    byte_offset: 20
+    fieldset: FCR
 fieldset/CR:
  description: stream x configuration register
  fields:
-    - name: EN
-      description: Stream enable / flag stream ready when read low
-      bit_offset: 0
-      bit_size: 1
-    - name: DMEIE
-      description: Direct mode error interrupt enable
-      bit_offset: 1
-      bit_size: 1
-    - name: TEIE
-      description: Transfer error interrupt enable
-      bit_offset: 2
-      bit_size: 1
-    - name: HTIE
-      description: Half transfer interrupt enable
-      bit_offset: 3
-      bit_size: 1
-    - name: TCIE
-      description: Transfer complete interrupt enable
-      bit_offset: 4
-      bit_size: 1
-    - name: PFCTRL
-      description: Peripheral flow controller
-      bit_offset: 5
-      bit_size: 1
-      enum: PFCTRL
-    - name: DIR
-      description: Data transfer direction
-      bit_offset: 6
-      bit_size: 2
-      enum: DIR
-    - name: CIRC
-      description: Circular mode
-      bit_offset: 8
-      bit_size: 1
-      enum: CIRC
-    - name: PINC
-      description: Peripheral increment mode
-      bit_offset: 9
-      bit_size: 1
-      enum: INC
-    - name: MINC
-      description: Memory increment mode
-      bit_offset: 10
-      bit_size: 1
-      enum: INC
-    - name: PSIZE
-      description: Peripheral data size
-      bit_offset: 11
-      bit_size: 2
-      enum: SIZE
-    - name: MSIZE
-      description: Memory data size
-      bit_offset: 13
-      bit_size: 2
-      enum: SIZE
-    - name: PINCOS
-      description: Peripheral increment offset size
-      bit_offset: 15
-      bit_size: 1
-      enum: PINCOS
-    - name: PL
-      description: Priority level
-      bit_offset: 16
-      bit_size: 2
-      enum: PL
-    - name: DBM
-      description: Double buffer mode
-      bit_offset: 18
-      bit_size: 1
-      enum: DBM
-    - name: CT
-      description: Current target (only in double buffer mode)
-      bit_offset: 19
-      bit_size: 1
-      enum: CT
-    - name: TRBUFF
-      description: Enable bufferable transfers
-      bit_offset: 20
-      bit_size: 1
-    - name: PBURST
-      description: Peripheral burst transfer configuration
-      bit_offset: 21
-      bit_size: 2
-      enum: BURST
-    - name: MBURST
-      description: Memory burst transfer configuration
-      bit_offset: 23
-      bit_size: 2
-      enum: BURST
+  - name: EN
+    description: Stream enable / flag stream ready when read low
+    bit_offset: 0
+    bit_size: 1
+  - name: DMEIE
+    description: Direct mode error interrupt enable
+    bit_offset: 1
+    bit_size: 1
+  - name: TEIE
+    description: Transfer error interrupt enable
+    bit_offset: 2
+    bit_size: 1
+  - name: HTIE
+    description: Half transfer interrupt enable
+    bit_offset: 3
+    bit_size: 1
+  - name: TCIE
+    description: Transfer complete interrupt enable
+    bit_offset: 4
+    bit_size: 1
+  - name: PFCTRL
+    description: Peripheral flow controller
+    bit_offset: 5
+    bit_size: 1
+    enum: PFCTRL
+  - name: DIR
+    description: Data transfer direction
+    bit_offset: 6
+    bit_size: 2
+    enum: DIR
+  - name: CIRC
+    description: Circular mode
+    bit_offset: 8
+    bit_size: 1
+    enum: CIRC
+  - name: PINC
+    description: Peripheral increment mode
+    bit_offset: 9
+    bit_size: 1
+    enum: INC
+  - name: MINC
+    description: Memory increment mode
+    bit_offset: 10
+    bit_size: 1
+    enum: INC
+  - name: PSIZE
+    description: Peripheral data size
+    bit_offset: 11
+    bit_size: 2
+    enum: SIZE
+  - name: MSIZE
+    description: Memory data size
+    bit_offset: 13
+    bit_size: 2
+    enum: SIZE
+  - name: PINCOS
+    description: Peripheral increment offset size
+    bit_offset: 15
+    bit_size: 1
+    enum: PINCOS
+  - name: PL
+    description: Priority level
+    bit_offset: 16
+    bit_size: 2
+    enum: PL
+  - name: DBM
+    description: Double buffer mode
+    bit_offset: 18
+    bit_size: 1
+    enum: DBM
+  - name: CT
+    description: Current target (only in double buffer mode)
+    bit_offset: 19
+    bit_size: 1
+    enum: CT
+  - name: TRBUFF
+    description: Enable bufferable transfers
+    bit_offset: 20
+    bit_size: 1
+  - name: PBURST
+    description: Peripheral burst transfer configuration
+    bit_offset: 21
+    bit_size: 2
+    enum: BURST
+  - name: MBURST
+    description: Memory burst transfer configuration
+    bit_offset: 23
+    bit_size: 2
+    enum: BURST
 fieldset/FCR:
  description: stream x FIFO control register
  fields:
-    - name: FTH
-      description: FIFO threshold selection
-      bit_offset: 0
-      bit_size: 2
-      enum: FTH
-    - name: DMDIS
-      description: Direct mode disable
-      bit_offset: 2
-      bit_size: 1
-      enum: DMDIS
-    - name: FS
-      description: FIFO status
-      bit_offset: 3
-      bit_size: 3
-      enum: FS
-    - name: FEIE
-      description: FIFO error interrupt enable
-      bit_offset: 7
-      bit_size: 1
+  - name: FTH
+    description: FIFO threshold selection
+    bit_offset: 0
+    bit_size: 2
+    enum: FTH
+  - name: DMDIS
+    description: Direct mode disable
+    bit_offset: 2
+    bit_size: 1
+    enum: DMDIS
+  - name: FS
+    description: FIFO status
+    bit_offset: 3
+    bit_size: 3
+    enum: FS
+  - name: FEIE
+    description: FIFO error interrupt enable
+    bit_offset: 7
+    bit_size: 1
 fieldset/IXR:
  description: interrupt register
  fields:
-    - name: FEIF
-      description: Stream x FIFO error interrupt flag (x=3..0)
-      bit_offset: 0
-      bit_size: 1
-      array:
-        offsets:
-          - 0
-          - 6
-          - 16
-          - 22
-    - name: DMEIF
-      description: Stream x direct mode error interrupt flag (x=3..0)
-      bit_offset: 2
-      bit_size: 1
-      array:
-        offsets:
-          - 0
-          - 6
-          - 16
-          - 22
-    - name: TEIF
-      description: Stream x transfer error interrupt flag (x=3..0)
-      bit_offset: 3
-      bit_size: 1
-      array:
-        offsets:
-          - 0
-          - 6
-          - 16
-          - 22
-    - name: HTIF
-      description: Stream x half transfer interrupt flag (x=3..0)
-      bit_offset: 4
-      bit_size: 1
-      array:
-        offsets:
-          - 0
-          - 6
-          - 16
-          - 22
-    - name: TCIF
-      description: Stream x transfer complete interrupt flag (x = 3..0)
-      bit_offset: 5
-      bit_size: 1
-      array:
-        offsets:
-          - 0
-          - 6
-          - 16
-          - 22
+  - name: FEIF
+    description: Stream x FIFO error interrupt flag (x=3..0)
+    bit_offset: 0
+    bit_size: 1
+    array:
+      offsets:
+      - 0
+      - 6
+      - 16
+      - 22
+  - name: DMEIF
+    description: Stream x direct mode error interrupt flag (x=3..0)
+    bit_offset: 2
+    bit_size: 1
+    array:
+      offsets:
+      - 0
+      - 6
+      - 16
+      - 22
+  - name: TEIF
+    description: Stream x transfer error interrupt flag (x=3..0)
+    bit_offset: 3
+    bit_size: 1
+    array:
+      offsets:
+      - 0
+      - 6
+      - 16
+      - 22
+  - name: HTIF
+    description: Stream x half transfer interrupt flag (x=3..0)
+    bit_offset: 4
+    bit_size: 1
+    array:
+      offsets:
+      - 0
+      - 6
+      - 16
+      - 22
+  - name: TCIF
+    description: Stream x transfer complete interrupt flag (x = 3..0)
+    bit_offset: 5
+    bit_size: 1
+    array:
+      offsets:
+      - 0
+      - 6
+      - 16
+      - 22
 fieldset/NDTR:
  description: stream x number of data register
  fields:
-    - name: NDT
-      description: Number of data items to transfer
-      bit_offset: 0
-      bit_size: 16
+  - name: NDT
+    description: Number of data items to transfer
+    bit_offset: 0
+    bit_size: 16
 enum/BURST:
  bit_size: 2
  variants:
-    - name: Single
-      description: Single transfer
-      value: 0
-    - name: INCR4
-      description: Incremental burst of 4 beats
-      value: 1
-    - name: INCR8
-      description: Incremental burst of 8 beats
-      value: 2
-    - name: INCR16
-      description: Incremental burst of 16 beats
-      value: 3
+  - name: Single
+    description: Single transfer
+    value: 0
+  - name: INCR4
+    description: Incremental burst of 4 beats
+    value: 1
+  - name: INCR8
+    description: Incremental burst of 8 beats
+    value: 2
+  - name: INCR16
+    description: Incremental burst of 16 beats
+    value: 3
 enum/CIRC:
  bit_size: 1
  variants:
-    - name: Disabled
-      description: Circular mode disabled
-      value: 0
-    - name: Enabled
-      description: Circular mode enabled
-      value: 1
+  - name: Disabled
+    description: Circular mode disabled
+    value: 0
+  - name: Enabled
+    description: Circular mode enabled
+    value: 1
 enum/CT:
  bit_size: 1
  variants:
-    - name: Memory0
-      description: The current target memory is Memory 0
-      value: 0
-    - name: Memory1
-      description: The current target memory is Memory 1
-      value: 1
+  - name: Memory0
+    description: The current target memory is Memory 0
+    value: 0
+  - name: Memory1
+    description: The current target memory is Memory 1
+    value: 1
 enum/DBM:
  bit_size: 1
  variants:
-    - name: Disabled
-      description: No buffer switching at the end of transfer
-      value: 0
-    - name: Enabled
-      description: Memory target switched at the end of the DMA transfer
-      value: 1
+  - name: Disabled
+    description: No buffer switching at the end of transfer
+    value: 0
+  - name: Enabled
+    description: Memory target switched at the end of the DMA transfer
+    value: 1
 enum/DIR:
  bit_size: 2
  variants:
-    - name: PeripheralToMemory
-      description: Peripheral-to-memory
-      value: 0
-    - name: MemoryToPeripheral
-      description: Memory-to-peripheral
-      value: 1
-    - name: MemoryToMemory
-      description: Memory-to-memory
-      value: 2
+  - name: PeripheralToMemory
+    description: Peripheral-to-memory
+    value: 0
+  - name: MemoryToPeripheral
+    description: Memory-to-peripheral
+    value: 1
+  - name: MemoryToMemory
+    description: Memory-to-memory
+    value: 2
 enum/DMDIS:
  bit_size: 1
  variants:
-    - name: Enabled
-      description: Direct mode is enabled
-      value: 0
-    - name: Disabled
-      description: Direct mode is disabled
-      value: 1
+  - name: Enabled
+    description: Direct mode is enabled
+    value: 0
+  - name: Disabled
+    description: Direct mode is disabled
+    value: 1
 enum/FS:
  bit_size: 3
  variants:
-    - name: Quarter1
-      description: 0 < fifo_level < 1/4
-      value: 0
-    - name: Quarter2
-      description: 1/4 <= fifo_level < 1/2
-      value: 1
-    - name: Quarter3
-      description: 1/2 <= fifo_level < 3/4
-      value: 2
-    - name: Quarter4
-      description: 3/4 <= fifo_level < full
-      value: 3
-    - name: Empty
-      description: FIFO is empty
-      value: 4
-    - name: Full
-      description: FIFO is full
-      value: 5
+  - name: Quarter1
+    description: 0 < fifo_level < 1/4
+    value: 0
+  - name: Quarter2
+    description: 1/4 <= fifo_level < 1/2
+    value: 1
+  - name: Quarter3
+    description: 1/2 <= fifo_level < 3/4
+    value: 2
+  - name: Quarter4
+    description: 3/4 <= fifo_level < full
+    value: 3
+  - name: Empty
+    description: FIFO is empty
+    value: 4
+  - name: Full
+    description: FIFO is full
+    value: 5
 enum/FTH:
  bit_size: 2
  variants:
-    - name: Quarter
-      description: 1/4 full FIFO
-      value: 0
-    - name: Half
-      description: 1/2 full FIFO
-      value: 1
-    - name: ThreeQuarters
-      description: 3/4 full FIFO
-      value: 2
-    - name: Full
-      description: Full FIFO
-      value: 3
+  - name: Quarter
+    description: 1/4 full FIFO
+    value: 0
+  - name: Half
+    description: 1/2 full FIFO
+    value: 1
+  - name: ThreeQuarters
+    description: 3/4 full FIFO
+    value: 2
+  - name: Full
+    description: Full FIFO
+    value: 3
 enum/INC:
  bit_size: 1
  variants:
-    - name: Fixed
-      description: Address pointer is fixed
-      value: 0
-    - name: Incremented
-      description: Address pointer is incremented after each data transfer
-      value: 1
+  - name: Fixed
+    description: Address pointer is fixed
+    value: 0
+  - name: Incremented
+    description: Address pointer is incremented after each data transfer
+    value: 1
 enum/PFCTRL:
  bit_size: 1
  variants:
-    - name: DMA
-      description: The DMA is the flow controller
-      value: 0
-    - name: Peripheral
-      description: The peripheral is the flow controller
-      value: 1
+  - name: DMA
+    description: The DMA is the flow controller
+    value: 0
+  - name: Peripheral
+    description: The peripheral is the flow controller
+    value: 1
 enum/PINCOS:
  bit_size: 1
  variants:
-    - name: PSIZE
-      description: The offset size for the peripheral address calculation is linked to the PSIZE
-      value: 0
-    - name: Fixed4
-      description: The offset size for the peripheral address calculation is fixed to 4 (32-bit alignment)
-      value: 1
+  - name: PSIZE
+    description: The offset size for the peripheral address calculation is linked to the PSIZE
+    value: 0
+  - name: Fixed4
+    description: The offset size for the peripheral address calculation is fixed to 4 (32-bit alignment)
+    value: 1
 enum/PL:
  bit_size: 2
  variants:
-    - name: Low
-      description: Low
-      value: 0
-    - name: Medium
-      description: Medium
-      value: 1
-    - name: High
-      description: High
-      value: 2
-    - name: VeryHigh
-      description: Very high
-      value: 3
+  - name: Low
+    description: Low
+    value: 0
+  - name: Medium
+    description: Medium
+    value: 1
+  - name: High
+    description: High
+    value: 2
+  - name: VeryHigh
+    description: Very high
+    value: 3
 enum/SIZE:
  bit_size: 2
  variants:
-    - name: Bits8
-      description: Byte (8-bit)
-      value: 0
-    - name: Bits16
-      description: Half-word (16-bit)
-      value: 1
-    - name: Bits32
-      description: Word (32-bit)
-      value: 2
+  - name: Bits8
+    description: Byte (8-bit)
+    value: 0
+  - name: Bits16
+    description: Half-word (16-bit)
+    value: 1
+  - name: Bits32
+    description: Word (32-bit)
+    value: 2
--- a/data/registers/dma_v2.yaml
+++ b/data/registers/dma_v2.yaml
@ -1,378 +1,377 @@
---
 block/DMA:
  description: DMA controller
  items:
-    - name: ISR
-      description: low interrupt status register
-      array:
-        len: 2
-        stride: 4
-      byte_offset: 0
-      access: Read
-      fieldset: IXR
-    - name: IFCR
-      description: low interrupt flag clear register
-      array:
-        len: 2
-        stride: 4
-      byte_offset: 8
-      access: Write
-      fieldset: IXR
-    - name: ST
-      description: "Stream cluster: S?CR, S?NDTR, S?M0AR, S?M1AR and S?FCR registers"
-      array:
-        len: 8
-        stride: 24
-      byte_offset: 16
-      block: ST
+  - name: ISR
+    description: low interrupt status register
+    array:
+      len: 2
+      stride: 4
+    byte_offset: 0
+    access: Read
+    fieldset: IXR
+  - name: IFCR
+    description: low interrupt flag clear register
+    array:
+      len: 2
+      stride: 4
+    byte_offset: 8
+    access: Write
+    fieldset: IXR
+  - name: ST
+    description: 'Stream cluster: S?CR, S?NDTR, S?M0AR, S?M1AR and S?FCR registers'
+    array:
+      len: 8
+      stride: 24
+    byte_offset: 16
+    block: ST
 block/ST:
-  description: "Stream cluster: S?CR, S?NDTR, S?M0AR, S?M1AR and S?FCR registers"
+  description: 'Stream cluster: S?CR, S?NDTR, S?M0AR, S?M1AR and S?FCR registers'
  items:
-    - name: CR
-      description: stream x configuration register
-      byte_offset: 0
-      fieldset: CR
-    - name: NDTR
-      description: stream x number of data register
-      byte_offset: 4
-      fieldset: NDTR
-    - name: PAR
-      description: stream x peripheral address register
-      byte_offset: 8
-    - name: M0AR
-      description: stream x memory 0 address register
-      byte_offset: 12
-    - name: M1AR
-      description: stream x memory 1 address register
-      byte_offset: 16
-    - name: FCR
-      description: stream x FIFO control register
-      byte_offset: 20
-      fieldset: FCR
+  - name: CR
+    description: stream x configuration register
+    byte_offset: 0
+    fieldset: CR
+  - name: NDTR
+    description: stream x number of data register
+    byte_offset: 4
+    fieldset: NDTR
+  - name: PAR
+    description: stream x peripheral address register
+    byte_offset: 8
+  - name: M0AR
+    description: stream x memory 0 address register
+    byte_offset: 12
+  - name: M1AR
+    description: stream x memory 1 address register
+    byte_offset: 16
+  - name: FCR
+    description: stream x FIFO control register
+    byte_offset: 20
+    fieldset: FCR
 fieldset/CR:
  description: stream x configuration register
  fields:
-    - name: EN
-      description: Stream enable / flag stream ready when read low
-      bit_offset: 0
-      bit_size: 1
-    - name: DMEIE
-      description: Direct mode error interrupt enable
-      bit_offset: 1
-      bit_size: 1
-    - name: TEIE
-      description: Transfer error interrupt enable
-      bit_offset: 2
-      bit_size: 1
-    - name: HTIE
-      description: Half transfer interrupt enable
-      bit_offset: 3
-      bit_size: 1
-    - name: TCIE
-      description: Transfer complete interrupt enable
-      bit_offset: 4
-      bit_size: 1
-    - name: PFCTRL
-      description: Peripheral flow controller
-      bit_offset: 5
-      bit_size: 1
-      enum: PFCTRL
-    - name: DIR
-      description: Data transfer direction
-      bit_offset: 6
-      bit_size: 2
-      enum: DIR
-    - name: CIRC
-      description: Circular mode
-      bit_offset: 8
-      bit_size: 1
-      enum: CIRC
-    - name: PINC
-      description: Peripheral increment mode
-      bit_offset: 9
-      bit_size: 1
-      enum: INC
-    - name: MINC
-      description: Memory increment mode
-      bit_offset: 10
-      bit_size: 1
-      enum: INC
-    - name: PSIZE
-      description: Peripheral data size
-      bit_offset: 11
-      bit_size: 2
-      enum: SIZE
-    - name: MSIZE
-      description: Memory data size
-      bit_offset: 13
-      bit_size: 2
-      enum: SIZE
-    - name: PINCOS
-      description: Peripheral increment offset size
-      bit_offset: 15
-      bit_size: 1
-      enum: PINCOS
-    - name: PL
-      description: Priority level
-      bit_offset: 16
-      bit_size: 2
-      enum: PL
-    - name: DBM
-      description: Double buffer mode
-      bit_offset: 18
-      bit_size: 1
-      enum: DBM
-    - name: CT
-      description: Current target (only in double buffer mode)
-      bit_offset: 19
-      bit_size: 1
-      enum: CT
-    - name: PBURST
-      description: Peripheral burst transfer configuration
-      bit_offset: 21
-      bit_size: 2
-      enum: BURST
-    - name: MBURST
-      description: Memory burst transfer configuration
-      bit_offset: 23
-      bit_size: 2
-      enum: BURST
-    - name: CHSEL
-      description: Channel selection
-      bit_offset: 25
-      bit_size: 4
+  - name: EN
+    description: Stream enable / flag stream ready when read low
+    bit_offset: 0
+    bit_size: 1
+  - name: DMEIE
+    description: Direct mode error interrupt enable
+    bit_offset: 1
+    bit_size: 1
+  - name: TEIE
+    description: Transfer error interrupt enable
+    bit_offset: 2
+    bit_size: 1
+  - name: HTIE
+    description: Half transfer interrupt enable
+    bit_offset: 3
+    bit_size: 1
+  - name: TCIE
+    description: Transfer complete interrupt enable
+    bit_offset: 4
+    bit_size: 1
+  - name: PFCTRL
+    description: Peripheral flow controller
+    bit_offset: 5
+    bit_size: 1
+    enum: PFCTRL
+  - name: DIR
+    description: Data transfer direction
+    bit_offset: 6
+    bit_size: 2
+    enum: DIR
+  - name: CIRC
+    description: Circular mode
+    bit_offset: 8
+    bit_size: 1
+    enum: CIRC
+  - name: PINC
+    description: Peripheral increment mode
+    bit_offset: 9
+    bit_size: 1
+    enum: INC
+  - name: MINC
+    description: Memory increment mode
+    bit_offset: 10
+    bit_size: 1
+    enum: INC
+  - name: PSIZE
+    description: Peripheral data size
+    bit_offset: 11
+    bit_size: 2
+    enum: SIZE
+  - name: MSIZE
+    description: Memory data size
+    bit_offset: 13
+    bit_size: 2
+    enum: SIZE
+  - name: PINCOS
+    description: Peripheral increment offset size
+    bit_offset: 15
+    bit_size: 1
+    enum: PINCOS
+  - name: PL
+    description: Priority level
+    bit_offset: 16
+    bit_size: 2
+    enum: PL
+  - name: DBM
+    description: Double buffer mode
+    bit_offset: 18
+    bit_size: 1
+    enum: DBM
+  - name: CT
+    description: Current target (only in double buffer mode)
+    bit_offset: 19
+    bit_size: 1
+    enum: CT
+  - name: PBURST
+    description: Peripheral burst transfer configuration
+    bit_offset: 21
+    bit_size: 2
+    enum: BURST
+  - name: MBURST
+    description: Memory burst transfer configuration
+    bit_offset: 23
+    bit_size: 2
+    enum: BURST
+  - name: CHSEL
+    description: Channel selection
+    bit_offset: 25
+    bit_size: 4
 fieldset/FCR:
  description: stream x FIFO control register
  fields:
-    - name: FTH
-      description: FIFO threshold selection
-      bit_offset: 0
-      bit_size: 2
-      enum: FTH
-    - name: DMDIS
-      description: Direct mode disable
-      bit_offset: 2
-      bit_size: 1
-      enum: DMDIS
-    - name: FS
-      description: FIFO status
-      bit_offset: 3
-      bit_size: 3
-      enum: FS
-    - name: FEIE
-      description: FIFO error interrupt enable
-      bit_offset: 7
-      bit_size: 1
+  - name: FTH
+    description: FIFO threshold selection
+    bit_offset: 0
+    bit_size: 2
+    enum: FTH
+  - name: DMDIS
+    description: Direct mode disable
+    bit_offset: 2
+    bit_size: 1
+    enum: DMDIS
+  - name: FS
+    description: FIFO status
+    bit_offset: 3
+    bit_size: 3
+    enum: FS
+  - name: FEIE
+    description: FIFO error interrupt enable
+    bit_offset: 7
+    bit_size: 1
 fieldset/IXR:
  description: interrupt register
  fields:
-    - name: FEIF
-      description: Stream x FIFO error interrupt flag (x=3..0)
-      bit_offset: 0
-      bit_size: 1
-      array:
-        offsets:
-          - 0
-          - 6
-          - 16
-          - 22
-    - name: DMEIF
-      description: Stream x direct mode error interrupt flag (x=3..0)
-      bit_offset: 2
-      bit_size: 1
-      array:
-        offsets:
-          - 0
-          - 6
-          - 16
-          - 22
-    - name: TEIF
-      description: Stream x transfer error interrupt flag (x=3..0)
-      bit_offset: 3
-      bit_size: 1
-      array:
-        offsets:
-          - 0
-          - 6
-          - 16
-          - 22
-    - name: HTIF
-      description: Stream x half transfer interrupt flag (x=3..0)
-      bit_offset: 4
-      bit_size: 1
-      array:
-        offsets:
-          - 0
-          - 6
-          - 16
-          - 22
-    - name: TCIF
-      description: Stream x transfer complete interrupt flag (x = 3..0)
-      bit_offset: 5
-      bit_size: 1
-      array:
-        offsets:
-          - 0
-          - 6
-          - 16
-          - 22
+  - name: FEIF
+    description: Stream x FIFO error interrupt flag (x=3..0)
+    bit_offset: 0
+    bit_size: 1
+    array:
+      offsets:
+      - 0
+      - 6
+      - 16
+      - 22
+  - name: DMEIF
+    description: Stream x direct mode error interrupt flag (x=3..0)
+    bit_offset: 2
+    bit_size: 1
+    array:
+      offsets:
+      - 0
+      - 6
+      - 16
+      - 22
+  - name: TEIF
+    description: Stream x transfer error interrupt flag (x=3..0)
+    bit_offset: 3
+    bit_size: 1
+    array:
+      offsets:
+      - 0
+      - 6
+      - 16
+      - 22
+  - name: HTIF
+    description: Stream x half transfer interrupt flag (x=3..0)
+    bit_offset: 4
+    bit_size: 1
+    array:
+      offsets:
+      - 0
+      - 6
+      - 16
+      - 22
+  - name: TCIF
+    description: Stream x transfer complete interrupt flag (x = 3..0)
+    bit_offset: 5
+    bit_size: 1
+    array:
+      offsets:
+      - 0
+      - 6
+      - 16
+      - 22
 fieldset/NDTR:
  description: stream x number of data register
  fields:
-    - name: NDT
-      description: Number of data items to transfer
-      bit_offset: 0
-      bit_size: 16
+  - name: NDT
+    description: Number of data items to transfer
+    bit_offset: 0
+    bit_size: 16
 enum/BURST:
  bit_size: 2
  variants:
-    - name: Single
-      description: Single transfer
-      value: 0
-    - name: INCR4
-      description: Incremental burst of 4 beats
-      value: 1
-    - name: INCR8
-      description: Incremental burst of 8 beats
-      value: 2
-    - name: INCR16
-      description: Incremental burst of 16 beats
-      value: 3
+  - name: Single
+    description: Single transfer
+    value: 0
+  - name: INCR4
+    description: Incremental burst of 4 beats
+    value: 1
+  - name: INCR8
+    description: Incremental burst of 8 beats
+    value: 2
+  - name: INCR16
+    description: Incremental burst of 16 beats
+    value: 3
 enum/CIRC:
  bit_size: 1
  variants:
-    - name: Disabled
-      description: Circular mode disabled
-      value: 0
-    - name: Enabled
-      description: Circular mode enabled
-      value: 1
+  - name: Disabled
+    description: Circular mode disabled
+    value: 0
+  - name: Enabled
+    description: Circular mode enabled
+    value: 1
 enum/CT:
  bit_size: 1
  variants:
-    - name: Memory0
-      description: The current target memory is Memory 0
-      value: 0
-    - name: Memory1
-      description: The current target memory is Memory 1
-      value: 1
+  - name: Memory0
+    description: The current target memory is Memory 0
+    value: 0
+  - name: Memory1
+    description: The current target memory is Memory 1
+    value: 1
 enum/DBM:
  bit_size: 1
  variants:
-    - name: Disabled
-      description: No buffer switching at the end of transfer
-      value: 0
-    - name: Enabled
-      description: Memory target switched at the end of the DMA transfer
-      value: 1
+  - name: Disabled
+    description: No buffer switching at the end of transfer
+    value: 0
+  - name: Enabled
+    description: Memory target switched at the end of the DMA transfer
+    value: 1
 enum/DIR:
  bit_size: 2
  variants:
-    - name: PeripheralToMemory
-      description: Peripheral-to-memory
-      value: 0
-    - name: MemoryToPeripheral
-      description: Memory-to-peripheral
-      value: 1
-    - name: MemoryToMemory
-      description: Memory-to-memory
-      value: 2
+  - name: PeripheralToMemory
+    description: Peripheral-to-memory
+    value: 0
+  - name: MemoryToPeripheral
+    description: Memory-to-peripheral
+    value: 1
+  - name: MemoryToMemory
+    description: Memory-to-memory
+    value: 2
 enum/DMDIS:
  bit_size: 1
  variants:
-    - name: Enabled
-      description: Direct mode is enabled
-      value: 0
-    - name: Disabled
-      description: Direct mode is disabled
-      value: 1
+  - name: Enabled
+    description: Direct mode is enabled
+    value: 0
+  - name: Disabled
+    description: Direct mode is disabled
+    value: 1
 enum/FS:
  bit_size: 3
  variants:
-    - name: Quarter1
-      description: 0 < fifo_level < 1/4
-      value: 0
-    - name: Quarter2
-      description: 1/4 <= fifo_level < 1/2
-      value: 1
-    - name: Quarter3
-      description: 1/2 <= fifo_level < 3/4
-      value: 2
-    - name: Quarter4
-      description: 3/4 <= fifo_level < full
-      value: 3
-    - name: Empty
-      description: FIFO is empty
-      value: 4
-    - name: Full
-      description: FIFO is full
-      value: 5
+  - name: Quarter1
+    description: 0 < fifo_level < 1/4
+    value: 0
+  - name: Quarter2
+    description: 1/4 <= fifo_level < 1/2
+    value: 1
+  - name: Quarter3
+    description: 1/2 <= fifo_level < 3/4
+    value: 2
+  - name: Quarter4
+    description: 3/4 <= fifo_level < full
+    value: 3
+  - name: Empty
+    description: FIFO is empty
+    value: 4
+  - name: Full
+    description: FIFO is full
+    value: 5
 enum/FTH:
  bit_size: 2
  variants:
-    - name: Quarter
-      description: 1/4 full FIFO
-      value: 0
-    - name: Half
-      description: 1/2 full FIFO
-      value: 1
-    - name: ThreeQuarters
-      description: 3/4 full FIFO
-      value: 2
-    - name: Full
-      description: Full FIFO
-      value: 3
+  - name: Quarter
+    description: 1/4 full FIFO
+    value: 0
+  - name: Half
+    description: 1/2 full FIFO
+    value: 1
+  - name: ThreeQuarters
+    description: 3/4 full FIFO
+    value: 2
+  - name: Full
+    description: Full FIFO
+    value: 3
 enum/INC:
  bit_size: 1
  variants:
-    - name: Fixed
-      description: Address pointer is fixed
-      value: 0
-    - name: Incremented
-      description: Address pointer is incremented after each data transfer
-      value: 1
+  - name: Fixed
+    description: Address pointer is fixed
+    value: 0
+  - name: Incremented
+    description: Address pointer is incremented after each data transfer
+    value: 1
 enum/PFCTRL:
  bit_size: 1
  variants:
-    - name: DMA
-      description: The DMA is the flow controller
-      value: 0
-    - name: Peripheral
-      description: The peripheral is the flow controller
-      value: 1
+  - name: DMA
+    description: The DMA is the flow controller
+    value: 0
+  - name: Peripheral
+    description: The peripheral is the flow controller
+    value: 1
 enum/PINCOS:
  bit_size: 1
  variants:
-    - name: PSIZE
-      description: The offset size for the peripheral address calculation is linked to the PSIZE
-      value: 0
-    - name: Fixed4
-      description: The offset size for the peripheral address calculation is fixed to 4 (32-bit alignment)
-      value: 1
+  - name: PSIZE
+    description: The offset size for the peripheral address calculation is linked to the PSIZE
+    value: 0
+  - name: Fixed4
+    description: The offset size for the peripheral address calculation is fixed to 4 (32-bit alignment)
+    value: 1
 enum/PL:
  bit_size: 2
  variants:
-    - name: Low
-      description: Low
-      value: 0
-    - name: Medium
-      description: Medium
-      value: 1
-    - name: High
-      description: High
-      value: 2
-    - name: VeryHigh
-      description: Very high
-      value: 3
+  - name: Low
+    description: Low
+    value: 0
+  - name: Medium
+    description: Medium
+    value: 1
+  - name: High
+    description: High
+    value: 2
+  - name: VeryHigh
+    description: Very high
+    value: 3
 enum/SIZE:
  bit_size: 2
  variants:
-    - name: Bits8
-      description: Byte (8-bit)
-      value: 0
-    - name: Bits16
-      description: Half-word (16-bit)
-      value: 1
-    - name: Bits32
-      description: Word (32-bit)
-      value: 2
+  - name: Bits8
+    description: Byte (8-bit)
+    value: 0
+  - name: Bits16
+    description: Half-word (16-bit)
+    value: 1
+  - name: Bits32
+    description: Word (32-bit)
+    value: 2
--- a/data/registers/dmamux_v1.yaml
+++ b/data/registers/dmamux_v1.yaml
@ -1,129 +1,128 @@
---
 block/DMAMUX:
  description: DMAMUX
  items:
-    - name: CCR
-      description: DMAMux - DMA request line multiplexer channel x control register
-      array:
-        len: 16
-        stride: 4
-      byte_offset: 0
-      fieldset: CCR
-    - name: CSR
-      description: DMAMUX request line multiplexer interrupt channel status register
-      byte_offset: 128
-      access: Read
-      fieldset: CSR
-    - name: CFR
-      description: DMAMUX request line multiplexer interrupt clear flag register
-      byte_offset: 132
-      access: Write
-      fieldset: CSR
-    - name: RGCR
-      description: DMAMux - DMA request generator channel x control register
-      array:
-        len: 8
-        stride: 4
-      byte_offset: 256
-      fieldset: RGCR
-    - name: RGSR
-      description: DMAMux - DMA request generator status register
-      byte_offset: 320
-      access: Read
-      fieldset: RGSR
-    - name: RGCFR
-      description: DMAMux - DMA request generator clear flag register
-      byte_offset: 324
-      access: Write
-      fieldset: RGSR
+  - name: CCR
+    description: DMAMux - DMA request line multiplexer channel x control register
+    array:
+      len: 16
+      stride: 4
+    byte_offset: 0
+    fieldset: CCR
+  - name: CSR
+    description: DMAMUX request line multiplexer interrupt channel status register
+    byte_offset: 128
+    access: Read
+    fieldset: CSR
+  - name: CFR
+    description: DMAMUX request line multiplexer interrupt clear flag register
+    byte_offset: 132
+    access: Write
+    fieldset: CSR
+  - name: RGCR
+    description: DMAMux - DMA request generator channel x control register
+    array:
+      len: 8
+      stride: 4
+    byte_offset: 256
+    fieldset: RGCR
+  - name: RGSR
+    description: DMAMux - DMA request generator status register
+    byte_offset: 320
+    access: Read
+    fieldset: RGSR
+  - name: RGCFR
+    description: DMAMux - DMA request generator clear flag register
+    byte_offset: 324
+    access: Write
+    fieldset: RGSR
 fieldset/CCR:
  description: DMAMux - DMA request line multiplexer channel x control register
  fields:
-    - name: DMAREQ_ID
-      description: Input DMA request line selected
-      bit_offset: 0
-      bit_size: 8
-    - name: SOIE
-      description: Interrupt enable at synchronization event overrun
-      bit_offset: 8
-      bit_size: 1
-    - name: EGE
-      description: Event generation enable/disable
-      bit_offset: 9
-      bit_size: 1
-    - name: SE
-      description: Synchronous operating mode enable/disable
-      bit_offset: 16
-      bit_size: 1
-    - name: SPOL
-      description: "Synchronization event type selector Defines the synchronization event on the selected synchronization input:"
-      bit_offset: 17
-      bit_size: 2
-      enum: POL
-    - name: NBREQ
-      description: "Number of DMA requests to forward Defines the number of DMA requests forwarded before output event is generated. In synchronous mode, it also defines the number of DMA requests to forward after a synchronization event, then stop forwarding. The actual number of DMA requests forwarded is NBREQ+1. Note: This field can only be written when both SE and EGE bits are reset."
-      bit_offset: 19
-      bit_size: 5
-    - name: SYNC_ID
-      description: Synchronization input selected
-      bit_offset: 24
-      bit_size: 5
+  - name: DMAREQ_ID
+    description: Input DMA request line selected
+    bit_offset: 0
+    bit_size: 8
+  - name: SOIE
+    description: Interrupt enable at synchronization event overrun
+    bit_offset: 8
+    bit_size: 1
+  - name: EGE
+    description: Event generation enable/disable
+    bit_offset: 9
+    bit_size: 1
+  - name: SE
+    description: Synchronous operating mode enable/disable
+    bit_offset: 16
+    bit_size: 1
+  - name: SPOL
+    description: 'Synchronization event type selector Defines the synchronization event on the selected synchronization input:'
+    bit_offset: 17
+    bit_size: 2
+    enum: POL
+  - name: NBREQ
+    description: 'Number of DMA requests to forward Defines the number of DMA requests forwarded before output event is generated. In synchronous mode, it also defines the number of DMA requests to forward after a synchronization event, then stop forwarding. The actual number of DMA requests forwarded is NBREQ+1. Note: This field can only be written when both SE and EGE bits are reset.'
+    bit_offset: 19
+    bit_size: 5
+  - name: SYNC_ID
+    description: Synchronization input selected
+    bit_offset: 24
+    bit_size: 5
 fieldset/CSR:
  description: DMAMUX request line multiplexer interrupt channel status register
  fields:
-    - name: SOF
-      description: Synchronization overrun event flag
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 16
-        stride: 1
+  - name: SOF
+    description: Synchronization overrun event flag
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 16
+      stride: 1
 fieldset/RGCR:
  description: DMAMux - DMA request generator channel x control register
  fields:
-    - name: SIG_ID
-      description: DMA request trigger input selected
-      bit_offset: 0
-      bit_size: 5
-    - name: OIE
-      description: Interrupt enable at trigger event overrun
-      bit_offset: 8
-      bit_size: 1
-    - name: GE
-      description: DMA request generator channel enable/disable
-      bit_offset: 16
-      bit_size: 1
-    - name: GPOL
-      description: DMA request generator trigger event type selection Defines the trigger event on the selected DMA request trigger input
-      bit_offset: 17
-      bit_size: 2
-      enum: POL
-    - name: GNBREQ
-      description: "Number of DMA requests to generate Defines the number of DMA requests generated after a trigger event, then stop generating. The actual number of generated DMA requests is GNBREQ+1. Note: This field can only be written when GE bit is reset."
-      bit_offset: 19
-      bit_size: 5
+  - name: SIG_ID
+    description: DMA request trigger input selected
+    bit_offset: 0
+    bit_size: 5
+  - name: OIE
+    description: Interrupt enable at trigger event overrun
+    bit_offset: 8
+    bit_size: 1
+  - name: GE
+    description: DMA request generator channel enable/disable
+    bit_offset: 16
+    bit_size: 1
+  - name: GPOL
+    description: DMA request generator trigger event type selection Defines the trigger event on the selected DMA request trigger input
+    bit_offset: 17
+    bit_size: 2
+    enum: POL
+  - name: GNBREQ
+    description: 'Number of DMA requests to generate Defines the number of DMA requests generated after a trigger event, then stop generating. The actual number of generated DMA requests is GNBREQ+1. Note: This field can only be written when GE bit is reset.'
+    bit_offset: 19
+    bit_size: 5
 fieldset/RGSR:
  description: DMAMux - DMA request generator status register
  fields:
-    - name: OF
-      description: "Trigger event overrun flag The flag is set when a trigger event occurs on DMA request generator channel x, while the DMA request generator counter value is lower than GNBREQ. The flag is cleared by writing 1 to the corresponding COFx bit in DMAMUX_RGCFR register."
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 8
-        stride: 1
+  - name: OF
+    description: Trigger event overrun flag The flag is set when a trigger event occurs on DMA request generator channel x, while the DMA request generator counter value is lower than GNBREQ. The flag is cleared by writing 1 to the corresponding COFx bit in DMAMUX_RGCFR register.
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 8
+      stride: 1
 enum/POL:
  bit_size: 2
  variants:
-    - name: NoEdge
-      description: "No event, i.e. no synchronization nor detection"
-      value: 0
-    - name: RisingEdge
-      description: Rising edge
-      value: 1
-    - name: FallingEdge
-      description: Falling edge
-      value: 2
-    - name: BothEdges
-      description: Rising and falling edges
-      value: 3
+  - name: NoEdge
+    description: No event, i.e. no synchronization nor detection
+    value: 0
+  - name: RisingEdge
+    description: Rising edge
+    value: 1
+  - name: FallingEdge
+    description: Falling edge
+    value: 2
+  - name: BothEdges
+    description: Rising and falling edges
+    value: 3
--- a/data/registers/eth_v1a.yaml
+++ b/data/registers/eth_v1a.yaml
--- a/data/registers/eth_v1b.yaml
+++ b/data/registers/eth_v1b.yaml
--- a/data/registers/eth_v1c.yaml
+++ b/data/registers/eth_v1c.yaml
--- a/data/registers/eth_v2.yaml
+++ b/data/registers/eth_v2.yaml
--- a/data/registers/exti_c0.yaml
+++ b/data/registers/exti_c0.yaml
@ -1,80 +1,79 @@
---
 block/EXTI:
  description: External interrupt/event controller
  items:
-    - name: RTSR
-      description: Rising Trigger selection register
-      array:
-        len: 1
-        stride: 40
-      byte_offset: 0
-      fieldset: LINES
-    - name: FTSR
-      description: Falling Trigger selection register
-      array:
-        len: 1
-        stride: 40
-      byte_offset: 4
-      fieldset: LINES
-    - name: SWIER
-      description: Software interrupt event register
-      array:
-        len: 1
-        stride: 40
-      byte_offset: 8
-      fieldset: LINES
-    - name: RPR
-      description: Rising pending register
-      array:
-        len: 1
-        stride: 40
-      byte_offset: 12
-      fieldset: LINES
-    - name: FPR
-      description: Falling pending register
-      array:
-        len: 1
-        stride: 40
-      byte_offset: 16
-      fieldset: LINES
-    - name: EXTICR
-      description: Configuration register
-      array:
-        len: 4
-        stride: 4
-      byte_offset: 96
-      fieldset: EXTICR
-    - name: IMR
-      description: Interrupt mask register
-      array:
-        len: 1
-        stride: 16
-      byte_offset: 128
-      fieldset: LINES
-    - name: EMR
-      description: Event mask register
-      array:
-        len: 1
-        stride: 16
-      byte_offset: 132
-      fieldset: LINES
+  - name: RTSR
+    description: Rising Trigger selection register
+    array:
+      len: 1
+      stride: 40
+    byte_offset: 0
+    fieldset: LINES
+  - name: FTSR
+    description: Falling Trigger selection register
+    array:
+      len: 1
+      stride: 40
+    byte_offset: 4
+    fieldset: LINES
+  - name: SWIER
+    description: Software interrupt event register
+    array:
+      len: 1
+      stride: 40
+    byte_offset: 8
+    fieldset: LINES
+  - name: RPR
+    description: Rising pending register
+    array:
+      len: 1
+      stride: 40
+    byte_offset: 12
+    fieldset: LINES
+  - name: FPR
+    description: Falling pending register
+    array:
+      len: 1
+      stride: 40
+    byte_offset: 16
+    fieldset: LINES
+  - name: EXTICR
+    description: Configuration register
+    array:
+      len: 4
+      stride: 4
+    byte_offset: 96
+    fieldset: EXTICR
+  - name: IMR
+    description: Interrupt mask register
+    array:
+      len: 1
+      stride: 16
+    byte_offset: 128
+    fieldset: LINES
+  - name: EMR
+    description: Event mask register
+    array:
+      len: 1
+      stride: 16
+    byte_offset: 132
+    fieldset: LINES
 fieldset/EXTICR:
  description: external interrupt configuration register 1
  fields:
-    - name: EXTI
-      description: EXTI configuration bits
-      bit_offset: 0
-      bit_size: 8
-      array:
-        len: 4
-        stride: 8
+  - name: EXTI
+    description: EXTI configuration bits
+    bit_offset: 0
+    bit_size: 8
+    array:
+      len: 4
+      stride: 8
 fieldset/LINES:
-  description: "EXTI lines register, 1 bit per line"
+  description: EXTI lines register, 1 bit per line
  fields:
-    - name: LINE
-      description: EXTI line
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 32
-        stride: 1
+  - name: LINE
+    description: EXTI line
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 32
+      stride: 1
--- a/data/registers/exti_g0.yaml
+++ b/data/registers/exti_g0.yaml
@ -1,80 +1,79 @@
---
 block/EXTI:
  description: External interrupt/event controller
  items:
-    - name: RTSR
-      description: Rising Trigger selection register
-      array:
-        len: 2
-        stride: 40
-      byte_offset: 0
-      fieldset: LINES
-    - name: FTSR
-      description: Falling Trigger selection register
-      array:
-        len: 2
-        stride: 40
-      byte_offset: 4
-      fieldset: LINES
-    - name: SWIER
-      description: Software interrupt event register
-      array:
-        len: 2
-        stride: 40
-      byte_offset: 8
-      fieldset: LINES
-    - name: RPR
-      description: Rising pending register
-      array:
-        len: 2
-        stride: 40
-      byte_offset: 12
-      fieldset: LINES
-    - name: FPR
-      description: Falling pending register
-      array:
-        len: 2
-        stride: 40
-      byte_offset: 16
-      fieldset: LINES
-    - name: EXTICR
-      description: Configuration register
-      array:
-        len: 4
-        stride: 4
-      byte_offset: 96
-      fieldset: EXTICR
-    - name: IMR
-      description: Interrupt mask register
-      array:
-        len: 2
-        stride: 16
-      byte_offset: 128
-      fieldset: LINES
-    - name: EMR
-      description: Event mask register
-      array:
-        len: 2
-        stride: 16
-      byte_offset: 132
-      fieldset: LINES
+  - name: RTSR
+    description: Rising Trigger selection register
+    array:
+      len: 2
+      stride: 40
+    byte_offset: 0
+    fieldset: LINES
+  - name: FTSR
+    description: Falling Trigger selection register
+    array:
+      len: 2
+      stride: 40
+    byte_offset: 4
+    fieldset: LINES
+  - name: SWIER
+    description: Software interrupt event register
+    array:
+      len: 2
+      stride: 40
+    byte_offset: 8
+    fieldset: LINES
+  - name: RPR
+    description: Rising pending register
+    array:
+      len: 2
+      stride: 40
+    byte_offset: 12
+    fieldset: LINES
+  - name: FPR
+    description: Falling pending register
+    array:
+      len: 2
+      stride: 40
+    byte_offset: 16
+    fieldset: LINES
+  - name: EXTICR
+    description: Configuration register
+    array:
+      len: 4
+      stride: 4
+    byte_offset: 96
+    fieldset: EXTICR
+  - name: IMR
+    description: Interrupt mask register
+    array:
+      len: 2
+      stride: 16
+    byte_offset: 128
+    fieldset: LINES
+  - name: EMR
+    description: Event mask register
+    array:
+      len: 2
+      stride: 16
+    byte_offset: 132
+    fieldset: LINES
 fieldset/EXTICR:
  description: external interrupt configuration register 1
  fields:
-    - name: EXTI
-      description: EXTI configuration bits
-      bit_offset: 0
-      bit_size: 8
-      array:
-        len: 4
-        stride: 8
+  - name: EXTI
+    description: EXTI configuration bits
+    bit_offset: 0
+    bit_size: 8
+    array:
+      len: 4
+      stride: 8
 fieldset/LINES:
-  description: "EXTI lines register, 1 bit per line"
+  description: EXTI lines register, 1 bit per line
  fields:
-    - name: LINE
-      description: EXTI line
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 32
-        stride: 1
+  - name: LINE
+    description: EXTI line
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 32
+      stride: 1
--- a/data/registers/exti_h5.yaml
+++ b/data/registers/exti_h5.yaml
@ -1,145 +1,144 @@
---
 block/EXTI:
  description: Extended interrupt and event controller
  items:
-    - name: RTSR
-      description: rising trigger selection register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 0
-      fieldset: LINES
-    - name: FTSR
-      description: falling trigger selection register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 4
-      fieldset: LINES
-    - name: SWIER
-      description: software interrupt event register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 8
-      fieldset: LINES
-    - name: RPR
-      description: rising edge pending register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 12
-      fieldset: LINES
-    - name: FPR
-      description: falling edge pending register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 16
-      fieldset: LINES
-    - name: SECCFGR
-      description: security configuration register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 20
-      fieldset: SEC
-    - name: PRIVCFGR
-      description: privilege configuration register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 24
-      fieldset: PRIV
-    - name: EXTICR
-      description: external interrupt selection register
-      array:
-        len: 4
-        stride: 4
-      byte_offset: 96
-      fieldset: EXTI
-    - name: LOCKR
-      description: lock register
-      byte_offset: 112
-      fieldset: LOCKR
-    - name: IMR
-      description: CPU wakeup with interrupt mask register
-      array:
-        len: 2
-        stride: 16
-      byte_offset: 128
-      fieldset: LINES
-    - name: EMR
-      description: CPU wakeup with event mask register
-      array:
-        len: 2
-        stride: 16
-      byte_offset: 132
-      fieldset: LINES
+  - name: RTSR
+    description: rising trigger selection register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 0
+    fieldset: LINES
+  - name: FTSR
+    description: falling trigger selection register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 4
+    fieldset: LINES
+  - name: SWIER
+    description: software interrupt event register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 8
+    fieldset: LINES
+  - name: RPR
+    description: rising edge pending register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 12
+    fieldset: LINES
+  - name: FPR
+    description: falling edge pending register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 16
+    fieldset: LINES
+  - name: SECCFGR
+    description: security configuration register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 20
+    fieldset: SEC
+  - name: PRIVCFGR
+    description: privilege configuration register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 24
+    fieldset: PRIV
+  - name: EXTICR
+    description: external interrupt selection register
+    array:
+      len: 4
+      stride: 4
+    byte_offset: 96
+    fieldset: EXTI
+  - name: LOCKR
+    description: lock register
+    byte_offset: 112
+    fieldset: LOCKR
+  - name: IMR
+    description: CPU wakeup with interrupt mask register
+    array:
+      len: 2
+      stride: 16
+    byte_offset: 128
+    fieldset: LINES
+  - name: EMR
+    description: CPU wakeup with event mask register
+    array:
+      len: 2
+      stride: 16
+    byte_offset: 132
+    fieldset: LINES
 fieldset/EXTI:
  description: EXTI external interrupt selection register
  fields:
-    - name: EXTI
-      description: "EXTI12 GPIO port selection\r These bits are written by software to select the source input for EXTI12 external interrupt.\r When EXTI_PRIVCFGR.PRIV12 is disabled, EXTI12 can be accessed with privileged and unprivileged access.\r When EXTI_PRIVCFGR.PRIV12 is enabled, EXTI12 can only be accessed with privileged access. Unprivileged write to this bit is discarded.\r Others: reserved"
-      bit_offset: 0
-      bit_size: 8
-      array:
-        len: 4
-        stride: 8
+  - name: EXTI
+    description: "EXTI12 GPIO port selection\r These bits are written by software to select the source input for EXTI12 external interrupt.\r When EXTI_PRIVCFGR.PRIV12 is disabled, EXTI12 can be accessed with privileged and unprivileged access.\r When EXTI_PRIVCFGR.PRIV12 is enabled, EXTI12 can only be accessed with privileged access. Unprivileged write to this bit is discarded.\r Others: reserved"
+    bit_offset: 0
+    bit_size: 8
+    array:
+      len: 4
+      stride: 8
 fieldset/LINES:
-  description: "EXTI lines register, 1 bit per line"
+  description: EXTI lines register, 1 bit per line
  fields:
-    - name: LINE
-      description: EXTI line
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 32
-        stride: 1
+  - name: LINE
+    description: EXTI line
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 32
+      stride: 1
 fieldset/LOCKR:
  description: lock register
  fields:
-    - name: LOCK
-      description: "Global security and privilege configuration registers (EXTI_SECCFGR and EXTI_PRIVCFGR) lock \r This bit is written once after reset."
-      bit_offset: 0
-      bit_size: 1
+  - name: LOCK
+    description: "Global security and privilege configuration registers (EXTI_SECCFGR and EXTI_PRIVCFGR) lock \r This bit is written once after reset."
+    bit_offset: 0
+    bit_size: 1
 fieldset/PRIV:
  description: privilege configuration register
  fields:
-    - name: PRIV
-      description: "Security enable on event input x\r When EXTI_SECCFGR.SECx is disabled, PRIVx can be accessed with secure and non-secure access.\r When EXTI_SECCFGR.SECx is enabled, PRIVx can only be written with secure access. Non-secure write to this PRIVx is discarded."
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 32
-        stride: 1
-      enum: PRIV
+  - name: PRIV
+    description: "Security enable on event input x\r When EXTI_SECCFGR.SECx is disabled, PRIVx can be accessed with secure and non-secure access.\r When EXTI_SECCFGR.SECx is enabled, PRIVx can only be written with secure access. Non-secure write to this PRIVx is discarded."
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 32
+      stride: 1
+    enum: PRIV
 fieldset/SEC:
  description: security configuration register
  fields:
-    - name: SEC
-      description: "Security enable on event input x\r When EXTI_PRIVCFGR.PRIVx is disabled, SECx can be accessed with privileged and unprivileged access.\r When EXTI_PRIVCFGR.PRIVx is enabled, SECx can only be written with privileged access. Unprivileged write to this SECx is discarded."
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 32
-        stride: 1
-      enum: SEC
+  - name: SEC
+    description: "Security enable on event input x\r When EXTI_PRIVCFGR.PRIVx is disabled, SECx can be accessed with privileged and unprivileged access.\r When EXTI_PRIVCFGR.PRIVx is enabled, SECx can only be written with privileged access. Unprivileged write to this SECx is discarded."
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 32
+      stride: 1
+    enum: SEC
 enum/PRIV:
  bit_size: 1
  variants:
-    - name: Unprivileged
-      description: Event privilege disabled (unprivileged)
-      value: 0
-    - name: Privileged
-      description: Event privilege enabled (privileged)
-      value: 1
+  - name: Unprivileged
+    description: Event privilege disabled (unprivileged)
+    value: 0
+  - name: Privileged
+    description: Event privilege enabled (privileged)
+    value: 1
 enum/SEC:
  bit_size: 1
  variants:
-    - name: NonSecure
-      description: Event security disabled (non-secure)
-      value: 0
-    - name: Secure
-      description: Event security enabled (secure)
-      value: 1
+  - name: NonSecure
+    description: Event security disabled (non-secure)
+    value: 0
+  - name: Secure
+    description: Event security enabled (secure)
+    value: 1
--- a/data/registers/exti_h50.yaml
+++ b/data/registers/exti_h50.yaml
@ -1,107 +1,106 @@
---
 block/EXTI:
  description: Extended interrupt and event controller
  items:
-    - name: RTSR
-      description: rising trigger selection register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 0
-      fieldset: LINES
-    - name: FTSR
-      description: falling trigger selection register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 4
-      fieldset: LINES
-    - name: SWIER
-      description: software interrupt event register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 8
-      fieldset: LINES
-    - name: RPR
-      description: rising edge pending register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 12
-      fieldset: LINES
-    - name: FPR
-      description: falling edge pending register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 16
-      fieldset: LINES
-    - name: PRIVCFGR
-      description: privilege configuration register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 24
-      fieldset: PRIV
-    - name: EXTICR
-      description: external interrupt selection register
-      array:
-        len: 4
-        stride: 4
-      byte_offset: 96
-      fieldset: EXTI
-    - name: IMR
-      description: CPU wakeup with interrupt mask register
-      array:
-        len: 2
-        stride: 16
-      byte_offset: 128
-      fieldset: LINES
-    - name: EMR
-      description: CPU wakeup with event mask register
-      array:
-        len: 2
-        stride: 16
-      byte_offset: 132
-      fieldset: LINES
+  - name: RTSR
+    description: rising trigger selection register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 0
+    fieldset: LINES
+  - name: FTSR
+    description: falling trigger selection register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 4
+    fieldset: LINES
+  - name: SWIER
+    description: software interrupt event register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 8
+    fieldset: LINES
+  - name: RPR
+    description: rising edge pending register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 12
+    fieldset: LINES
+  - name: FPR
+    description: falling edge pending register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 16
+    fieldset: LINES
+  - name: PRIVCFGR
+    description: privilege configuration register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 24
+    fieldset: PRIV
+  - name: EXTICR
+    description: external interrupt selection register
+    array:
+      len: 4
+      stride: 4
+    byte_offset: 96
+    fieldset: EXTI
+  - name: IMR
+    description: CPU wakeup with interrupt mask register
+    array:
+      len: 2
+      stride: 16
+    byte_offset: 128
+    fieldset: LINES
+  - name: EMR
+    description: CPU wakeup with event mask register
+    array:
+      len: 2
+      stride: 16
+    byte_offset: 132
+    fieldset: LINES
 fieldset/EXTI:
  description: EXTI external interrupt selection register
  fields:
-    - name: EXTI
-      description: "EXTI12 GPIO port selection\r These bits are written by software to select the source input for EXTI12 external interrupt.\r When EXTI_PRIVCFGR.PRIV12 is disabled, EXTI12 can be accessed with privileged and unprivileged access.\r When EXTI_PRIVCFGR.PRIV12 is enabled, EXTI12 can only be accessed with privileged access. Unprivileged write to this bit is discarded.\r Others: reserved"
-      bit_offset: 0
-      bit_size: 8
-      array:
-        len: 4
-        stride: 8
+  - name: EXTI
+    description: "EXTI12 GPIO port selection\r These bits are written by software to select the source input for EXTI12 external interrupt.\r When EXTI_PRIVCFGR.PRIV12 is disabled, EXTI12 can be accessed with privileged and unprivileged access.\r When EXTI_PRIVCFGR.PRIV12 is enabled, EXTI12 can only be accessed with privileged access. Unprivileged write to this bit is discarded.\r Others: reserved"
+    bit_offset: 0
+    bit_size: 8
+    array:
+      len: 4
+      stride: 8
 fieldset/LINES:
-  description: "EXTI lines register, 1 bit per line"
+  description: EXTI lines register, 1 bit per line
  fields:
-    - name: LINE
-      description: EXTI line
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 32
-        stride: 1
+  - name: LINE
+    description: EXTI line
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 32
+      stride: 1
 fieldset/PRIV:
  description: privilege configuration register
  fields:
-    - name: PRIV
-      description: "Security enable on event input x\r When EXTI_SECCFGR.SECx is disabled, PRIVx can be accessed with secure and non-secure access.\r When EXTI_SECCFGR.SECx is enabled, PRIVx can only be written with secure access. Non-secure write to this PRIVx is discarded."
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 32
-        stride: 1
-      enum: PRIV
+  - name: PRIV
+    description: "Security enable on event input x\r When EXTI_SECCFGR.SECx is disabled, PRIVx can be accessed with secure and non-secure access.\r When EXTI_SECCFGR.SECx is enabled, PRIVx can only be written with secure access. Non-secure write to this PRIVx is discarded."
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 32
+      stride: 1
+    enum: PRIV
 enum/PRIV:
  bit_size: 1
  variants:
-    - name: Unprivileged
-      description: Event privilege disabled (unprivileged)
-      value: 0
-    - name: Privileged
-      description: Event privilege enabled (privileged)
-      value: 1
+  - name: Unprivileged
+    description: Event privilege disabled (unprivileged)
+    value: 0
+  - name: Privileged
+    description: Event privilege enabled (privileged)
+    value: 1
--- a/data/registers/exti_h7.yaml
+++ b/data/registers/exti_h7.yaml
@ -1,56 +1,55 @@
---
 block/EXTI:
  description: External interrupt/event controller
  items:
-    - name: RTSR
-      description: Rising Trigger selection register
-      array:
-        len: 1
-        stride: 0
-      byte_offset: 0
-      fieldset: LINES
-    - name: FTSR
-      description: Falling Trigger selection register
-      array:
-        len: 1
-        stride: 0
-      byte_offset: 4
-      fieldset: LINES
-    - name: SWIER
-      description: Software interrupt event register
-      array:
-        len: 1
-        stride: 0
-      byte_offset: 8
-      fieldset: LINES
-    - name: IMR
-      description: Interrupt mask register
-      array:
-        len: 1
-        stride: 0
-      byte_offset: 128
-      fieldset: LINES
-    - name: EMR
-      description: Event mask register
-      array:
-        len: 1
-        stride: 0
-      byte_offset: 132
-      fieldset: LINES
-    - name: PR
-      description: Pending register
-      array:
-        len: 1
-        stride: 0
-      byte_offset: 136
-      fieldset: LINES
+  - name: RTSR
+    description: Rising Trigger selection register
+    array:
+      len: 1
+      stride: 0
+    byte_offset: 0
+    fieldset: LINES
+  - name: FTSR
+    description: Falling Trigger selection register
+    array:
+      len: 1
+      stride: 0
+    byte_offset: 4
+    fieldset: LINES
+  - name: SWIER
+    description: Software interrupt event register
+    array:
+      len: 1
+      stride: 0
+    byte_offset: 8
+    fieldset: LINES
+  - name: IMR
+    description: Interrupt mask register
+    array:
+      len: 1
+      stride: 0
+    byte_offset: 128
+    fieldset: LINES
+  - name: EMR
+    description: Event mask register
+    array:
+      len: 1
+      stride: 0
+    byte_offset: 132
+    fieldset: LINES
+  - name: PR
+    description: Pending register
+    array:
+      len: 1
+      stride: 0
+    byte_offset: 136
+    fieldset: LINES
 fieldset/LINES:
-  description: "EXTI lines register, 1 bit per line"
+  description: EXTI lines register, 1 bit per line
  fields:
-    - name: LINE
-      description: EXTI line
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 32
-        stride: 1
+  - name: LINE
+    description: EXTI line
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 32
+      stride: 1
--- a/data/registers/exti_l5.yaml
+++ b/data/registers/exti_l5.yaml
@ -1,125 +1,124 @@
---
 block/EXTI:
  description: External interrupt/event controller
  items:
-    - name: RTSR
-      description: Rising Trigger selection register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 0
-      fieldset: LINES
-    - name: FTSR
-      description: Falling Trigger selection register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 4
-      fieldset: LINES
-    - name: SWIER
-      description: Software interrupt event register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 8
-      fieldset: LINES
-    - name: RPR
-      description: Rising pending register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 12
-      fieldset: LINES
-    - name: FPR
-      description: Falling pending register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 16
-      fieldset: LINES
-    - name: SECCFGR
-      description: Security configuration register
-      array:
-        len: 2
-        stride: 36
-      byte_offset: 20
-      fieldset: SECCFGR
-    - name: PRIVCFGR
-      description: Privilege configuration register
-      array:
-        len: 2
-        stride: 28
-      byte_offset: 24
-      fieldset: PRIVCFGR
-    - name: EXTICR
-      description: Configuration register
-      array:
-        len: 4
-        stride: 4
-      byte_offset: 96
-      fieldset: EXTICR
-    - name: LOCKRG
-      description: EXTI lock register
-      byte_offset: 112
-      fieldset: LOCKRG
-    - name: IMR
-      description: Interrupt mask register
-      array:
-        len: 2
-        stride: 16
-      byte_offset: 128
-      fieldset: LINES
-    - name: EMR
-      description: Event mask register
-      array:
-        len: 2
-        stride: 16
-      byte_offset: 132
-      fieldset: LINES
+  - name: RTSR
+    description: Rising Trigger selection register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 0
+    fieldset: LINES
+  - name: FTSR
+    description: Falling Trigger selection register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 4
+    fieldset: LINES
+  - name: SWIER
+    description: Software interrupt event register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 8
+    fieldset: LINES
+  - name: RPR
+    description: Rising pending register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 12
+    fieldset: LINES
+  - name: FPR
+    description: Falling pending register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 16
+    fieldset: LINES
+  - name: SECCFGR
+    description: Security configuration register
+    array:
+      len: 2
+      stride: 36
+    byte_offset: 20
+    fieldset: SECCFGR
+  - name: PRIVCFGR
+    description: Privilege configuration register
+    array:
+      len: 2
+      stride: 28
+    byte_offset: 24
+    fieldset: PRIVCFGR
+  - name: EXTICR
+    description: Configuration register
+    array:
+      len: 4
+      stride: 4
+    byte_offset: 96
+    fieldset: EXTICR
+  - name: LOCKRG
+    description: EXTI lock register
+    byte_offset: 112
+    fieldset: LOCKRG
+  - name: IMR
+    description: Interrupt mask register
+    array:
+      len: 2
+      stride: 16
+    byte_offset: 128
+    fieldset: LINES
+  - name: EMR
+    description: Event mask register
+    array:
+      len: 2
+      stride: 16
+    byte_offset: 132
+    fieldset: LINES
 fieldset/EXTICR:
  description: external interrupt configuration register 1
  fields:
-    - name: EXTI
-      description: EXTI configuration bits
-      bit_offset: 0
-      bit_size: 8
-      array:
-        len: 4
-        stride: 8
+  - name: EXTI
+    description: EXTI configuration bits
+    bit_offset: 0
+    bit_size: 8
+    array:
+      len: 4
+      stride: 8
 fieldset/LINES:
-  description: "EXTI lines register, 1 bit per line"
+  description: EXTI lines register, 1 bit per line
  fields:
-    - name: LINE
-      description: EXTI line
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 32
-        stride: 1
+  - name: LINE
+    description: EXTI line
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 32
+      stride: 1
 fieldset/LOCKRG:
  description: EXTI lock register
  fields:
-    - name: LOCK
-      description: LOCK
-      bit_offset: 0
-      bit_size: 1
+  - name: LOCK
+    description: LOCK
+    bit_offset: 0
+    bit_size: 1
 fieldset/PRIVCFGR:
  description: Privilege configuration register
  fields:
-    - name: PRIV
-      description: Security enable on event input x
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 32
-        stride: 1
+  - name: PRIV
+    description: Security enable on event input x
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 32
+      stride: 1
 fieldset/SECCFGR:
  description: Security configuration register
  fields:
-    - name: SEC
-      description: Security enable on event input x
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 32
-        stride: 1
+  - name: SEC
+    description: Security enable on event input x
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 32
+      stride: 1
--- a/data/registers/exti_u5.yaml
+++ b/data/registers/exti_u5.yaml
@ -1,125 +1,124 @@
---
 block/EXTI:
  description: External interrupt/event controller
  items:
-    - name: RTSR
-      description: Rising Trigger selection register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 0
-      fieldset: LINES
-    - name: FTSR
-      description: Falling Trigger selection register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 4
-      fieldset: LINES
-    - name: SWIER
-      description: Software interrupt event register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 8
-      fieldset: LINES
-    - name: RPR
-      description: Rising pending register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 12
-      fieldset: LINES
-    - name: FPR
-      description: Falling pending register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 16
-      fieldset: LINES
-    - name: SECCFGR
-      description: Security configuration register
-      array:
-        len: 2
-        stride: 36
-      byte_offset: 20
-      fieldset: SECCFGR
-    - name: PRIVCFGR
-      description: Privilege configuration register
-      array:
-        len: 2
-        stride: 28
-      byte_offset: 24
-      fieldset: PRIVCFGR
-    - name: EXTICR
-      description: Configuration register
-      array:
-        len: 4
-        stride: 4
-      byte_offset: 96
-      fieldset: EXTICR
-    - name: LOCKRG
-      description: EXTI lock register
-      byte_offset: 112
-      fieldset: LOCKRG
-    - name: IMR
-      description: Interrupt mask register
-      array:
-        len: 2
-        stride: 16
-      byte_offset: 128
-      fieldset: LINES
-    - name: EMR
-      description: Event mask register
-      array:
-        len: 2
-        stride: 16
-      byte_offset: 132
-      fieldset: LINES
+  - name: RTSR
+    description: Rising Trigger selection register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 0
+    fieldset: LINES
+  - name: FTSR
+    description: Falling Trigger selection register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 4
+    fieldset: LINES
+  - name: SWIER
+    description: Software interrupt event register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 8
+    fieldset: LINES
+  - name: RPR
+    description: Rising pending register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 12
+    fieldset: LINES
+  - name: FPR
+    description: Falling pending register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 16
+    fieldset: LINES
+  - name: SECCFGR
+    description: Security configuration register
+    array:
+      len: 2
+      stride: 36
+    byte_offset: 20
+    fieldset: SECCFGR
+  - name: PRIVCFGR
+    description: Privilege configuration register
+    array:
+      len: 2
+      stride: 28
+    byte_offset: 24
+    fieldset: PRIVCFGR
+  - name: EXTICR
+    description: Configuration register
+    array:
+      len: 4
+      stride: 4
+    byte_offset: 96
+    fieldset: EXTICR
+  - name: LOCKRG
+    description: EXTI lock register
+    byte_offset: 112
+    fieldset: LOCKRG
+  - name: IMR
+    description: Interrupt mask register
+    array:
+      len: 2
+      stride: 16
+    byte_offset: 128
+    fieldset: LINES
+  - name: EMR
+    description: Event mask register
+    array:
+      len: 2
+      stride: 16
+    byte_offset: 132
+    fieldset: LINES
 fieldset/EXTICR:
  description: external interrupt configuration register 1
  fields:
-    - name: EXTI
-      description: EXTI configuration bits
-      bit_offset: 0
-      bit_size: 8
-      array:
-        len: 4
-        stride: 8
+  - name: EXTI
+    description: EXTI configuration bits
+    bit_offset: 0
+    bit_size: 8
+    array:
+      len: 4
+      stride: 8
 fieldset/LINES:
-  description: "EXTI lines register, 1 bit per line"
+  description: EXTI lines register, 1 bit per line
  fields:
-    - name: LINE
-      description: EXTI line
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 32
-        stride: 1
+  - name: LINE
+    description: EXTI line
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 32
+      stride: 1
 fieldset/LOCKRG:
  description: EXTI lock register
  fields:
-    - name: LOCK
-      description: LOCK
-      bit_offset: 0
-      bit_size: 1
+  - name: LOCK
+    description: LOCK
+    bit_offset: 0
+    bit_size: 1
 fieldset/PRIVCFGR:
  description: Privilege configuration register
  fields:
-    - name: PRIV
-      description: Security enable on event input x
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 32
-        stride: 1
+  - name: PRIV
+    description: Security enable on event input x
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 32
+      stride: 1
 fieldset/SECCFGR:
  description: Security configuration register
  fields:
-    - name: SEC
-      description: Security enable on event input x
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 32
-        stride: 1
+  - name: SEC
+    description: Security enable on event input x
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 32
+      stride: 1
--- a/data/registers/exti_v1.yaml
+++ b/data/registers/exti_v1.yaml
@ -1,56 +1,55 @@
---
 block/EXTI:
  description: External interrupt/event controller
  items:
-    - name: IMR
-      description: Interrupt mask register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 0
-      fieldset: LINES
-    - name: EMR
-      description: Interrupt mask register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 4
-      fieldset: LINES
-    - name: RTSR
-      description: Rising Trigger selection register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 8
-      fieldset: LINES
-    - name: FTSR
-      description: Falling Trigger selection register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 12
-      fieldset: LINES
-    - name: SWIER
-      description: Software interrupt event register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 16
-      fieldset: LINES
-    - name: PR
-      description: Pending register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 20
-      fieldset: LINES
+  - name: IMR
+    description: Interrupt mask register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 0
+    fieldset: LINES
+  - name: EMR
+    description: Interrupt mask register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 4
+    fieldset: LINES
+  - name: RTSR
+    description: Rising Trigger selection register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 8
+    fieldset: LINES
+  - name: FTSR
+    description: Falling Trigger selection register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 12
+    fieldset: LINES
+  - name: SWIER
+    description: Software interrupt event register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 16
+    fieldset: LINES
+  - name: PR
+    description: Pending register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 20
+    fieldset: LINES
 fieldset/LINES:
-  description: "EXTI lines register, 1 bit per line"
+  description: EXTI lines register, 1 bit per line
  fields:
-    - name: LINE
-      description: EXTI line
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 32
-        stride: 1
+  - name: LINE
+    description: EXTI line
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 32
+      stride: 1
--- a/data/registers/exti_w.yaml
+++ b/data/registers/exti_w.yaml
@ -1,66 +1,65 @@
---
 block/CPU:
  description: CPU-specific registers
  items:
-    - name: IMR
-      description: CPU x interrupt mask register
-      array:
-        len: 2
-        stride: 16
-      byte_offset: 0
-      fieldset: LINES
-    - name: EMR
-      description: CPU x event mask register
-      array:
-        len: 2
-        stride: 16
-      byte_offset: 4
-      fieldset: LINES
+  - name: IMR
+    description: CPU x interrupt mask register
+    array:
+      len: 2
+      stride: 16
+    byte_offset: 0
+    fieldset: LINES
+  - name: EMR
+    description: CPU x event mask register
+    array:
+      len: 2
+      stride: 16
+    byte_offset: 4
+    fieldset: LINES
 block/EXTI:
  description: External interrupt/event controller
  items:
-    - name: RTSR
-      description: rising trigger selection register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 0
-      fieldset: LINES
-    - name: FTSR
-      description: falling trigger selection register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 4
-      fieldset: LINES
-    - name: SWIER
-      description: software interrupt event register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 8
-      fieldset: LINES
-    - name: PR
-      description: EXTI pending register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 12
-      fieldset: LINES
-    - name: CPU
-      description: CPU specific registers
-      array:
-        len: 2
-        stride: 64
-      byte_offset: 128
-      block: CPU
+  - name: RTSR
+    description: rising trigger selection register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 0
+    fieldset: LINES
+  - name: FTSR
+    description: falling trigger selection register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 4
+    fieldset: LINES
+  - name: SWIER
+    description: software interrupt event register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 8
+    fieldset: LINES
+  - name: PR
+    description: EXTI pending register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 12
+    fieldset: LINES
+  - name: CPU
+    description: CPU specific registers
+    array:
+      len: 2
+      stride: 64
+    byte_offset: 128
+    block: CPU
 fieldset/LINES:
-  description: "EXTI lines register, 1 bit per line"
+  description: EXTI lines register, 1 bit per line
  fields:
-    - name: LINE
-      description: EXTI line
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 32
-        stride: 1
+  - name: LINE
+    description: EXTI line
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 32
+      stride: 1
--- a/data/registers/exti_wle.yaml
+++ b/data/registers/exti_wle.yaml
@ -1,56 +1,55 @@
---
 block/EXTI:
  description: External interrupt/event controller
  items:
-    - name: RTSR
-      description: Rising Trigger selection register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 0
-      fieldset: LINES
-    - name: FTSR
-      description: Falling Trigger selection register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 4
-      fieldset: LINES
-    - name: SWIER
-      description: Software interrupt event register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 8
-      fieldset: LINES
-    - name: PR
-      description: Pending register
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 12
-      fieldset: LINES
-    - name: IMR
-      description: Interrupt mask register
-      array:
-        len: 2
-        stride: 16
-      byte_offset: 128
-      fieldset: LINES
-    - name: EMR
-      description: Event mask register
-      array:
-        len: 2
-        stride: 16
-      byte_offset: 132
-      fieldset: LINES
+  - name: RTSR
+    description: Rising Trigger selection register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 0
+    fieldset: LINES
+  - name: FTSR
+    description: Falling Trigger selection register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 4
+    fieldset: LINES
+  - name: SWIER
+    description: Software interrupt event register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 8
+    fieldset: LINES
+  - name: PR
+    description: Pending register
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 12
+    fieldset: LINES
+  - name: IMR
+    description: Interrupt mask register
+    array:
+      len: 2
+      stride: 16
+    byte_offset: 128
+    fieldset: LINES
+  - name: EMR
+    description: Event mask register
+    array:
+      len: 2
+      stride: 16
+    byte_offset: 132
+    fieldset: LINES
 fieldset/LINES:
-  description: "EXTI lines register, 1 bit per line"
+  description: EXTI lines register, 1 bit per line
  fields:
-    - name: LINE
-      description: EXTI line
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 32
-        stride: 1
+  - name: LINE
+    description: EXTI line
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 32
+      stride: 1
--- a/data/registers/flash_c0.yaml
+++ b/data/registers/flash_c0.yaml
@ -1,424 +1,423 @@
---
 block/FLASH:
  description: Flash
  items:
-    - name: ACR
-      description: Access control register
-      byte_offset: 0
-      fieldset: ACR
-    - name: KEYR
-      description: Flash key register
-      byte_offset: 8
-      access: Write
-      fieldset: KEYR
-    - name: OPTKEYR
-      description: Option byte key register
-      byte_offset: 12
-      access: Write
-      fieldset: OPTKEYR
-    - name: SR
-      description: Status register
-      byte_offset: 16
-      fieldset: SR
-    - name: CR
-      description: Flash control register
-      byte_offset: 20
-      fieldset: CR
-    - name: OPTR
-      description: Flash option register
-      byte_offset: 32
-      fieldset: OPTR
-    - name: PCROP1ASR
-      description: Flash PCROP zone A Start address register
-      byte_offset: 36
-      access: Read
-      fieldset: PCROP1ASR
-    - name: PCROP1AER
-      description: Flash PCROP zone A End address register
-      byte_offset: 40
-      access: Read
-      fieldset: PCROP1AER
-    - name: WRP1AR
-      description: Flash WRP area A address register
-      byte_offset: 44
-      access: Read
-      fieldset: WRP1AR
-    - name: WRP1BR
-      description: Flash WRP area B address register
-      byte_offset: 48
-      access: Read
-      fieldset: WRP1BR
-    - name: PCROP1BSR
-      description: Flash PCROP zone B Start address register
-      byte_offset: 52
-      access: Read
-      fieldset: PCROP1BSR
-    - name: PCROP1BER
-      description: Flash PCROP zone B End address register
-      byte_offset: 56
-      access: Read
-      fieldset: PCROP1BER
-    - name: SECR
-      description: Flash Security register
-      byte_offset: 128
-      access: Read
-      fieldset: SECR
+  - name: ACR
+    description: Access control register
+    byte_offset: 0
+    fieldset: ACR
+  - name: KEYR
+    description: Flash key register
+    byte_offset: 8
+    access: Write
+    fieldset: KEYR
+  - name: OPTKEYR
+    description: Option byte key register
+    byte_offset: 12
+    access: Write
+    fieldset: OPTKEYR
+  - name: SR
+    description: Status register
+    byte_offset: 16
+    fieldset: SR
+  - name: CR
+    description: Flash control register
+    byte_offset: 20
+    fieldset: CR
+  - name: OPTR
+    description: Flash option register
+    byte_offset: 32
+    fieldset: OPTR
+  - name: PCROP1ASR
+    description: Flash PCROP zone A Start address register
+    byte_offset: 36
+    access: Read
+    fieldset: PCROP1ASR
+  - name: PCROP1AER
+    description: Flash PCROP zone A End address register
+    byte_offset: 40
+    access: Read
+    fieldset: PCROP1AER
+  - name: WRP1AR
+    description: Flash WRP area A address register
+    byte_offset: 44
+    access: Read
+    fieldset: WRP1AR
+  - name: WRP1BR
+    description: Flash WRP area B address register
+    byte_offset: 48
+    access: Read
+    fieldset: WRP1BR
+  - name: PCROP1BSR
+    description: Flash PCROP zone B Start address register
+    byte_offset: 52
+    access: Read
+    fieldset: PCROP1BSR
+  - name: PCROP1BER
+    description: Flash PCROP zone B End address register
+    byte_offset: 56
+    access: Read
+    fieldset: PCROP1BER
+  - name: SECR
+    description: Flash Security register
+    byte_offset: 128
+    access: Read
+    fieldset: SECR
 fieldset/ACR:
  description: Access control register
  fields:
-    - name: LATENCY
-      description: Latency
-      bit_offset: 0
-      bit_size: 3
-      enum: LATENCY
-    - name: PRFTEN
-      description: Prefetch enable
-      bit_offset: 8
-      bit_size: 1
-    - name: ICEN
-      description: Instruction cache enable
-      bit_offset: 9
-      bit_size: 1
-    - name: ICRST
-      description: Instruction cache reset
-      bit_offset: 11
-      bit_size: 1
-    - name: EMPTY
-      description: Flash User area empty
-      bit_offset: 16
-      bit_size: 1
-    - name: DBG_SWEN
-      description: Debug access software enable
-      bit_offset: 18
-      bit_size: 1
+  - name: LATENCY
+    description: Latency
+    bit_offset: 0
+    bit_size: 3
+    enum: LATENCY
+  - name: PRFTEN
+    description: Prefetch enable
+    bit_offset: 8
+    bit_size: 1
+  - name: ICEN
+    description: Instruction cache enable
+    bit_offset: 9
+    bit_size: 1
+  - name: ICRST
+    description: Instruction cache reset
+    bit_offset: 11
+    bit_size: 1
+  - name: EMPTY
+    description: Flash User area empty
+    bit_offset: 16
+    bit_size: 1
+  - name: DBG_SWEN
+    description: Debug access software enable
+    bit_offset: 18
+    bit_size: 1
 fieldset/CR:
  description: Flash control register
  fields:
-    - name: PG
-      description: Programming
-      bit_offset: 0
-      bit_size: 1
-    - name: PER
-      description: Page erase
-      bit_offset: 1
-      bit_size: 1
-    - name: MER
-      description: Mass erase
-      bit_offset: 2
-      bit_size: 1
-    - name: PNB
-      description: Page number
-      bit_offset: 3
-      bit_size: 4
-    - name: STRT
-      description: Start
-      bit_offset: 16
-      bit_size: 1
-    - name: OPTSTRT
-      description: Options modification start
-      bit_offset: 17
-      bit_size: 1
-    - name: FSTPG
-      description: Fast programming
-      bit_offset: 18
-      bit_size: 1
-    - name: EOPIE
-      description: End of operation interrupt enable
-      bit_offset: 24
-      bit_size: 1
-    - name: ERRIE
-      description: Error interrupt enable
-      bit_offset: 25
-      bit_size: 1
-    - name: RDERRIE
-      description: PCROP read error interrupt enable
-      bit_offset: 26
-      bit_size: 1
-    - name: OBL_LAUNCH
-      description: Force the option byte loading
-      bit_offset: 27
-      bit_size: 1
-    - name: SEC_PROT
-      description: Securable memory area protection enable
-      bit_offset: 28
-      bit_size: 1
-    - name: OPTLOCK
-      description: Options Lock
-      bit_offset: 30
-      bit_size: 1
-    - name: LOCK
-      description: FLASH_CR Lock
-      bit_offset: 31
-      bit_size: 1
+  - name: PG
+    description: Programming
+    bit_offset: 0
+    bit_size: 1
+  - name: PER
+    description: Page erase
+    bit_offset: 1
+    bit_size: 1
+  - name: MER
+    description: Mass erase
+    bit_offset: 2
+    bit_size: 1
+  - name: PNB
+    description: Page number
+    bit_offset: 3
+    bit_size: 4
+  - name: STRT
+    description: Start
+    bit_offset: 16
+    bit_size: 1
+  - name: OPTSTRT
+    description: Options modification start
+    bit_offset: 17
+    bit_size: 1
+  - name: FSTPG
+    description: Fast programming
+    bit_offset: 18
+    bit_size: 1
+  - name: EOPIE
+    description: End of operation interrupt enable
+    bit_offset: 24
+    bit_size: 1
+  - name: ERRIE
+    description: Error interrupt enable
+    bit_offset: 25
+    bit_size: 1
+  - name: RDERRIE
+    description: PCROP read error interrupt enable
+    bit_offset: 26
+    bit_size: 1
+  - name: OBL_LAUNCH
+    description: Force the option byte loading
+    bit_offset: 27
+    bit_size: 1
+  - name: SEC_PROT
+    description: Securable memory area protection enable
+    bit_offset: 28
+    bit_size: 1
+  - name: OPTLOCK
+    description: Options Lock
+    bit_offset: 30
+    bit_size: 1
+  - name: LOCK
+    description: FLASH_CR Lock
+    bit_offset: 31
+    bit_size: 1
 fieldset/KEYR:
  description: Flash key register
  fields:
-    - name: KEYR
-      description: KEYR
-      bit_offset: 0
-      bit_size: 32
+  - name: KEYR
+    description: KEYR
+    bit_offset: 0
+    bit_size: 32
 fieldset/OPTKEYR:
  description: Option byte key register
  fields:
-    - name: OPTKEYR
-      description: Option byte key
-      bit_offset: 0
-      bit_size: 32
+  - name: OPTKEYR
+    description: Option byte key
+    bit_offset: 0
+    bit_size: 32
 fieldset/OPTR:
  description: Flash option register
  fields:
-    - name: RDP
-      description: Read protection level
-      bit_offset: 0
-      bit_size: 8
-      enum: RDP
-    - name: BOREN
-      description: BOR reset Level
-      bit_offset: 8
-      bit_size: 1
-    - name: BORF_LEV
-      description: These bits contain the VDD supply level threshold that activates the reset
-      bit_offset: 9
-      bit_size: 2
-      enum: BORF_LEV
-    - name: BORR_LEV
-      description: These bits contain the VDD supply level threshold that releases the reset.
-      bit_offset: 11
-      bit_size: 2
-      enum: BORR_LEV
-    - name: nRST_STOP
-      description: nRST_STOP
-      bit_offset: 13
-      bit_size: 1
-    - name: nRST_STDBY
-      description: nRST_STDBY
-      bit_offset: 14
-      bit_size: 1
-    - name: nRSTS_HDW
-      description: nRSTS_HDW
-      bit_offset: 15
-      bit_size: 1
-    - name: IDWG_SW
-      description: Independent watchdog selection
-      bit_offset: 16
-      bit_size: 1
-    - name: IWDG_STOP
-      description: Independent watchdog counter freeze in Stop mode
-      bit_offset: 17
-      bit_size: 1
-    - name: IWDG_STDBY
-      description: Independent watchdog counter freeze in Standby mode
-      bit_offset: 18
-      bit_size: 1
-    - name: WWDG_SW
-      description: Window watchdog selection
-      bit_offset: 19
-      bit_size: 1
-    - name: RAM_PARITY_CHECK
-      description: SRAM parity check control
-      bit_offset: 22
-      bit_size: 1
-    - name: nBOOT_SEL
-      description: nBOOT_SEL
-      bit_offset: 24
-      bit_size: 1
-    - name: nBOOT1
-      description: Boot configuration
-      bit_offset: 25
-      bit_size: 1
-    - name: nBOOT0
-      description: nBOOT0 option bit
-      bit_offset: 26
-      bit_size: 1
-    - name: NRST_MODE
-      description: NRST_MODE
-      bit_offset: 27
-      bit_size: 2
-      enum: NRST_MODE
-    - name: IRHEN
-      description: Internal reset holder enable bit
-      bit_offset: 29
-      bit_size: 1
+  - name: RDP
+    description: Read protection level
+    bit_offset: 0
+    bit_size: 8
+    enum: RDP
+  - name: BOREN
+    description: BOR reset Level
+    bit_offset: 8
+    bit_size: 1
+  - name: BORF_LEV
+    description: These bits contain the VDD supply level threshold that activates the reset
+    bit_offset: 9
+    bit_size: 2
+    enum: BORF_LEV
+  - name: BORR_LEV
+    description: These bits contain the VDD supply level threshold that releases the reset.
+    bit_offset: 11
+    bit_size: 2
+    enum: BORR_LEV
+  - name: nRST_STOP
+    description: nRST_STOP
+    bit_offset: 13
+    bit_size: 1
+  - name: nRST_STDBY
+    description: nRST_STDBY
+    bit_offset: 14
+    bit_size: 1
+  - name: nRSTS_HDW
+    description: nRSTS_HDW
+    bit_offset: 15
+    bit_size: 1
+  - name: IDWG_SW
+    description: Independent watchdog selection
+    bit_offset: 16
+    bit_size: 1
+  - name: IWDG_STOP
+    description: Independent watchdog counter freeze in Stop mode
+    bit_offset: 17
+    bit_size: 1
+  - name: IWDG_STDBY
+    description: Independent watchdog counter freeze in Standby mode
+    bit_offset: 18
+    bit_size: 1
+  - name: WWDG_SW
+    description: Window watchdog selection
+    bit_offset: 19
+    bit_size: 1
+  - name: RAM_PARITY_CHECK
+    description: SRAM parity check control
+    bit_offset: 22
+    bit_size: 1
+  - name: nBOOT_SEL
+    description: nBOOT_SEL
+    bit_offset: 24
+    bit_size: 1
+  - name: nBOOT1
+    description: Boot configuration
+    bit_offset: 25
+    bit_size: 1
+  - name: nBOOT0
+    description: nBOOT0 option bit
+    bit_offset: 26
+    bit_size: 1
+  - name: NRST_MODE
+    description: NRST_MODE
+    bit_offset: 27
+    bit_size: 2
+    enum: NRST_MODE
+  - name: IRHEN
+    description: Internal reset holder enable bit
+    bit_offset: 29
+    bit_size: 1
 fieldset/PCROP1AER:
  description: Flash PCROP zone A End address register
  fields:
-    - name: PCROP1A_END
-      description: PCROP1A area end offset
-      bit_offset: 0
-      bit_size: 6
-    - name: PCROP_RDP
-      description: PCROP area preserved when RDP level decreased
-      bit_offset: 31
-      bit_size: 1
+  - name: PCROP1A_END
+    description: PCROP1A area end offset
+    bit_offset: 0
+    bit_size: 6
+  - name: PCROP_RDP
+    description: PCROP area preserved when RDP level decreased
+    bit_offset: 31
+    bit_size: 1
 fieldset/PCROP1ASR:
  description: Flash PCROP zone A Start address register
  fields:
-    - name: PCROP1A_STRT
-      description: PCROP1A area start offset
-      bit_offset: 0
-      bit_size: 6
+  - name: PCROP1A_STRT
+    description: PCROP1A area start offset
+    bit_offset: 0
+    bit_size: 6
 fieldset/PCROP1BER:
  description: Flash PCROP zone B End address register
  fields:
-    - name: PCROP1B_END
-      description: PCROP1B area end offset
-      bit_offset: 0
-      bit_size: 6
+  - name: PCROP1B_END
+    description: PCROP1B area end offset
+    bit_offset: 0
+    bit_size: 6
 fieldset/PCROP1BSR:
  description: Flash PCROP zone B Start address register
  fields:
-    - name: PCROP1B_STRT
-      description: PCROP1B area start offset
-      bit_offset: 0
-      bit_size: 6
+  - name: PCROP1B_STRT
+    description: PCROP1B area start offset
+    bit_offset: 0
+    bit_size: 6
 fieldset/SECR:
  description: Flash Security register
  fields:
-    - name: SEC_SIZE
-      description: Securable memory area size
-      bit_offset: 0
-      bit_size: 5
-    - name: BOOT_LOCK
-      description: used to force boot from user area
-      bit_offset: 16
-      bit_size: 1
+  - name: SEC_SIZE
+    description: Securable memory area size
+    bit_offset: 0
+    bit_size: 5
+  - name: BOOT_LOCK
+    description: used to force boot from user area
+    bit_offset: 16
+    bit_size: 1
 fieldset/SR:
  description: Status register
  fields:
-    - name: EOP
-      description: End of operation
-      bit_offset: 0
-      bit_size: 1
-    - name: OPERR
-      description: Operation error
-      bit_offset: 1
-      bit_size: 1
-    - name: PROGERR
-      description: Programming error
-      bit_offset: 3
-      bit_size: 1
-    - name: WRPERR
-      description: Write protected error
-      bit_offset: 4
-      bit_size: 1
-    - name: PGAERR
-      description: Programming alignment error
-      bit_offset: 5
-      bit_size: 1
-    - name: SIZERR
-      description: Size error
-      bit_offset: 6
-      bit_size: 1
-    - name: PGSERR
-      description: Programming sequence error
-      bit_offset: 7
-      bit_size: 1
-    - name: MISERR
-      description: Fast programming data miss error
-      bit_offset: 8
-      bit_size: 1
-    - name: FASTERR
-      description: Fast programming error
-      bit_offset: 9
-      bit_size: 1
-    - name: RDERR
-      description: PCROP read error
-      bit_offset: 14
-      bit_size: 1
-    - name: OPTVERR
-      description: Option and Engineering bits loading validity error
-      bit_offset: 15
-      bit_size: 1
-    - name: BSY
-      description: Busy
-      bit_offset: 16
-      bit_size: 1
-    - name: CFGBSY
-      description: Programming or erase configuration busy.
-      bit_offset: 18
-      bit_size: 1
+  - name: EOP
+    description: End of operation
+    bit_offset: 0
+    bit_size: 1
+  - name: OPERR
+    description: Operation error
+    bit_offset: 1
+    bit_size: 1
+  - name: PROGERR
+    description: Programming error
+    bit_offset: 3
+    bit_size: 1
+  - name: WRPERR
+    description: Write protected error
+    bit_offset: 4
+    bit_size: 1
+  - name: PGAERR
+    description: Programming alignment error
+    bit_offset: 5
+    bit_size: 1
+  - name: SIZERR
+    description: Size error
+    bit_offset: 6
+    bit_size: 1
+  - name: PGSERR
+    description: Programming sequence error
+    bit_offset: 7
+    bit_size: 1
+  - name: MISERR
+    description: Fast programming data miss error
+    bit_offset: 8
+    bit_size: 1
+  - name: FASTERR
+    description: Fast programming error
+    bit_offset: 9
+    bit_size: 1
+  - name: RDERR
+    description: PCROP read error
+    bit_offset: 14
+    bit_size: 1
+  - name: OPTVERR
+    description: Option and Engineering bits loading validity error
+    bit_offset: 15
+    bit_size: 1
+  - name: BSY
+    description: Busy
+    bit_offset: 16
+    bit_size: 1
+  - name: CFGBSY
+    description: Programming or erase configuration busy.
+    bit_offset: 18
+    bit_size: 1
 fieldset/WRP1AR:
  description: Flash WRP area A address register
  fields:
-    - name: WRP1A_STRT
-      description: WRP area A start offset
-      bit_offset: 0
-      bit_size: 6
-    - name: WRP1A_END
-      description: WRP area A end offset
-      bit_offset: 16
-      bit_size: 6
+  - name: WRP1A_STRT
+    description: WRP area A start offset
+    bit_offset: 0
+    bit_size: 6
+  - name: WRP1A_END
+    description: WRP area A end offset
+    bit_offset: 16
+    bit_size: 6
 fieldset/WRP1BR:
  description: Flash WRP area B address register
  fields:
-    - name: WRP1B_STRT
-      description: WRP area B start offset
-      bit_offset: 0
-      bit_size: 6
-    - name: WRP1B_END
-      description: WRP area B end offset
-      bit_offset: 16
-      bit_size: 6
+  - name: WRP1B_STRT
+    description: WRP area B start offset
+    bit_offset: 0
+    bit_size: 6
+  - name: WRP1B_END
+    description: WRP area B end offset
+    bit_offset: 16
+    bit_size: 6
 enum/BORF_LEV:
  bit_size: 2
  variants:
-    - name: FALLING_0
-      description: BOR falling level 1 with threshold around 2.0V
-      value: 0
-    - name: FALLING_1
-      description: BOR falling level 2 with threshold around 2.2V
-      value: 1
-    - name: FALLING_2
-      description: BOR falling level 3 with threshold around 2.5V
-      value: 2
-    - name: FALLING_3
-      description: BOR falling level 4 with threshold around 2.8V
-      value: 3
+  - name: FALLING_0
+    description: BOR falling level 1 with threshold around 2.0V
+    value: 0
+  - name: FALLING_1
+    description: BOR falling level 2 with threshold around 2.2V
+    value: 1
+  - name: FALLING_2
+    description: BOR falling level 3 with threshold around 2.5V
+    value: 2
+  - name: FALLING_3
+    description: BOR falling level 4 with threshold around 2.8V
+    value: 3
 enum/BORR_LEV:
  bit_size: 2
  variants:
-    - name: RISING_0
-      description: BOR rising level 1 with threshold around 2.1V
-      value: 0
-    - name: RISING_1
-      description: BOR rising level 2 with threshold around 2.3V
-      value: 1
-    - name: RISING_2
-      description: BOR rising level 3 with threshold around 2.6V
-      value: 2
-    - name: RISING_3
-      description: BOR rising level 4 with threshold around 2.9V
-      value: 3
+  - name: RISING_0
+    description: BOR rising level 1 with threshold around 2.1V
+    value: 0
+  - name: RISING_1
+    description: BOR rising level 2 with threshold around 2.3V
+    value: 1
+  - name: RISING_2
+    description: BOR rising level 3 with threshold around 2.6V
+    value: 2
+  - name: RISING_3
+    description: BOR rising level 4 with threshold around 2.9V
+    value: 3
 enum/LATENCY:
  bit_size: 3
  variants:
-    - name: WS0
-      description: Zero wait states
-      value: 0
-    - name: WS1
-      description: One wait state
-      value: 1
+  - name: WS0
+    description: Zero wait states
+    value: 0
+  - name: WS1
+    description: One wait state
+    value: 1
 enum/NRST_MODE:
  bit_size: 2
  variants:
-    - name: INPUT_ONLY
-      description: Reset pin is in reset input mode only
-      value: 1
-    - name: GPIO
-      description: Reset pin is in GPIO mode only
-      value: 2
-    - name: INPUT_OUTPUT
-      description: Reset pin is in resety input and output mode
-      value: 3
+  - name: INPUT_ONLY
+    description: Reset pin is in reset input mode only
+    value: 1
+  - name: GPIO
+    description: Reset pin is in GPIO mode only
+    value: 2
+  - name: INPUT_OUTPUT
+    description: Reset pin is in resety input and output mode
+    value: 3
 enum/RDP:
  bit_size: 8
  variants:
-    - name: LEVEL_0
-      description: Read protection not active
-      value: 170
-    - name: LEVEL_1
-      description: Memories read protection active
-      value: 187
-    - name: LEVEL_2
-      description: Chip read protection active
-      value: 204
+  - name: LEVEL_0
+    description: Read protection not active
+    value: 170
+  - name: LEVEL_1
+    description: Memories read protection active
+    value: 187
+  - name: LEVEL_2
+    description: Chip read protection active
+    value: 204
--- a/data/registers/flash_f0.yaml
+++ b/data/registers/flash_f0.yaml
@ -1,304 +1,303 @@
---
 block/FLASH:
  description: Flash
  items:
-    - name: ACR
-      description: Flash access control register
-      byte_offset: 0
-      fieldset: ACR
-    - name: KEYR
-      description: Flash key register
-      byte_offset: 4
-      access: Write
-      fieldset: KEYR
-    - name: OPTKEYR
-      description: Flash option key register
-      byte_offset: 8
-      access: Write
-      fieldset: OPTKEYR
-    - name: SR
-      description: Flash status register
-      byte_offset: 12
-      fieldset: SR
-    - name: CR
-      description: Flash control register
-      byte_offset: 16
-      fieldset: CR
-    - name: AR
-      description: Flash address register
-      byte_offset: 20
-      access: Write
-      fieldset: AR
-    - name: OBR
-      description: Option byte register
-      byte_offset: 28
-      access: Read
-      fieldset: OBR
-    - name: WRPR
-      description: Write protection register
-      byte_offset: 32
-      access: Read
-      fieldset: WRPR
+  - name: ACR
+    description: Flash access control register
+    byte_offset: 0
+    fieldset: ACR
+  - name: KEYR
+    description: Flash key register
+    byte_offset: 4
+    access: Write
+    fieldset: KEYR
+  - name: OPTKEYR
+    description: Flash option key register
+    byte_offset: 8
+    access: Write
+    fieldset: OPTKEYR
+  - name: SR
+    description: Flash status register
+    byte_offset: 12
+    fieldset: SR
+  - name: CR
+    description: Flash control register
+    byte_offset: 16
+    fieldset: CR
+  - name: AR
+    description: Flash address register
+    byte_offset: 20
+    access: Write
+    fieldset: AR
+  - name: OBR
+    description: Option byte register
+    byte_offset: 28
+    access: Read
+    fieldset: OBR
+  - name: WRPR
+    description: Write protection register
+    byte_offset: 32
+    access: Read
+    fieldset: WRPR
 fieldset/ACR:
  description: Flash access control register
  fields:
-    - name: LATENCY
-      description: LATENCY
-      bit_offset: 0
-      bit_size: 3
-      enum: LATENCY
-    - name: PRFTBE
-      description: Prefetch buffer enable
-      bit_offset: 4
-      bit_size: 1
-    - name: PRFTBS
-      description: Prefetch buffer status
-      bit_offset: 5
-      bit_size: 1
+  - name: LATENCY
+    description: LATENCY
+    bit_offset: 0
+    bit_size: 3
+    enum: LATENCY
+  - name: PRFTBE
+    description: Prefetch buffer enable
+    bit_offset: 4
+    bit_size: 1
+  - name: PRFTBS
+    description: Prefetch buffer status
+    bit_offset: 5
+    bit_size: 1
 fieldset/AR:
  description: Flash address register
  fields:
-    - name: FAR
-      description: Flash address
-      bit_offset: 0
-      bit_size: 32
+  - name: FAR
+    description: Flash address
+    bit_offset: 0
+    bit_size: 32
 fieldset/CR:
  description: Flash control register
  fields:
-    - name: PG
-      description: Programming
-      bit_offset: 0
-      bit_size: 1
-    - name: PER
-      description: Page erase
-      bit_offset: 1
-      bit_size: 1
-    - name: MER
-      description: Mass erase
-      bit_offset: 2
-      bit_size: 1
-    - name: OPTPG
-      description: Option byte programming
-      bit_offset: 4
-      bit_size: 1
-    - name: OPTER
-      description: Option byte erase
-      bit_offset: 5
-      bit_size: 1
-    - name: STRT
-      description: Start
-      bit_offset: 6
-      bit_size: 1
-    - name: LOCK
-      description: Lock
-      bit_offset: 7
-      bit_size: 1
-    - name: OPTWRE
-      description: Option bytes write enable
-      bit_offset: 9
-      bit_size: 1
-    - name: ERRIE
-      description: Error interrupt enable
-      bit_offset: 10
-      bit_size: 1
-    - name: EOPIE
-      description: End of operation interrupt enable
-      bit_offset: 12
-      bit_size: 1
-    - name: FORCE_OPTLOAD
-      description: Force option byte loading
-      bit_offset: 13
-      bit_size: 1
+  - name: PG
+    description: Programming
+    bit_offset: 0
+    bit_size: 1
+  - name: PER
+    description: Page erase
+    bit_offset: 1
+    bit_size: 1
+  - name: MER
+    description: Mass erase
+    bit_offset: 2
+    bit_size: 1
+  - name: OPTPG
+    description: Option byte programming
+    bit_offset: 4
+    bit_size: 1
+  - name: OPTER
+    description: Option byte erase
+    bit_offset: 5
+    bit_size: 1
+  - name: STRT
+    description: Start
+    bit_offset: 6
+    bit_size: 1
+  - name: LOCK
+    description: Lock
+    bit_offset: 7
+    bit_size: 1
+  - name: OPTWRE
+    description: Option bytes write enable
+    bit_offset: 9
+    bit_size: 1
+  - name: ERRIE
+    description: Error interrupt enable
+    bit_offset: 10
+    bit_size: 1
+  - name: EOPIE
+    description: End of operation interrupt enable
+    bit_offset: 12
+    bit_size: 1
+  - name: FORCE_OPTLOAD
+    description: Force option byte loading
+    bit_offset: 13
+    bit_size: 1
 fieldset/KEYR:
  description: Flash key register
  fields:
-    - name: FKEYR
-      description: Flash Key
-      bit_offset: 0
-      bit_size: 32
+  - name: FKEYR
+    description: Flash Key
+    bit_offset: 0
+    bit_size: 32
 fieldset/OBR:
  description: Option byte register
  fields:
-    - name: OPTERR
-      description: Option byte error
-      bit_offset: 0
-      bit_size: 1
-    - name: RDPRT
-      description: Read protection level status
-      bit_offset: 1
-      bit_size: 2
-      enum: RDPRT
-    - name: WDG_SW
-      description: WDG_SW
-      bit_offset: 8
-      bit_size: 1
-      enum: WDG_SW
-    - name: nRST_STOP
-      description: nRST_STOP
-      bit_offset: 9
-      bit_size: 1
-      enum: nRST_STOP
-    - name: nRST_STDBY
-      description: nRST_STDBY
-      bit_offset: 10
-      bit_size: 1
-      enum: nRST_STDBY
-    - name: nBOOT0
-      description: nBOOT0
-      bit_offset: 11
-      bit_size: 1
-      enum: nBOOT0
-    - name: nBOOT1
-      description: BOOT1
-      bit_offset: 12
-      bit_size: 1
-      enum: nBOOT1
-    - name: VDDA_MONITOR
-      description: VDDA_MONITOR
-      bit_offset: 13
-      bit_size: 1
-      enum: VDDA_MONITOR
-    - name: RAM_PARITY_CHECK
-      description: RAM_PARITY_CHECK
-      bit_offset: 14
-      bit_size: 1
-      enum: RAM_PARITY_CHECK
-    - name: BOOT_SEL
-      description: BOOT_SEL
-      bit_offset: 15
-      bit_size: 1
-      enum: BOOT_SEL
-    - name: Data0
-      description: Data0
-      bit_offset: 16
-      bit_size: 8
-    - name: Data1
-      description: Data1
-      bit_offset: 24
-      bit_size: 8
+  - name: OPTERR
+    description: Option byte error
+    bit_offset: 0
+    bit_size: 1
+  - name: RDPRT
+    description: Read protection level status
+    bit_offset: 1
+    bit_size: 2
+    enum: RDPRT
+  - name: WDG_SW
+    description: WDG_SW
+    bit_offset: 8
+    bit_size: 1
+    enum: WDG_SW
+  - name: nRST_STOP
+    description: nRST_STOP
+    bit_offset: 9
+    bit_size: 1
+    enum: nRST_STOP
+  - name: nRST_STDBY
+    description: nRST_STDBY
+    bit_offset: 10
+    bit_size: 1
+    enum: nRST_STDBY
+  - name: nBOOT0
+    description: nBOOT0
+    bit_offset: 11
+    bit_size: 1
+    enum: nBOOT0
+  - name: nBOOT1
+    description: BOOT1
+    bit_offset: 12
+    bit_size: 1
+    enum: nBOOT1
+  - name: VDDA_MONITOR
+    description: VDDA_MONITOR
+    bit_offset: 13
+    bit_size: 1
+    enum: VDDA_MONITOR
+  - name: RAM_PARITY_CHECK
+    description: RAM_PARITY_CHECK
+    bit_offset: 14
+    bit_size: 1
+    enum: RAM_PARITY_CHECK
+  - name: BOOT_SEL
+    description: BOOT_SEL
+    bit_offset: 15
+    bit_size: 1
+    enum: BOOT_SEL
+  - name: Data0
+    description: Data0
+    bit_offset: 16
+    bit_size: 8
+  - name: Data1
+    description: Data1
+    bit_offset: 24
+    bit_size: 8
 fieldset/OPTKEYR:
  description: Flash option key register
  fields:
-    - name: OPTKEYR
-      description: Option byte key
-      bit_offset: 0
-      bit_size: 32
+  - name: OPTKEYR
+    description: Option byte key
+    bit_offset: 0
+    bit_size: 32
 fieldset/SR:
  description: Flash status register
  fields:
-    - name: BSY
-      description: Busy
-      bit_offset: 0
-      bit_size: 1
-    - name: PGERR
-      description: Programming error
-      bit_offset: 2
-      bit_size: 1
-    - name: WRPRT
-      description: Write protection error
-      bit_offset: 4
-      bit_size: 1
-    - name: EOP
-      description: End of operation
-      bit_offset: 5
-      bit_size: 1
+  - name: BSY
+    description: Busy
+    bit_offset: 0
+    bit_size: 1
+  - name: PGERR
+    description: Programming error
+    bit_offset: 2
+    bit_size: 1
+  - name: WRPRT
+    description: Write protection error
+    bit_offset: 4
+    bit_size: 1
+  - name: EOP
+    description: End of operation
+    bit_offset: 5
+    bit_size: 1
 fieldset/WRPR:
  description: Write protection register
  fields:
-    - name: WRP
-      description: Write protect
-      bit_offset: 0
-      bit_size: 32
+  - name: WRP
+    description: Write protect
+    bit_offset: 0
+    bit_size: 32
 enum/BOOT_SEL:
  bit_size: 1
  variants:
-    - name: nBOOT0
-      description: BOOT0 signal is defined by nBOOT0 option bit
-      value: 0
-    - name: BOOT0
-      description: BOOT0 signal is defined by BOOT0 pin value (legacy mode)
-      value: 1
+  - name: nBOOT0
+    description: BOOT0 signal is defined by nBOOT0 option bit
+    value: 0
+  - name: BOOT0
+    description: BOOT0 signal is defined by BOOT0 pin value (legacy mode)
+    value: 1
 enum/LATENCY:
  bit_size: 3
  variants:
-    - name: WS0
-      description: 0 wait states
-      value: 0
-    - name: WS1
-      description: 1 wait state
-      value: 1
+  - name: WS0
+    description: 0 wait states
+    value: 0
+  - name: WS1
+    description: 1 wait state
+    value: 1
 enum/RAM_PARITY_CHECK:
  bit_size: 1
  variants:
-    - name: Enabled
-      description: RAM parity check enabled
-      value: 0
-    - name: Disabled
-      description: RAM parity check disabled
-      value: 1
+  - name: Enabled
+    description: RAM parity check enabled
+    value: 0
+  - name: Disabled
+    description: RAM parity check disabled
+    value: 1
 enum/RDPRT:
  bit_size: 2
  variants:
-    - name: Level0
-      description: Level 0
-      value: 0
-    - name: Level1
-      description: Level 1
-      value: 1
-    - name: Level2
-      description: Level 2
-      value: 3
+  - name: Level0
+    description: Level 0
+    value: 0
+  - name: Level1
+    description: Level 1
+    value: 1
+  - name: Level2
+    description: Level 2
+    value: 3
 enum/VDDA_MONITOR:
  bit_size: 1
  variants:
-    - name: Disabled
-      description: VDDA power supply supervisor disabled
-      value: 0
-    - name: Enabled
-      description: VDDA power supply supervisor enabled
-      value: 1
+  - name: Disabled
+    description: VDDA power supply supervisor disabled
+    value: 0
+  - name: Enabled
+    description: VDDA power supply supervisor enabled
+    value: 1
 enum/WDG_SW:
  bit_size: 1
  variants:
-    - name: Hardware
-      description: Hardware watchdog
-      value: 0
-    - name: Software
-      description: Software watchdog
-      value: 1
+  - name: Hardware
+    description: Hardware watchdog
+    value: 0
+  - name: Software
+    description: Software watchdog
+    value: 1
 enum/nBOOT0:
  bit_size: 1
  variants:
-    - name: Disabled
-      description: "When BOOT_SEL is cleared, select the device boot mode"
-      value: 0
-    - name: Enabled
-      description: "When BOOT_SEL is cleared, select the device boot mode"
-      value: 1
+  - name: Disabled
+    description: When BOOT_SEL is cleared, select the device boot mode
+    value: 0
+  - name: Enabled
+    description: When BOOT_SEL is cleared, select the device boot mode
+    value: 1
 enum/nBOOT1:
  bit_size: 1
  variants:
-    - name: Disabled
-      description: "Together with BOOT0, select the device boot mode"
-      value: 0
-    - name: Enabled
-      description: "Together with BOOT0, select the device boot mode"
-      value: 1
+  - name: Disabled
+    description: Together with BOOT0, select the device boot mode
+    value: 0
+  - name: Enabled
+    description: Together with BOOT0, select the device boot mode
+    value: 1
 enum/nRST_STDBY:
  bit_size: 1
  variants:
-    - name: Reset
-      description: Reset generated when entering Standby mode
-      value: 0
-    - name: NoReset
-      description: No reset generated
-      value: 1
+  - name: Reset
+    description: Reset generated when entering Standby mode
+    value: 0
+  - name: NoReset
+    description: No reset generated
+    value: 1
 enum/nRST_STOP:
  bit_size: 1
  variants:
-    - name: Reset
-      description: Reset generated when entering Stop mode
-      value: 0
-    - name: NoReset
-      description: No reset generated
-      value: 1
+  - name: Reset
+    description: Reset generated when entering Stop mode
+    value: 0
+  - name: NoReset
+    description: No reset generated
+    value: 1
--- a/data/registers/flash_f1.yaml
+++ b/data/registers/flash_f1.yaml
@ -1,194 +1,193 @@
---
 block/FLASH:
  description: FLASH
  items:
-    - name: ACR
-      description: Flash access control register
-      byte_offset: 0
-      fieldset: ACR
-    - name: KEYR
-      description: Flash key register
-      byte_offset: 4
-      access: Write
-      fieldset: KEYR
-    - name: OPTKEYR
-      description: Flash option key register
-      byte_offset: 8
-      access: Write
-      fieldset: OPTKEYR
-    - name: SR
-      description: Status register
-      byte_offset: 12
-      fieldset: SR
-    - name: CR
-      description: Control register
-      byte_offset: 16
-      fieldset: CR
-    - name: AR
-      description: Flash address register
-      byte_offset: 20
-      access: Write
-      fieldset: AR
-    - name: OBR
-      description: Option byte register
-      byte_offset: 28
-      access: Read
-      fieldset: OBR
-    - name: WRPR
-      description: Write protection register
-      byte_offset: 32
-      access: Read
-      fieldset: WRPR
+  - name: ACR
+    description: Flash access control register
+    byte_offset: 0
+    fieldset: ACR
+  - name: KEYR
+    description: Flash key register
+    byte_offset: 4
+    access: Write
+    fieldset: KEYR
+  - name: OPTKEYR
+    description: Flash option key register
+    byte_offset: 8
+    access: Write
+    fieldset: OPTKEYR
+  - name: SR
+    description: Status register
+    byte_offset: 12
+    fieldset: SR
+  - name: CR
+    description: Control register
+    byte_offset: 16
+    fieldset: CR
+  - name: AR
+    description: Flash address register
+    byte_offset: 20
+    access: Write
+    fieldset: AR
+  - name: OBR
+    description: Option byte register
+    byte_offset: 28
+    access: Read
+    fieldset: OBR
+  - name: WRPR
+    description: Write protection register
+    byte_offset: 32
+    access: Read
+    fieldset: WRPR
 fieldset/ACR:
  description: Flash access control register
  fields:
-    - name: LATENCY
-      description: Latency
-      bit_offset: 0
-      bit_size: 3
-      enum: LATENCY
-    - name: HLFCYA
-      description: Flash half cycle access enable
-      bit_offset: 3
-      bit_size: 1
-    - name: PRFTBE
-      description: Prefetch buffer enable
-      bit_offset: 4
-      bit_size: 1
-    - name: PRFTBS
-      description: Prefetch buffer status
-      bit_offset: 5
-      bit_size: 1
+  - name: LATENCY
+    description: Latency
+    bit_offset: 0
+    bit_size: 3
+    enum: LATENCY
+  - name: HLFCYA
+    description: Flash half cycle access enable
+    bit_offset: 3
+    bit_size: 1
+  - name: PRFTBE
+    description: Prefetch buffer enable
+    bit_offset: 4
+    bit_size: 1
+  - name: PRFTBS
+    description: Prefetch buffer status
+    bit_offset: 5
+    bit_size: 1
 fieldset/AR:
  description: Flash address register
  fields:
-    - name: FAR
-      description: Flash Address
-      bit_offset: 0
-      bit_size: 32
+  - name: FAR
+    description: Flash Address
+    bit_offset: 0
+    bit_size: 32
 fieldset/CR:
  description: Control register
  fields:
-    - name: PG
-      description: Programming
-      bit_offset: 0
-      bit_size: 1
-    - name: PER
-      description: Page Erase
-      bit_offset: 1
-      bit_size: 1
-    - name: MER
-      description: Mass Erase
-      bit_offset: 2
-      bit_size: 1
-    - name: OPTPG
-      description: Option byte programming
-      bit_offset: 4
-      bit_size: 1
-    - name: OPTER
-      description: Option byte erase
-      bit_offset: 5
-      bit_size: 1
-    - name: STRT
-      description: Start
-      bit_offset: 6
-      bit_size: 1
-    - name: LOCK
-      description: Lock
-      bit_offset: 7
-      bit_size: 1
-    - name: OPTWRE
-      description: Option bytes write enable
-      bit_offset: 9
-      bit_size: 1
-    - name: ERRIE
-      description: Error interrupt enable
-      bit_offset: 10
-      bit_size: 1
-    - name: EOPIE
-      description: End of operation interrupt enable
-      bit_offset: 12
-      bit_size: 1
+  - name: PG
+    description: Programming
+    bit_offset: 0
+    bit_size: 1
+  - name: PER
+    description: Page Erase
+    bit_offset: 1
+    bit_size: 1
+  - name: MER
+    description: Mass Erase
+    bit_offset: 2
+    bit_size: 1
+  - name: OPTPG
+    description: Option byte programming
+    bit_offset: 4
+    bit_size: 1
+  - name: OPTER
+    description: Option byte erase
+    bit_offset: 5
+    bit_size: 1
+  - name: STRT
+    description: Start
+    bit_offset: 6
+    bit_size: 1
+  - name: LOCK
+    description: Lock
+    bit_offset: 7
+    bit_size: 1
+  - name: OPTWRE
+    description: Option bytes write enable
+    bit_offset: 9
+    bit_size: 1
+  - name: ERRIE
+    description: Error interrupt enable
+    bit_offset: 10
+    bit_size: 1
+  - name: EOPIE
+    description: End of operation interrupt enable
+    bit_offset: 12
+    bit_size: 1
 fieldset/KEYR:
  description: Flash key register
  fields:
-    - name: KEY
-      description: FPEC key
-      bit_offset: 0
-      bit_size: 32
+  - name: KEY
+    description: FPEC key
+    bit_offset: 0
+    bit_size: 32
 fieldset/OBR:
  description: Option byte register
  fields:
-    - name: OPTERR
-      description: Option byte error
-      bit_offset: 0
-      bit_size: 1
-    - name: RDPRT
-      description: Read protection
-      bit_offset: 1
-      bit_size: 1
-    - name: WDG_SW
-      description: WDG_SW
-      bit_offset: 2
-      bit_size: 1
-    - name: nRST_STOP
-      description: nRST_STOP
-      bit_offset: 3
-      bit_size: 1
-    - name: nRST_STDBY
-      description: nRST_STDBY
-      bit_offset: 4
-      bit_size: 1
-    - name: Data0
-      description: Data0
-      bit_offset: 10
-      bit_size: 8
-    - name: Data1
-      description: Data1
-      bit_offset: 18
-      bit_size: 8
+  - name: OPTERR
+    description: Option byte error
+    bit_offset: 0
+    bit_size: 1
+  - name: RDPRT
+    description: Read protection
+    bit_offset: 1
+    bit_size: 1
+  - name: WDG_SW
+    description: WDG_SW
+    bit_offset: 2
+    bit_size: 1
+  - name: nRST_STOP
+    description: nRST_STOP
+    bit_offset: 3
+    bit_size: 1
+  - name: nRST_STDBY
+    description: nRST_STDBY
+    bit_offset: 4
+    bit_size: 1
+  - name: Data0
+    description: Data0
+    bit_offset: 10
+    bit_size: 8
+  - name: Data1
+    description: Data1
+    bit_offset: 18
+    bit_size: 8
 fieldset/OPTKEYR:
  description: Flash option key register
  fields:
-    - name: OPTKEY
-      description: Option byte key
-      bit_offset: 0
-      bit_size: 32
+  - name: OPTKEY
+    description: Option byte key
+    bit_offset: 0
+    bit_size: 32
 fieldset/SR:
  description: Status register
  fields:
-    - name: BSY
-      description: Busy
-      bit_offset: 0
-      bit_size: 1
-    - name: PGERR
-      description: Programming error
-      bit_offset: 2
-      bit_size: 1
-    - name: WRPRTERR
-      description: Write protection error
-      bit_offset: 4
-      bit_size: 1
-    - name: EOP
-      description: End of operation
-      bit_offset: 5
-      bit_size: 1
+  - name: BSY
+    description: Busy
+    bit_offset: 0
+    bit_size: 1
+  - name: PGERR
+    description: Programming error
+    bit_offset: 2
+    bit_size: 1
+  - name: WRPRTERR
+    description: Write protection error
+    bit_offset: 4
+    bit_size: 1
+  - name: EOP
+    description: End of operation
+    bit_offset: 5
+    bit_size: 1
 fieldset/WRPR:
  description: Write protection register
  fields:
-    - name: WRP
-      description: Write protect
-      bit_offset: 0
-      bit_size: 32
+  - name: WRP
+    description: Write protect
+    bit_offset: 0
+    bit_size: 32
 enum/LATENCY:
  bit_size: 3
  variants:
-    - name: WS0
-      description: "Zero wait state, if 0 < SYSCLK≤ 24 MHz"
-      value: 0
-    - name: WS1
-      description: "One wait state, if 24 MHz < SYSCLK ≤ 48 MHz"
-      value: 1
-    - name: WS2
-      description: "Two wait states, if 48 MHz < SYSCLK ≤ 72 MHz"
-      value: 2
+  - name: WS0
+    description: Zero wait state, if 0 < SYSCLK≤ 24 MHz
+    value: 0
+  - name: WS1
+    description: One wait state, if 24 MHz < SYSCLK ≤ 48 MHz
+    value: 1
+  - name: WS2
+    description: Two wait states, if 48 MHz < SYSCLK ≤ 72 MHz
+    value: 2
--- a/data/registers/flash_f2.yaml
+++ b/data/registers/flash_f2.yaml
@ -1,220 +1,219 @@
---
 block/FLASH:
  description: FLASH
  items:
-    - name: ACR
-      description: Flash access control register
-      byte_offset: 0
-      fieldset: ACR
-    - name: KEYR
-      description: Flash key register
-      byte_offset: 4
-      access: Write
-      fieldset: KEYR
-    - name: OPTKEYR
-      description: Flash option key register
-      byte_offset: 8
-      access: Write
-      fieldset: OPTKEYR
-    - name: SR
-      description: Status register
-      byte_offset: 12
-      fieldset: SR
-    - name: CR
-      description: Control register
-      byte_offset: 16
-      fieldset: CR
-    - name: OPTCR
-      description: Flash option control register
-      byte_offset: 20
-      fieldset: OPTCR
+  - name: ACR
+    description: Flash access control register
+    byte_offset: 0
+    fieldset: ACR
+  - name: KEYR
+    description: Flash key register
+    byte_offset: 4
+    access: Write
+    fieldset: KEYR
+  - name: OPTKEYR
+    description: Flash option key register
+    byte_offset: 8
+    access: Write
+    fieldset: OPTKEYR
+  - name: SR
+    description: Status register
+    byte_offset: 12
+    fieldset: SR
+  - name: CR
+    description: Control register
+    byte_offset: 16
+    fieldset: CR
+  - name: OPTCR
+    description: Flash option control register
+    byte_offset: 20
+    fieldset: OPTCR
 fieldset/ACR:
  description: Flash access control register
  fields:
-    - name: LATENCY
-      description: Latency
-      bit_offset: 0
-      bit_size: 3
-      enum: LATENCY
-    - name: PRFTEN
-      description: Prefetch enable
-      bit_offset: 8
-      bit_size: 1
-    - name: ICEN
-      description: Instruction cache enable
-      bit_offset: 9
-      bit_size: 1
-    - name: DCEN
-      description: Data cache enable
-      bit_offset: 10
-      bit_size: 1
-    - name: ICRST
-      description: Instruction cache reset
-      bit_offset: 11
-      bit_size: 1
-    - name: DCRST
-      description: Data cache reset
-      bit_offset: 12
-      bit_size: 1
+  - name: LATENCY
+    description: Latency
+    bit_offset: 0
+    bit_size: 3
+    enum: LATENCY
+  - name: PRFTEN
+    description: Prefetch enable
+    bit_offset: 8
+    bit_size: 1
+  - name: ICEN
+    description: Instruction cache enable
+    bit_offset: 9
+    bit_size: 1
+  - name: DCEN
+    description: Data cache enable
+    bit_offset: 10
+    bit_size: 1
+  - name: ICRST
+    description: Instruction cache reset
+    bit_offset: 11
+    bit_size: 1
+  - name: DCRST
+    description: Data cache reset
+    bit_offset: 12
+    bit_size: 1
 fieldset/CR:
  description: Control register
  fields:
-    - name: PG
-      description: Programming
-      bit_offset: 0
-      bit_size: 1
-    - name: SER
-      description: Sector Erase
-      bit_offset: 1
-      bit_size: 1
-    - name: MER
-      description: Mass Erase
-      bit_offset: 2
-      bit_size: 1
-    - name: SNB
-      description: Sector number
-      bit_offset: 3
-      bit_size: 4
-    - name: PSIZE
-      description: Program size
-      bit_offset: 8
-      bit_size: 2
-      enum: PSIZE
-    - name: STRT
-      description: Start
-      bit_offset: 16
-      bit_size: 1
-    - name: EOPIE
-      description: End of operation interrupt enable
-      bit_offset: 24
-      bit_size: 1
-    - name: ERRIE
-      description: Error interrupt enable
-      bit_offset: 25
-      bit_size: 1
-    - name: LOCK
-      description: Lock
-      bit_offset: 31
-      bit_size: 1
+  - name: PG
+    description: Programming
+    bit_offset: 0
+    bit_size: 1
+  - name: SER
+    description: Sector Erase
+    bit_offset: 1
+    bit_size: 1
+  - name: MER
+    description: Mass Erase
+    bit_offset: 2
+    bit_size: 1
+  - name: SNB
+    description: Sector number
+    bit_offset: 3
+    bit_size: 4
+  - name: PSIZE
+    description: Program size
+    bit_offset: 8
+    bit_size: 2
+    enum: PSIZE
+  - name: STRT
+    description: Start
+    bit_offset: 16
+    bit_size: 1
+  - name: EOPIE
+    description: End of operation interrupt enable
+    bit_offset: 24
+    bit_size: 1
+  - name: ERRIE
+    description: Error interrupt enable
+    bit_offset: 25
+    bit_size: 1
+  - name: LOCK
+    description: Lock
+    bit_offset: 31
+    bit_size: 1
 fieldset/KEYR:
  description: Flash key register
  fields:
-    - name: KEY
-      description: FPEC key
-      bit_offset: 0
-      bit_size: 32
+  - name: KEY
+    description: FPEC key
+    bit_offset: 0
+    bit_size: 32
 fieldset/OPTCR:
  description: Flash option control register
  fields:
-    - name: OPTLOCK
-      description: Option lock
-      bit_offset: 0
-      bit_size: 1
-    - name: OPTSTRT
-      description: Option start
-      bit_offset: 1
-      bit_size: 1
-    - name: BOR_LEV
-      description: BOR reset Level
-      bit_offset: 2
-      bit_size: 2
-    - name: WDG_SW
-      description: WDG_SW User option bytes
-      bit_offset: 5
-      bit_size: 1
-    - name: nRST_STOP
-      description: nRST_STOP User option bytes
-      bit_offset: 6
-      bit_size: 1
-    - name: nRST_STDBY
-      description: nRST_STDBY User option bytes
-      bit_offset: 7
-      bit_size: 1
-    - name: RDP
-      description: Read protect
-      bit_offset: 8
-      bit_size: 8
-    - name: nWRP
-      description: Not write protect
-      bit_offset: 16
-      bit_size: 12
+  - name: OPTLOCK
+    description: Option lock
+    bit_offset: 0
+    bit_size: 1
+  - name: OPTSTRT
+    description: Option start
+    bit_offset: 1
+    bit_size: 1
+  - name: BOR_LEV
+    description: BOR reset Level
+    bit_offset: 2
+    bit_size: 2
+  - name: WDG_SW
+    description: WDG_SW User option bytes
+    bit_offset: 5
+    bit_size: 1
+  - name: nRST_STOP
+    description: nRST_STOP User option bytes
+    bit_offset: 6
+    bit_size: 1
+  - name: nRST_STDBY
+    description: nRST_STDBY User option bytes
+    bit_offset: 7
+    bit_size: 1
+  - name: RDP
+    description: Read protect
+    bit_offset: 8
+    bit_size: 8
+  - name: nWRP
+    description: Not write protect
+    bit_offset: 16
+    bit_size: 12
 fieldset/OPTKEYR:
  description: Flash option key register
  fields:
-    - name: OPTKEY
-      description: Option byte key
-      bit_offset: 0
-      bit_size: 32
+  - name: OPTKEY
+    description: Option byte key
+    bit_offset: 0
+    bit_size: 32
 fieldset/SR:
  description: Status register
  fields:
-    - name: EOP
-      description: End of operation
-      bit_offset: 0
-      bit_size: 1
-    - name: OPERR
-      description: Operation error
-      bit_offset: 1
-      bit_size: 1
-    - name: WRPERR
-      description: Write protection error
-      bit_offset: 4
-      bit_size: 1
-    - name: PGAERR
-      description: Programming alignment error
-      bit_offset: 5
-      bit_size: 1
-    - name: PGPERR
-      description: Programming parallelism error
-      bit_offset: 6
-      bit_size: 1
-    - name: PGSERR
-      description: Programming sequence error
-      bit_offset: 7
-      bit_size: 1
-    - name: BSY
-      description: Busy
-      bit_offset: 16
-      bit_size: 1
+  - name: EOP
+    description: End of operation
+    bit_offset: 0
+    bit_size: 1
+  - name: OPERR
+    description: Operation error
+    bit_offset: 1
+    bit_size: 1
+  - name: WRPERR
+    description: Write protection error
+    bit_offset: 4
+    bit_size: 1
+  - name: PGAERR
+    description: Programming alignment error
+    bit_offset: 5
+    bit_size: 1
+  - name: PGPERR
+    description: Programming parallelism error
+    bit_offset: 6
+    bit_size: 1
+  - name: PGSERR
+    description: Programming sequence error
+    bit_offset: 7
+    bit_size: 1
+  - name: BSY
+    description: Busy
+    bit_offset: 16
+    bit_size: 1
 enum/LATENCY:
  bit_size: 3
  variants:
-    - name: WS0
-      description: 0 wait states
-      value: 0
-    - name: WS1
-      description: 1 wait states
-      value: 1
-    - name: WS2
-      description: 2 wait states
-      value: 2
-    - name: WS3
-      description: 3 wait states
-      value: 3
-    - name: WS4
-      description: 4 wait states
-      value: 4
-    - name: WS5
-      description: 5 wait states
-      value: 5
-    - name: WS6
-      description: 6 wait states
-      value: 6
-    - name: WS7
-      description: 7 wait states
-      value: 7
+  - name: WS0
+    description: 0 wait states
+    value: 0
+  - name: WS1
+    description: 1 wait states
+    value: 1
+  - name: WS2
+    description: 2 wait states
+    value: 2
+  - name: WS3
+    description: 3 wait states
+    value: 3
+  - name: WS4
+    description: 4 wait states
+    value: 4
+  - name: WS5
+    description: 5 wait states
+    value: 5
+  - name: WS6
+    description: 6 wait states
+    value: 6
+  - name: WS7
+    description: 7 wait states
+    value: 7
 enum/PSIZE:
  bit_size: 2
  variants:
-    - name: PSIZE8
-      description: Program x8
-      value: 0
-    - name: PSIZE16
-      description: Program x16
-      value: 1
-    - name: PSIZE32
-      description: Program x32
-      value: 2
-    - name: PSIZE64
-      description: Program x64
-      value: 3
+  - name: PSIZE8
+    description: Program x8
+    value: 0
+  - name: PSIZE16
+    description: Program x16
+    value: 1
+  - name: PSIZE32
+    description: Program x32
+    value: 2
+  - name: PSIZE64
+    description: Program x64
+    value: 3
--- a/data/registers/flash_f3.yaml
+++ b/data/registers/flash_f3.yaml
@ -1,257 +1,256 @@
---
 block/FLASH:
  description: Flash
  items:
-    - name: ACR
-      description: Flash access control register
-      byte_offset: 0
-      fieldset: ACR
-    - name: KEYR
-      description: Flash key register
-      byte_offset: 4
-      access: Write
-      fieldset: KEYR
-    - name: OPTKEYR
-      description: Flash option key register
-      byte_offset: 8
-      access: Write
-      fieldset: OPTKEYR
-    - name: SR
-      description: Flash status register
-      byte_offset: 12
-      fieldset: SR
-    - name: CR
-      description: Flash control register
-      byte_offset: 16
-      fieldset: CR
-    - name: AR
-      description: Flash address register
-      byte_offset: 20
-      access: Write
-      fieldset: AR
-    - name: OBR
-      description: Option byte register
-      byte_offset: 28
-      access: Read
-      fieldset: OBR
-    - name: WRPR
-      description: Write protection register
-      byte_offset: 32
-      access: Read
-      fieldset: WRPR
+  - name: ACR
+    description: Flash access control register
+    byte_offset: 0
+    fieldset: ACR
+  - name: KEYR
+    description: Flash key register
+    byte_offset: 4
+    access: Write
+    fieldset: KEYR
+  - name: OPTKEYR
+    description: Flash option key register
+    byte_offset: 8
+    access: Write
+    fieldset: OPTKEYR
+  - name: SR
+    description: Flash status register
+    byte_offset: 12
+    fieldset: SR
+  - name: CR
+    description: Flash control register
+    byte_offset: 16
+    fieldset: CR
+  - name: AR
+    description: Flash address register
+    byte_offset: 20
+    access: Write
+    fieldset: AR
+  - name: OBR
+    description: Option byte register
+    byte_offset: 28
+    access: Read
+    fieldset: OBR
+  - name: WRPR
+    description: Write protection register
+    byte_offset: 32
+    access: Read
+    fieldset: WRPR
 fieldset/ACR:
  description: Flash access control register
  fields:
-    - name: LATENCY
-      description: LATENCY
-      bit_offset: 0
-      bit_size: 3
-      enum: LATENCY
-    - name: HLFCYA
-      description: Flash half cycle access enable
-      bit_offset: 3
-      bit_size: 1
-    - name: PRFTBE
-      description: PRFTBE
-      bit_offset: 4
-      bit_size: 1
-    - name: PRFTBS
-      description: PRFTBS
-      bit_offset: 5
-      bit_size: 1
+  - name: LATENCY
+    description: LATENCY
+    bit_offset: 0
+    bit_size: 3
+    enum: LATENCY
+  - name: HLFCYA
+    description: Flash half cycle access enable
+    bit_offset: 3
+    bit_size: 1
+  - name: PRFTBE
+    description: PRFTBE
+    bit_offset: 4
+    bit_size: 1
+  - name: PRFTBS
+    description: PRFTBS
+    bit_offset: 5
+    bit_size: 1
 fieldset/AR:
  description: Flash address register
  fields:
-    - name: FAR
-      description: Flash address
-      bit_offset: 0
-      bit_size: 32
+  - name: FAR
+    description: Flash address
+    bit_offset: 0
+    bit_size: 32
 fieldset/CR:
  description: Flash control register
  fields:
-    - name: PG
-      description: Programming
-      bit_offset: 0
-      bit_size: 1
-    - name: PER
-      description: Page erase
-      bit_offset: 1
-      bit_size: 1
-    - name: MER
-      description: Mass erase
-      bit_offset: 2
-      bit_size: 1
-    - name: OPTPG
-      description: Option byte programming
-      bit_offset: 4
-      bit_size: 1
-    - name: OPTER
-      description: Option byte erase
-      bit_offset: 5
-      bit_size: 1
-    - name: STRT
-      description: Start
-      bit_offset: 6
-      bit_size: 1
-    - name: LOCK
-      description: Lock
-      bit_offset: 7
-      bit_size: 1
-    - name: OPTWRE
-      description: Option bytes write enable
-      bit_offset: 9
-      bit_size: 1
-    - name: ERRIE
-      description: Error interrupt enable
-      bit_offset: 10
-      bit_size: 1
-    - name: EOPIE
-      description: End of operation interrupt enable
-      bit_offset: 12
-      bit_size: 1
-    - name: OBL_LAUNCH
-      description: Force option byte loading
-      bit_offset: 13
-      bit_size: 1
+  - name: PG
+    description: Programming
+    bit_offset: 0
+    bit_size: 1
+  - name: PER
+    description: Page erase
+    bit_offset: 1
+    bit_size: 1
+  - name: MER
+    description: Mass erase
+    bit_offset: 2
+    bit_size: 1
+  - name: OPTPG
+    description: Option byte programming
+    bit_offset: 4
+    bit_size: 1
+  - name: OPTER
+    description: Option byte erase
+    bit_offset: 5
+    bit_size: 1
+  - name: STRT
+    description: Start
+    bit_offset: 6
+    bit_size: 1
+  - name: LOCK
+    description: Lock
+    bit_offset: 7
+    bit_size: 1
+  - name: OPTWRE
+    description: Option bytes write enable
+    bit_offset: 9
+    bit_size: 1
+  - name: ERRIE
+    description: Error interrupt enable
+    bit_offset: 10
+    bit_size: 1
+  - name: EOPIE
+    description: End of operation interrupt enable
+    bit_offset: 12
+    bit_size: 1
+  - name: OBL_LAUNCH
+    description: Force option byte loading
+    bit_offset: 13
+    bit_size: 1
 fieldset/KEYR:
  description: Flash key register
  fields:
-    - name: FKEYR
-      description: Flash Key
-      bit_offset: 0
-      bit_size: 32
+  - name: FKEYR
+    description: Flash Key
+    bit_offset: 0
+    bit_size: 32
 fieldset/OBR:
  description: Option byte register
  fields:
-    - name: OPTERR
-      description: Option byte error
-      bit_offset: 0
-      bit_size: 1
-    - name: RDPRT
-      description: Read protection Level status
-      bit_offset: 1
-      bit_size: 2
-      enum: RDPRT
-    - name: WDG_SW
-      description: WDG_SW
-      bit_offset: 8
-      bit_size: 1
-      enum: WDG_SW
-    - name: nRST_STOP
-      description: nRST_STOP
-      bit_offset: 9
-      bit_size: 1
-      enum: nRST_STOP
-    - name: nRST_STDBY
-      description: nRST_STDBY
-      bit_offset: 10
-      bit_size: 1
-      enum: nRST_STDBY
-    - name: nBOOT1
-      description: BOOT1
-      bit_offset: 12
-      bit_size: 1
-    - name: VDDA_MONITOR
-      description: VDDA_MONITOR
-      bit_offset: 13
-      bit_size: 1
-    - name: SRAM_PARITY_CHECK
-      description: SRAM_PARITY_CHECK
-      bit_offset: 14
-      bit_size: 1
-    - name: SDADC12_VDD_MONITOR
-      description: SDADC12_VDD_MONITOR
-      bit_offset: 15
-      bit_size: 1
-    - name: Data0
-      description: Data0
-      bit_offset: 16
-      bit_size: 8
-    - name: Data1
-      description: Data1
-      bit_offset: 24
-      bit_size: 8
+  - name: OPTERR
+    description: Option byte error
+    bit_offset: 0
+    bit_size: 1
+  - name: RDPRT
+    description: Read protection Level status
+    bit_offset: 1
+    bit_size: 2
+    enum: RDPRT
+  - name: WDG_SW
+    description: WDG_SW
+    bit_offset: 8
+    bit_size: 1
+    enum: WDG_SW
+  - name: nRST_STOP
+    description: nRST_STOP
+    bit_offset: 9
+    bit_size: 1
+    enum: nRST_STOP
+  - name: nRST_STDBY
+    description: nRST_STDBY
+    bit_offset: 10
+    bit_size: 1
+    enum: nRST_STDBY
+  - name: nBOOT1
+    description: BOOT1
+    bit_offset: 12
+    bit_size: 1
+  - name: VDDA_MONITOR
+    description: VDDA_MONITOR
+    bit_offset: 13
+    bit_size: 1
+  - name: SRAM_PARITY_CHECK
+    description: SRAM_PARITY_CHECK
+    bit_offset: 14
+    bit_size: 1
+  - name: SDADC12_VDD_MONITOR
+    description: SDADC12_VDD_MONITOR
+    bit_offset: 15
+    bit_size: 1
+  - name: Data0
+    description: Data0
+    bit_offset: 16
+    bit_size: 8
+  - name: Data1
+    description: Data1
+    bit_offset: 24
+    bit_size: 8
 fieldset/OPTKEYR:
  description: Flash option key register
  fields:
-    - name: OPTKEYR
-      description: Option byte key
-      bit_offset: 0
-      bit_size: 32
+  - name: OPTKEYR
+    description: Option byte key
+    bit_offset: 0
+    bit_size: 32
 fieldset/SR:
  description: Flash status register
  fields:
-    - name: BSY
-      description: Busy
-      bit_offset: 0
-      bit_size: 1
-    - name: PGERR
-      description: Programming error
-      bit_offset: 2
-      bit_size: 1
-    - name: WRPRTERR
-      description: Write protection error
-      bit_offset: 4
-      bit_size: 1
-    - name: EOP
-      description: End of operation
-      bit_offset: 5
-      bit_size: 1
+  - name: BSY
+    description: Busy
+    bit_offset: 0
+    bit_size: 1
+  - name: PGERR
+    description: Programming error
+    bit_offset: 2
+    bit_size: 1
+  - name: WRPRTERR
+    description: Write protection error
+    bit_offset: 4
+    bit_size: 1
+  - name: EOP
+    description: End of operation
+    bit_offset: 5
+    bit_size: 1
 fieldset/WRPR:
  description: Write protection register
  fields:
-    - name: WRP
-      description: Write protect
-      bit_offset: 0
-      bit_size: 32
+  - name: WRP
+    description: Write protect
+    bit_offset: 0
+    bit_size: 32
 enum/LATENCY:
  bit_size: 3
  variants:
-    - name: WS0
-      description: "0 wait states, if 0 < HCLK <= 24 MHz"
-      value: 0
-    - name: WS1
-      description: "1 wait state, if 24 < HCLK <= 48 MHz"
-      value: 1
-    - name: WS2
-      description: "2 wait states, if 48 < HCLK <= 72 MHz"
-      value: 2
+  - name: WS0
+    description: 0 wait states, if 0 < HCLK <= 24 MHz
+    value: 0
+  - name: WS1
+    description: 1 wait state, if 24 < HCLK <= 48 MHz
+    value: 1
+  - name: WS2
+    description: 2 wait states, if 48 < HCLK <= 72 MHz
+    value: 2
 enum/RDPRT:
  bit_size: 2
  variants:
-    - name: Level0
-      description: Level 0
-      value: 0
-    - name: Level1
-      description: Level 1
-      value: 1
-    - name: Level2
-      description: Level 2
-      value: 3
+  - name: Level0
+    description: Level 0
+    value: 0
+  - name: Level1
+    description: Level 1
+    value: 1
+  - name: Level2
+    description: Level 2
+    value: 3
 enum/WDG_SW:
  bit_size: 1
  variants:
-    - name: Hardware
-      description: Hardware watchdog
-      value: 0
-    - name: Software
-      description: Software watchdog
-      value: 1
+  - name: Hardware
+    description: Hardware watchdog
+    value: 0
+  - name: Software
+    description: Software watchdog
+    value: 1
 enum/nRST_STDBY:
  bit_size: 1
  variants:
-    - name: Reset
-      description: Reset generated when entering Standby mode
-      value: 0
-    - name: NoReset
-      description: No reset generated
-      value: 1
+  - name: Reset
+    description: Reset generated when entering Standby mode
+    value: 0
+  - name: NoReset
+    description: No reset generated
+    value: 1
 enum/nRST_STOP:
  bit_size: 1
  variants:
-    - name: Reset
-      description: Reset generated when entering Stop mode
-      value: 0
-    - name: NoReset
-      description: No reset generated
-      value: 1
+  - name: Reset
+    description: Reset generated when entering Stop mode
+    value: 0
+  - name: NoReset
+    description: No reset generated
+    value: 1
--- a/data/registers/flash_f4.yaml
+++ b/data/registers/flash_f4.yaml
@ -1,252 +1,251 @@
---
 block/FLASH:
  description: FLASH
  items:
-    - name: ACR
-      description: Flash access control register
-      byte_offset: 0
-      fieldset: ACR
-    - name: KEYR
-      description: Flash key register
-      byte_offset: 4
-      access: Write
-      fieldset: KEYR
-    - name: OPTKEYR
-      description: Flash option key register
-      byte_offset: 8
-      access: Write
-      fieldset: OPTKEYR
-    - name: SR
-      description: Status register
-      byte_offset: 12
-      fieldset: SR
-    - name: CR
-      description: Control register
-      byte_offset: 16
-      fieldset: CR
-    - name: OPTCR
-      description: Flash option control register
-      byte_offset: 20
-      fieldset: OPTCR
+  - name: ACR
+    description: Flash access control register
+    byte_offset: 0
+    fieldset: ACR
+  - name: KEYR
+    description: Flash key register
+    byte_offset: 4
+    access: Write
+    fieldset: KEYR
+  - name: OPTKEYR
+    description: Flash option key register
+    byte_offset: 8
+    access: Write
+    fieldset: OPTKEYR
+  - name: SR
+    description: Status register
+    byte_offset: 12
+    fieldset: SR
+  - name: CR
+    description: Control register
+    byte_offset: 16
+    fieldset: CR
+  - name: OPTCR
+    description: Flash option control register
+    byte_offset: 20
+    fieldset: OPTCR
 fieldset/ACR:
  description: Flash access control register
  fields:
-    - name: LATENCY
-      description: Latency
-      bit_offset: 0
-      bit_size: 3
-      enum: LATENCY
-    - name: PRFTEN
-      description: Prefetch enable
-      bit_offset: 8
-      bit_size: 1
-    - name: ICEN
-      description: Instruction cache enable
-      bit_offset: 9
-      bit_size: 1
-    - name: DCEN
-      description: Data cache enable
-      bit_offset: 10
-      bit_size: 1
-    - name: ICRST
-      description: Instruction cache reset
-      bit_offset: 11
-      bit_size: 1
-    - name: DCRST
-      description: Data cache reset
-      bit_offset: 12
-      bit_size: 1
+  - name: LATENCY
+    description: Latency
+    bit_offset: 0
+    bit_size: 3
+    enum: LATENCY
+  - name: PRFTEN
+    description: Prefetch enable
+    bit_offset: 8
+    bit_size: 1
+  - name: ICEN
+    description: Instruction cache enable
+    bit_offset: 9
+    bit_size: 1
+  - name: DCEN
+    description: Data cache enable
+    bit_offset: 10
+    bit_size: 1
+  - name: ICRST
+    description: Instruction cache reset
+    bit_offset: 11
+    bit_size: 1
+  - name: DCRST
+    description: Data cache reset
+    bit_offset: 12
+    bit_size: 1
 fieldset/CR:
  description: Control register
  fields:
-    - name: PG
-      description: Programming
-      bit_offset: 0
-      bit_size: 1
-    - name: SER
-      description: Sector Erase
-      bit_offset: 1
-      bit_size: 1
-    - name: MER
-      description: Mass Erase
-      bit_offset: 2
-      bit_size: 1
-    - name: SNB
-      description: Sector number
-      bit_offset: 3
-      bit_size: 5
-    - name: PSIZE
-      description: Program size
-      bit_offset: 8
-      bit_size: 2
-      enum: PSIZE
-    - name: STRT
-      description: Start
-      bit_offset: 16
-      bit_size: 1
-    - name: EOPIE
-      description: End of operation interrupt enable
-      bit_offset: 24
-      bit_size: 1
-    - name: ERRIE
-      description: Error interrupt enable
-      bit_offset: 25
-      bit_size: 1
-    - name: LOCK
-      description: Lock
-      bit_offset: 31
-      bit_size: 1
+  - name: PG
+    description: Programming
+    bit_offset: 0
+    bit_size: 1
+  - name: SER
+    description: Sector Erase
+    bit_offset: 1
+    bit_size: 1
+  - name: MER
+    description: Mass Erase
+    bit_offset: 2
+    bit_size: 1
+  - name: SNB
+    description: Sector number
+    bit_offset: 3
+    bit_size: 5
+  - name: PSIZE
+    description: Program size
+    bit_offset: 8
+    bit_size: 2
+    enum: PSIZE
+  - name: STRT
+    description: Start
+    bit_offset: 16
+    bit_size: 1
+  - name: EOPIE
+    description: End of operation interrupt enable
+    bit_offset: 24
+    bit_size: 1
+  - name: ERRIE
+    description: Error interrupt enable
+    bit_offset: 25
+    bit_size: 1
+  - name: LOCK
+    description: Lock
+    bit_offset: 31
+    bit_size: 1
 fieldset/KEYR:
  description: Flash key register
  fields:
-    - name: KEY
-      description: FPEC key
-      bit_offset: 0
-      bit_size: 32
+  - name: KEY
+    description: FPEC key
+    bit_offset: 0
+    bit_size: 32
 fieldset/OPTCR:
  description: Flash option control register
  fields:
-    - name: OPTLOCK
-      description: Option lock
-      bit_offset: 0
-      bit_size: 1
-    - name: OPTSTRT
-      description: Option start
-      bit_offset: 1
-      bit_size: 1
-    - name: BOR_LEV
-      description: BOR reset Level
-      bit_offset: 2
-      bit_size: 2
-    - name: WDG_SW
-      description: WDG_SW User option bytes
-      bit_offset: 5
-      bit_size: 1
-    - name: nRST_STOP
-      description: nRST_STOP User option bytes
-      bit_offset: 6
-      bit_size: 1
-    - name: nRST_STDBY
-      description: nRST_STDBY User option bytes
-      bit_offset: 7
-      bit_size: 1
-    - name: RDP
-      description: Read protect
-      bit_offset: 8
-      bit_size: 8
-    - name: nWRP
-      description: Not write protect
-      bit_offset: 16
-      bit_size: 12
-    - name: DB1M
-      description: Dual-bank enable on 1 Mbyte Flash memory devices
-      bit_offset: 30
-      bit_size: 1
-    - name: SPRMOD
-      description: Selection of protection mode for nWPRi bits
-      bit_offset: 31
-      bit_size: 1
+  - name: OPTLOCK
+    description: Option lock
+    bit_offset: 0
+    bit_size: 1
+  - name: OPTSTRT
+    description: Option start
+    bit_offset: 1
+    bit_size: 1
+  - name: BOR_LEV
+    description: BOR reset Level
+    bit_offset: 2
+    bit_size: 2
+  - name: WDG_SW
+    description: WDG_SW User option bytes
+    bit_offset: 5
+    bit_size: 1
+  - name: nRST_STOP
+    description: nRST_STOP User option bytes
+    bit_offset: 6
+    bit_size: 1
+  - name: nRST_STDBY
+    description: nRST_STDBY User option bytes
+    bit_offset: 7
+    bit_size: 1
+  - name: RDP
+    description: Read protect
+    bit_offset: 8
+    bit_size: 8
+  - name: nWRP
+    description: Not write protect
+    bit_offset: 16
+    bit_size: 12
+  - name: DB1M
+    description: Dual-bank enable on 1 Mbyte Flash memory devices
+    bit_offset: 30
+    bit_size: 1
+  - name: SPRMOD
+    description: Selection of protection mode for nWPRi bits
+    bit_offset: 31
+    bit_size: 1
 fieldset/OPTKEYR:
  description: Flash option key register
  fields:
-    - name: OPTKEY
-      description: Option byte key
-      bit_offset: 0
-      bit_size: 32
+  - name: OPTKEY
+    description: Option byte key
+    bit_offset: 0
+    bit_size: 32
 fieldset/SR:
  description: Status register
  fields:
-    - name: EOP
-      description: End of operation
-      bit_offset: 0
-      bit_size: 1
-    - name: OPERR
-      description: Operation error
-      bit_offset: 1
-      bit_size: 1
-    - name: WRPERR
-      description: Write protection error
-      bit_offset: 4
-      bit_size: 1
-    - name: PGAERR
-      description: Programming alignment error
-      bit_offset: 5
-      bit_size: 1
-    - name: PGPERR
-      description: Programming parallelism error
-      bit_offset: 6
-      bit_size: 1
-    - name: PGSERR
-      description: Programming sequence error
-      bit_offset: 7
-      bit_size: 1
-    - name: BSY
-      description: Busy
-      bit_offset: 16
-      bit_size: 1
+  - name: EOP
+    description: End of operation
+    bit_offset: 0
+    bit_size: 1
+  - name: OPERR
+    description: Operation error
+    bit_offset: 1
+    bit_size: 1
+  - name: WRPERR
+    description: Write protection error
+    bit_offset: 4
+    bit_size: 1
+  - name: PGAERR
+    description: Programming alignment error
+    bit_offset: 5
+    bit_size: 1
+  - name: PGPERR
+    description: Programming parallelism error
+    bit_offset: 6
+    bit_size: 1
+  - name: PGSERR
+    description: Programming sequence error
+    bit_offset: 7
+    bit_size: 1
+  - name: BSY
+    description: Busy
+    bit_offset: 16
+    bit_size: 1
 enum/LATENCY:
  bit_size: 3
  variants:
-    - name: WS0
-      description: 0 wait states
-      value: 0
-    - name: WS1
-      description: 1 wait states
-      value: 1
-    - name: WS2
-      description: 2 wait states
-      value: 2
-    - name: WS3
-      description: 3 wait states
-      value: 3
-    - name: WS4
-      description: 4 wait states
-      value: 4
-    - name: WS5
-      description: 5 wait states
-      value: 5
-    - name: WS6
-      description: 6 wait states
-      value: 6
-    - name: WS7
-      description: 7 wait states
-      value: 7
-    - name: WS8
-      description: 8 wait states
-      value: 8
-    - name: WS9
-      description: 9 wait states
-      value: 9
-    - name: WS10
-      description: 10 wait states
-      value: 10
-    - name: WS11
-      description: 11 wait states
-      value: 11
-    - name: WS12
-      description: 12 wait states
-      value: 12
-    - name: WS13
-      description: 13 wait states
-      value: 13
-    - name: WS14
-      description: 14 wait states
-      value: 14
-    - name: WS15
-      description: 15 wait states
-      value: 15
+  - name: WS0
+    description: 0 wait states
+    value: 0
+  - name: WS1
+    description: 1 wait states
+    value: 1
+  - name: WS2
+    description: 2 wait states
+    value: 2
+  - name: WS3
+    description: 3 wait states
+    value: 3
+  - name: WS4
+    description: 4 wait states
+    value: 4
+  - name: WS5
+    description: 5 wait states
+    value: 5
+  - name: WS6
+    description: 6 wait states
+    value: 6
+  - name: WS7
+    description: 7 wait states
+    value: 7
+  - name: WS8
+    description: 8 wait states
+    value: 8
+  - name: WS9
+    description: 9 wait states
+    value: 9
+  - name: WS10
+    description: 10 wait states
+    value: 10
+  - name: WS11
+    description: 11 wait states
+    value: 11
+  - name: WS12
+    description: 12 wait states
+    value: 12
+  - name: WS13
+    description: 13 wait states
+    value: 13
+  - name: WS14
+    description: 14 wait states
+    value: 14
+  - name: WS15
+    description: 15 wait states
+    value: 15
 enum/PSIZE:
  bit_size: 2
  variants:
-    - name: PSIZE8
-      description: Program x8
-      value: 0
-    - name: PSIZE16
-      description: Program x16
-      value: 1
-    - name: PSIZE32
-      description: Program x32
-      value: 2
-    - name: PSIZE64
-      description: Program x64
-      value: 3
+  - name: PSIZE8
+    description: Program x8
+    value: 0
+  - name: PSIZE16
+    description: Program x16
+    value: 1
+  - name: PSIZE32
+    description: Program x32
+    value: 2
+  - name: PSIZE64
+    description: Program x64
+    value: 3
--- a/data/registers/flash_f7.yaml
+++ b/data/registers/flash_f7.yaml
@ -1,294 +1,293 @@
---
 block/FLASH:
  description: FLASH
  items:
-    - name: ACR
-      description: Flash access control register
-      byte_offset: 0
-      fieldset: ACR
-    - name: KEYR
-      description: Flash key register
-      byte_offset: 4
-      access: Write
-      fieldset: KEYR
-    - name: OPTKEYR
-      description: Flash option key register
-      byte_offset: 8
-      access: Write
-      fieldset: OPTKEYR
-    - name: SR
-      description: Status register
-      byte_offset: 12
-      fieldset: SR
-    - name: CR
-      description: Control register
-      byte_offset: 16
-      fieldset: CR
-    - name: OPTCR
-      description: Flash option control register
-      byte_offset: 20
-      fieldset: OPTCR
-    - name: OPTCR1
-      description: Flash option control register 1
-      byte_offset: 24
-      fieldset: OPTCR1
-    - name: OPTCR2
-      description: Flash option control register
-      byte_offset: 28
-      fieldset: OPTCR2
+  - name: ACR
+    description: Flash access control register
+    byte_offset: 0
+    fieldset: ACR
+  - name: KEYR
+    description: Flash key register
+    byte_offset: 4
+    access: Write
+    fieldset: KEYR
+  - name: OPTKEYR
+    description: Flash option key register
+    byte_offset: 8
+    access: Write
+    fieldset: OPTKEYR
+  - name: SR
+    description: Status register
+    byte_offset: 12
+    fieldset: SR
+  - name: CR
+    description: Control register
+    byte_offset: 16
+    fieldset: CR
+  - name: OPTCR
+    description: Flash option control register
+    byte_offset: 20
+    fieldset: OPTCR
+  - name: OPTCR1
+    description: Flash option control register 1
+    byte_offset: 24
+    fieldset: OPTCR1
+  - name: OPTCR2
+    description: Flash option control register
+    byte_offset: 28
+    fieldset: OPTCR2
 fieldset/ACR:
  description: Flash access control register
  fields:
-    - name: LATENCY
-      description: Latency
-      bit_offset: 0
-      bit_size: 4
-      enum: LATENCY
-    - name: PRFTEN
-      description: Prefetch enable
-      bit_offset: 8
-      bit_size: 1
-    - name: ARTEN
-      description: ART Accelerator Enable
-      bit_offset: 9
-      bit_size: 1
-    - name: ARTRST
-      description: ART Accelerator reset
-      bit_offset: 11
-      bit_size: 1
+  - name: LATENCY
+    description: Latency
+    bit_offset: 0
+    bit_size: 4
+    enum: LATENCY
+  - name: PRFTEN
+    description: Prefetch enable
+    bit_offset: 8
+    bit_size: 1
+  - name: ARTEN
+    description: ART Accelerator Enable
+    bit_offset: 9
+    bit_size: 1
+  - name: ARTRST
+    description: ART Accelerator reset
+    bit_offset: 11
+    bit_size: 1
 fieldset/CR:
  description: Control register
  fields:
-    - name: PG
-      description: Programming
-      bit_offset: 0
-      bit_size: 1
-    - name: SER
-      description: Sector Erase
-      bit_offset: 1
-      bit_size: 1
-    - name: MER
-      description: Mass Erase of sectors 0 to 11
-      bit_offset: 2
-      bit_size: 1
-    - name: SNB
-      description: Sector number
-      bit_offset: 3
-      bit_size: 4
-    - name: PSIZE
-      description: Program size
-      bit_offset: 8
-      bit_size: 2
-      enum: PSIZE
-    - name: STRT
-      description: Start
-      bit_offset: 16
-      bit_size: 1
-    - name: EOPIE
-      description: End of operation interrupt enable
-      bit_offset: 24
-      bit_size: 1
-    - name: ERRIE
-      description: Error interrupt enable
-      bit_offset: 25
-      bit_size: 1
-    - name: RDERRIE
-      description: PCROP error interrupt enable
-      bit_offset: 26
-      bit_size: 1
-    - name: LOCK
-      description: Lock
-      bit_offset: 31
-      bit_size: 1
+  - name: PG
+    description: Programming
+    bit_offset: 0
+    bit_size: 1
+  - name: SER
+    description: Sector Erase
+    bit_offset: 1
+    bit_size: 1
+  - name: MER
+    description: Mass Erase of sectors 0 to 11
+    bit_offset: 2
+    bit_size: 1
+  - name: SNB
+    description: Sector number
+    bit_offset: 3
+    bit_size: 4
+  - name: PSIZE
+    description: Program size
+    bit_offset: 8
+    bit_size: 2
+    enum: PSIZE
+  - name: STRT
+    description: Start
+    bit_offset: 16
+    bit_size: 1
+  - name: EOPIE
+    description: End of operation interrupt enable
+    bit_offset: 24
+    bit_size: 1
+  - name: ERRIE
+    description: Error interrupt enable
+    bit_offset: 25
+    bit_size: 1
+  - name: RDERRIE
+    description: PCROP error interrupt enable
+    bit_offset: 26
+    bit_size: 1
+  - name: LOCK
+    description: Lock
+    bit_offset: 31
+    bit_size: 1
 fieldset/KEYR:
  description: Flash key register
  fields:
-    - name: KEY
-      description: FPEC key
-      bit_offset: 0
-      bit_size: 32
+  - name: KEY
+    description: FPEC key
+    bit_offset: 0
+    bit_size: 32
 fieldset/OPTCR:
  description: Flash option control register
  fields:
-    - name: OPTLOCK
-      description: Option lock
-      bit_offset: 0
-      bit_size: 1
-    - name: OPTSTRT
-      description: Option start
-      bit_offset: 1
-      bit_size: 1
-    - name: BOR_LEV
-      description: BOR reset Level
-      bit_offset: 2
-      bit_size: 2
-    - name: WWDG_SW
-      description: User option bytes
-      bit_offset: 4
-      bit_size: 1
-    - name: IWDG_SW
-      description: WDG_SW User option bytes
-      bit_offset: 5
-      bit_size: 1
-    - name: nRST_STOP
-      description: nRST_STOP User option bytes
-      bit_offset: 6
-      bit_size: 1
-    - name: nRST_STDBY
-      description: nRST_STDBY User option bytes
-      bit_offset: 7
-      bit_size: 1
-    - name: RDP
-      description: Read protect
-      bit_offset: 8
-      bit_size: 8
-    - name: nWRP
-      description: Not write protect
-      bit_offset: 16
-      bit_size: 8
-    - name: nDBOOT
-      description: Dual Boot mode (valid only when nDBANK=0)
-      bit_offset: 28
-      bit_size: 1
-    - name: nDBANK
-      description: Not dual bank mode
-      bit_offset: 29
-      bit_size: 1
-    - name: IWDG_STDBY
-      description: Independent watchdog counter freeze in standby mode
-      bit_offset: 30
-      bit_size: 1
-    - name: IWDG_STOP
-      description: Independent watchdog counter freeze in Stop mode
-      bit_offset: 31
-      bit_size: 1
+  - name: OPTLOCK
+    description: Option lock
+    bit_offset: 0
+    bit_size: 1
+  - name: OPTSTRT
+    description: Option start
+    bit_offset: 1
+    bit_size: 1
+  - name: BOR_LEV
+    description: BOR reset Level
+    bit_offset: 2
+    bit_size: 2
+  - name: WWDG_SW
+    description: User option bytes
+    bit_offset: 4
+    bit_size: 1
+  - name: IWDG_SW
+    description: WDG_SW User option bytes
+    bit_offset: 5
+    bit_size: 1
+  - name: nRST_STOP
+    description: nRST_STOP User option bytes
+    bit_offset: 6
+    bit_size: 1
+  - name: nRST_STDBY
+    description: nRST_STDBY User option bytes
+    bit_offset: 7
+    bit_size: 1
+  - name: RDP
+    description: Read protect
+    bit_offset: 8
+    bit_size: 8
+  - name: nWRP
+    description: Not write protect
+    bit_offset: 16
+    bit_size: 8
+  - name: nDBOOT
+    description: Dual Boot mode (valid only when nDBANK=0)
+    bit_offset: 28
+    bit_size: 1
+  - name: nDBANK
+    description: Not dual bank mode
+    bit_offset: 29
+    bit_size: 1
+  - name: IWDG_STDBY
+    description: Independent watchdog counter freeze in standby mode
+    bit_offset: 30
+    bit_size: 1
+  - name: IWDG_STOP
+    description: Independent watchdog counter freeze in Stop mode
+    bit_offset: 31
+    bit_size: 1
 fieldset/OPTCR1:
  description: Flash option control register 1
  fields:
-    - name: BOOT_ADD0
-      description: Boot base address when Boot pin =0
-      bit_offset: 0
-      bit_size: 16
-    - name: BOOT_ADD1
-      description: Boot base address when Boot pin =1
-      bit_offset: 16
-      bit_size: 16
+  - name: BOOT_ADD0
+    description: Boot base address when Boot pin =0
+    bit_offset: 0
+    bit_size: 16
+  - name: BOOT_ADD1
+    description: Boot base address when Boot pin =1
+    bit_offset: 16
+    bit_size: 16
 fieldset/OPTCR2:
  description: Flash option control register
  fields:
-    - name: PCROPi
-      description: PCROP option byte
-      bit_offset: 0
-      bit_size: 8
-    - name: PCROP_RDP
-      description: PCROP zone preserved when RDP level decreased
-      bit_offset: 31
-      bit_size: 1
+  - name: PCROPi
+    description: PCROP option byte
+    bit_offset: 0
+    bit_size: 8
+  - name: PCROP_RDP
+    description: PCROP zone preserved when RDP level decreased
+    bit_offset: 31
+    bit_size: 1
 fieldset/OPTKEYR:
  description: Flash option key register
  fields:
-    - name: OPTKEYR
-      description: Option byte key
-      bit_offset: 0
-      bit_size: 32
+  - name: OPTKEYR
+    description: Option byte key
+    bit_offset: 0
+    bit_size: 32
 fieldset/SR:
  description: Status register
  fields:
-    - name: EOP
-      description: End of operation
-      bit_offset: 0
-      bit_size: 1
-    - name: OPERR
-      description: Operation error
-      bit_offset: 1
-      bit_size: 1
-    - name: WRPERR
-      description: Write protection error
-      bit_offset: 4
-      bit_size: 1
-    - name: PGAERR
-      description: Programming alignment error
-      bit_offset: 5
-      bit_size: 1
-    - name: PGPERR
-      description: Programming parallelism error
-      bit_offset: 6
-      bit_size: 1
-    - name: ERSERR
-      description: Erase Sequence Error
-      bit_offset: 7
-      bit_size: 1
-    - name: RDERR
-      description: RDERR
-      bit_offset: 8
-      bit_size: 1
-    - name: BSY
-      description: Busy
-      bit_offset: 16
-      bit_size: 1
+  - name: EOP
+    description: End of operation
+    bit_offset: 0
+    bit_size: 1
+  - name: OPERR
+    description: Operation error
+    bit_offset: 1
+    bit_size: 1
+  - name: WRPERR
+    description: Write protection error
+    bit_offset: 4
+    bit_size: 1
+  - name: PGAERR
+    description: Programming alignment error
+    bit_offset: 5
+    bit_size: 1
+  - name: PGPERR
+    description: Programming parallelism error
+    bit_offset: 6
+    bit_size: 1
+  - name: ERSERR
+    description: Erase Sequence Error
+    bit_offset: 7
+    bit_size: 1
+  - name: RDERR
+    description: RDERR
+    bit_offset: 8
+    bit_size: 1
+  - name: BSY
+    description: Busy
+    bit_offset: 16
+    bit_size: 1
 enum/LATENCY:
  bit_size: 4
  variants:
-    - name: WS0
-      description: 0 wait states
-      value: 0
-    - name: WS1
-      description: 1 wait states
-      value: 1
-    - name: WS2
-      description: 2 wait states
-      value: 2
-    - name: WS3
-      description: 3 wait states
-      value: 3
-    - name: WS4
-      description: 4 wait states
-      value: 4
-    - name: WS5
-      description: 5 wait states
-      value: 5
-    - name: WS6
-      description: 6 wait states
-      value: 6
-    - name: WS7
-      description: 7 wait states
-      value: 7
-    - name: WS8
-      description: 8 wait states
-      value: 8
-    - name: WS9
-      description: 9 wait states
-      value: 9
-    - name: WS10
-      description: 10 wait states
-      value: 10
-    - name: WS11
-      description: 11 wait states
-      value: 11
-    - name: WS12
-      description: 12 wait states
-      value: 12
-    - name: WS13
-      description: 13 wait states
-      value: 13
-    - name: WS14
-      description: 14 wait states
-      value: 14
-    - name: WS15
-      description: 15 wait states
-      value: 15
+  - name: WS0
+    description: 0 wait states
+    value: 0
+  - name: WS1
+    description: 1 wait states
+    value: 1
+  - name: WS2
+    description: 2 wait states
+    value: 2
+  - name: WS3
+    description: 3 wait states
+    value: 3
+  - name: WS4
+    description: 4 wait states
+    value: 4
+  - name: WS5
+    description: 5 wait states
+    value: 5
+  - name: WS6
+    description: 6 wait states
+    value: 6
+  - name: WS7
+    description: 7 wait states
+    value: 7
+  - name: WS8
+    description: 8 wait states
+    value: 8
+  - name: WS9
+    description: 9 wait states
+    value: 9
+  - name: WS10
+    description: 10 wait states
+    value: 10
+  - name: WS11
+    description: 11 wait states
+    value: 11
+  - name: WS12
+    description: 12 wait states
+    value: 12
+  - name: WS13
+    description: 13 wait states
+    value: 13
+  - name: WS14
+    description: 14 wait states
+    value: 14
+  - name: WS15
+    description: 15 wait states
+    value: 15
 enum/PSIZE:
  bit_size: 2
  variants:
-    - name: PSIZE8
-      description: Program x8
-      value: 0
-    - name: PSIZE16
-      description: Program x16
-      value: 1
-    - name: PSIZE32
-      description: Program x32
-      value: 2
-    - name: PSIZE64
-      description: Program x64
-      value: 3
+  - name: PSIZE8
+    description: Program x8
+    value: 0
+  - name: PSIZE16
+    description: Program x16
+    value: 1
+  - name: PSIZE32
+    description: Program x32
+    value: 2
+  - name: PSIZE64
+    description: Program x64
+    value: 3
--- a/data/registers/flash_g0.yaml
+++ b/data/registers/flash_g0.yaml
@ -1,454 +1,453 @@
---
 block/FLASH:
  description: Flash
  items:
-    - name: ACR
-      description: Access control register
-      byte_offset: 0
-      fieldset: ACR
-    - name: KEYR
-      description: Flash key register
-      byte_offset: 8
-      access: Write
-      fieldset: KEYR
-    - name: OPTKEYR
-      description: Option byte key register
-      byte_offset: 12
-      access: Write
-      fieldset: OPTKEYR
-    - name: SR
-      description: Status register
-      byte_offset: 16
-      fieldset: SR
-    - name: CR
-      description: Flash control register
-      byte_offset: 20
-      fieldset: CR
-    - name: ECCR
-      description: Flash ECC register
-      byte_offset: 24
-      fieldset: ECCR
-    - name: OPTR
-      description: Flash option register
-      byte_offset: 32
-      fieldset: OPTR
-    - name: PCROP1ASR
-      description: Flash PCROP zone A Start address register
-      byte_offset: 36
-      access: Read
-      fieldset: PCROP1ASR
-    - name: PCROP1AER
-      description: Flash PCROP zone A End address register
-      byte_offset: 40
-      access: Read
-      fieldset: PCROP1AER
-    - name: WRP1AR
-      description: Flash WRP area A address register
-      byte_offset: 44
-      access: Read
-      fieldset: WRP1AR
-    - name: WRP1BR
-      description: Flash WRP area B address register
-      byte_offset: 48
-      access: Read
-      fieldset: WRP1BR
-    - name: PCROP1BSR
-      description: Flash PCROP zone B Start address register
-      byte_offset: 52
-      access: Read
-      fieldset: PCROP1BSR
-    - name: PCROP1BER
-      description: Flash PCROP zone B End address register
-      byte_offset: 56
-      access: Read
-      fieldset: PCROP1BER
-    - name: SECR
-      description: Flash Security register
-      byte_offset: 128
-      access: Read
-      fieldset: SECR
+  - name: ACR
+    description: Access control register
+    byte_offset: 0
+    fieldset: ACR
+  - name: KEYR
+    description: Flash key register
+    byte_offset: 8
+    access: Write
+    fieldset: KEYR
+  - name: OPTKEYR
+    description: Option byte key register
+    byte_offset: 12
+    access: Write
+    fieldset: OPTKEYR
+  - name: SR
+    description: Status register
+    byte_offset: 16
+    fieldset: SR
+  - name: CR
+    description: Flash control register
+    byte_offset: 20
+    fieldset: CR
+  - name: ECCR
+    description: Flash ECC register
+    byte_offset: 24
+    fieldset: ECCR
+  - name: OPTR
+    description: Flash option register
+    byte_offset: 32
+    fieldset: OPTR
+  - name: PCROP1ASR
+    description: Flash PCROP zone A Start address register
+    byte_offset: 36
+    access: Read
+    fieldset: PCROP1ASR
+  - name: PCROP1AER
+    description: Flash PCROP zone A End address register
+    byte_offset: 40
+    access: Read
+    fieldset: PCROP1AER
+  - name: WRP1AR
+    description: Flash WRP area A address register
+    byte_offset: 44
+    access: Read
+    fieldset: WRP1AR
+  - name: WRP1BR
+    description: Flash WRP area B address register
+    byte_offset: 48
+    access: Read
+    fieldset: WRP1BR
+  - name: PCROP1BSR
+    description: Flash PCROP zone B Start address register
+    byte_offset: 52
+    access: Read
+    fieldset: PCROP1BSR
+  - name: PCROP1BER
+    description: Flash PCROP zone B End address register
+    byte_offset: 56
+    access: Read
+    fieldset: PCROP1BER
+  - name: SECR
+    description: Flash Security register
+    byte_offset: 128
+    access: Read
+    fieldset: SECR
 fieldset/ACR:
  description: Access control register
  fields:
-    - name: LATENCY
-      description: Latency
-      bit_offset: 0
-      bit_size: 3
-      enum: LATENCY
-    - name: PRFTEN
-      description: Prefetch enable
-      bit_offset: 8
-      bit_size: 1
-    - name: ICEN
-      description: Instruction cache enable
-      bit_offset: 9
-      bit_size: 1
-    - name: ICRST
-      description: Instruction cache reset
-      bit_offset: 11
-      bit_size: 1
-    - name: EMPTY
-      description: Flash User area empty
-      bit_offset: 16
-      bit_size: 1
-    - name: DBG_SWEN
-      description: Debug access software enable
-      bit_offset: 18
-      bit_size: 1
+  - name: LATENCY
+    description: Latency
+    bit_offset: 0
+    bit_size: 3
+    enum: LATENCY
+  - name: PRFTEN
+    description: Prefetch enable
+    bit_offset: 8
+    bit_size: 1
+  - name: ICEN
+    description: Instruction cache enable
+    bit_offset: 9
+    bit_size: 1
+  - name: ICRST
+    description: Instruction cache reset
+    bit_offset: 11
+    bit_size: 1
+  - name: EMPTY
+    description: Flash User area empty
+    bit_offset: 16
+    bit_size: 1
+  - name: DBG_SWEN
+    description: Debug access software enable
+    bit_offset: 18
+    bit_size: 1
 fieldset/CR:
  description: Flash control register
  fields:
-    - name: PG
-      description: Programming
-      bit_offset: 0
-      bit_size: 1
-    - name: PER
-      description: Page erase
-      bit_offset: 1
-      bit_size: 1
-    - name: MER
-      description: Mass erase
-      bit_offset: 2
-      bit_size: 1
-    - name: PNB
-      description: Page number
-      bit_offset: 3
-      bit_size: 6
-    - name: STRT
-      description: Start
-      bit_offset: 16
-      bit_size: 1
-    - name: OPTSTRT
-      description: Options modification start
-      bit_offset: 17
-      bit_size: 1
-    - name: FSTPG
-      description: Fast programming
-      bit_offset: 18
-      bit_size: 1
-    - name: EOPIE
-      description: End of operation interrupt enable
-      bit_offset: 24
-      bit_size: 1
-    - name: ERRIE
-      description: Error interrupt enable
-      bit_offset: 25
-      bit_size: 1
-    - name: RDERRIE
-      description: PCROP read error interrupt enable
-      bit_offset: 26
-      bit_size: 1
-    - name: OBL_LAUNCH
-      description: Force the option byte loading
-      bit_offset: 27
-      bit_size: 1
-    - name: SEC_PROT
-      description: Securable memory area protection enable
-      bit_offset: 28
-      bit_size: 1
-    - name: OPTLOCK
-      description: Options Lock
-      bit_offset: 30
-      bit_size: 1
-    - name: LOCK
-      description: FLASH_CR Lock
-      bit_offset: 31
-      bit_size: 1
+  - name: PG
+    description: Programming
+    bit_offset: 0
+    bit_size: 1
+  - name: PER
+    description: Page erase
+    bit_offset: 1
+    bit_size: 1
+  - name: MER
+    description: Mass erase
+    bit_offset: 2
+    bit_size: 1
+  - name: PNB
+    description: Page number
+    bit_offset: 3
+    bit_size: 6
+  - name: STRT
+    description: Start
+    bit_offset: 16
+    bit_size: 1
+  - name: OPTSTRT
+    description: Options modification start
+    bit_offset: 17
+    bit_size: 1
+  - name: FSTPG
+    description: Fast programming
+    bit_offset: 18
+    bit_size: 1
+  - name: EOPIE
+    description: End of operation interrupt enable
+    bit_offset: 24
+    bit_size: 1
+  - name: ERRIE
+    description: Error interrupt enable
+    bit_offset: 25
+    bit_size: 1
+  - name: RDERRIE
+    description: PCROP read error interrupt enable
+    bit_offset: 26
+    bit_size: 1
+  - name: OBL_LAUNCH
+    description: Force the option byte loading
+    bit_offset: 27
+    bit_size: 1
+  - name: SEC_PROT
+    description: Securable memory area protection enable
+    bit_offset: 28
+    bit_size: 1
+  - name: OPTLOCK
+    description: Options Lock
+    bit_offset: 30
+    bit_size: 1
+  - name: LOCK
+    description: FLASH_CR Lock
+    bit_offset: 31
+    bit_size: 1
 fieldset/ECCR:
  description: Flash ECC register
  fields:
-    - name: ADDR_ECC
-      description: ECC fail address
-      bit_offset: 0
-      bit_size: 14
-    - name: SYSF_ECC
-      description: ECC fail for Corrected ECC Error or Double ECC Error in info block
-      bit_offset: 20
-      bit_size: 1
-    - name: ECCIE
-      description: ECC correction interrupt enable
-      bit_offset: 24
-      bit_size: 1
-    - name: ECCC
-      description: ECC correction
-      bit_offset: 30
-      bit_size: 1
-    - name: ECCD
-      description: ECC detection
-      bit_offset: 31
-      bit_size: 1
+  - name: ADDR_ECC
+    description: ECC fail address
+    bit_offset: 0
+    bit_size: 14
+  - name: SYSF_ECC
+    description: ECC fail for Corrected ECC Error or Double ECC Error in info block
+    bit_offset: 20
+    bit_size: 1
+  - name: ECCIE
+    description: ECC correction interrupt enable
+    bit_offset: 24
+    bit_size: 1
+  - name: ECCC
+    description: ECC correction
+    bit_offset: 30
+    bit_size: 1
+  - name: ECCD
+    description: ECC detection
+    bit_offset: 31
+    bit_size: 1
 fieldset/KEYR:
  description: Flash key register
  fields:
-    - name: KEYR
-      description: KEYR
-      bit_offset: 0
-      bit_size: 32
+  - name: KEYR
+    description: KEYR
+    bit_offset: 0
+    bit_size: 32
 fieldset/OPTKEYR:
  description: Option byte key register
  fields:
-    - name: OPTKEYR
-      description: Option byte key
-      bit_offset: 0
-      bit_size: 32
+  - name: OPTKEYR
+    description: Option byte key
+    bit_offset: 0
+    bit_size: 32
 fieldset/OPTR:
  description: Flash option register
  fields:
-    - name: RDP
-      description: Read protection level
-      bit_offset: 0
-      bit_size: 8
-      enum: RDP
-    - name: BOREN
-      description: BOR reset Level
-      bit_offset: 8
-      bit_size: 1
-    - name: BORF_LEV
-      description: These bits contain the VDD supply level threshold that activates the reset
-      bit_offset: 9
-      bit_size: 2
-      enum: BORF_LEV
-    - name: BORR_LEV
-      description: These bits contain the VDD supply level threshold that releases the reset.
-      bit_offset: 11
-      bit_size: 2
-      enum: BORR_LEV
-    - name: nRST_STOP
-      description: nRST_STOP
-      bit_offset: 13
-      bit_size: 1
-    - name: nRST_STDBY
-      description: nRST_STDBY
-      bit_offset: 14
-      bit_size: 1
-    - name: nRSTS_HDW
-      description: nRSTS_HDW
-      bit_offset: 15
-      bit_size: 1
-    - name: IDWG_SW
-      description: Independent watchdog selection
-      bit_offset: 16
-      bit_size: 1
-    - name: IWDG_STOP
-      description: Independent watchdog counter freeze in Stop mode
-      bit_offset: 17
-      bit_size: 1
-    - name: IWDG_STDBY
-      description: Independent watchdog counter freeze in Standby mode
-      bit_offset: 18
-      bit_size: 1
-    - name: WWDG_SW
-      description: Window watchdog selection
-      bit_offset: 19
-      bit_size: 1
-    - name: RAM_PARITY_CHECK
-      description: SRAM parity check control
-      bit_offset: 22
-      bit_size: 1
-    - name: nBOOT_SEL
-      description: nBOOT_SEL
-      bit_offset: 24
-      bit_size: 1
-    - name: nBOOT1
-      description: Boot configuration
-      bit_offset: 25
-      bit_size: 1
-    - name: nBOOT0
-      description: nBOOT0 option bit
-      bit_offset: 26
-      bit_size: 1
-    - name: NRST_MODE
-      description: NRST_MODE
-      bit_offset: 27
-      bit_size: 2
-      enum: NRST_MODE
-    - name: IRHEN
-      description: Internal reset holder enable bit
-      bit_offset: 29
-      bit_size: 1
+  - name: RDP
+    description: Read protection level
+    bit_offset: 0
+    bit_size: 8
+    enum: RDP
+  - name: BOREN
+    description: BOR reset Level
+    bit_offset: 8
+    bit_size: 1
+  - name: BORF_LEV
+    description: These bits contain the VDD supply level threshold that activates the reset
+    bit_offset: 9
+    bit_size: 2
+    enum: BORF_LEV
+  - name: BORR_LEV
+    description: These bits contain the VDD supply level threshold that releases the reset.
+    bit_offset: 11
+    bit_size: 2
+    enum: BORR_LEV
+  - name: nRST_STOP
+    description: nRST_STOP
+    bit_offset: 13
+    bit_size: 1
+  - name: nRST_STDBY
+    description: nRST_STDBY
+    bit_offset: 14
+    bit_size: 1
+  - name: nRSTS_HDW
+    description: nRSTS_HDW
+    bit_offset: 15
+    bit_size: 1
+  - name: IDWG_SW
+    description: Independent watchdog selection
+    bit_offset: 16
+    bit_size: 1
+  - name: IWDG_STOP
+    description: Independent watchdog counter freeze in Stop mode
+    bit_offset: 17
+    bit_size: 1
+  - name: IWDG_STDBY
+    description: Independent watchdog counter freeze in Standby mode
+    bit_offset: 18
+    bit_size: 1
+  - name: WWDG_SW
+    description: Window watchdog selection
+    bit_offset: 19
+    bit_size: 1
+  - name: RAM_PARITY_CHECK
+    description: SRAM parity check control
+    bit_offset: 22
+    bit_size: 1
+  - name: nBOOT_SEL
+    description: nBOOT_SEL
+    bit_offset: 24
+    bit_size: 1
+  - name: nBOOT1
+    description: Boot configuration
+    bit_offset: 25
+    bit_size: 1
+  - name: nBOOT0
+    description: nBOOT0 option bit
+    bit_offset: 26
+    bit_size: 1
+  - name: NRST_MODE
+    description: NRST_MODE
+    bit_offset: 27
+    bit_size: 2
+    enum: NRST_MODE
+  - name: IRHEN
+    description: Internal reset holder enable bit
+    bit_offset: 29
+    bit_size: 1
 fieldset/PCROP1AER:
  description: Flash PCROP zone A End address register
  fields:
-    - name: PCROP1A_END
-      description: PCROP1A area end offset
-      bit_offset: 0
-      bit_size: 8
-    - name: PCROP_RDP
-      description: PCROP area preserved when RDP level decreased
-      bit_offset: 31
-      bit_size: 1
+  - name: PCROP1A_END
+    description: PCROP1A area end offset
+    bit_offset: 0
+    bit_size: 8
+  - name: PCROP_RDP
+    description: PCROP area preserved when RDP level decreased
+    bit_offset: 31
+    bit_size: 1
 fieldset/PCROP1ASR:
  description: Flash PCROP zone A Start address register
  fields:
-    - name: PCROP1A_STRT
-      description: PCROP1A area start offset
-      bit_offset: 0
-      bit_size: 8
+  - name: PCROP1A_STRT
+    description: PCROP1A area start offset
+    bit_offset: 0
+    bit_size: 8
 fieldset/PCROP1BER:
  description: Flash PCROP zone B End address register
  fields:
-    - name: PCROP1B_END
-      description: PCROP1B area end offset
-      bit_offset: 0
-      bit_size: 8
+  - name: PCROP1B_END
+    description: PCROP1B area end offset
+    bit_offset: 0
+    bit_size: 8
 fieldset/PCROP1BSR:
  description: Flash PCROP zone B Start address register
  fields:
-    - name: PCROP1B_STRT
-      description: PCROP1B area start offset
-      bit_offset: 0
-      bit_size: 8
+  - name: PCROP1B_STRT
+    description: PCROP1B area start offset
+    bit_offset: 0
+    bit_size: 8
 fieldset/SECR:
  description: Flash Security register
  fields:
-    - name: SEC_SIZE
-      description: Securable memory area size
-      bit_offset: 0
-      bit_size: 7
-    - name: BOOT_LOCK
-      description: used to force boot from user area
-      bit_offset: 16
-      bit_size: 1
+  - name: SEC_SIZE
+    description: Securable memory area size
+    bit_offset: 0
+    bit_size: 7
+  - name: BOOT_LOCK
+    description: used to force boot from user area
+    bit_offset: 16
+    bit_size: 1
 fieldset/SR:
  description: Status register
  fields:
-    - name: EOP
-      description: End of operation
-      bit_offset: 0
-      bit_size: 1
-    - name: OPERR
-      description: Operation error
-      bit_offset: 1
-      bit_size: 1
-    - name: PROGERR
-      description: Programming error
-      bit_offset: 3
-      bit_size: 1
-    - name: WRPERR
-      description: Write protected error
-      bit_offset: 4
-      bit_size: 1
-    - name: PGAERR
-      description: Programming alignment error
-      bit_offset: 5
-      bit_size: 1
-    - name: SIZERR
-      description: Size error
-      bit_offset: 6
-      bit_size: 1
-    - name: PGSERR
-      description: Programming sequence error
-      bit_offset: 7
-      bit_size: 1
-    - name: MISERR
-      description: Fast programming data miss error
-      bit_offset: 8
-      bit_size: 1
-    - name: FASTERR
-      description: Fast programming error
-      bit_offset: 9
-      bit_size: 1
-    - name: RDERR
-      description: PCROP read error
-      bit_offset: 14
-      bit_size: 1
-    - name: OPTVERR
-      description: Option and Engineering bits loading validity error
-      bit_offset: 15
-      bit_size: 1
-    - name: BSY
-      description: Busy
-      bit_offset: 16
-      bit_size: 1
-    - name: CFGBSY
-      description: Programming or erase configuration busy.
-      bit_offset: 18
-      bit_size: 1
+  - name: EOP
+    description: End of operation
+    bit_offset: 0
+    bit_size: 1
+  - name: OPERR
+    description: Operation error
+    bit_offset: 1
+    bit_size: 1
+  - name: PROGERR
+    description: Programming error
+    bit_offset: 3
+    bit_size: 1
+  - name: WRPERR
+    description: Write protected error
+    bit_offset: 4
+    bit_size: 1
+  - name: PGAERR
+    description: Programming alignment error
+    bit_offset: 5
+    bit_size: 1
+  - name: SIZERR
+    description: Size error
+    bit_offset: 6
+    bit_size: 1
+  - name: PGSERR
+    description: Programming sequence error
+    bit_offset: 7
+    bit_size: 1
+  - name: MISERR
+    description: Fast programming data miss error
+    bit_offset: 8
+    bit_size: 1
+  - name: FASTERR
+    description: Fast programming error
+    bit_offset: 9
+    bit_size: 1
+  - name: RDERR
+    description: PCROP read error
+    bit_offset: 14
+    bit_size: 1
+  - name: OPTVERR
+    description: Option and Engineering bits loading validity error
+    bit_offset: 15
+    bit_size: 1
+  - name: BSY
+    description: Busy
+    bit_offset: 16
+    bit_size: 1
+  - name: CFGBSY
+    description: Programming or erase configuration busy.
+    bit_offset: 18
+    bit_size: 1
 fieldset/WRP1AR:
  description: Flash WRP area A address register
  fields:
-    - name: WRP1A_STRT
-      description: WRP area A start offset
-      bit_offset: 0
-      bit_size: 6
-    - name: WRP1A_END
-      description: WRP area A end offset
-      bit_offset: 16
-      bit_size: 6
+  - name: WRP1A_STRT
+    description: WRP area A start offset
+    bit_offset: 0
+    bit_size: 6
+  - name: WRP1A_END
+    description: WRP area A end offset
+    bit_offset: 16
+    bit_size: 6
 fieldset/WRP1BR:
  description: Flash WRP area B address register
  fields:
-    - name: WRP1B_STRT
-      description: WRP area B start offset
-      bit_offset: 0
-      bit_size: 6
-    - name: WRP1B_END
-      description: WRP area B end offset
-      bit_offset: 16
-      bit_size: 6
+  - name: WRP1B_STRT
+    description: WRP area B start offset
+    bit_offset: 0
+    bit_size: 6
+  - name: WRP1B_END
+    description: WRP area B end offset
+    bit_offset: 16
+    bit_size: 6
 enum/BORF_LEV:
  bit_size: 2
  variants:
-    - name: FALLING_0
-      description: BOR falling level 1 with threshold around 2.0V
-      value: 0
-    - name: FALLING_1
-      description: BOR falling level 2 with threshold around 2.2V
-      value: 1
-    - name: FALLING_2
-      description: BOR falling level 3 with threshold around 2.5V
-      value: 2
-    - name: FALLING_3
-      description: BOR falling level 4 with threshold around 2.8V
-      value: 3
+  - name: FALLING_0
+    description: BOR falling level 1 with threshold around 2.0V
+    value: 0
+  - name: FALLING_1
+    description: BOR falling level 2 with threshold around 2.2V
+    value: 1
+  - name: FALLING_2
+    description: BOR falling level 3 with threshold around 2.5V
+    value: 2
+  - name: FALLING_3
+    description: BOR falling level 4 with threshold around 2.8V
+    value: 3
 enum/BORR_LEV:
  bit_size: 2
  variants:
-    - name: RISING_0
-      description: BOR rising level 1 with threshold around 2.1V
-      value: 0
-    - name: RISING_1
-      description: BOR rising level 2 with threshold around 2.3V
-      value: 1
-    - name: RISING_2
-      description: BOR rising level 3 with threshold around 2.6V
-      value: 2
-    - name: RISING_3
-      description: BOR rising level 4 with threshold around 2.9V
-      value: 3
+  - name: RISING_0
+    description: BOR rising level 1 with threshold around 2.1V
+    value: 0
+  - name: RISING_1
+    description: BOR rising level 2 with threshold around 2.3V
+    value: 1
+  - name: RISING_2
+    description: BOR rising level 3 with threshold around 2.6V
+    value: 2
+  - name: RISING_3
+    description: BOR rising level 4 with threshold around 2.9V
+    value: 3
 enum/LATENCY:
  bit_size: 3
  variants:
-    - name: WS0
-      description: Zero wait states
-      value: 0
-    - name: WS1
-      description: One wait state
-      value: 1
-    - name: WS2
-      description: Two wait states
-      value: 2
+  - name: WS0
+    description: Zero wait states
+    value: 0
+  - name: WS1
+    description: One wait state
+    value: 1
+  - name: WS2
+    description: Two wait states
+    value: 2
 enum/NRST_MODE:
  bit_size: 2
  variants:
-    - name: INPUT_ONLY
-      description: Reset pin is in reset input mode only
-      value: 1
-    - name: GPIO
-      description: Reset pin is in GPIO mode only
-      value: 2
-    - name: INPUT_OUTPUT
-      description: Reset pin is in resety input and output mode
-      value: 3
+  - name: INPUT_ONLY
+    description: Reset pin is in reset input mode only
+    value: 1
+  - name: GPIO
+    description: Reset pin is in GPIO mode only
+    value: 2
+  - name: INPUT_OUTPUT
+    description: Reset pin is in resety input and output mode
+    value: 3
 enum/RDP:
  bit_size: 8
  variants:
-    - name: LEVEL_0
-      description: Read protection not active
-      value: 170
-    - name: LEVEL_1
-      description: Memories read protection active
-      value: 187
-    - name: LEVEL_2
-      description: Chip read protection active
-      value: 204
+  - name: LEVEL_0
+    description: Read protection not active
+    value: 170
+  - name: LEVEL_1
+    description: Memories read protection active
+    value: 187
+  - name: LEVEL_2
+    description: Chip read protection active
+    value: 204
--- a/data/registers/flash_g4.yaml
+++ b/data/registers/flash_g4.yaml
@ -1,427 +1,426 @@
---
 block/FLASH:
  description: Flash
  items:
-    - name: ACR
-      description: Access control register
-      byte_offset: 0
-      fieldset: ACR
-    - name: PDKEYR
-      description: Power down key register
-      byte_offset: 4
-      access: Write
-      fieldset: PDKEYR
-    - name: KEYR
-      description: Flash key register
-      byte_offset: 8
-      access: Write
-      fieldset: KEYR
-    - name: OPTKEYR
-      description: Option byte key register
-      byte_offset: 12
-      access: Write
-      fieldset: OPTKEYR
-    - name: SR
-      description: Status register
-      byte_offset: 16
-      fieldset: SR
-    - name: CR
-      description: Flash control register
-      byte_offset: 20
-      fieldset: CR
-    - name: ECCR
-      description: Flash ECC register
-      byte_offset: 24
-      fieldset: ECCR
-    - name: OPTR
-      description: Flash option register
-      byte_offset: 32
-      fieldset: OPTR
-    - name: PCROP1SR
-      description: Flash Bank 1 PCROP Start address register
-      byte_offset: 36
-      fieldset: PCROP1SR
-    - name: PCROP1ER
-      description: Flash Bank 1 PCROP End address register
-      byte_offset: 40
-      fieldset: PCROP1ER
-    - name: WRP1AR
-      description: Flash Bank 1 WRP area A address register
-      byte_offset: 44
-      fieldset: WRP1AR
-    - name: WRP1BR
-      description: Flash Bank 1 WRP area B address register
-      byte_offset: 48
-      fieldset: WRP1BR
-    - name: SEC1R
-      description: securable area bank1 register
-      byte_offset: 112
-      fieldset: SEC1R
+  - name: ACR
+    description: Access control register
+    byte_offset: 0
+    fieldset: ACR
+  - name: PDKEYR
+    description: Power down key register
+    byte_offset: 4
+    access: Write
+    fieldset: PDKEYR
+  - name: KEYR
+    description: Flash key register
+    byte_offset: 8
+    access: Write
+    fieldset: KEYR
+  - name: OPTKEYR
+    description: Option byte key register
+    byte_offset: 12
+    access: Write
+    fieldset: OPTKEYR
+  - name: SR
+    description: Status register
+    byte_offset: 16
+    fieldset: SR
+  - name: CR
+    description: Flash control register
+    byte_offset: 20
+    fieldset: CR
+  - name: ECCR
+    description: Flash ECC register
+    byte_offset: 24
+    fieldset: ECCR
+  - name: OPTR
+    description: Flash option register
+    byte_offset: 32
+    fieldset: OPTR
+  - name: PCROP1SR
+    description: Flash Bank 1 PCROP Start address register
+    byte_offset: 36
+    fieldset: PCROP1SR
+  - name: PCROP1ER
+    description: Flash Bank 1 PCROP End address register
+    byte_offset: 40
+    fieldset: PCROP1ER
+  - name: WRP1AR
+    description: Flash Bank 1 WRP area A address register
+    byte_offset: 44
+    fieldset: WRP1AR
+  - name: WRP1BR
+    description: Flash Bank 1 WRP area B address register
+    byte_offset: 48
+    fieldset: WRP1BR
+  - name: SEC1R
+    description: securable area bank1 register
+    byte_offset: 112
+    fieldset: SEC1R
 fieldset/ACR:
  description: Access control register
  fields:
-    - name: LATENCY
-      description: Latency
-      bit_offset: 0
-      bit_size: 4
-      enum: LATENCY
-    - name: PRFTEN
-      description: Prefetch enable
-      bit_offset: 8
-      bit_size: 1
-    - name: ICEN
-      description: Instruction cache enable
-      bit_offset: 9
-      bit_size: 1
-    - name: DCEN
-      description: Data cache enable
-      bit_offset: 10
-      bit_size: 1
-    - name: ICRST
-      description: Instruction cache reset
-      bit_offset: 11
-      bit_size: 1
-    - name: DCRST
-      description: Data cache reset
-      bit_offset: 12
-      bit_size: 1
-    - name: RUN_PD
-      description: Flash Power-down mode during Low-power run mode
-      bit_offset: 13
-      bit_size: 1
-    - name: SLEEP_PD
-      description: Flash Power-down mode during Low-power sleep mode
-      bit_offset: 14
-      bit_size: 1
-    - name: DBG_SWEN
-      description: Debug software enable
-      bit_offset: 18
-      bit_size: 1
+  - name: LATENCY
+    description: Latency
+    bit_offset: 0
+    bit_size: 4
+    enum: LATENCY
+  - name: PRFTEN
+    description: Prefetch enable
+    bit_offset: 8
+    bit_size: 1
+  - name: ICEN
+    description: Instruction cache enable
+    bit_offset: 9
+    bit_size: 1
+  - name: DCEN
+    description: Data cache enable
+    bit_offset: 10
+    bit_size: 1
+  - name: ICRST
+    description: Instruction cache reset
+    bit_offset: 11
+    bit_size: 1
+  - name: DCRST
+    description: Data cache reset
+    bit_offset: 12
+    bit_size: 1
+  - name: RUN_PD
+    description: Flash Power-down mode during Low-power run mode
+    bit_offset: 13
+    bit_size: 1
+  - name: SLEEP_PD
+    description: Flash Power-down mode during Low-power sleep mode
+    bit_offset: 14
+    bit_size: 1
+  - name: DBG_SWEN
+    description: Debug software enable
+    bit_offset: 18
+    bit_size: 1
 fieldset/CR:
  description: Flash control register
  fields:
-    - name: PG
-      description: Programming
-      bit_offset: 0
-      bit_size: 1
-    - name: PER
-      description: Page erase
-      bit_offset: 1
-      bit_size: 1
-    - name: MER1
-      description: Bank 1 Mass erase
-      bit_offset: 2
-      bit_size: 1
-    - name: PNB
-      description: Page number
-      bit_offset: 3
-      bit_size: 7
-    - name: STRT
-      description: Start
-      bit_offset: 16
-      bit_size: 1
-    - name: OPTSTRT
-      description: Options modification start
-      bit_offset: 17
-      bit_size: 1
-    - name: FSTPG
-      description: Fast programming
-      bit_offset: 18
-      bit_size: 1
-    - name: EOPIE
-      description: End of operation interrupt enable
-      bit_offset: 24
-      bit_size: 1
-    - name: ERRIE
-      description: Error interrupt enable
-      bit_offset: 25
-      bit_size: 1
-    - name: RDERRIE
-      description: PCROP read error interrupt enable
-      bit_offset: 26
-      bit_size: 1
-    - name: OBL_LAUNCH
-      description: Force the option byte loading
-      bit_offset: 27
-      bit_size: 1
-    - name: SEC_PROT1
-      description: Securable memory area protection enable
-      bit_offset: 28
-      bit_size: 1
-    - name: OPTLOCK
-      description: Options Lock
-      bit_offset: 30
-      bit_size: 1
-    - name: LOCK
-      description: FLASH_CR Lock
-      bit_offset: 31
-      bit_size: 1
+  - name: PG
+    description: Programming
+    bit_offset: 0
+    bit_size: 1
+  - name: PER
+    description: Page erase
+    bit_offset: 1
+    bit_size: 1
+  - name: MER1
+    description: Bank 1 Mass erase
+    bit_offset: 2
+    bit_size: 1
+  - name: PNB
+    description: Page number
+    bit_offset: 3
+    bit_size: 7
+  - name: STRT
+    description: Start
+    bit_offset: 16
+    bit_size: 1
+  - name: OPTSTRT
+    description: Options modification start
+    bit_offset: 17
+    bit_size: 1
+  - name: FSTPG
+    description: Fast programming
+    bit_offset: 18
+    bit_size: 1
+  - name: EOPIE
+    description: End of operation interrupt enable
+    bit_offset: 24
+    bit_size: 1
+  - name: ERRIE
+    description: Error interrupt enable
+    bit_offset: 25
+    bit_size: 1
+  - name: RDERRIE
+    description: PCROP read error interrupt enable
+    bit_offset: 26
+    bit_size: 1
+  - name: OBL_LAUNCH
+    description: Force the option byte loading
+    bit_offset: 27
+    bit_size: 1
+  - name: SEC_PROT1
+    description: Securable memory area protection enable
+    bit_offset: 28
+    bit_size: 1
+  - name: OPTLOCK
+    description: Options Lock
+    bit_offset: 30
+    bit_size: 1
+  - name: LOCK
+    description: FLASH_CR Lock
+    bit_offset: 31
+    bit_size: 1
 fieldset/ECCR:
  description: Flash ECC register
  fields:
-    - name: ADDR_ECC
-      description: ECC fail address
-      bit_offset: 0
-      bit_size: 19
-    - name: BK_ECC
-      description: ECC fail for Corrected ECC Error or Double ECC Error in info block
-      bit_offset: 21
-      bit_size: 1
-    - name: SYSF_ECC
-      description: ECC fail for Corrected ECC Error or Double ECC Error in info block
-      bit_offset: 22
-      bit_size: 1
-    - name: ECCIE
-      description: ECC correction interrupt enable
-      bit_offset: 24
-      bit_size: 1
-    - name: ECCC2
-      description: ECC correction
-      bit_offset: 28
-      bit_size: 1
-    - name: ECCD2
-      description: ECC2 detection
-      bit_offset: 29
-      bit_size: 1
-    - name: ECCC
-      description: ECC correction
-      bit_offset: 30
-      bit_size: 1
-    - name: ECCD
-      description: ECC detection
-      bit_offset: 31
-      bit_size: 1
+  - name: ADDR_ECC
+    description: ECC fail address
+    bit_offset: 0
+    bit_size: 19
+  - name: BK_ECC
+    description: ECC fail for Corrected ECC Error or Double ECC Error in info block
+    bit_offset: 21
+    bit_size: 1
+  - name: SYSF_ECC
+    description: ECC fail for Corrected ECC Error or Double ECC Error in info block
+    bit_offset: 22
+    bit_size: 1
+  - name: ECCIE
+    description: ECC correction interrupt enable
+    bit_offset: 24
+    bit_size: 1
+  - name: ECCC2
+    description: ECC correction
+    bit_offset: 28
+    bit_size: 1
+  - name: ECCD2
+    description: ECC2 detection
+    bit_offset: 29
+    bit_size: 1
+  - name: ECCC
+    description: ECC correction
+    bit_offset: 30
+    bit_size: 1
+  - name: ECCD
+    description: ECC detection
+    bit_offset: 31
+    bit_size: 1
 fieldset/KEYR:
  description: Flash key register
  fields:
-    - name: KEYR
-      description: KEYR
-      bit_offset: 0
-      bit_size: 32
+  - name: KEYR
+    description: KEYR
+    bit_offset: 0
+    bit_size: 32
 fieldset/OPTKEYR:
  description: Option byte key register
  fields:
-    - name: OPTKEYR
-      description: Option byte key
-      bit_offset: 0
-      bit_size: 32
+  - name: OPTKEYR
+    description: Option byte key
+    bit_offset: 0
+    bit_size: 32
 fieldset/OPTR:
  description: Flash option register
  fields:
-    - name: RDP
-      description: Read protection level
-      bit_offset: 0
-      bit_size: 8
-      enum: RDP
-    - name: BOR_LEV
-      description: BOR reset Level
-      bit_offset: 8
-      bit_size: 3
-    - name: nRST_STOP
-      description: nRST_STOP
-      bit_offset: 12
-      bit_size: 1
-    - name: nRST_STDBY
-      description: nRST_STDBY
-      bit_offset: 13
-      bit_size: 1
-    - name: nRST_SHDW
-      description: nRST_SHDW
-      bit_offset: 14
-      bit_size: 1
-    - name: IDWG_SW
-      description: Independent watchdog selection
-      bit_offset: 16
-      bit_size: 1
-    - name: IWDG_STOP
-      description: Independent watchdog counter freeze in Stop mode
-      bit_offset: 17
-      bit_size: 1
-    - name: IWDG_STDBY
-      description: Independent watchdog counter freeze in Standby mode
-      bit_offset: 18
-      bit_size: 1
-    - name: WWDG_SW
-      description: Window watchdog selection
-      bit_offset: 19
-      bit_size: 1
-    - name: nBOOT1
-      description: Boot configuration
-      bit_offset: 23
-      bit_size: 1
-    - name: SRAM2_PE
-      description: SRAM2 parity check enable
-      bit_offset: 24
-      bit_size: 1
-    - name: SRAM2_RST
-      description: SRAM2 Erase when system reset
-      bit_offset: 25
-      bit_size: 1
-    - name: nSWBOOT0
-      description: nSWBOOT0
-      bit_offset: 26
-      bit_size: 1
-    - name: nBOOT0
-      description: nBOOT0 option bit
-      bit_offset: 27
-      bit_size: 1
-    - name: NRST_MODE
-      description: NRST_MODE
-      bit_offset: 28
-      bit_size: 2
-      enum: NRST_MODE
-    - name: IRHEN
-      description: Internal reset holder enable bit
-      bit_offset: 30
-      bit_size: 1
+  - name: RDP
+    description: Read protection level
+    bit_offset: 0
+    bit_size: 8
+    enum: RDP
+  - name: BOR_LEV
+    description: BOR reset Level
+    bit_offset: 8
+    bit_size: 3
+  - name: nRST_STOP
+    description: nRST_STOP
+    bit_offset: 12
+    bit_size: 1
+  - name: nRST_STDBY
+    description: nRST_STDBY
+    bit_offset: 13
+    bit_size: 1
+  - name: nRST_SHDW
+    description: nRST_SHDW
+    bit_offset: 14
+    bit_size: 1
+  - name: IDWG_SW
+    description: Independent watchdog selection
+    bit_offset: 16
+    bit_size: 1
+  - name: IWDG_STOP
+    description: Independent watchdog counter freeze in Stop mode
+    bit_offset: 17
+    bit_size: 1
+  - name: IWDG_STDBY
+    description: Independent watchdog counter freeze in Standby mode
+    bit_offset: 18
+    bit_size: 1
+  - name: WWDG_SW
+    description: Window watchdog selection
+    bit_offset: 19
+    bit_size: 1
+  - name: nBOOT1
+    description: Boot configuration
+    bit_offset: 23
+    bit_size: 1
+  - name: SRAM2_PE
+    description: SRAM2 parity check enable
+    bit_offset: 24
+    bit_size: 1
+  - name: SRAM2_RST
+    description: SRAM2 Erase when system reset
+    bit_offset: 25
+    bit_size: 1
+  - name: nSWBOOT0
+    description: nSWBOOT0
+    bit_offset: 26
+    bit_size: 1
+  - name: nBOOT0
+    description: nBOOT0 option bit
+    bit_offset: 27
+    bit_size: 1
+  - name: NRST_MODE
+    description: NRST_MODE
+    bit_offset: 28
+    bit_size: 2
+    enum: NRST_MODE
+  - name: IRHEN
+    description: Internal reset holder enable bit
+    bit_offset: 30
+    bit_size: 1
 fieldset/PCROP1ER:
  description: Flash Bank 1 PCROP End address register
  fields:
-    - name: PCROP1_END
-      description: Bank 1 PCROP area end offset
-      bit_offset: 0
-      bit_size: 15
-    - name: PCROP_RDP
-      description: PCROP area preserved when RDP level decreased
-      bit_offset: 31
-      bit_size: 1
+  - name: PCROP1_END
+    description: Bank 1 PCROP area end offset
+    bit_offset: 0
+    bit_size: 15
+  - name: PCROP_RDP
+    description: PCROP area preserved when RDP level decreased
+    bit_offset: 31
+    bit_size: 1
 fieldset/PCROP1SR:
  description: Flash Bank 1 PCROP Start address register
  fields:
-    - name: PCROP1_STRT
-      description: Bank 1 PCROP area start offset
-      bit_offset: 0
-      bit_size: 15
+  - name: PCROP1_STRT
+    description: Bank 1 PCROP area start offset
+    bit_offset: 0
+    bit_size: 15
 fieldset/PDKEYR:
  description: Power down key register
  fields:
-    - name: PDKEYR
-      description: RUN_PD in FLASH_ACR key
-      bit_offset: 0
-      bit_size: 32
+  - name: PDKEYR
+    description: RUN_PD in FLASH_ACR key
+    bit_offset: 0
+    bit_size: 32
 fieldset/SEC1R:
  description: securable area bank1 register
  fields:
-    - name: SEC_SIZE1
-      description: SEC_SIZE1
-      bit_offset: 0
-      bit_size: 8
-    - name: BOOT_LOCK
-      description: used to force boot from user area
-      bit_offset: 16
-      bit_size: 1
+  - name: SEC_SIZE1
+    description: SEC_SIZE1
+    bit_offset: 0
+    bit_size: 8
+  - name: BOOT_LOCK
+    description: used to force boot from user area
+    bit_offset: 16
+    bit_size: 1
 fieldset/SR:
  description: Status register
  fields:
-    - name: EOP
-      description: End of operation
-      bit_offset: 0
-      bit_size: 1
-    - name: OPERR
-      description: Operation error
-      bit_offset: 1
-      bit_size: 1
-    - name: PROGERR
-      description: Programming error
-      bit_offset: 3
-      bit_size: 1
-    - name: WRPERR
-      description: Write protected error
-      bit_offset: 4
-      bit_size: 1
-    - name: PGAERR
-      description: Programming alignment error
-      bit_offset: 5
-      bit_size: 1
-    - name: SIZERR
-      description: Size error
-      bit_offset: 6
-      bit_size: 1
-    - name: PGSERR
-      description: Programming sequence error
-      bit_offset: 7
-      bit_size: 1
-    - name: MISERR
-      description: Fast programming data miss error
-      bit_offset: 8
-      bit_size: 1
-    - name: FASTERR
-      description: Fast programming error
-      bit_offset: 9
-      bit_size: 1
-    - name: RDERR
-      description: PCROP read error
-      bit_offset: 14
-      bit_size: 1
-    - name: OPTVERR
-      description: Option validity error
-      bit_offset: 15
-      bit_size: 1
-    - name: BSY
-      description: Busy
-      bit_offset: 16
-      bit_size: 1
+  - name: EOP
+    description: End of operation
+    bit_offset: 0
+    bit_size: 1
+  - name: OPERR
+    description: Operation error
+    bit_offset: 1
+    bit_size: 1
+  - name: PROGERR
+    description: Programming error
+    bit_offset: 3
+    bit_size: 1
+  - name: WRPERR
+    description: Write protected error
+    bit_offset: 4
+    bit_size: 1
+  - name: PGAERR
+    description: Programming alignment error
+    bit_offset: 5
+    bit_size: 1
+  - name: SIZERR
+    description: Size error
+    bit_offset: 6
+    bit_size: 1
+  - name: PGSERR
+    description: Programming sequence error
+    bit_offset: 7
+    bit_size: 1
+  - name: MISERR
+    description: Fast programming data miss error
+    bit_offset: 8
+    bit_size: 1
+  - name: FASTERR
+    description: Fast programming error
+    bit_offset: 9
+    bit_size: 1
+  - name: RDERR
+    description: PCROP read error
+    bit_offset: 14
+    bit_size: 1
+  - name: OPTVERR
+    description: Option validity error
+    bit_offset: 15
+    bit_size: 1
+  - name: BSY
+    description: Busy
+    bit_offset: 16
+    bit_size: 1
 fieldset/WRP1AR:
  description: Flash Bank 1 WRP area A address register
  fields:
-    - name: WRP1A_STRT
-      description: Bank 1 WRP first area start offset
-      bit_offset: 0
-      bit_size: 7
-    - name: WRP1A_END
-      description: Bank 1 WRP first area A end offset
-      bit_offset: 16
-      bit_size: 7
+  - name: WRP1A_STRT
+    description: Bank 1 WRP first area start offset
+    bit_offset: 0
+    bit_size: 7
+  - name: WRP1A_END
+    description: Bank 1 WRP first area A end offset
+    bit_offset: 16
+    bit_size: 7
 fieldset/WRP1BR:
  description: Flash Bank 1 WRP area B address register
  fields:
-    - name: WRP1B_STRT
-      description: Bank 1 WRP second area B end offset
-      bit_offset: 0
-      bit_size: 7
-    - name: WRP1B_END
-      description: Bank 1 WRP second area B start offset
-      bit_offset: 16
-      bit_size: 7
+  - name: WRP1B_STRT
+    description: Bank 1 WRP second area B end offset
+    bit_offset: 0
+    bit_size: 7
+  - name: WRP1B_END
+    description: Bank 1 WRP second area B start offset
+    bit_offset: 16
+    bit_size: 7
 enum/LATENCY:
  bit_size: 3
  variants:
-    - name: WS0
-      description: Zero wait states
-      value: 0
-    - name: WS1
-      description: One wait state
-      value: 1
-    - name: WS2
-      description: Two wait states
-      value: 2
-    - name: WS3
-      description: Three wait states
-      value: 3
-    - name: WS4
-      description: Four wait states
-      value: 4
+  - name: WS0
+    description: Zero wait states
+    value: 0
+  - name: WS1
+    description: One wait state
+    value: 1
+  - name: WS2
+    description: Two wait states
+    value: 2
+  - name: WS3
+    description: Three wait states
+    value: 3
+  - name: WS4
+    description: Four wait states
+    value: 4
 enum/NRST_MODE:
  bit_size: 2
  variants:
-    - name: INPUT_ONLY
-      description: Reset pin is in reset input mode only
-      value: 1
-    - name: GPIO
-      description: Reset pin is in GPIO mode only
-      value: 2
-    - name: INPUT_OUTPUT
-      description: Reset pin is in reset input and output mode
-      value: 3
+  - name: INPUT_ONLY
+    description: Reset pin is in reset input mode only
+    value: 1
+  - name: GPIO
+    description: Reset pin is in GPIO mode only
+    value: 2
+  - name: INPUT_OUTPUT
+    description: Reset pin is in reset input and output mode
+    value: 3
 enum/RDP:
  bit_size: 8
  variants:
-    - name: LEVEL_0
-      description: Read protection not active
-      value: 170
-    - name: LEVEL_1
-      description: Memories read protection active
-      value: 187
-    - name: LEVEL_2
-      description: Chip read protection active
-      value: 204
+  - name: LEVEL_0
+    description: Read protection not active
+    value: 170
+  - name: LEVEL_1
+    description: Memories read protection active
+    value: 187
+  - name: LEVEL_2
+    description: Chip read protection active
+    value: 204
--- a/data/registers/flash_h5.yaml
+++ b/data/registers/flash_h5.yaml
--- a/data/registers/flash_h50.yaml
+++ b/data/registers/flash_h50.yaml
--- a/data/registers/flash_h7.yaml
+++ b/data/registers/flash_h7.yaml
--- a/data/registers/flash_h7ab.yaml
+++ b/data/registers/flash_h7ab.yaml
--- a/data/registers/flash_l0.yaml
+++ b/data/registers/flash_l0.yaml
@ -1,229 +1,228 @@
---
 block/FLASH:
  description: Flash
  items:
-    - name: ACR
-      description: Access control register
-      byte_offset: 0
-      fieldset: ACR
-    - name: PECR
-      description: Program/erase control register
-      byte_offset: 4
-      fieldset: PECR
-    - name: PDKEYR
-      description: Power down key register
-      byte_offset: 8
-      access: Write
-      fieldset: PDKEYR
-    - name: PEKEYR
-      description: Program/erase key register
-      byte_offset: 12
-      access: Write
-      fieldset: PEKEYR
-    - name: PRGKEYR
-      description: Program memory key register
-      byte_offset: 16
-      access: Write
-      fieldset: PRGKEYR
-    - name: OPTKEYR
-      description: Option byte key register
-      byte_offset: 20
-      access: Write
-      fieldset: OPTKEYR
-    - name: SR
-      description: Status register
-      byte_offset: 24
-      fieldset: SR
-    - name: OPTR
-      description: Option byte register
-      byte_offset: 28
-      access: Read
-      fieldset: OPTR
-    - name: WRPROT
-      description: Write Protection Register 1
-      byte_offset: 32
-      access: Read
-      fieldset: WRPROT
-    - name: WRPROT2
-      description: Write Protection Register 2
-      byte_offset: 128
-      access: Read
-      fieldset: WRPROT
+  - name: ACR
+    description: Access control register
+    byte_offset: 0
+    fieldset: ACR
+  - name: PECR
+    description: Program/erase control register
+    byte_offset: 4
+    fieldset: PECR
+  - name: PDKEYR
+    description: Power down key register
+    byte_offset: 8
+    access: Write
+    fieldset: PDKEYR
+  - name: PEKEYR
+    description: Program/erase key register
+    byte_offset: 12
+    access: Write
+    fieldset: PEKEYR
+  - name: PRGKEYR
+    description: Program memory key register
+    byte_offset: 16
+    access: Write
+    fieldset: PRGKEYR
+  - name: OPTKEYR
+    description: Option byte key register
+    byte_offset: 20
+    access: Write
+    fieldset: OPTKEYR
+  - name: SR
+    description: Status register
+    byte_offset: 24
+    fieldset: SR
+  - name: OPTR
+    description: Option byte register
+    byte_offset: 28
+    access: Read
+    fieldset: OPTR
+  - name: WRPROT
+    description: Write Protection Register 1
+    byte_offset: 32
+    access: Read
+    fieldset: WRPROT
+  - name: WRPROT2
+    description: Write Protection Register 2
+    byte_offset: 128
+    access: Read
+    fieldset: WRPROT
 fieldset/ACR:
  description: Access control register
  fields:
-    - name: LATENCY
-      description: Latency
-      bit_offset: 0
-      bit_size: 1
-    - name: PRFTEN
-      description: Prefetch enable
-      bit_offset: 1
-      bit_size: 1
-    - name: SLEEP_PD
-      description: Flash mode during Sleep
-      bit_offset: 3
-      bit_size: 1
-    - name: RUN_PD
-      description: Flash mode during Run
-      bit_offset: 4
-      bit_size: 1
-    - name: DISAB_BUF
-      description: Disable Buffer
-      bit_offset: 5
-      bit_size: 1
-    - name: PRE_READ
-      description: Pre-read data address
-      bit_offset: 6
-      bit_size: 1
+  - name: LATENCY
+    description: Latency
+    bit_offset: 0
+    bit_size: 1
+  - name: PRFTEN
+    description: Prefetch enable
+    bit_offset: 1
+    bit_size: 1
+  - name: SLEEP_PD
+    description: Flash mode during Sleep
+    bit_offset: 3
+    bit_size: 1
+  - name: RUN_PD
+    description: Flash mode during Run
+    bit_offset: 4
+    bit_size: 1
+  - name: DISAB_BUF
+    description: Disable Buffer
+    bit_offset: 5
+    bit_size: 1
+  - name: PRE_READ
+    description: Pre-read data address
+    bit_offset: 6
+    bit_size: 1
 fieldset/OPTKEYR:
  description: Option byte key register
  fields:
-    - name: OPTKEYR
-      description: Option byte key
-      bit_offset: 0
-      bit_size: 32
+  - name: OPTKEYR
+    description: Option byte key
+    bit_offset: 0
+    bit_size: 32
 fieldset/OPTR:
  description: Option byte register
  fields:
-    - name: RDPROT
-      description: Read protection
-      bit_offset: 0
-      bit_size: 8
-    - name: WPRMOD
-      description: Selection of protection mode of WPR bits
-      bit_offset: 8
-      bit_size: 1
-    - name: BOR_LEV
-      description: BOR_LEV
-      bit_offset: 16
-      bit_size: 4
+  - name: RDPROT
+    description: Read protection
+    bit_offset: 0
+    bit_size: 8
+  - name: WPRMOD
+    description: Selection of protection mode of WPR bits
+    bit_offset: 8
+    bit_size: 1
+  - name: BOR_LEV
+    description: BOR_LEV
+    bit_offset: 16
+    bit_size: 4
 fieldset/PDKEYR:
  description: Power down key register
  fields:
-    - name: PDKEYR
-      description: RUN_PD in FLASH_ACR key
-      bit_offset: 0
-      bit_size: 32
+  - name: PDKEYR
+    description: RUN_PD in FLASH_ACR key
+    bit_offset: 0
+    bit_size: 32
 fieldset/PECR:
  description: Program/erase control register
  fields:
-    - name: PELOCK
-      description: FLASH_PECR and data EEPROM lock
-      bit_offset: 0
-      bit_size: 1
-    - name: PRGLOCK
-      description: Program memory lock
-      bit_offset: 1
-      bit_size: 1
-    - name: OPTLOCK
-      description: Option bytes block lock
-      bit_offset: 2
-      bit_size: 1
-    - name: PROG
-      description: Program memory selection
-      bit_offset: 3
-      bit_size: 1
-    - name: DATA
-      description: Data EEPROM selection
-      bit_offset: 4
-      bit_size: 1
-    - name: FIX
-      description: "Fixed time data write for Byte, Half Word and Word programming"
-      bit_offset: 8
-      bit_size: 1
-    - name: ERASE
-      description: Page or Double Word erase mode
-      bit_offset: 9
-      bit_size: 1
-    - name: FPRG
-      description: Half Page/Double Word programming mode
-      bit_offset: 10
-      bit_size: 1
-    - name: PARALLELBANK
-      description: Parallel bank mode
-      bit_offset: 15
-      bit_size: 1
-    - name: EOPIE
-      description: End of programming interrupt enable
-      bit_offset: 16
-      bit_size: 1
-    - name: ERRIE
-      description: Error interrupt enable
-      bit_offset: 17
-      bit_size: 1
-    - name: OBL_LAUNCH
-      description: Launch the option byte loading
-      bit_offset: 18
-      bit_size: 1
+  - name: PELOCK
+    description: FLASH_PECR and data EEPROM lock
+    bit_offset: 0
+    bit_size: 1
+  - name: PRGLOCK
+    description: Program memory lock
+    bit_offset: 1
+    bit_size: 1
+  - name: OPTLOCK
+    description: Option bytes block lock
+    bit_offset: 2
+    bit_size: 1
+  - name: PROG
+    description: Program memory selection
+    bit_offset: 3
+    bit_size: 1
+  - name: DATA
+    description: Data EEPROM selection
+    bit_offset: 4
+    bit_size: 1
+  - name: FIX
+    description: Fixed time data write for Byte, Half Word and Word programming
+    bit_offset: 8
+    bit_size: 1
+  - name: ERASE
+    description: Page or Double Word erase mode
+    bit_offset: 9
+    bit_size: 1
+  - name: FPRG
+    description: Half Page/Double Word programming mode
+    bit_offset: 10
+    bit_size: 1
+  - name: PARALLELBANK
+    description: Parallel bank mode
+    bit_offset: 15
+    bit_size: 1
+  - name: EOPIE
+    description: End of programming interrupt enable
+    bit_offset: 16
+    bit_size: 1
+  - name: ERRIE
+    description: Error interrupt enable
+    bit_offset: 17
+    bit_size: 1
+  - name: OBL_LAUNCH
+    description: Launch the option byte loading
+    bit_offset: 18
+    bit_size: 1
 fieldset/PEKEYR:
  description: Program/erase key register
  fields:
-    - name: PEKEYR
-      description: FLASH_PEC and data EEPROM key
-      bit_offset: 0
-      bit_size: 32
+  - name: PEKEYR
+    description: FLASH_PEC and data EEPROM key
+    bit_offset: 0
+    bit_size: 32
 fieldset/PRGKEYR:
  description: Program memory key register
  fields:
-    - name: PRGKEYR
-      description: Program memory key
-      bit_offset: 0
-      bit_size: 32
+  - name: PRGKEYR
+    description: Program memory key
+    bit_offset: 0
+    bit_size: 32
 fieldset/SR:
  description: Status register
  fields:
-    - name: BSY
-      description: Write/erase operations in progress
-      bit_offset: 0
-      bit_size: 1
-    - name: EOP
-      description: End of operation
-      bit_offset: 1
-      bit_size: 1
-    - name: ENDHV
-      description: End of high voltage
-      bit_offset: 2
-      bit_size: 1
-    - name: READY
-      description: Flash memory module ready after low power mode
-      bit_offset: 3
-      bit_size: 1
-    - name: WRPERR
-      description: Write protected error
-      bit_offset: 8
-      bit_size: 1
-    - name: PGAERR
-      description: Programming alignment error
-      bit_offset: 9
-      bit_size: 1
-    - name: SIZERR
-      description: Size error
-      bit_offset: 10
-      bit_size: 1
-    - name: OPTVERR
-      description: Option validity error
-      bit_offset: 11
-      bit_size: 1
-    - name: RDERR
-      description: RDERR
-      bit_offset: 14
-      bit_size: 1
-    - name: NOTZEROERR
-      description: NOTZEROERR
-      bit_offset: 16
-      bit_size: 1
-    - name: FWWERR
-      description: FWWERR
-      bit_offset: 17
-      bit_size: 1
+  - name: BSY
+    description: Write/erase operations in progress
+    bit_offset: 0
+    bit_size: 1
+  - name: EOP
+    description: End of operation
+    bit_offset: 1
+    bit_size: 1
+  - name: ENDHV
+    description: End of high voltage
+    bit_offset: 2
+    bit_size: 1
+  - name: READY
+    description: Flash memory module ready after low power mode
+    bit_offset: 3
+    bit_size: 1
+  - name: WRPERR
+    description: Write protected error
+    bit_offset: 8
+    bit_size: 1
+  - name: PGAERR
+    description: Programming alignment error
+    bit_offset: 9
+    bit_size: 1
+  - name: SIZERR
+    description: Size error
+    bit_offset: 10
+    bit_size: 1
+  - name: OPTVERR
+    description: Option validity error
+    bit_offset: 11
+    bit_size: 1
+  - name: RDERR
+    description: RDERR
+    bit_offset: 14
+    bit_size: 1
+  - name: NOTZEROERR
+    description: NOTZEROERR
+    bit_offset: 16
+    bit_size: 1
+  - name: FWWERR
+    description: FWWERR
+    bit_offset: 17
+    bit_size: 1
 fieldset/WRPROT:
  description: Write Protection Register
  fields:
-    - name: WRPROT
-      description: Write Protection
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 32
-        stride: 1
+  - name: WRPROT
+    description: Write Protection
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 32
+      stride: 1
--- a/data/registers/flash_l1.yaml
+++ b/data/registers/flash_l1.yaml
@ -1,242 +1,241 @@
---
 block/FLASH:
  description: Flash
  items:
-    - name: ACR
-      description: Access control register
-      byte_offset: 0
-      fieldset: ACR
-    - name: PECR
-      description: Program/erase control register
-      byte_offset: 4
-      fieldset: PECR
-    - name: PDKEYR
-      description: Power down key register
-      byte_offset: 8
-      access: Write
-      fieldset: PDKEYR
-    - name: PEKEYR
-      description: Program/erase key register
-      byte_offset: 12
-      access: Write
-      fieldset: PEKEYR
-    - name: PRGKEYR
-      description: Program memory key register
-      byte_offset: 16
-      access: Write
-      fieldset: PRGKEYR
-    - name: OPTKEYR
-      description: Option byte key register
-      byte_offset: 20
-      access: Write
-      fieldset: OPTKEYR
-    - name: SR
-      description: Status register
-      byte_offset: 24
-      fieldset: SR
-    - name: OBR
-      description: Option byte register
-      byte_offset: 28
-      access: Read
-      fieldset: OBR
-    - name: WRPR1
-      description: Write protection register
-      byte_offset: 32
-      fieldset: WRPR1
-    - name: WRPR2
-      description: Write protection register
-      byte_offset: 128
-      fieldset: WRPR2
-    - name: WRPR3
-      description: Write protection register
-      byte_offset: 132
-      fieldset: WRPR3
+  - name: ACR
+    description: Access control register
+    byte_offset: 0
+    fieldset: ACR
+  - name: PECR
+    description: Program/erase control register
+    byte_offset: 4
+    fieldset: PECR
+  - name: PDKEYR
+    description: Power down key register
+    byte_offset: 8
+    access: Write
+    fieldset: PDKEYR
+  - name: PEKEYR
+    description: Program/erase key register
+    byte_offset: 12
+    access: Write
+    fieldset: PEKEYR
+  - name: PRGKEYR
+    description: Program memory key register
+    byte_offset: 16
+    access: Write
+    fieldset: PRGKEYR
+  - name: OPTKEYR
+    description: Option byte key register
+    byte_offset: 20
+    access: Write
+    fieldset: OPTKEYR
+  - name: SR
+    description: Status register
+    byte_offset: 24
+    fieldset: SR
+  - name: OBR
+    description: Option byte register
+    byte_offset: 28
+    access: Read
+    fieldset: OBR
+  - name: WRPR1
+    description: Write protection register
+    byte_offset: 32
+    fieldset: WRPR1
+  - name: WRPR2
+    description: Write protection register
+    byte_offset: 128
+    fieldset: WRPR2
+  - name: WRPR3
+    description: Write protection register
+    byte_offset: 132
+    fieldset: WRPR3
 fieldset/ACR:
  description: Access control register
  fields:
-    - name: LATENCY
-      description: Latency
-      bit_offset: 0
-      bit_size: 1
-    - name: PRFTEN
-      description: Prefetch enable
-      bit_offset: 1
-      bit_size: 1
-    - name: ACC64
-      description: 64-bit access
-      bit_offset: 2
-      bit_size: 1
-    - name: SLEEP_PD
-      description: Flash mode during Sleep
-      bit_offset: 3
-      bit_size: 1
-    - name: RUN_PD
-      description: Flash mode during Run
-      bit_offset: 4
-      bit_size: 1
+  - name: LATENCY
+    description: Latency
+    bit_offset: 0
+    bit_size: 1
+  - name: PRFTEN
+    description: Prefetch enable
+    bit_offset: 1
+    bit_size: 1
+  - name: ACC64
+    description: 64-bit access
+    bit_offset: 2
+    bit_size: 1
+  - name: SLEEP_PD
+    description: Flash mode during Sleep
+    bit_offset: 3
+    bit_size: 1
+  - name: RUN_PD
+    description: Flash mode during Run
+    bit_offset: 4
+    bit_size: 1
 fieldset/OBR:
  description: Option byte register
  fields:
-    - name: RDPRT
-      description: Read protection
-      bit_offset: 0
-      bit_size: 8
-    - name: BOR_LEV
-      description: BOR_LEV
-      bit_offset: 16
-      bit_size: 4
-    - name: IWDG_SW
-      description: IWDG_SW
-      bit_offset: 20
-      bit_size: 1
-    - name: nRTS_STOP
-      description: nRTS_STOP
-      bit_offset: 21
-      bit_size: 1
-    - name: nRST_STDBY
-      description: nRST_STDBY
-      bit_offset: 22
-      bit_size: 1
-    - name: BFB2
-      description: Boot From Bank 2
-      bit_offset: 23
-      bit_size: 1
+  - name: RDPRT
+    description: Read protection
+    bit_offset: 0
+    bit_size: 8
+  - name: BOR_LEV
+    description: BOR_LEV
+    bit_offset: 16
+    bit_size: 4
+  - name: IWDG_SW
+    description: IWDG_SW
+    bit_offset: 20
+    bit_size: 1
+  - name: nRTS_STOP
+    description: nRTS_STOP
+    bit_offset: 21
+    bit_size: 1
+  - name: nRST_STDBY
+    description: nRST_STDBY
+    bit_offset: 22
+    bit_size: 1
+  - name: BFB2
+    description: Boot From Bank 2
+    bit_offset: 23
+    bit_size: 1
 fieldset/OPTKEYR:
  description: Option byte key register
  fields:
-    - name: OPTKEYR
-      description: Option byte key
-      bit_offset: 0
-      bit_size: 32
+  - name: OPTKEYR
+    description: Option byte key
+    bit_offset: 0
+    bit_size: 32
 fieldset/PDKEYR:
  description: Power down key register
  fields:
-    - name: PDKEYR
-      description: RUN_PD in FLASH_ACR key
-      bit_offset: 0
-      bit_size: 32
+  - name: PDKEYR
+    description: RUN_PD in FLASH_ACR key
+    bit_offset: 0
+    bit_size: 32
 fieldset/PECR:
  description: Program/erase control register
  fields:
-    - name: PELOCK
-      description: FLASH_PECR and data EEPROM lock
-      bit_offset: 0
-      bit_size: 1
-    - name: PRGLOCK
-      description: Program memory lock
-      bit_offset: 1
-      bit_size: 1
-    - name: OPTLOCK
-      description: Option bytes block lock
-      bit_offset: 2
-      bit_size: 1
-    - name: PROG
-      description: Program memory selection
-      bit_offset: 3
-      bit_size: 1
-    - name: DATA
-      description: Data EEPROM selection
-      bit_offset: 4
-      bit_size: 1
-    - name: FTDW
-      description: "Fixed time data write for Byte, Half Word and Word programming"
-      bit_offset: 8
-      bit_size: 1
-    - name: ERASE
-      description: Page or Double Word erase mode
-      bit_offset: 9
-      bit_size: 1
-    - name: FPRG
-      description: Half Page/Double Word programming mode
-      bit_offset: 10
-      bit_size: 1
-    - name: PARALLELBANK
-      description: Parallel bank mode
-      bit_offset: 15
-      bit_size: 1
-    - name: EOPIE
-      description: End of programming interrupt enable
-      bit_offset: 16
-      bit_size: 1
-    - name: ERRIE
-      description: Error interrupt enable
-      bit_offset: 17
-      bit_size: 1
-    - name: OBL_LAUNCH
-      description: Launch the option byte loading
-      bit_offset: 18
-      bit_size: 1
+  - name: PELOCK
+    description: FLASH_PECR and data EEPROM lock
+    bit_offset: 0
+    bit_size: 1
+  - name: PRGLOCK
+    description: Program memory lock
+    bit_offset: 1
+    bit_size: 1
+  - name: OPTLOCK
+    description: Option bytes block lock
+    bit_offset: 2
+    bit_size: 1
+  - name: PROG
+    description: Program memory selection
+    bit_offset: 3
+    bit_size: 1
+  - name: DATA
+    description: Data EEPROM selection
+    bit_offset: 4
+    bit_size: 1
+  - name: FTDW
+    description: Fixed time data write for Byte, Half Word and Word programming
+    bit_offset: 8
+    bit_size: 1
+  - name: ERASE
+    description: Page or Double Word erase mode
+    bit_offset: 9
+    bit_size: 1
+  - name: FPRG
+    description: Half Page/Double Word programming mode
+    bit_offset: 10
+    bit_size: 1
+  - name: PARALLELBANK
+    description: Parallel bank mode
+    bit_offset: 15
+    bit_size: 1
+  - name: EOPIE
+    description: End of programming interrupt enable
+    bit_offset: 16
+    bit_size: 1
+  - name: ERRIE
+    description: Error interrupt enable
+    bit_offset: 17
+    bit_size: 1
+  - name: OBL_LAUNCH
+    description: Launch the option byte loading
+    bit_offset: 18
+    bit_size: 1
 fieldset/PEKEYR:
  description: Program/erase key register
  fields:
-    - name: PEKEYR
-      description: FLASH_PEC and data EEPROM key
-      bit_offset: 0
-      bit_size: 32
+  - name: PEKEYR
+    description: FLASH_PEC and data EEPROM key
+    bit_offset: 0
+    bit_size: 32
 fieldset/PRGKEYR:
  description: Program memory key register
  fields:
-    - name: PRGKEYR
-      description: Program memory key
-      bit_offset: 0
-      bit_size: 32
+  - name: PRGKEYR
+    description: Program memory key
+    bit_offset: 0
+    bit_size: 32
 fieldset/SR:
  description: Status register
  fields:
-    - name: BSY
-      description: Write/erase operations in progress
-      bit_offset: 0
-      bit_size: 1
-    - name: EOP
-      description: End of operation
-      bit_offset: 1
-      bit_size: 1
-    - name: ENDHV
-      description: End of high voltage
-      bit_offset: 2
-      bit_size: 1
-    - name: READY
-      description: Flash memory module ready after low power mode
-      bit_offset: 3
-      bit_size: 1
-    - name: WRPERR
-      description: Write protected error
-      bit_offset: 8
-      bit_size: 1
-    - name: PGAERR
-      description: Programming alignment error
-      bit_offset: 9
-      bit_size: 1
-    - name: SIZERR
-      description: Size error
-      bit_offset: 10
-      bit_size: 1
-    - name: OPTVERR
-      description: Option validity error
-      bit_offset: 11
-      bit_size: 1
-    - name: OPTVERRUSR
-      description: Option UserValidity Error
-      bit_offset: 12
-      bit_size: 1
+  - name: BSY
+    description: Write/erase operations in progress
+    bit_offset: 0
+    bit_size: 1
+  - name: EOP
+    description: End of operation
+    bit_offset: 1
+    bit_size: 1
+  - name: ENDHV
+    description: End of high voltage
+    bit_offset: 2
+    bit_size: 1
+  - name: READY
+    description: Flash memory module ready after low power mode
+    bit_offset: 3
+    bit_size: 1
+  - name: WRPERR
+    description: Write protected error
+    bit_offset: 8
+    bit_size: 1
+  - name: PGAERR
+    description: Programming alignment error
+    bit_offset: 9
+    bit_size: 1
+  - name: SIZERR
+    description: Size error
+    bit_offset: 10
+    bit_size: 1
+  - name: OPTVERR
+    description: Option validity error
+    bit_offset: 11
+    bit_size: 1
+  - name: OPTVERRUSR
+    description: Option UserValidity Error
+    bit_offset: 12
+    bit_size: 1
 fieldset/WRPR1:
  description: Write protection register
  fields:
-    - name: WRP1
-      description: Write protection
-      bit_offset: 0
-      bit_size: 32
+  - name: WRP1
+    description: Write protection
+    bit_offset: 0
+    bit_size: 32
 fieldset/WRPR2:
  description: Write protection register
  fields:
-    - name: WRP2
-      description: WRP2
-      bit_offset: 0
-      bit_size: 32
+  - name: WRP2
+    description: WRP2
+    bit_offset: 0
+    bit_size: 32
 fieldset/WRPR3:
  description: Write protection register
  fields:
-    - name: WRP3
-      description: WRP3
-      bit_offset: 0
-      bit_size: 32
+  - name: WRP3
+    description: WRP3
+    bit_offset: 0
+    bit_size: 32
--- a/data/registers/flash_l4.yaml
+++ b/data/registers/flash_l4.yaml
@ -1,406 +1,405 @@
---
 block/FLASH:
  description: Flash
  items:
-    - name: ACR
-      description: Access control register
-      byte_offset: 0
-      fieldset: ACR
-    - name: PDKEYR
-      description: Power down key register
-      byte_offset: 4
-      access: Write
-      fieldset: PDKEYR
-    - name: KEYR
-      description: Flash key register
-      byte_offset: 8
-      access: Write
-      fieldset: KEYR
-    - name: OPTKEYR
-      description: Option byte key register
-      byte_offset: 12
-      access: Write
-      fieldset: OPTKEYR
-    - name: SR
-      description: Status register
-      byte_offset: 16
-      fieldset: SR
-    - name: CR
-      description: Flash control register
-      byte_offset: 20
-      fieldset: CR
-    - name: ECCR
-      description: Flash ECC register
-      byte_offset: 24
-      fieldset: ECCR
-    - name: OPTR
-      description: Flash option register
-      byte_offset: 32
-      fieldset: OPTR
-    - name: PCROP1SR
-      description: Flash Bank 1 PCROP Start address register
-      byte_offset: 36
-      fieldset: PCROP1SR
-    - name: PCROP1ER
-      description: Flash Bank 1 PCROP End address register
-      byte_offset: 40
-      fieldset: PCROP1ER
-    - name: WRP1AR
-      description: Flash Bank 1 WRP area A address register
-      byte_offset: 44
-      fieldset: WRP1AR
-    - name: WRP1BR
-      description: Flash Bank 1 WRP area B address register
-      byte_offset: 48
-      fieldset: WRP1BR
-    - name: PCROP2SR
-      description: Flash Bank 2 PCROP Start address register
-      byte_offset: 68
-      fieldset: PCROP2SR
-    - name: PCROP2ER
-      description: Flash Bank 2 PCROP End address register
-      byte_offset: 72
-      fieldset: PCROP2ER
-    - name: WRP2AR
-      description: Flash Bank 2 WRP area A address register
-      byte_offset: 76
-      fieldset: WRP2AR
-    - name: WRP2BR
-      description: Flash Bank 2 WRP area B address register
-      byte_offset: 80
-      fieldset: WRP2BR
+  - name: ACR
+    description: Access control register
+    byte_offset: 0
+    fieldset: ACR
+  - name: PDKEYR
+    description: Power down key register
+    byte_offset: 4
+    access: Write
+    fieldset: PDKEYR
+  - name: KEYR
+    description: Flash key register
+    byte_offset: 8
+    access: Write
+    fieldset: KEYR
+  - name: OPTKEYR
+    description: Option byte key register
+    byte_offset: 12
+    access: Write
+    fieldset: OPTKEYR
+  - name: SR
+    description: Status register
+    byte_offset: 16
+    fieldset: SR
+  - name: CR
+    description: Flash control register
+    byte_offset: 20
+    fieldset: CR
+  - name: ECCR
+    description: Flash ECC register
+    byte_offset: 24
+    fieldset: ECCR
+  - name: OPTR
+    description: Flash option register
+    byte_offset: 32
+    fieldset: OPTR
+  - name: PCROP1SR
+    description: Flash Bank 1 PCROP Start address register
+    byte_offset: 36
+    fieldset: PCROP1SR
+  - name: PCROP1ER
+    description: Flash Bank 1 PCROP End address register
+    byte_offset: 40
+    fieldset: PCROP1ER
+  - name: WRP1AR
+    description: Flash Bank 1 WRP area A address register
+    byte_offset: 44
+    fieldset: WRP1AR
+  - name: WRP1BR
+    description: Flash Bank 1 WRP area B address register
+    byte_offset: 48
+    fieldset: WRP1BR
+  - name: PCROP2SR
+    description: Flash Bank 2 PCROP Start address register
+    byte_offset: 68
+    fieldset: PCROP2SR
+  - name: PCROP2ER
+    description: Flash Bank 2 PCROP End address register
+    byte_offset: 72
+    fieldset: PCROP2ER
+  - name: WRP2AR
+    description: Flash Bank 2 WRP area A address register
+    byte_offset: 76
+    fieldset: WRP2AR
+  - name: WRP2BR
+    description: Flash Bank 2 WRP area B address register
+    byte_offset: 80
+    fieldset: WRP2BR
 fieldset/ACR:
  description: Access control register
  fields:
-    - name: LATENCY
-      description: Latency
-      bit_offset: 0
-      bit_size: 3
-    - name: PRFTEN
-      description: Prefetch enable
-      bit_offset: 8
-      bit_size: 1
-    - name: ICEN
-      description: Instruction cache enable
-      bit_offset: 9
-      bit_size: 1
-    - name: DCEN
-      description: Data cache enable
-      bit_offset: 10
-      bit_size: 1
-    - name: ICRST
-      description: Instruction cache reset
-      bit_offset: 11
-      bit_size: 1
-    - name: DCRST
-      description: Data cache reset
-      bit_offset: 12
-      bit_size: 1
-    - name: RUN_PD
-      description: Flash Power-down mode during Low-power run mode
-      bit_offset: 13
-      bit_size: 1
-    - name: SLEEP_PD
-      description: Flash Power-down mode during Low-power sleep mode
-      bit_offset: 14
-      bit_size: 1
+  - name: LATENCY
+    description: Latency
+    bit_offset: 0
+    bit_size: 3
+  - name: PRFTEN
+    description: Prefetch enable
+    bit_offset: 8
+    bit_size: 1
+  - name: ICEN
+    description: Instruction cache enable
+    bit_offset: 9
+    bit_size: 1
+  - name: DCEN
+    description: Data cache enable
+    bit_offset: 10
+    bit_size: 1
+  - name: ICRST
+    description: Instruction cache reset
+    bit_offset: 11
+    bit_size: 1
+  - name: DCRST
+    description: Data cache reset
+    bit_offset: 12
+    bit_size: 1
+  - name: RUN_PD
+    description: Flash Power-down mode during Low-power run mode
+    bit_offset: 13
+    bit_size: 1
+  - name: SLEEP_PD
+    description: Flash Power-down mode during Low-power sleep mode
+    bit_offset: 14
+    bit_size: 1
 fieldset/CR:
  description: Flash control register
  fields:
-    - name: PG
-      description: Programming
-      bit_offset: 0
-      bit_size: 1
-    - name: PER
-      description: Page erase
-      bit_offset: 1
-      bit_size: 1
-    - name: MER
-      description: Bank 1 Mass erase
-      bit_offset: 2
-      bit_size: 1
-      array:
-        len: 2
-        stride: 13
-    - name: PNB
-      description: Page number
-      bit_offset: 3
-      bit_size: 8
-    - name: BKER
-      description: Bank erase
-      bit_offset: 11
-      bit_size: 1
-    - name: START
-      description: Start
-      bit_offset: 16
-      bit_size: 1
-    - name: OPTSTRT
-      description: Options modification start
-      bit_offset: 17
-      bit_size: 1
-    - name: FSTPG
-      description: Fast programming
-      bit_offset: 18
-      bit_size: 1
-    - name: EOPIE
-      description: End of operation interrupt enable
-      bit_offset: 24
-      bit_size: 1
-    - name: ERRIE
-      description: Error interrupt enable
-      bit_offset: 25
-      bit_size: 1
-    - name: RDERRIE
-      description: PCROP read error interrupt enable
-      bit_offset: 26
-      bit_size: 1
-    - name: OBL_LAUNCH
-      description: Force the option byte loading
-      bit_offset: 27
-      bit_size: 1
-    - name: OPTLOCK
-      description: Options Lock
-      bit_offset: 30
-      bit_size: 1
-    - name: LOCK
-      description: FLASH_CR Lock
-      bit_offset: 31
-      bit_size: 1
+  - name: PG
+    description: Programming
+    bit_offset: 0
+    bit_size: 1
+  - name: PER
+    description: Page erase
+    bit_offset: 1
+    bit_size: 1
+  - name: MER
+    description: Bank 1 Mass erase
+    bit_offset: 2
+    bit_size: 1
+    array:
+      len: 2
+      stride: 13
+  - name: PNB
+    description: Page number
+    bit_offset: 3
+    bit_size: 8
+  - name: BKER
+    description: Bank erase
+    bit_offset: 11
+    bit_size: 1
+  - name: START
+    description: Start
+    bit_offset: 16
+    bit_size: 1
+  - name: OPTSTRT
+    description: Options modification start
+    bit_offset: 17
+    bit_size: 1
+  - name: FSTPG
+    description: Fast programming
+    bit_offset: 18
+    bit_size: 1
+  - name: EOPIE
+    description: End of operation interrupt enable
+    bit_offset: 24
+    bit_size: 1
+  - name: ERRIE
+    description: Error interrupt enable
+    bit_offset: 25
+    bit_size: 1
+  - name: RDERRIE
+    description: PCROP read error interrupt enable
+    bit_offset: 26
+    bit_size: 1
+  - name: OBL_LAUNCH
+    description: Force the option byte loading
+    bit_offset: 27
+    bit_size: 1
+  - name: OPTLOCK
+    description: Options Lock
+    bit_offset: 30
+    bit_size: 1
+  - name: LOCK
+    description: FLASH_CR Lock
+    bit_offset: 31
+    bit_size: 1
 fieldset/ECCR:
  description: Flash ECC register
  fields:
-    - name: ADDR_ECC
-      description: ECC fail address
-      bit_offset: 0
-      bit_size: 19
-    - name: BK_ECC
-      description: ECC fail bank
-      bit_offset: 19
-      bit_size: 1
-    - name: SYSF_ECC
-      description: System Flash ECC fail
-      bit_offset: 20
-      bit_size: 1
-    - name: ECCIE
-      description: ECC correction interrupt enable
-      bit_offset: 24
-      bit_size: 1
-    - name: ECCC
-      description: ECC correction
-      bit_offset: 30
-      bit_size: 1
-    - name: ECCD
-      description: ECC detection
-      bit_offset: 31
-      bit_size: 1
+  - name: ADDR_ECC
+    description: ECC fail address
+    bit_offset: 0
+    bit_size: 19
+  - name: BK_ECC
+    description: ECC fail bank
+    bit_offset: 19
+    bit_size: 1
+  - name: SYSF_ECC
+    description: System Flash ECC fail
+    bit_offset: 20
+    bit_size: 1
+  - name: ECCIE
+    description: ECC correction interrupt enable
+    bit_offset: 24
+    bit_size: 1
+  - name: ECCC
+    description: ECC correction
+    bit_offset: 30
+    bit_size: 1
+  - name: ECCD
+    description: ECC detection
+    bit_offset: 31
+    bit_size: 1
 fieldset/KEYR:
  description: Flash key register
  fields:
-    - name: KEYR
-      description: KEYR
-      bit_offset: 0
-      bit_size: 32
+  - name: KEYR
+    description: KEYR
+    bit_offset: 0
+    bit_size: 32
 fieldset/OPTKEYR:
  description: Option byte key register
  fields:
-    - name: OPTKEYR
-      description: Option byte key
-      bit_offset: 0
-      bit_size: 32
+  - name: OPTKEYR
+    description: Option byte key
+    bit_offset: 0
+    bit_size: 32
 fieldset/OPTR:
  description: Flash option register
  fields:
-    - name: RDP
-      description: Read protection level
-      bit_offset: 0
-      bit_size: 8
-    - name: BOR_LEV
-      description: BOR reset Level
-      bit_offset: 8
-      bit_size: 3
-    - name: nRST_STOP
-      description: nRST_STOP
-      bit_offset: 12
-      bit_size: 1
-    - name: nRST_STDBY
-      description: nRST_STDBY
-      bit_offset: 13
-      bit_size: 1
-    - name: IDWG_SW
-      description: Independent watchdog selection
-      bit_offset: 16
-      bit_size: 1
-    - name: IWDG_STOP
-      description: Independent watchdog counter freeze in Stop mode
-      bit_offset: 17
-      bit_size: 1
-    - name: IWDG_STDBY
-      description: Independent watchdog counter freeze in Standby mode
-      bit_offset: 18
-      bit_size: 1
-    - name: WWDG_SW
-      description: Window watchdog selection
-      bit_offset: 19
-      bit_size: 1
-    - name: BFB
-      description: Dual-bank boot
-      bit_offset: 20
-      bit_size: 1
-    - name: DUALBANK
-      description: Dual-Bank on 512 KB or 256 KB Flash memory devices
-      bit_offset: 21
-      bit_size: 1
-    - name: nBOOT1
-      description: Boot configuration
-      bit_offset: 23
-      bit_size: 1
-    - name: SRAM2_PE
-      description: SRAM2 parity check enable
-      bit_offset: 24
-      bit_size: 1
-    - name: SRAM2_RST
-      description: SRAM2 Erase when system reset
-      bit_offset: 25
-      bit_size: 1
-    - name: nSWBOOT0
-      description: Software BOOT0
-      bit_offset: 26
-      bit_size: 1
-    - name: nBOOT0
-      description: nBOOT0 option bit
-      bit_offset: 27
-      bit_size: 1
+  - name: RDP
+    description: Read protection level
+    bit_offset: 0
+    bit_size: 8
+  - name: BOR_LEV
+    description: BOR reset Level
+    bit_offset: 8
+    bit_size: 3
+  - name: nRST_STOP
+    description: nRST_STOP
+    bit_offset: 12
+    bit_size: 1
+  - name: nRST_STDBY
+    description: nRST_STDBY
+    bit_offset: 13
+    bit_size: 1
+  - name: IDWG_SW
+    description: Independent watchdog selection
+    bit_offset: 16
+    bit_size: 1
+  - name: IWDG_STOP
+    description: Independent watchdog counter freeze in Stop mode
+    bit_offset: 17
+    bit_size: 1
+  - name: IWDG_STDBY
+    description: Independent watchdog counter freeze in Standby mode
+    bit_offset: 18
+    bit_size: 1
+  - name: WWDG_SW
+    description: Window watchdog selection
+    bit_offset: 19
+    bit_size: 1
+  - name: BFB
+    description: Dual-bank boot
+    bit_offset: 20
+    bit_size: 1
+  - name: DUALBANK
+    description: Dual-Bank on 512 KB or 256 KB Flash memory devices
+    bit_offset: 21
+    bit_size: 1
+  - name: nBOOT1
+    description: Boot configuration
+    bit_offset: 23
+    bit_size: 1
+  - name: SRAM2_PE
+    description: SRAM2 parity check enable
+    bit_offset: 24
+    bit_size: 1
+  - name: SRAM2_RST
+    description: SRAM2 Erase when system reset
+    bit_offset: 25
+    bit_size: 1
+  - name: nSWBOOT0
+    description: Software BOOT0
+    bit_offset: 26
+    bit_size: 1
+  - name: nBOOT0
+    description: nBOOT0 option bit
+    bit_offset: 27
+    bit_size: 1
 fieldset/PCROP1ER:
  description: Flash Bank 1 PCROP End address register
  fields:
-    - name: PCROP1_END
-      description: Bank 1 PCROP area end offset
-      bit_offset: 0
-      bit_size: 16
-    - name: PCROP_RDP
-      description: PCROP area preserved when RDP level decreased
-      bit_offset: 31
-      bit_size: 1
+  - name: PCROP1_END
+    description: Bank 1 PCROP area end offset
+    bit_offset: 0
+    bit_size: 16
+  - name: PCROP_RDP
+    description: PCROP area preserved when RDP level decreased
+    bit_offset: 31
+    bit_size: 1
 fieldset/PCROP1SR:
  description: Flash Bank 1 PCROP Start address register
  fields:
-    - name: PCROP1_STRT
-      description: Bank 1 PCROP area start offset
-      bit_offset: 0
-      bit_size: 16
+  - name: PCROP1_STRT
+    description: Bank 1 PCROP area start offset
+    bit_offset: 0
+    bit_size: 16
 fieldset/PCROP2ER:
  description: Flash Bank 2 PCROP End address register
  fields:
-    - name: PCROP2_END
-      description: Bank 2 PCROP area end offset
-      bit_offset: 0
-      bit_size: 16
+  - name: PCROP2_END
+    description: Bank 2 PCROP area end offset
+    bit_offset: 0
+    bit_size: 16
 fieldset/PCROP2SR:
  description: Flash Bank 2 PCROP Start address register
  fields:
-    - name: PCROP2_STRT
-      description: Bank 2 PCROP area start offset
-      bit_offset: 0
-      bit_size: 16
+  - name: PCROP2_STRT
+    description: Bank 2 PCROP area start offset
+    bit_offset: 0
+    bit_size: 16
 fieldset/PDKEYR:
  description: Power down key register
  fields:
-    - name: PDKEYR
-      description: RUN_PD in FLASH_ACR key
-      bit_offset: 0
-      bit_size: 32
+  - name: PDKEYR
+    description: RUN_PD in FLASH_ACR key
+    bit_offset: 0
+    bit_size: 32
 fieldset/SR:
  description: Status register
  fields:
-    - name: EOP
-      description: End of operation
-      bit_offset: 0
-      bit_size: 1
-    - name: OPERR
-      description: Operation error
-      bit_offset: 1
-      bit_size: 1
-    - name: PROGERR
-      description: Programming error
-      bit_offset: 3
-      bit_size: 1
-    - name: WRPERR
-      description: Write protected error
-      bit_offset: 4
-      bit_size: 1
-    - name: PGAERR
-      description: Programming alignment error
-      bit_offset: 5
-      bit_size: 1
-    - name: SIZERR
-      description: Size error
-      bit_offset: 6
-      bit_size: 1
-    - name: PGSERR
-      description: Programming sequence error
-      bit_offset: 7
-      bit_size: 1
-    - name: MISERR
-      description: Fast programming data miss error
-      bit_offset: 8
-      bit_size: 1
-    - name: FASTERR
-      description: Fast programming error
-      bit_offset: 9
-      bit_size: 1
-    - name: RDERR
-      description: PCROP read error
-      bit_offset: 14
-      bit_size: 1
-    - name: OPTVERR
-      description: Option validity error
-      bit_offset: 15
-      bit_size: 1
-    - name: BSY
-      description: Busy
-      bit_offset: 16
-      bit_size: 1
+  - name: EOP
+    description: End of operation
+    bit_offset: 0
+    bit_size: 1
+  - name: OPERR
+    description: Operation error
+    bit_offset: 1
+    bit_size: 1
+  - name: PROGERR
+    description: Programming error
+    bit_offset: 3
+    bit_size: 1
+  - name: WRPERR
+    description: Write protected error
+    bit_offset: 4
+    bit_size: 1
+  - name: PGAERR
+    description: Programming alignment error
+    bit_offset: 5
+    bit_size: 1
+  - name: SIZERR
+    description: Size error
+    bit_offset: 6
+    bit_size: 1
+  - name: PGSERR
+    description: Programming sequence error
+    bit_offset: 7
+    bit_size: 1
+  - name: MISERR
+    description: Fast programming data miss error
+    bit_offset: 8
+    bit_size: 1
+  - name: FASTERR
+    description: Fast programming error
+    bit_offset: 9
+    bit_size: 1
+  - name: RDERR
+    description: PCROP read error
+    bit_offset: 14
+    bit_size: 1
+  - name: OPTVERR
+    description: Option validity error
+    bit_offset: 15
+    bit_size: 1
+  - name: BSY
+    description: Busy
+    bit_offset: 16
+    bit_size: 1
 fieldset/WRP1AR:
  description: Flash Bank 1 WRP area A address register
  fields:
-    - name: WRP1A_STRT
-      description: Bank 1 WRP first area tart offset
-      bit_offset: 0
-      bit_size: 8
-    - name: WRP1A_END
-      description: Bank 1 WRP first area A end offset
-      bit_offset: 16
-      bit_size: 8
+  - name: WRP1A_STRT
+    description: Bank 1 WRP first area tart offset
+    bit_offset: 0
+    bit_size: 8
+  - name: WRP1A_END
+    description: Bank 1 WRP first area A end offset
+    bit_offset: 16
+    bit_size: 8
 fieldset/WRP1BR:
  description: Flash Bank 1 WRP area B address register
  fields:
-    - name: WRP1B_STRT
-      description: Bank 1 WRP second area B start offset
-      bit_offset: 0
-      bit_size: 8
-    - name: WRP1B_END
-      description: Bank 1 WRP second area B end offset
-      bit_offset: 16
-      bit_size: 8
+  - name: WRP1B_STRT
+    description: Bank 1 WRP second area B start offset
+    bit_offset: 0
+    bit_size: 8
+  - name: WRP1B_END
+    description: Bank 1 WRP second area B end offset
+    bit_offset: 16
+    bit_size: 8
 fieldset/WRP2AR:
  description: Flash Bank 2 WRP area A address register
  fields:
-    - name: WRP2A_STRT
-      description: Bank 2 WRP first area A start offset
-      bit_offset: 0
-      bit_size: 8
-    - name: WRP2A_END
-      description: Bank 2 WRP first area A end offset
-      bit_offset: 16
-      bit_size: 8
+  - name: WRP2A_STRT
+    description: Bank 2 WRP first area A start offset
+    bit_offset: 0
+    bit_size: 8
+  - name: WRP2A_END
+    description: Bank 2 WRP first area A end offset
+    bit_offset: 16
+    bit_size: 8
 fieldset/WRP2BR:
  description: Flash Bank 2 WRP area B address register
  fields:
-    - name: WRP2B_STRT
-      description: Bank 2 WRP second area B start offset
-      bit_offset: 0
-      bit_size: 8
-    - name: WRP2B_END
-      description: Bank 2 WRP second area B end offset
-      bit_offset: 16
-      bit_size: 8
+  - name: WRP2B_STRT
+    description: Bank 2 WRP second area B start offset
+    bit_offset: 0
+    bit_size: 8
+  - name: WRP2B_END
+    description: Bank 2 WRP second area B end offset
+    bit_offset: 16
+    bit_size: 8
--- a/data/registers/flash_l5.yaml
+++ b/data/registers/flash_l5.yaml
--- a/data/registers/flash_u5.yaml
+++ b/data/registers/flash_u5.yaml
--- a/data/registers/flash_wb.yaml
+++ b/data/registers/flash_wb.yaml
--- a/data/registers/flash_wl.yaml
+++ b/data/registers/flash_wl.yaml
--- a/data/registers/fmac_v1.yaml
+++ b/data/registers/fmac_v1.yaml
@ -1,179 +1,178 @@
---
 block/FMAC:
  description: Filter math accelerator
  items:
-    - name: X1BUFCFG
-      description: X1 buffer configuration register
-      byte_offset: 0
-      fieldset: X1BUFCFG
-    - name: X2BUFCFG
-      description: X2 buffer configuration register
-      byte_offset: 4
-      fieldset: X2BUFCFG
-    - name: YBUFCFG
-      description: Y buffer configuration register
-      byte_offset: 8
-      fieldset: YBUFCFG
-    - name: PARAM
-      description: Parameter register
-      byte_offset: 12
-      fieldset: PARAM
-    - name: CR
-      description: Control register
-      byte_offset: 16
-      fieldset: CR
-    - name: SR
-      description: Status register
-      byte_offset: 20
-      access: Read
-      fieldset: SR
-    - name: WDATA
-      description: Write data register
-      byte_offset: 24
-      access: Write
-      fieldset: WDATA
-    - name: RDATA
-      description: Read data register
-      byte_offset: 28
-      access: Read
-      fieldset: RDATA
+  - name: X1BUFCFG
+    description: X1 buffer configuration register
+    byte_offset: 0
+    fieldset: X1BUFCFG
+  - name: X2BUFCFG
+    description: X2 buffer configuration register
+    byte_offset: 4
+    fieldset: X2BUFCFG
+  - name: YBUFCFG
+    description: Y buffer configuration register
+    byte_offset: 8
+    fieldset: YBUFCFG
+  - name: PARAM
+    description: Parameter register
+    byte_offset: 12
+    fieldset: PARAM
+  - name: CR
+    description: Control register
+    byte_offset: 16
+    fieldset: CR
+  - name: SR
+    description: Status register
+    byte_offset: 20
+    access: Read
+    fieldset: SR
+  - name: WDATA
+    description: Write data register
+    byte_offset: 24
+    access: Write
+    fieldset: WDATA
+  - name: RDATA
+    description: Read data register
+    byte_offset: 28
+    access: Read
+    fieldset: RDATA
 fieldset/CR:
  description: Control register
  fields:
-    - name: RIEN
-      description: Enable read interrupt
-      bit_offset: 0
-      bit_size: 1
-    - name: WIEN
-      description: Enable write interrupt
-      bit_offset: 1
-      bit_size: 1
-    - name: OVFLIEN
-      description: Enable overflow error interrupts
-      bit_offset: 2
-      bit_size: 1
-    - name: UNFLIEN
-      description: Enable underflow error interrupts
-      bit_offset: 3
-      bit_size: 1
-    - name: SATIEN
-      description: Enable saturation error interrupts
-      bit_offset: 4
-      bit_size: 1
-    - name: DMAREN
-      description: Enable DMA read channel requests
-      bit_offset: 8
-      bit_size: 1
-    - name: DMAWEN
-      description: Enable DMA write channel requests
-      bit_offset: 9
-      bit_size: 1
-    - name: CLIPEN
-      description: Enable clipping
-      bit_offset: 15
-      bit_size: 1
-    - name: RESET
-      description: Reset FMAC unit
-      bit_offset: 16
-      bit_size: 1
+  - name: RIEN
+    description: Enable read interrupt
+    bit_offset: 0
+    bit_size: 1
+  - name: WIEN
+    description: Enable write interrupt
+    bit_offset: 1
+    bit_size: 1
+  - name: OVFLIEN
+    description: Enable overflow error interrupts
+    bit_offset: 2
+    bit_size: 1
+  - name: UNFLIEN
+    description: Enable underflow error interrupts
+    bit_offset: 3
+    bit_size: 1
+  - name: SATIEN
+    description: Enable saturation error interrupts
+    bit_offset: 4
+    bit_size: 1
+  - name: DMAREN
+    description: Enable DMA read channel requests
+    bit_offset: 8
+    bit_size: 1
+  - name: DMAWEN
+    description: Enable DMA write channel requests
+    bit_offset: 9
+    bit_size: 1
+  - name: CLIPEN
+    description: Enable clipping
+    bit_offset: 15
+    bit_size: 1
+  - name: RESET
+    description: Reset FMAC unit
+    bit_offset: 16
+    bit_size: 1
 fieldset/PARAM:
  description: Parameter register
  fields:
-    - name: P
-      description: Input parameter P
-      bit_offset: 0
-      bit_size: 8
-    - name: Q
-      description: Input parameter Q
-      bit_offset: 8
-      bit_size: 8
-    - name: R
-      description: Input parameter R
-      bit_offset: 16
-      bit_size: 8
-    - name: FUNC
-      description: Function
-      bit_offset: 24
-      bit_size: 7
-    - name: START
-      description: Enable execution
-      bit_offset: 31
-      bit_size: 1
+  - name: P
+    description: Input parameter P
+    bit_offset: 0
+    bit_size: 8
+  - name: Q
+    description: Input parameter Q
+    bit_offset: 8
+    bit_size: 8
+  - name: R
+    description: Input parameter R
+    bit_offset: 16
+    bit_size: 8
+  - name: FUNC
+    description: Function
+    bit_offset: 24
+    bit_size: 7
+  - name: START
+    description: Enable execution
+    bit_offset: 31
+    bit_size: 1
 fieldset/RDATA:
  description: Read data register
  fields:
-    - name: RES
-      description: Read data (contents of the Y output buffer at the address indicated by the READ pointer)
-      bit_offset: 0
-      bit_size: 16
+  - name: RES
+    description: Read data (contents of the Y output buffer at the address indicated by the READ pointer)
+    bit_offset: 0
+    bit_size: 16
 fieldset/SR:
  description: Status register
  fields:
-    - name: YEMPTY
-      description: Y buffer empty flag
-      bit_offset: 0
-      bit_size: 1
-    - name: X1FULL
-      description: X1 buffer full flag
-      bit_offset: 1
-      bit_size: 1
-    - name: OVFL
-      description: Overflow error flag
-      bit_offset: 8
-      bit_size: 1
-    - name: UNFL
-      description: Underflow error flag
-      bit_offset: 9
-      bit_size: 1
-    - name: SAT
-      description: Saturation error flag
-      bit_offset: 10
-      bit_size: 1
+  - name: YEMPTY
+    description: Y buffer empty flag
+    bit_offset: 0
+    bit_size: 1
+  - name: X1FULL
+    description: X1 buffer full flag
+    bit_offset: 1
+    bit_size: 1
+  - name: OVFL
+    description: Overflow error flag
+    bit_offset: 8
+    bit_size: 1
+  - name: UNFL
+    description: Underflow error flag
+    bit_offset: 9
+    bit_size: 1
+  - name: SAT
+    description: Saturation error flag
+    bit_offset: 10
+    bit_size: 1
 fieldset/WDATA:
  description: Write data register
  fields:
-    - name: WDATA
-      description: Write data (write data are transferred to the address indicated by the write pointer)
-      bit_offset: 0
-      bit_size: 16
+  - name: WDATA
+    description: Write data (write data are transferred to the address indicated by the write pointer)
+    bit_offset: 0
+    bit_size: 16
 fieldset/X1BUFCFG:
  description: X1 buffer configuration register
  fields:
-    - name: X1_BASE
-      description: Base address of X1 buffer
-      bit_offset: 0
-      bit_size: 8
-    - name: X1_BUF_SIZE
-      description: Allocated size of X1 buffer in 16-bit words
-      bit_offset: 8
-      bit_size: 8
-    - name: FULL_WM
-      description: Watermark for buffer full flag
-      bit_offset: 24
-      bit_size: 2
+  - name: X1_BASE
+    description: Base address of X1 buffer
+    bit_offset: 0
+    bit_size: 8
+  - name: X1_BUF_SIZE
+    description: Allocated size of X1 buffer in 16-bit words
+    bit_offset: 8
+    bit_size: 8
+  - name: FULL_WM
+    description: Watermark for buffer full flag
+    bit_offset: 24
+    bit_size: 2
 fieldset/X2BUFCFG:
  description: X2 buffer configuration register
  fields:
-    - name: X2_BASE
-      description: Base address of X2 buffer
-      bit_offset: 0
-      bit_size: 8
-    - name: X2_BUF_SIZE
-      description: Size of X2 buffer in 16-bit words
-      bit_offset: 8
-      bit_size: 8
+  - name: X2_BASE
+    description: Base address of X2 buffer
+    bit_offset: 0
+    bit_size: 8
+  - name: X2_BUF_SIZE
+    description: Size of X2 buffer in 16-bit words
+    bit_offset: 8
+    bit_size: 8
 fieldset/YBUFCFG:
  description: Y buffer configuration register
  fields:
-    - name: Y_BASE
-      description: Base address of Y buffer
-      bit_offset: 0
-      bit_size: 8
-    - name: Y_BUF_SIZE
-      description: Size of Y buffer in 16-bit words
-      bit_offset: 8
-      bit_size: 8
-    - name: EMPTY_WM
-      description: Watermark for buffer empty flag
-      bit_offset: 24
-      bit_size: 2
+  - name: Y_BASE
+    description: Base address of Y buffer
+    bit_offset: 0
+    bit_size: 8
+  - name: Y_BUF_SIZE
+    description: Size of Y buffer in 16-bit words
+    bit_offset: 8
+    bit_size: 8
+  - name: EMPTY_WM
+    description: Watermark for buffer empty flag
+    bit_offset: 24
+    bit_size: 2
--- a/data/registers/fmc_v1x3.yaml
+++ b/data/registers/fmc_v1x3.yaml
--- a/data/registers/fmc_v2x1.yaml
+++ b/data/registers/fmc_v2x1.yaml
--- a/data/registers/fmc_v3x1.yaml
+++ b/data/registers/fmc_v3x1.yaml
--- a/data/registers/fsmc_v1x0.yaml
+++ b/data/registers/fsmc_v1x0.yaml
@ -1,224 +1,223 @@
---
 block/FSMC:
  description: Flexible static memory controller
  items:
-    - name: BCR
-      description: SRAM/NOR-Flash chip-select control register 1-4
-      array:
-        len: 4
-        stride: 8
-      byte_offset: 0
-      fieldset: BCR
-    - name: BTR
-      description: SRAM/NOR-Flash chip-select timing register 1-4
-      array:
-        len: 4
-        stride: 8
-      byte_offset: 4
-      fieldset: BTR
-    - name: BWTR
-      description: SRAM/NOR-Flash write timing registers 1-4
-      array:
-        len: 4
-        stride: 8
-      byte_offset: 260
-      fieldset: BWTR
+  - name: BCR
+    description: SRAM/NOR-Flash chip-select control register 1-4
+    array:
+      len: 4
+      stride: 8
+    byte_offset: 0
+    fieldset: BCR
+  - name: BTR
+    description: SRAM/NOR-Flash chip-select timing register 1-4
+    array:
+      len: 4
+      stride: 8
+    byte_offset: 4
+    fieldset: BTR
+  - name: BWTR
+    description: SRAM/NOR-Flash write timing registers 1-4
+    array:
+      len: 4
+      stride: 8
+    byte_offset: 260
+    fieldset: BWTR
 fieldset/BCR:
  description: SRAM/NOR-Flash chip-select control register
  fields:
-    - name: MBKEN
-      description: Memory bank enable bit
-      bit_offset: 0
-      bit_size: 1
-    - name: MUXEN
-      description: Address/data multiplexing enable bit
-      bit_offset: 1
-      bit_size: 1
-    - name: MTYP
-      description: Memory type
-      bit_offset: 2
-      bit_size: 2
-      enum: MTYP
-    - name: MWID
-      description: Memory data bus width
-      bit_offset: 4
-      bit_size: 2
-      enum: MWID
-    - name: FACCEN
-      description: Flash access enable
-      bit_offset: 6
-      bit_size: 1
-    - name: BURSTEN
-      description: Burst enable bit
-      bit_offset: 8
-      bit_size: 1
-    - name: WAITPOL
-      description: Wait signal polarity bit
-      bit_offset: 9
-      bit_size: 1
-      enum: WAITPOL
-    - name: WRAPMOD
-      description: WRAPMOD
-      bit_offset: 10
-      bit_size: 1
-    - name: WAITCFG
-      description: Wait timing configuration
-      bit_offset: 11
-      bit_size: 1
-      enum: WAITCFG
-    - name: WREN
-      description: Write enable bit
-      bit_offset: 12
-      bit_size: 1
-    - name: WAITEN
-      description: Wait enable bit
-      bit_offset: 13
-      bit_size: 1
-    - name: EXTMOD
-      description: Extended mode enable
-      bit_offset: 14
-      bit_size: 1
-    - name: ASYNCWAIT
-      description: Wait signal during asynchronous transfers
-      bit_offset: 15
-      bit_size: 1
-    - name: CPSIZE
-      description: CRAM page size
-      bit_offset: 16
-      bit_size: 3
-      enum: CPSIZE
-    - name: CBURSTRW
-      description: Write burst enable
-      bit_offset: 19
-      bit_size: 1
+  - name: MBKEN
+    description: Memory bank enable bit
+    bit_offset: 0
+    bit_size: 1
+  - name: MUXEN
+    description: Address/data multiplexing enable bit
+    bit_offset: 1
+    bit_size: 1
+  - name: MTYP
+    description: Memory type
+    bit_offset: 2
+    bit_size: 2
+    enum: MTYP
+  - name: MWID
+    description: Memory data bus width
+    bit_offset: 4
+    bit_size: 2
+    enum: MWID
+  - name: FACCEN
+    description: Flash access enable
+    bit_offset: 6
+    bit_size: 1
+  - name: BURSTEN
+    description: Burst enable bit
+    bit_offset: 8
+    bit_size: 1
+  - name: WAITPOL
+    description: Wait signal polarity bit
+    bit_offset: 9
+    bit_size: 1
+    enum: WAITPOL
+  - name: WRAPMOD
+    description: WRAPMOD
+    bit_offset: 10
+    bit_size: 1
+  - name: WAITCFG
+    description: Wait timing configuration
+    bit_offset: 11
+    bit_size: 1
+    enum: WAITCFG
+  - name: WREN
+    description: Write enable bit
+    bit_offset: 12
+    bit_size: 1
+  - name: WAITEN
+    description: Wait enable bit
+    bit_offset: 13
+    bit_size: 1
+  - name: EXTMOD
+    description: Extended mode enable
+    bit_offset: 14
+    bit_size: 1
+  - name: ASYNCWAIT
+    description: Wait signal during asynchronous transfers
+    bit_offset: 15
+    bit_size: 1
+  - name: CPSIZE
+    description: CRAM page size
+    bit_offset: 16
+    bit_size: 3
+    enum: CPSIZE
+  - name: CBURSTRW
+    description: Write burst enable
+    bit_offset: 19
+    bit_size: 1
 fieldset/BTR:
  description: SRAM/NOR-Flash chip-select timing register
  fields:
-    - name: ADDSET
-      description: Address setup phase duration
-      bit_offset: 0
-      bit_size: 4
-    - name: ADDHLD
-      description: Address-hold phase duration
-      bit_offset: 4
-      bit_size: 4
-    - name: DATAST
-      description: Data-phase duration
-      bit_offset: 8
-      bit_size: 8
-    - name: BUSTURN
-      description: Bus turnaround phase duration
-      bit_offset: 16
-      bit_size: 4
-    - name: CLKDIV
-      description: Clock divide ratio (for FMC_CLK signal)
-      bit_offset: 20
-      bit_size: 4
-    - name: DATLAT
-      description: Data latency for synchronous memory
-      bit_offset: 24
-      bit_size: 4
-    - name: ACCMOD
-      description: Access mode
-      bit_offset: 28
-      bit_size: 2
-      enum: ACCMOD
+  - name: ADDSET
+    description: Address setup phase duration
+    bit_offset: 0
+    bit_size: 4
+  - name: ADDHLD
+    description: Address-hold phase duration
+    bit_offset: 4
+    bit_size: 4
+  - name: DATAST
+    description: Data-phase duration
+    bit_offset: 8
+    bit_size: 8
+  - name: BUSTURN
+    description: Bus turnaround phase duration
+    bit_offset: 16
+    bit_size: 4
+  - name: CLKDIV
+    description: Clock divide ratio (for FMC_CLK signal)
+    bit_offset: 20
+    bit_size: 4
+  - name: DATLAT
+    description: Data latency for synchronous memory
+    bit_offset: 24
+    bit_size: 4
+  - name: ACCMOD
+    description: Access mode
+    bit_offset: 28
+    bit_size: 2
+    enum: ACCMOD
 fieldset/BWTR:
  description: SRAM/NOR-Flash write timing registers
  fields:
-    - name: ADDSET
-      description: Address setup phase duration
-      bit_offset: 0
-      bit_size: 4
-    - name: ADDHLD
-      description: Address-hold phase duration
-      bit_offset: 4
-      bit_size: 4
-    - name: DATAST
-      description: Data-phase duration
-      bit_offset: 8
-      bit_size: 8
-    - name: BUSTURN
-      description: Bus turnaround phase duration
-      bit_offset: 16
-      bit_size: 4
-    - name: ACCMOD
-      description: Access mode
-      bit_offset: 28
-      bit_size: 2
-      enum: ACCMOD
+  - name: ADDSET
+    description: Address setup phase duration
+    bit_offset: 0
+    bit_size: 4
+  - name: ADDHLD
+    description: Address-hold phase duration
+    bit_offset: 4
+    bit_size: 4
+  - name: DATAST
+    description: Data-phase duration
+    bit_offset: 8
+    bit_size: 8
+  - name: BUSTURN
+    description: Bus turnaround phase duration
+    bit_offset: 16
+    bit_size: 4
+  - name: ACCMOD
+    description: Access mode
+    bit_offset: 28
+    bit_size: 2
+    enum: ACCMOD
 enum/ACCMOD:
  bit_size: 2
  variants:
-    - name: A
-      description: Access mode A
-      value: 0
-    - name: B
-      description: Access mode B
-      value: 1
-    - name: C
-      description: Access mode C
-      value: 2
-    - name: D
-      description: Access mode D
-      value: 3
+  - name: A
+    description: Access mode A
+    value: 0
+  - name: B
+    description: Access mode B
+    value: 1
+  - name: C
+    description: Access mode C
+    value: 2
+  - name: D
+    description: Access mode D
+    value: 3
 enum/CPSIZE:
  bit_size: 3
  variants:
-    - name: NoBurstSplit
-      description: No burst split when crossing page boundary
-      value: 0
-    - name: Bytes128
-      description: 128 bytes CRAM page size
-      value: 1
-    - name: Bytes256
-      description: 256 bytes CRAM page size
-      value: 2
-    - name: Bytes512
-      description: 512 bytes CRAM page size
-      value: 3
-    - name: Bytes1024
-      description: 1024 bytes CRAM page size
-      value: 4
+  - name: NoBurstSplit
+    description: No burst split when crossing page boundary
+    value: 0
+  - name: Bytes128
+    description: 128 bytes CRAM page size
+    value: 1
+  - name: Bytes256
+    description: 256 bytes CRAM page size
+    value: 2
+  - name: Bytes512
+    description: 512 bytes CRAM page size
+    value: 3
+  - name: Bytes1024
+    description: 1024 bytes CRAM page size
+    value: 4
 enum/MTYP:
  bit_size: 2
  variants:
-    - name: SRAM
-      description: SRAM memory type
-      value: 0
-    - name: PSRAM
-      description: PSRAM (CRAM) memory type
-      value: 1
-    - name: Flash
-      description: NOR Flash/OneNAND Flash
-      value: 2
+  - name: SRAM
+    description: SRAM memory type
+    value: 0
+  - name: PSRAM
+    description: PSRAM (CRAM) memory type
+    value: 1
+  - name: Flash
+    description: NOR Flash/OneNAND Flash
+    value: 2
 enum/MWID:
  bit_size: 2
  variants:
-    - name: Bits8
-      description: Memory data bus width 8 bits
-      value: 0
-    - name: Bits16
-      description: Memory data bus width 16 bits
-      value: 1
-    - name: Bits32
-      description: Memory data bus width 32 bits
-      value: 2
+  - name: Bits8
+    description: Memory data bus width 8 bits
+    value: 0
+  - name: Bits16
+    description: Memory data bus width 16 bits
+    value: 1
+  - name: Bits32
+    description: Memory data bus width 32 bits
+    value: 2
 enum/WAITCFG:
  bit_size: 1
  variants:
-    - name: BeforeWaitState
-      description: NWAIT signal is active one data cycle before wait state
-      value: 0
-    - name: DuringWaitState
-      description: NWAIT signal is active during wait state
-      value: 1
+  - name: BeforeWaitState
+    description: NWAIT signal is active one data cycle before wait state
+    value: 0
+  - name: DuringWaitState
+    description: NWAIT signal is active during wait state
+    value: 1
 enum/WAITPOL:
  bit_size: 1
  variants:
-    - name: ActiveLow
-      description: NWAIT active low
-      value: 0
-    - name: ActiveHigh
-      description: NWAIT active high
-      value: 1
+  - name: ActiveLow
+    description: NWAIT active low
+    value: 0
+  - name: ActiveHigh
+    description: NWAIT active high
+    value: 1
--- a/data/registers/fsmc_v1x3.yaml
+++ b/data/registers/fsmc_v1x3.yaml
@ -1,433 +1,432 @@
---
 block/FSMC:
  description: Flexible static memory controller
  items:
-    - name: BCR
-      description: SRAM/NOR-Flash chip-select control register 1-4
-      array:
-        len: 4
-        stride: 8
-      byte_offset: 0
-      fieldset: BCR
-    - name: BTR
-      description: SRAM/NOR-Flash chip-select timing register 1-4
-      array:
-        len: 4
-        stride: 8
-      byte_offset: 4
-      fieldset: BTR
-    - name: PCR
-      description: PC Card/NAND Flash control register 2-4
-      array:
-        len: 3
-        stride: 32
-      byte_offset: 96
-      fieldset: PCR
-    - name: SR
-      description: FIFO status and interrupt register 2-4
-      array:
-        len: 3
-        stride: 32
-      byte_offset: 100
-      fieldset: SR
-    - name: PMEM
-      description: Common memory space timing register 2-4
-      array:
-        len: 3
-        stride: 32
-      byte_offset: 104
-      fieldset: PMEM
-    - name: PATT
-      description: Attribute memory space timing register 2-4
-      array:
-        len: 3
-        stride: 32
-      byte_offset: 108
-      fieldset: PATT
-    - name: ECCR
-      description: ECC result register 2-3
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 116
-      access: Read
-      fieldset: ECCR
-    - name: PIO4
-      description: I/O space timing register 4
-      byte_offset: 176
-      fieldset: PIO4
-    - name: BWTR
-      description: SRAM/NOR-Flash write timing registers 1-4
-      array:
-        len: 4
-        stride: 8
-      byte_offset: 260
-      fieldset: BWTR
+  - name: BCR
+    description: SRAM/NOR-Flash chip-select control register 1-4
+    array:
+      len: 4
+      stride: 8
+    byte_offset: 0
+    fieldset: BCR
+  - name: BTR
+    description: SRAM/NOR-Flash chip-select timing register 1-4
+    array:
+      len: 4
+      stride: 8
+    byte_offset: 4
+    fieldset: BTR
+  - name: PCR
+    description: PC Card/NAND Flash control register 2-4
+    array:
+      len: 3
+      stride: 32
+    byte_offset: 96
+    fieldset: PCR
+  - name: SR
+    description: FIFO status and interrupt register 2-4
+    array:
+      len: 3
+      stride: 32
+    byte_offset: 100
+    fieldset: SR
+  - name: PMEM
+    description: Common memory space timing register 2-4
+    array:
+      len: 3
+      stride: 32
+    byte_offset: 104
+    fieldset: PMEM
+  - name: PATT
+    description: Attribute memory space timing register 2-4
+    array:
+      len: 3
+      stride: 32
+    byte_offset: 108
+    fieldset: PATT
+  - name: ECCR
+    description: ECC result register 2-3
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 116
+    access: Read
+    fieldset: ECCR
+  - name: PIO4
+    description: I/O space timing register 4
+    byte_offset: 176
+    fieldset: PIO4
+  - name: BWTR
+    description: SRAM/NOR-Flash write timing registers 1-4
+    array:
+      len: 4
+      stride: 8
+    byte_offset: 260
+    fieldset: BWTR
 fieldset/BCR:
  description: SRAM/NOR-Flash chip-select control register
  fields:
-    - name: MBKEN
-      description: Memory bank enable bit
-      bit_offset: 0
-      bit_size: 1
-    - name: MUXEN
-      description: Address/data multiplexing enable bit
-      bit_offset: 1
-      bit_size: 1
-    - name: MTYP
-      description: Memory type
-      bit_offset: 2
-      bit_size: 2
-      enum: MTYP
-    - name: MWID
-      description: Memory data bus width
-      bit_offset: 4
-      bit_size: 2
-      enum: MWID
-    - name: FACCEN
-      description: Flash access enable
-      bit_offset: 6
-      bit_size: 1
-    - name: BURSTEN
-      description: Burst enable bit
-      bit_offset: 8
-      bit_size: 1
-    - name: WAITPOL
-      description: Wait signal polarity bit
-      bit_offset: 9
-      bit_size: 1
-      enum: WAITPOL
-    - name: WRAPMOD
-      description: WRAPMOD
-      bit_offset: 10
-      bit_size: 1
-    - name: WAITCFG
-      description: Wait timing configuration
-      bit_offset: 11
-      bit_size: 1
-      enum: WAITCFG
-    - name: WREN
-      description: Write enable bit
-      bit_offset: 12
-      bit_size: 1
-    - name: WAITEN
-      description: Wait enable bit
-      bit_offset: 13
-      bit_size: 1
-    - name: EXTMOD
-      description: Extended mode enable
-      bit_offset: 14
-      bit_size: 1
-    - name: ASYNCWAIT
-      description: Wait signal during asynchronous transfers
-      bit_offset: 15
-      bit_size: 1
-    - name: CPSIZE
-      description: CRAM page size
-      bit_offset: 16
-      bit_size: 3
-      enum: CPSIZE
-    - name: CBURSTRW
-      description: Write burst enable
-      bit_offset: 19
-      bit_size: 1
+  - name: MBKEN
+    description: Memory bank enable bit
+    bit_offset: 0
+    bit_size: 1
+  - name: MUXEN
+    description: Address/data multiplexing enable bit
+    bit_offset: 1
+    bit_size: 1
+  - name: MTYP
+    description: Memory type
+    bit_offset: 2
+    bit_size: 2
+    enum: MTYP
+  - name: MWID
+    description: Memory data bus width
+    bit_offset: 4
+    bit_size: 2
+    enum: MWID
+  - name: FACCEN
+    description: Flash access enable
+    bit_offset: 6
+    bit_size: 1
+  - name: BURSTEN
+    description: Burst enable bit
+    bit_offset: 8
+    bit_size: 1
+  - name: WAITPOL
+    description: Wait signal polarity bit
+    bit_offset: 9
+    bit_size: 1
+    enum: WAITPOL
+  - name: WRAPMOD
+    description: WRAPMOD
+    bit_offset: 10
+    bit_size: 1
+  - name: WAITCFG
+    description: Wait timing configuration
+    bit_offset: 11
+    bit_size: 1
+    enum: WAITCFG
+  - name: WREN
+    description: Write enable bit
+    bit_offset: 12
+    bit_size: 1
+  - name: WAITEN
+    description: Wait enable bit
+    bit_offset: 13
+    bit_size: 1
+  - name: EXTMOD
+    description: Extended mode enable
+    bit_offset: 14
+    bit_size: 1
+  - name: ASYNCWAIT
+    description: Wait signal during asynchronous transfers
+    bit_offset: 15
+    bit_size: 1
+  - name: CPSIZE
+    description: CRAM page size
+    bit_offset: 16
+    bit_size: 3
+    enum: CPSIZE
+  - name: CBURSTRW
+    description: Write burst enable
+    bit_offset: 19
+    bit_size: 1
 fieldset/BTR:
  description: SRAM/NOR-Flash chip-select timing register
  fields:
-    - name: ADDSET
-      description: Address setup phase duration
-      bit_offset: 0
-      bit_size: 4
-    - name: ADDHLD
-      description: Address-hold phase duration
-      bit_offset: 4
-      bit_size: 4
-    - name: DATAST
-      description: Data-phase duration
-      bit_offset: 8
-      bit_size: 8
-    - name: BUSTURN
-      description: Bus turnaround phase duration
-      bit_offset: 16
-      bit_size: 4
-    - name: CLKDIV
-      description: Clock divide ratio (for FMC_CLK signal)
-      bit_offset: 20
-      bit_size: 4
-    - name: DATLAT
-      description: Data latency for synchronous memory
-      bit_offset: 24
-      bit_size: 4
-    - name: ACCMOD
-      description: Access mode
-      bit_offset: 28
-      bit_size: 2
-      enum: ACCMOD
+  - name: ADDSET
+    description: Address setup phase duration
+    bit_offset: 0
+    bit_size: 4
+  - name: ADDHLD
+    description: Address-hold phase duration
+    bit_offset: 4
+    bit_size: 4
+  - name: DATAST
+    description: Data-phase duration
+    bit_offset: 8
+    bit_size: 8
+  - name: BUSTURN
+    description: Bus turnaround phase duration
+    bit_offset: 16
+    bit_size: 4
+  - name: CLKDIV
+    description: Clock divide ratio (for FMC_CLK signal)
+    bit_offset: 20
+    bit_size: 4
+  - name: DATLAT
+    description: Data latency for synchronous memory
+    bit_offset: 24
+    bit_size: 4
+  - name: ACCMOD
+    description: Access mode
+    bit_offset: 28
+    bit_size: 2
+    enum: ACCMOD
 fieldset/BWTR:
  description: SRAM/NOR-Flash write timing registers
  fields:
-    - name: ADDSET
-      description: Address setup phase duration
-      bit_offset: 0
-      bit_size: 4
-    - name: ADDHLD
-      description: Address-hold phase duration
-      bit_offset: 4
-      bit_size: 4
-    - name: DATAST
-      description: Data-phase duration
-      bit_offset: 8
-      bit_size: 8
-    - name: BUSTURN
-      description: Bus turnaround phase duration
-      bit_offset: 16
-      bit_size: 4
-    - name: ACCMOD
-      description: Access mode
-      bit_offset: 28
-      bit_size: 2
-      enum: ACCMOD
+  - name: ADDSET
+    description: Address setup phase duration
+    bit_offset: 0
+    bit_size: 4
+  - name: ADDHLD
+    description: Address-hold phase duration
+    bit_offset: 4
+    bit_size: 4
+  - name: DATAST
+    description: Data-phase duration
+    bit_offset: 8
+    bit_size: 8
+  - name: BUSTURN
+    description: Bus turnaround phase duration
+    bit_offset: 16
+    bit_size: 4
+  - name: ACCMOD
+    description: Access mode
+    bit_offset: 28
+    bit_size: 2
+    enum: ACCMOD
 fieldset/ECCR:
  description: ECC result register
  fields:
-    - name: ECC
-      description: ECC computation result value
-      bit_offset: 0
-      bit_size: 32
+  - name: ECC
+    description: ECC computation result value
+    bit_offset: 0
+    bit_size: 32
 fieldset/PATT:
  description: Attribute memory space timing register
  fields:
-    - name: ATTSET
-      description: Attribute memory setup time
-      bit_offset: 0
-      bit_size: 8
-    - name: ATTWAIT
-      description: Attribute memory wait time
-      bit_offset: 8
-      bit_size: 8
-    - name: ATTHOLD
-      description: Attribute memory hold time
-      bit_offset: 16
-      bit_size: 8
-    - name: ATTHIZ
-      description: Attribute memory data bus Hi-Z time
-      bit_offset: 24
-      bit_size: 8
+  - name: ATTSET
+    description: Attribute memory setup time
+    bit_offset: 0
+    bit_size: 8
+  - name: ATTWAIT
+    description: Attribute memory wait time
+    bit_offset: 8
+    bit_size: 8
+  - name: ATTHOLD
+    description: Attribute memory hold time
+    bit_offset: 16
+    bit_size: 8
+  - name: ATTHIZ
+    description: Attribute memory data bus Hi-Z time
+    bit_offset: 24
+    bit_size: 8
 fieldset/PCR:
  description: PC Card/NAND Flash control register
  fields:
-    - name: PWAITEN
-      description: Wait feature enable bit
-      bit_offset: 1
-      bit_size: 1
-    - name: PBKEN
-      description: NAND Flash memory bank enable bit
-      bit_offset: 2
-      bit_size: 1
-    - name: PTYP
-      description: Memory type
-      bit_offset: 3
-      bit_size: 1
-      enum: PTYP
-    - name: PWID
-      description: Data bus width
-      bit_offset: 4
-      bit_size: 2
-      enum: PWID
-    - name: ECCEN
-      description: ECC computation logic enable bit
-      bit_offset: 6
-      bit_size: 1
-    - name: TCLR
-      description: CLE to RE delay
-      bit_offset: 9
-      bit_size: 4
-    - name: TAR
-      description: ALE to RE delay
-      bit_offset: 13
-      bit_size: 4
-    - name: ECCPS
-      description: ECC page size
-      bit_offset: 17
-      bit_size: 3
-      enum: ECCPS
+  - name: PWAITEN
+    description: Wait feature enable bit
+    bit_offset: 1
+    bit_size: 1
+  - name: PBKEN
+    description: NAND Flash memory bank enable bit
+    bit_offset: 2
+    bit_size: 1
+  - name: PTYP
+    description: Memory type
+    bit_offset: 3
+    bit_size: 1
+    enum: PTYP
+  - name: PWID
+    description: Data bus width
+    bit_offset: 4
+    bit_size: 2
+    enum: PWID
+  - name: ECCEN
+    description: ECC computation logic enable bit
+    bit_offset: 6
+    bit_size: 1
+  - name: TCLR
+    description: CLE to RE delay
+    bit_offset: 9
+    bit_size: 4
+  - name: TAR
+    description: ALE to RE delay
+    bit_offset: 13
+    bit_size: 4
+  - name: ECCPS
+    description: ECC page size
+    bit_offset: 17
+    bit_size: 3
+    enum: ECCPS
 fieldset/PIO4:
  description: I/O space timing register 4
  fields:
-    - name: IOSETx
-      description: IOSETx
-      bit_offset: 0
-      bit_size: 8
-    - name: IOWAITx
-      description: IOWAITx
-      bit_offset: 8
-      bit_size: 8
-    - name: IOHOLDx
-      description: IOHOLDx
-      bit_offset: 16
-      bit_size: 8
-    - name: IOHIZx
-      description: IOHIZx
-      bit_offset: 24
-      bit_size: 8
+  - name: IOSETx
+    description: IOSETx
+    bit_offset: 0
+    bit_size: 8
+  - name: IOWAITx
+    description: IOWAITx
+    bit_offset: 8
+    bit_size: 8
+  - name: IOHOLDx
+    description: IOHOLDx
+    bit_offset: 16
+    bit_size: 8
+  - name: IOHIZx
+    description: IOHIZx
+    bit_offset: 24
+    bit_size: 8
 fieldset/PMEM:
  description: Common memory space timing register
  fields:
-    - name: MEMSET
-      description: Common memory x setup time
-      bit_offset: 0
-      bit_size: 8
-    - name: MEMWAIT
-      description: Common memory wait time
-      bit_offset: 8
-      bit_size: 8
-    - name: MEMHOLD
-      description: Common memory hold time
-      bit_offset: 16
-      bit_size: 8
-    - name: MEMHIZ
-      description: Common memory x data bus Hi-Z time
-      bit_offset: 24
-      bit_size: 8
+  - name: MEMSET
+    description: Common memory x setup time
+    bit_offset: 0
+    bit_size: 8
+  - name: MEMWAIT
+    description: Common memory wait time
+    bit_offset: 8
+    bit_size: 8
+  - name: MEMHOLD
+    description: Common memory hold time
+    bit_offset: 16
+    bit_size: 8
+  - name: MEMHIZ
+    description: Common memory x data bus Hi-Z time
+    bit_offset: 24
+    bit_size: 8
 fieldset/SR:
  description: FIFO status and interrupt register
  fields:
-    - name: IRS
-      description: Interrupt rising edge status
-      bit_offset: 0
-      bit_size: 1
-    - name: ILS
-      description: Interrupt high-level status
-      bit_offset: 1
-      bit_size: 1
-    - name: IFS
-      description: Interrupt falling edge status
-      bit_offset: 2
-      bit_size: 1
-    - name: IREN
-      description: Interrupt rising edge detection enable bit
-      bit_offset: 3
-      bit_size: 1
-    - name: ILEN
-      description: Interrupt high-level detection enable bit
-      bit_offset: 4
-      bit_size: 1
-    - name: IFEN
-      description: Interrupt falling edge detection enable bit
-      bit_offset: 5
-      bit_size: 1
-    - name: FEMPT
-      description: FIFO empty status
-      bit_offset: 6
-      bit_size: 1
+  - name: IRS
+    description: Interrupt rising edge status
+    bit_offset: 0
+    bit_size: 1
+  - name: ILS
+    description: Interrupt high-level status
+    bit_offset: 1
+    bit_size: 1
+  - name: IFS
+    description: Interrupt falling edge status
+    bit_offset: 2
+    bit_size: 1
+  - name: IREN
+    description: Interrupt rising edge detection enable bit
+    bit_offset: 3
+    bit_size: 1
+  - name: ILEN
+    description: Interrupt high-level detection enable bit
+    bit_offset: 4
+    bit_size: 1
+  - name: IFEN
+    description: Interrupt falling edge detection enable bit
+    bit_offset: 5
+    bit_size: 1
+  - name: FEMPT
+    description: FIFO empty status
+    bit_offset: 6
+    bit_size: 1
 enum/ACCMOD:
  bit_size: 2
  variants:
-    - name: A
-      description: Access mode A
-      value: 0
-    - name: B
-      description: Access mode B
-      value: 1
-    - name: C
-      description: Access mode C
-      value: 2
-    - name: D
-      description: Access mode D
-      value: 3
+  - name: A
+    description: Access mode A
+    value: 0
+  - name: B
+    description: Access mode B
+    value: 1
+  - name: C
+    description: Access mode C
+    value: 2
+  - name: D
+    description: Access mode D
+    value: 3
 enum/CPSIZE:
  bit_size: 3
  variants:
-    - name: NoBurstSplit
-      description: No burst split when crossing page boundary
-      value: 0
-    - name: Bytes128
-      description: 128 bytes CRAM page size
-      value: 1
-    - name: Bytes256
-      description: 256 bytes CRAM page size
-      value: 2
-    - name: Bytes512
-      description: 512 bytes CRAM page size
-      value: 3
-    - name: Bytes1024
-      description: 1024 bytes CRAM page size
-      value: 4
+  - name: NoBurstSplit
+    description: No burst split when crossing page boundary
+    value: 0
+  - name: Bytes128
+    description: 128 bytes CRAM page size
+    value: 1
+  - name: Bytes256
+    description: 256 bytes CRAM page size
+    value: 2
+  - name: Bytes512
+    description: 512 bytes CRAM page size
+    value: 3
+  - name: Bytes1024
+    description: 1024 bytes CRAM page size
+    value: 4
 enum/ECCPS:
  bit_size: 3
  variants:
-    - name: Bytes256
-      description: ECC page size 256 bytes
-      value: 0
-    - name: Bytes512
-      description: ECC page size 512 bytes
-      value: 1
-    - name: Bytes1024
-      description: ECC page size 1024 bytes
-      value: 2
-    - name: Bytes2048
-      description: ECC page size 2048 bytes
-      value: 3
-    - name: Bytes4096
-      description: ECC page size 4096 bytes
-      value: 4
-    - name: Bytes8192
-      description: ECC page size 8192 bytes
-      value: 5
+  - name: Bytes256
+    description: ECC page size 256 bytes
+    value: 0
+  - name: Bytes512
+    description: ECC page size 512 bytes
+    value: 1
+  - name: Bytes1024
+    description: ECC page size 1024 bytes
+    value: 2
+  - name: Bytes2048
+    description: ECC page size 2048 bytes
+    value: 3
+  - name: Bytes4096
+    description: ECC page size 4096 bytes
+    value: 4
+  - name: Bytes8192
+    description: ECC page size 8192 bytes
+    value: 5
 enum/MTYP:
  bit_size: 2
  variants:
-    - name: SRAM
-      description: SRAM memory type
-      value: 0
-    - name: PSRAM
-      description: PSRAM (CRAM) memory type
-      value: 1
-    - name: Flash
-      description: NOR Flash/OneNAND Flash
-      value: 2
+  - name: SRAM
+    description: SRAM memory type
+    value: 0
+  - name: PSRAM
+    description: PSRAM (CRAM) memory type
+    value: 1
+  - name: Flash
+    description: NOR Flash/OneNAND Flash
+    value: 2
 enum/MWID:
  bit_size: 2
  variants:
-    - name: Bits8
-      description: Memory data bus width 8 bits
-      value: 0
-    - name: Bits16
-      description: Memory data bus width 16 bits
-      value: 1
-    - name: Bits32
-      description: Memory data bus width 32 bits
-      value: 2
+  - name: Bits8
+    description: Memory data bus width 8 bits
+    value: 0
+  - name: Bits16
+    description: Memory data bus width 16 bits
+    value: 1
+  - name: Bits32
+    description: Memory data bus width 32 bits
+    value: 2
 enum/PTYP:
  bit_size: 1
  variants:
-    - name: NANDFlash
-      description: NAND Flash
-      value: 1
+  - name: NANDFlash
+    description: NAND Flash
+    value: 1
 enum/PWID:
  bit_size: 2
  variants:
-    - name: Bits8
-      description: External memory device width 8 bits
-      value: 0
-    - name: Bits16
-      description: External memory device width 16 bits
-      value: 1
+  - name: Bits8
+    description: External memory device width 8 bits
+    value: 0
+  - name: Bits16
+    description: External memory device width 16 bits
+    value: 1
 enum/WAITCFG:
  bit_size: 1
  variants:
-    - name: BeforeWaitState
-      description: NWAIT signal is active one data cycle before wait state
-      value: 0
-    - name: DuringWaitState
-      description: NWAIT signal is active during wait state
-      value: 1
+  - name: BeforeWaitState
+    description: NWAIT signal is active one data cycle before wait state
+    value: 0
+  - name: DuringWaitState
+    description: NWAIT signal is active during wait state
+    value: 1
 enum/WAITPOL:
  bit_size: 1
  variants:
-    - name: ActiveLow
-      description: NWAIT active low
-      value: 0
-    - name: ActiveHigh
-      description: NWAIT active high
-      value: 1
+  - name: ActiveLow
+    description: NWAIT active low
+    value: 0
+  - name: ActiveHigh
+    description: NWAIT active high
+    value: 1
--- a/data/registers/fsmc_v2x3.yaml
+++ b/data/registers/fsmc_v2x3.yaml
@ -1,477 +1,476 @@
---
 block/FSMC:
  description: Flexible static memory controller
  items:
-    - name: BCR1
-      description: SRAM/NOR-Flash chip-select control register 1
-      byte_offset: 0
-      fieldset: BCR1
-    - name: BTR
-      description: SRAM/NOR-Flash chip-select timing register 1-4
-      array:
-        len: 4
-        stride: 8
-      byte_offset: 4
-      fieldset: BTR
-    - name: BCR
-      description: SRAM/NOR-Flash chip-select control register 2-4
-      array:
-        len: 3
-        stride: 8
-      byte_offset: 8
-      fieldset: BCR
-    - name: PCR
-      description: PC Card/NAND Flash control register 2-4
-      array:
-        len: 3
-        stride: 32
-      byte_offset: 96
-      fieldset: PCR
-    - name: SR
-      description: FIFO status and interrupt register 2-4
-      array:
-        len: 3
-        stride: 32
-      byte_offset: 100
-      fieldset: SR
-    - name: PMEM
-      description: Common memory space timing register 2-4
-      array:
-        len: 3
-        stride: 32
-      byte_offset: 104
-      fieldset: PMEM
-    - name: PATT
-      description: Attribute memory space timing register 2-4
-      array:
-        len: 3
-        stride: 32
-      byte_offset: 108
-      fieldset: PATT
-    - name: ECCR
-      description: ECC result register 2-3
-      array:
-        len: 2
-        stride: 32
-      byte_offset: 116
-      access: Read
-      fieldset: ECCR
-    - name: PIO4
-      description: I/O space timing register 4
-      byte_offset: 176
-      fieldset: PIO4
-    - name: BWTR
-      description: SRAM/NOR-Flash write timing registers 1-4
-      array:
-        len: 4
-        stride: 8
-      byte_offset: 260
-      fieldset: BWTR
+  - name: BCR1
+    description: SRAM/NOR-Flash chip-select control register 1
+    byte_offset: 0
+    fieldset: BCR1
+  - name: BTR
+    description: SRAM/NOR-Flash chip-select timing register 1-4
+    array:
+      len: 4
+      stride: 8
+    byte_offset: 4
+    fieldset: BTR
+  - name: BCR
+    description: SRAM/NOR-Flash chip-select control register 2-4
+    array:
+      len: 3
+      stride: 8
+    byte_offset: 8
+    fieldset: BCR
+  - name: PCR
+    description: PC Card/NAND Flash control register 2-4
+    array:
+      len: 3
+      stride: 32
+    byte_offset: 96
+    fieldset: PCR
+  - name: SR
+    description: FIFO status and interrupt register 2-4
+    array:
+      len: 3
+      stride: 32
+    byte_offset: 100
+    fieldset: SR
+  - name: PMEM
+    description: Common memory space timing register 2-4
+    array:
+      len: 3
+      stride: 32
+    byte_offset: 104
+    fieldset: PMEM
+  - name: PATT
+    description: Attribute memory space timing register 2-4
+    array:
+      len: 3
+      stride: 32
+    byte_offset: 108
+    fieldset: PATT
+  - name: ECCR
+    description: ECC result register 2-3
+    array:
+      len: 2
+      stride: 32
+    byte_offset: 116
+    access: Read
+    fieldset: ECCR
+  - name: PIO4
+    description: I/O space timing register 4
+    byte_offset: 176
+    fieldset: PIO4
+  - name: BWTR
+    description: SRAM/NOR-Flash write timing registers 1-4
+    array:
+      len: 4
+      stride: 8
+    byte_offset: 260
+    fieldset: BWTR
 fieldset/BCR:
  description: SRAM/NOR-Flash chip-select control register 2-4
  fields:
-    - name: MBKEN
-      description: Memory bank enable bit
-      bit_offset: 0
-      bit_size: 1
-    - name: MUXEN
-      description: Address/data multiplexing enable bit
-      bit_offset: 1
-      bit_size: 1
-    - name: MTYP
-      description: Memory type
-      bit_offset: 2
-      bit_size: 2
-      enum: MTYP
-    - name: MWID
-      description: Memory data bus width
-      bit_offset: 4
-      bit_size: 2
-      enum: MWID
-    - name: FACCEN
-      description: Flash access enable
-      bit_offset: 6
-      bit_size: 1
-    - name: BURSTEN
-      description: Burst enable bit
-      bit_offset: 8
-      bit_size: 1
-    - name: WAITPOL
-      description: Wait signal polarity bit
-      bit_offset: 9
-      bit_size: 1
-      enum: WAITPOL
-    - name: WRAPMOD
-      description: WRAPMOD
-      bit_offset: 10
-      bit_size: 1
-    - name: WAITCFG
-      description: Wait timing configuration
-      bit_offset: 11
-      bit_size: 1
-      enum: WAITCFG
-    - name: WREN
-      description: Write enable bit
-      bit_offset: 12
-      bit_size: 1
-    - name: WAITEN
-      description: Wait enable bit
-      bit_offset: 13
-      bit_size: 1
-    - name: EXTMOD
-      description: Extended mode enable
-      bit_offset: 14
-      bit_size: 1
-    - name: ASYNCWAIT
-      description: Wait signal during asynchronous transfers
-      bit_offset: 15
-      bit_size: 1
-    - name: CBURSTRW
-      description: Write burst enable
-      bit_offset: 19
-      bit_size: 1
+  - name: MBKEN
+    description: Memory bank enable bit
+    bit_offset: 0
+    bit_size: 1
+  - name: MUXEN
+    description: Address/data multiplexing enable bit
+    bit_offset: 1
+    bit_size: 1
+  - name: MTYP
+    description: Memory type
+    bit_offset: 2
+    bit_size: 2
+    enum: MTYP
+  - name: MWID
+    description: Memory data bus width
+    bit_offset: 4
+    bit_size: 2
+    enum: MWID
+  - name: FACCEN
+    description: Flash access enable
+    bit_offset: 6
+    bit_size: 1
+  - name: BURSTEN
+    description: Burst enable bit
+    bit_offset: 8
+    bit_size: 1
+  - name: WAITPOL
+    description: Wait signal polarity bit
+    bit_offset: 9
+    bit_size: 1
+    enum: WAITPOL
+  - name: WRAPMOD
+    description: WRAPMOD
+    bit_offset: 10
+    bit_size: 1
+  - name: WAITCFG
+    description: Wait timing configuration
+    bit_offset: 11
+    bit_size: 1
+    enum: WAITCFG
+  - name: WREN
+    description: Write enable bit
+    bit_offset: 12
+    bit_size: 1
+  - name: WAITEN
+    description: Wait enable bit
+    bit_offset: 13
+    bit_size: 1
+  - name: EXTMOD
+    description: Extended mode enable
+    bit_offset: 14
+    bit_size: 1
+  - name: ASYNCWAIT
+    description: Wait signal during asynchronous transfers
+    bit_offset: 15
+    bit_size: 1
+  - name: CBURSTRW
+    description: Write burst enable
+    bit_offset: 19
+    bit_size: 1
 fieldset/BCR1:
  description: SRAM/NOR-Flash chip-select control register 1
  fields:
-    - name: MBKEN
-      description: Memory bank enable bit
-      bit_offset: 0
-      bit_size: 1
-    - name: MUXEN
-      description: Address/data multiplexing enable bit
-      bit_offset: 1
-      bit_size: 1
-    - name: MTYP
-      description: Memory type
-      bit_offset: 2
-      bit_size: 2
-      enum: MTYP
-    - name: MWID
-      description: Memory data bus width
-      bit_offset: 4
-      bit_size: 2
-      enum: MWID
-    - name: FACCEN
-      description: Flash access enable
-      bit_offset: 6
-      bit_size: 1
-    - name: BURSTEN
-      description: Burst enable bit
-      bit_offset: 8
-      bit_size: 1
-    - name: WAITPOL
-      description: Wait signal polarity bit
-      bit_offset: 9
-      bit_size: 1
-      enum: WAITPOL
-    - name: WRAPMOD
-      description: WRAPMOD
-      bit_offset: 10
-      bit_size: 1
-    - name: WAITCFG
-      description: Wait timing configuration
-      bit_offset: 11
-      bit_size: 1
-      enum: WAITCFG
-    - name: WREN
-      description: Write enable bit
-      bit_offset: 12
-      bit_size: 1
-    - name: WAITEN
-      description: Wait enable bit
-      bit_offset: 13
-      bit_size: 1
-    - name: EXTMOD
-      description: Extended mode enable
-      bit_offset: 14
-      bit_size: 1
-    - name: ASYNCWAIT
-      description: Wait signal during asynchronous transfers
-      bit_offset: 15
-      bit_size: 1
-    - name: CBURSTRW
-      description: Write burst enable
-      bit_offset: 19
-      bit_size: 1
-    - name: CCLKEN
-      description: Continuous clock enable
-      bit_offset: 20
-      bit_size: 1
+  - name: MBKEN
+    description: Memory bank enable bit
+    bit_offset: 0
+    bit_size: 1
+  - name: MUXEN
+    description: Address/data multiplexing enable bit
+    bit_offset: 1
+    bit_size: 1
+  - name: MTYP
+    description: Memory type
+    bit_offset: 2
+    bit_size: 2
+    enum: MTYP
+  - name: MWID
+    description: Memory data bus width
+    bit_offset: 4
+    bit_size: 2
+    enum: MWID
+  - name: FACCEN
+    description: Flash access enable
+    bit_offset: 6
+    bit_size: 1
+  - name: BURSTEN
+    description: Burst enable bit
+    bit_offset: 8
+    bit_size: 1
+  - name: WAITPOL
+    description: Wait signal polarity bit
+    bit_offset: 9
+    bit_size: 1
+    enum: WAITPOL
+  - name: WRAPMOD
+    description: WRAPMOD
+    bit_offset: 10
+    bit_size: 1
+  - name: WAITCFG
+    description: Wait timing configuration
+    bit_offset: 11
+    bit_size: 1
+    enum: WAITCFG
+  - name: WREN
+    description: Write enable bit
+    bit_offset: 12
+    bit_size: 1
+  - name: WAITEN
+    description: Wait enable bit
+    bit_offset: 13
+    bit_size: 1
+  - name: EXTMOD
+    description: Extended mode enable
+    bit_offset: 14
+    bit_size: 1
+  - name: ASYNCWAIT
+    description: Wait signal during asynchronous transfers
+    bit_offset: 15
+    bit_size: 1
+  - name: CBURSTRW
+    description: Write burst enable
+    bit_offset: 19
+    bit_size: 1
+  - name: CCLKEN
+    description: Continuous clock enable
+    bit_offset: 20
+    bit_size: 1
 fieldset/BTR:
  description: SRAM/NOR-Flash chip-select timing register
  fields:
-    - name: ADDSET
-      description: Address setup phase duration
-      bit_offset: 0
-      bit_size: 4
-    - name: ADDHLD
-      description: Address-hold phase duration
-      bit_offset: 4
-      bit_size: 4
-    - name: DATAST
-      description: Data-phase duration
-      bit_offset: 8
-      bit_size: 8
-    - name: BUSTURN
-      description: Bus turnaround phase duration
-      bit_offset: 16
-      bit_size: 4
-    - name: CLKDIV
-      description: Clock divide ratio (for FMC_CLK signal)
-      bit_offset: 20
-      bit_size: 4
-    - name: DATLAT
-      description: Data latency for synchronous memory
-      bit_offset: 24
-      bit_size: 4
-    - name: ACCMOD
-      description: Access mode
-      bit_offset: 28
-      bit_size: 2
-      enum: ACCMOD
+  - name: ADDSET
+    description: Address setup phase duration
+    bit_offset: 0
+    bit_size: 4
+  - name: ADDHLD
+    description: Address-hold phase duration
+    bit_offset: 4
+    bit_size: 4
+  - name: DATAST
+    description: Data-phase duration
+    bit_offset: 8
+    bit_size: 8
+  - name: BUSTURN
+    description: Bus turnaround phase duration
+    bit_offset: 16
+    bit_size: 4
+  - name: CLKDIV
+    description: Clock divide ratio (for FMC_CLK signal)
+    bit_offset: 20
+    bit_size: 4
+  - name: DATLAT
+    description: Data latency for synchronous memory
+    bit_offset: 24
+    bit_size: 4
+  - name: ACCMOD
+    description: Access mode
+    bit_offset: 28
+    bit_size: 2
+    enum: ACCMOD
 fieldset/BWTR:
  description: SRAM/NOR-Flash write timing registers
  fields:
-    - name: ADDSET
-      description: Address setup phase duration
-      bit_offset: 0
-      bit_size: 4
-    - name: ADDHLD
-      description: Address-hold phase duration
-      bit_offset: 4
-      bit_size: 4
-    - name: DATAST
-      description: Data-phase duration
-      bit_offset: 8
-      bit_size: 8
-    - name: ACCMOD
-      description: Access mode
-      bit_offset: 28
-      bit_size: 2
-      enum: ACCMOD
+  - name: ADDSET
+    description: Address setup phase duration
+    bit_offset: 0
+    bit_size: 4
+  - name: ADDHLD
+    description: Address-hold phase duration
+    bit_offset: 4
+    bit_size: 4
+  - name: DATAST
+    description: Data-phase duration
+    bit_offset: 8
+    bit_size: 8
+  - name: ACCMOD
+    description: Access mode
+    bit_offset: 28
+    bit_size: 2
+    enum: ACCMOD
 fieldset/ECCR:
  description: ECC result register
  fields:
-    - name: ECC
-      description: ECC computation result value
-      bit_offset: 0
-      bit_size: 32
+  - name: ECC
+    description: ECC computation result value
+    bit_offset: 0
+    bit_size: 32
 fieldset/PATT:
  description: Attribute memory space timing register
  fields:
-    - name: ATTSET
-      description: Attribute memory setup time
-      bit_offset: 0
-      bit_size: 8
-    - name: ATTWAIT
-      description: Attribute memory wait time
-      bit_offset: 8
-      bit_size: 8
-    - name: ATTHOLD
-      description: Attribute memory hold time
-      bit_offset: 16
-      bit_size: 8
-    - name: ATTHIZ
-      description: Attribute memory data bus Hi-Z time
-      bit_offset: 24
-      bit_size: 8
+  - name: ATTSET
+    description: Attribute memory setup time
+    bit_offset: 0
+    bit_size: 8
+  - name: ATTWAIT
+    description: Attribute memory wait time
+    bit_offset: 8
+    bit_size: 8
+  - name: ATTHOLD
+    description: Attribute memory hold time
+    bit_offset: 16
+    bit_size: 8
+  - name: ATTHIZ
+    description: Attribute memory data bus Hi-Z time
+    bit_offset: 24
+    bit_size: 8
 fieldset/PCR:
  description: PC Card/NAND Flash control register
  fields:
-    - name: PWAITEN
-      description: Wait feature enable bit
-      bit_offset: 1
-      bit_size: 1
-    - name: PBKEN
-      description: NAND Flash memory bank enable bit
-      bit_offset: 2
-      bit_size: 1
-    - name: PTYP
-      description: Memory type
-      bit_offset: 3
-      bit_size: 1
-      enum: PTYP
-    - name: PWID
-      description: Data bus width
-      bit_offset: 4
-      bit_size: 2
-      enum: PWID
-    - name: ECCEN
-      description: ECC computation logic enable bit
-      bit_offset: 6
-      bit_size: 1
-    - name: TCLR
-      description: CLE to RE delay
-      bit_offset: 9
-      bit_size: 4
-    - name: TAR
-      description: ALE to RE delay
-      bit_offset: 13
-      bit_size: 4
-    - name: ECCPS
-      description: ECC page size
-      bit_offset: 17
-      bit_size: 3
-      enum: ECCPS
+  - name: PWAITEN
+    description: Wait feature enable bit
+    bit_offset: 1
+    bit_size: 1
+  - name: PBKEN
+    description: NAND Flash memory bank enable bit
+    bit_offset: 2
+    bit_size: 1
+  - name: PTYP
+    description: Memory type
+    bit_offset: 3
+    bit_size: 1
+    enum: PTYP
+  - name: PWID
+    description: Data bus width
+    bit_offset: 4
+    bit_size: 2
+    enum: PWID
+  - name: ECCEN
+    description: ECC computation logic enable bit
+    bit_offset: 6
+    bit_size: 1
+  - name: TCLR
+    description: CLE to RE delay
+    bit_offset: 9
+    bit_size: 4
+  - name: TAR
+    description: ALE to RE delay
+    bit_offset: 13
+    bit_size: 4
+  - name: ECCPS
+    description: ECC page size
+    bit_offset: 17
+    bit_size: 3
+    enum: ECCPS
 fieldset/PIO4:
  description: I/O space timing register 4
  fields:
-    - name: IOSETx
-      description: IOSETx
-      bit_offset: 0
-      bit_size: 8
-    - name: IOWAITx
-      description: IOWAITx
-      bit_offset: 8
-      bit_size: 8
-    - name: IOHOLDx
-      description: IOHOLDx
-      bit_offset: 16
-      bit_size: 8
-    - name: IOHIZx
-      description: IOHIZx
-      bit_offset: 24
-      bit_size: 8
+  - name: IOSETx
+    description: IOSETx
+    bit_offset: 0
+    bit_size: 8
+  - name: IOWAITx
+    description: IOWAITx
+    bit_offset: 8
+    bit_size: 8
+  - name: IOHOLDx
+    description: IOHOLDx
+    bit_offset: 16
+    bit_size: 8
+  - name: IOHIZx
+    description: IOHIZx
+    bit_offset: 24
+    bit_size: 8
 fieldset/PMEM:
  description: Common memory space timing register
  fields:
-    - name: MEMSET
-      description: Common memory x setup time
-      bit_offset: 0
-      bit_size: 8
-    - name: MEMWAIT
-      description: Common memory wait time
-      bit_offset: 8
-      bit_size: 8
-    - name: MEMHOLD
-      description: Common memory hold time
-      bit_offset: 16
-      bit_size: 8
-    - name: MEMHIZ
-      description: Common memory x data bus Hi-Z time
-      bit_offset: 24
-      bit_size: 8
+  - name: MEMSET
+    description: Common memory x setup time
+    bit_offset: 0
+    bit_size: 8
+  - name: MEMWAIT
+    description: Common memory wait time
+    bit_offset: 8
+    bit_size: 8
+  - name: MEMHOLD
+    description: Common memory hold time
+    bit_offset: 16
+    bit_size: 8
+  - name: MEMHIZ
+    description: Common memory x data bus Hi-Z time
+    bit_offset: 24
+    bit_size: 8
 fieldset/SR:
  description: FIFO status and interrupt register
  fields:
-    - name: IRS
-      description: Interrupt rising edge status
-      bit_offset: 0
-      bit_size: 1
-    - name: ILS
-      description: Interrupt high-level status
-      bit_offset: 1
-      bit_size: 1
-    - name: IFS
-      description: Interrupt falling edge status
-      bit_offset: 2
-      bit_size: 1
-    - name: IREN
-      description: Interrupt rising edge detection enable bit
-      bit_offset: 3
-      bit_size: 1
-    - name: ILEN
-      description: Interrupt high-level detection enable bit
-      bit_offset: 4
-      bit_size: 1
-    - name: IFEN
-      description: Interrupt falling edge detection enable bit
-      bit_offset: 5
-      bit_size: 1
-    - name: FEMPT
-      description: FIFO empty status
-      bit_offset: 6
-      bit_size: 1
+  - name: IRS
+    description: Interrupt rising edge status
+    bit_offset: 0
+    bit_size: 1
+  - name: ILS
+    description: Interrupt high-level status
+    bit_offset: 1
+    bit_size: 1
+  - name: IFS
+    description: Interrupt falling edge status
+    bit_offset: 2
+    bit_size: 1
+  - name: IREN
+    description: Interrupt rising edge detection enable bit
+    bit_offset: 3
+    bit_size: 1
+  - name: ILEN
+    description: Interrupt high-level detection enable bit
+    bit_offset: 4
+    bit_size: 1
+  - name: IFEN
+    description: Interrupt falling edge detection enable bit
+    bit_offset: 5
+    bit_size: 1
+  - name: FEMPT
+    description: FIFO empty status
+    bit_offset: 6
+    bit_size: 1
 enum/ACCMOD:
  bit_size: 2
  variants:
-    - name: A
-      description: Access mode A
-      value: 0
-    - name: B
-      description: Access mode B
-      value: 1
-    - name: C
-      description: Access mode C
-      value: 2
-    - name: D
-      description: Access mode D
-      value: 3
+  - name: A
+    description: Access mode A
+    value: 0
+  - name: B
+    description: Access mode B
+    value: 1
+  - name: C
+    description: Access mode C
+    value: 2
+  - name: D
+    description: Access mode D
+    value: 3
 enum/ECCPS:
  bit_size: 3
  variants:
-    - name: Bytes256
-      description: ECC page size 256 bytes
-      value: 0
-    - name: Bytes512
-      description: ECC page size 512 bytes
-      value: 1
-    - name: Bytes1024
-      description: ECC page size 1024 bytes
-      value: 2
-    - name: Bytes2048
-      description: ECC page size 2048 bytes
-      value: 3
-    - name: Bytes4096
-      description: ECC page size 4096 bytes
-      value: 4
-    - name: Bytes8192
-      description: ECC page size 8192 bytes
-      value: 5
+  - name: Bytes256
+    description: ECC page size 256 bytes
+    value: 0
+  - name: Bytes512
+    description: ECC page size 512 bytes
+    value: 1
+  - name: Bytes1024
+    description: ECC page size 1024 bytes
+    value: 2
+  - name: Bytes2048
+    description: ECC page size 2048 bytes
+    value: 3
+  - name: Bytes4096
+    description: ECC page size 4096 bytes
+    value: 4
+  - name: Bytes8192
+    description: ECC page size 8192 bytes
+    value: 5
 enum/MTYP:
  bit_size: 2
  variants:
-    - name: SRAM
-      description: SRAM memory type
-      value: 0
-    - name: PSRAM
-      description: PSRAM (CRAM) memory type
-      value: 1
-    - name: Flash
-      description: NOR Flash/OneNAND Flash
-      value: 2
+  - name: SRAM
+    description: SRAM memory type
+    value: 0
+  - name: PSRAM
+    description: PSRAM (CRAM) memory type
+    value: 1
+  - name: Flash
+    description: NOR Flash/OneNAND Flash
+    value: 2
 enum/MWID:
  bit_size: 2
  variants:
-    - name: Bits8
-      description: Memory data bus width 8 bits
-      value: 0
-    - name: Bits16
-      description: Memory data bus width 16 bits
-      value: 1
-    - name: Bits32
-      description: Memory data bus width 32 bits
-      value: 2
+  - name: Bits8
+    description: Memory data bus width 8 bits
+    value: 0
+  - name: Bits16
+    description: Memory data bus width 16 bits
+    value: 1
+  - name: Bits32
+    description: Memory data bus width 32 bits
+    value: 2
 enum/PTYP:
  bit_size: 1
  variants:
-    - name: NANDFlash
-      description: NAND Flash
-      value: 1
+  - name: NANDFlash
+    description: NAND Flash
+    value: 1
 enum/PWID:
  bit_size: 2
  variants:
-    - name: Bits8
-      description: External memory device width 8 bits
-      value: 0
-    - name: Bits16
-      description: External memory device width 16 bits
-      value: 1
+  - name: Bits8
+    description: External memory device width 8 bits
+    value: 0
+  - name: Bits16
+    description: External memory device width 16 bits
+    value: 1
 enum/WAITCFG:
  bit_size: 1
  variants:
-    - name: BeforeWaitState
-      description: NWAIT signal is active one data cycle before wait state
-      value: 0
-    - name: DuringWaitState
-      description: NWAIT signal is active during wait state
-      value: 1
+  - name: BeforeWaitState
+    description: NWAIT signal is active one data cycle before wait state
+    value: 0
+  - name: DuringWaitState
+    description: NWAIT signal is active during wait state
+    value: 1
 enum/WAITPOL:
  bit_size: 1
  variants:
-    - name: ActiveLow
-      description: NWAIT active low
-      value: 0
-    - name: ActiveHigh
-      description: NWAIT active high
-      value: 1
+  - name: ActiveLow
+    description: NWAIT active low
+    value: 0
+  - name: ActiveHigh
+    description: NWAIT active high
+    value: 1
--- a/data/registers/fsmc_v3x1.yaml
+++ b/data/registers/fsmc_v3x1.yaml
@ -1,467 +1,466 @@
---
 block/FSMC:
  description: Flexible static memory controller
  items:
-    - name: BCR1
-      description: SRAM/NOR-Flash chip-select control register 1
-      byte_offset: 0
-      fieldset: BCR1
-    - name: BTR
-      description: SRAM/NOR-Flash chip-select timing register 1-4
-      array:
-        len: 4
-        stride: 8
-      byte_offset: 4
-      fieldset: BTR
-    - name: BCR
-      description: SRAM/NOR-Flash chip-select control register 2-4
-      array:
-        len: 3
-        stride: 8
-      byte_offset: 8
-      fieldset: BCR
-    - name: PCR
-      description: PC Card/NAND Flash control register
-      byte_offset: 128
-      fieldset: PCR
-    - name: SR
-      description: FIFO status and interrupt register
-      byte_offset: 132
-      fieldset: SR
-    - name: PMEM
-      description: Common memory space timing register
-      byte_offset: 136
-      fieldset: PMEM
-    - name: PATT
-      description: Attribute memory space timing register
-      byte_offset: 140
-      fieldset: PATT
-    - name: ECCR
-      description: ECC result register
-      byte_offset: 148
-      access: Read
-      fieldset: ECCR
-    - name: BWTR
-      description: SRAM/NOR-Flash write timing registers 1-4
-      array:
-        len: 4
-        stride: 8
-      byte_offset: 260
-      fieldset: BWTR
+  - name: BCR1
+    description: SRAM/NOR-Flash chip-select control register 1
+    byte_offset: 0
+    fieldset: BCR1
+  - name: BTR
+    description: SRAM/NOR-Flash chip-select timing register 1-4
+    array:
+      len: 4
+      stride: 8
+    byte_offset: 4
+    fieldset: BTR
+  - name: BCR
+    description: SRAM/NOR-Flash chip-select control register 2-4
+    array:
+      len: 3
+      stride: 8
+    byte_offset: 8
+    fieldset: BCR
+  - name: PCR
+    description: PC Card/NAND Flash control register
+    byte_offset: 128
+    fieldset: PCR
+  - name: SR
+    description: FIFO status and interrupt register
+    byte_offset: 132
+    fieldset: SR
+  - name: PMEM
+    description: Common memory space timing register
+    byte_offset: 136
+    fieldset: PMEM
+  - name: PATT
+    description: Attribute memory space timing register
+    byte_offset: 140
+    fieldset: PATT
+  - name: ECCR
+    description: ECC result register
+    byte_offset: 148
+    access: Read
+    fieldset: ECCR
+  - name: BWTR
+    description: SRAM/NOR-Flash write timing registers 1-4
+    array:
+      len: 4
+      stride: 8
+    byte_offset: 260
+    fieldset: BWTR
 fieldset/BCR:
  description: SRAM/NOR-Flash chip-select control register 2-4
  fields:
-    - name: MBKEN
-      description: Memory bank enable bit
-      bit_offset: 0
-      bit_size: 1
-    - name: MUXEN
-      description: Address/data multiplexing enable bit
-      bit_offset: 1
-      bit_size: 1
-    - name: MTYP
-      description: Memory type
-      bit_offset: 2
-      bit_size: 2
-      enum: MTYP
-    - name: MWID
-      description: Memory data bus width
-      bit_offset: 4
-      bit_size: 2
-      enum: MWID
-    - name: FACCEN
-      description: Flash access enable
-      bit_offset: 6
-      bit_size: 1
-    - name: BURSTEN
-      description: Burst enable bit
-      bit_offset: 8
-      bit_size: 1
-    - name: WAITPOL
-      description: Wait signal polarity bit
-      bit_offset: 9
-      bit_size: 1
-      enum: WAITPOL
-    - name: WAITCFG
-      description: Wait timing configuration
-      bit_offset: 11
-      bit_size: 1
-      enum: WAITCFG
-    - name: WREN
-      description: Write enable bit
-      bit_offset: 12
-      bit_size: 1
-    - name: WAITEN
-      description: Wait enable bit
-      bit_offset: 13
-      bit_size: 1
-    - name: EXTMOD
-      description: Extended mode enable
-      bit_offset: 14
-      bit_size: 1
-    - name: ASYNCWAIT
-      description: Wait signal during asynchronous transfers
-      bit_offset: 15
-      bit_size: 1
-    - name: CPSIZE
-      description: CRAM page size
-      bit_offset: 16
-      bit_size: 3
-      enum: CPSIZE
-    - name: CBURSTRW
-      description: Write burst enable
-      bit_offset: 19
-      bit_size: 1
+  - name: MBKEN
+    description: Memory bank enable bit
+    bit_offset: 0
+    bit_size: 1
+  - name: MUXEN
+    description: Address/data multiplexing enable bit
+    bit_offset: 1
+    bit_size: 1
+  - name: MTYP
+    description: Memory type
+    bit_offset: 2
+    bit_size: 2
+    enum: MTYP
+  - name: MWID
+    description: Memory data bus width
+    bit_offset: 4
+    bit_size: 2
+    enum: MWID
+  - name: FACCEN
+    description: Flash access enable
+    bit_offset: 6
+    bit_size: 1
+  - name: BURSTEN
+    description: Burst enable bit
+    bit_offset: 8
+    bit_size: 1
+  - name: WAITPOL
+    description: Wait signal polarity bit
+    bit_offset: 9
+    bit_size: 1
+    enum: WAITPOL
+  - name: WAITCFG
+    description: Wait timing configuration
+    bit_offset: 11
+    bit_size: 1
+    enum: WAITCFG
+  - name: WREN
+    description: Write enable bit
+    bit_offset: 12
+    bit_size: 1
+  - name: WAITEN
+    description: Wait enable bit
+    bit_offset: 13
+    bit_size: 1
+  - name: EXTMOD
+    description: Extended mode enable
+    bit_offset: 14
+    bit_size: 1
+  - name: ASYNCWAIT
+    description: Wait signal during asynchronous transfers
+    bit_offset: 15
+    bit_size: 1
+  - name: CPSIZE
+    description: CRAM page size
+    bit_offset: 16
+    bit_size: 3
+    enum: CPSIZE
+  - name: CBURSTRW
+    description: Write burst enable
+    bit_offset: 19
+    bit_size: 1
 fieldset/BCR1:
  description: SRAM/NOR-Flash chip-select control register 1
  fields:
-    - name: MBKEN
-      description: Memory bank enable bit
-      bit_offset: 0
-      bit_size: 1
-    - name: MUXEN
-      description: Address/data multiplexing enable bit
-      bit_offset: 1
-      bit_size: 1
-    - name: MTYP
-      description: Memory type
-      bit_offset: 2
-      bit_size: 2
-      enum: MTYP
-    - name: MWID
-      description: Memory data bus width
-      bit_offset: 4
-      bit_size: 2
-      enum: MWID
-    - name: FACCEN
-      description: Flash access enable
-      bit_offset: 6
-      bit_size: 1
-    - name: BURSTEN
-      description: Burst enable bit
-      bit_offset: 8
-      bit_size: 1
-    - name: WAITPOL
-      description: Wait signal polarity bit
-      bit_offset: 9
-      bit_size: 1
-      enum: WAITPOL
-    - name: WAITCFG
-      description: Wait timing configuration
-      bit_offset: 11
-      bit_size: 1
-      enum: WAITCFG
-    - name: WREN
-      description: Write enable bit
-      bit_offset: 12
-      bit_size: 1
-    - name: WAITEN
-      description: Wait enable bit
-      bit_offset: 13
-      bit_size: 1
-    - name: EXTMOD
-      description: Extended mode enable
-      bit_offset: 14
-      bit_size: 1
-    - name: ASYNCWAIT
-      description: Wait signal during asynchronous transfers
-      bit_offset: 15
-      bit_size: 1
-    - name: CPSIZE
-      description: CRAM page size
-      bit_offset: 16
-      bit_size: 3
-      enum: CPSIZE
-    - name: CBURSTRW
-      description: Write burst enable
-      bit_offset: 19
-      bit_size: 1
-    - name: CCLKEN
-      description: Continuous clock enable
-      bit_offset: 20
-      bit_size: 1
-    - name: WFDIS
-      description: Write FIFO disable
-      bit_offset: 21
-      bit_size: 1
+  - name: MBKEN
+    description: Memory bank enable bit
+    bit_offset: 0
+    bit_size: 1
+  - name: MUXEN
+    description: Address/data multiplexing enable bit
+    bit_offset: 1
+    bit_size: 1
+  - name: MTYP
+    description: Memory type
+    bit_offset: 2
+    bit_size: 2
+    enum: MTYP
+  - name: MWID
+    description: Memory data bus width
+    bit_offset: 4
+    bit_size: 2
+    enum: MWID
+  - name: FACCEN
+    description: Flash access enable
+    bit_offset: 6
+    bit_size: 1
+  - name: BURSTEN
+    description: Burst enable bit
+    bit_offset: 8
+    bit_size: 1
+  - name: WAITPOL
+    description: Wait signal polarity bit
+    bit_offset: 9
+    bit_size: 1
+    enum: WAITPOL
+  - name: WAITCFG
+    description: Wait timing configuration
+    bit_offset: 11
+    bit_size: 1
+    enum: WAITCFG
+  - name: WREN
+    description: Write enable bit
+    bit_offset: 12
+    bit_size: 1
+  - name: WAITEN
+    description: Wait enable bit
+    bit_offset: 13
+    bit_size: 1
+  - name: EXTMOD
+    description: Extended mode enable
+    bit_offset: 14
+    bit_size: 1
+  - name: ASYNCWAIT
+    description: Wait signal during asynchronous transfers
+    bit_offset: 15
+    bit_size: 1
+  - name: CPSIZE
+    description: CRAM page size
+    bit_offset: 16
+    bit_size: 3
+    enum: CPSIZE
+  - name: CBURSTRW
+    description: Write burst enable
+    bit_offset: 19
+    bit_size: 1
+  - name: CCLKEN
+    description: Continuous clock enable
+    bit_offset: 20
+    bit_size: 1
+  - name: WFDIS
+    description: Write FIFO disable
+    bit_offset: 21
+    bit_size: 1
 fieldset/BTR:
  description: SRAM/NOR-Flash chip-select timing register
  fields:
-    - name: ADDSET
-      description: Address setup phase duration
-      bit_offset: 0
-      bit_size: 4
-    - name: ADDHLD
-      description: Address-hold phase duration
-      bit_offset: 4
-      bit_size: 4
-    - name: DATAST
-      description: Data-phase duration
-      bit_offset: 8
-      bit_size: 8
-    - name: BUSTURN
-      description: Bus turnaround phase duration
-      bit_offset: 16
-      bit_size: 4
-    - name: CLKDIV
-      description: Clock divide ratio (for FMC_CLK signal)
-      bit_offset: 20
-      bit_size: 4
-    - name: DATLAT
-      description: Data latency for synchronous memory
-      bit_offset: 24
-      bit_size: 4
-    - name: ACCMOD
-      description: Access mode
-      bit_offset: 28
-      bit_size: 2
-      enum: ACCMOD
+  - name: ADDSET
+    description: Address setup phase duration
+    bit_offset: 0
+    bit_size: 4
+  - name: ADDHLD
+    description: Address-hold phase duration
+    bit_offset: 4
+    bit_size: 4
+  - name: DATAST
+    description: Data-phase duration
+    bit_offset: 8
+    bit_size: 8
+  - name: BUSTURN
+    description: Bus turnaround phase duration
+    bit_offset: 16
+    bit_size: 4
+  - name: CLKDIV
+    description: Clock divide ratio (for FMC_CLK signal)
+    bit_offset: 20
+    bit_size: 4
+  - name: DATLAT
+    description: Data latency for synchronous memory
+    bit_offset: 24
+    bit_size: 4
+  - name: ACCMOD
+    description: Access mode
+    bit_offset: 28
+    bit_size: 2
+    enum: ACCMOD
 fieldset/BWTR:
  description: SRAM/NOR-Flash write timing registers
  fields:
-    - name: ADDSET
-      description: Address setup phase duration
-      bit_offset: 0
-      bit_size: 4
-    - name: ADDHLD
-      description: Address-hold phase duration
-      bit_offset: 4
-      bit_size: 4
-    - name: DATAST
-      description: Data-phase duration
-      bit_offset: 8
-      bit_size: 8
-    - name: BUSTURN
-      description: Bus turnaround phase duration
-      bit_offset: 16
-      bit_size: 4
-    - name: ACCMOD
-      description: Access mode
-      bit_offset: 28
-      bit_size: 2
-      enum: ACCMOD
+  - name: ADDSET
+    description: Address setup phase duration
+    bit_offset: 0
+    bit_size: 4
+  - name: ADDHLD
+    description: Address-hold phase duration
+    bit_offset: 4
+    bit_size: 4
+  - name: DATAST
+    description: Data-phase duration
+    bit_offset: 8
+    bit_size: 8
+  - name: BUSTURN
+    description: Bus turnaround phase duration
+    bit_offset: 16
+    bit_size: 4
+  - name: ACCMOD
+    description: Access mode
+    bit_offset: 28
+    bit_size: 2
+    enum: ACCMOD
 fieldset/ECCR:
  description: ECC result register
  fields:
-    - name: ECC
-      description: ECC computation result value
-      bit_offset: 0
-      bit_size: 32
+  - name: ECC
+    description: ECC computation result value
+    bit_offset: 0
+    bit_size: 32
 fieldset/PATT:
  description: Attribute memory space timing register
  fields:
-    - name: ATTSET
-      description: Attribute memory setup time
-      bit_offset: 0
-      bit_size: 8
-    - name: ATTWAIT
-      description: Attribute memory wait time
-      bit_offset: 8
-      bit_size: 8
-    - name: ATTHOLD
-      description: Attribute memory hold time
-      bit_offset: 16
-      bit_size: 8
-    - name: ATTHIZ
-      description: Attribute memory data bus Hi-Z time
-      bit_offset: 24
-      bit_size: 8
+  - name: ATTSET
+    description: Attribute memory setup time
+    bit_offset: 0
+    bit_size: 8
+  - name: ATTWAIT
+    description: Attribute memory wait time
+    bit_offset: 8
+    bit_size: 8
+  - name: ATTHOLD
+    description: Attribute memory hold time
+    bit_offset: 16
+    bit_size: 8
+  - name: ATTHIZ
+    description: Attribute memory data bus Hi-Z time
+    bit_offset: 24
+    bit_size: 8
 fieldset/PCR:
  description: PC Card/NAND Flash control register
  fields:
-    - name: PWAITEN
-      description: Wait feature enable bit
-      bit_offset: 1
-      bit_size: 1
-    - name: PBKEN
-      description: NAND Flash memory bank enable bit
-      bit_offset: 2
-      bit_size: 1
-    - name: PTYP
-      description: Memory type
-      bit_offset: 3
-      bit_size: 1
-      enum: PTYP
-    - name: PWID
-      description: Data bus width
-      bit_offset: 4
-      bit_size: 2
-      enum: PWID
-    - name: ECCEN
-      description: ECC computation logic enable bit
-      bit_offset: 6
-      bit_size: 1
-    - name: TCLR
-      description: CLE to RE delay
-      bit_offset: 9
-      bit_size: 4
-    - name: TAR
-      description: ALE to RE delay
-      bit_offset: 13
-      bit_size: 4
-    - name: ECCPS
-      description: ECC page size
-      bit_offset: 17
-      bit_size: 3
-      enum: ECCPS
+  - name: PWAITEN
+    description: Wait feature enable bit
+    bit_offset: 1
+    bit_size: 1
+  - name: PBKEN
+    description: NAND Flash memory bank enable bit
+    bit_offset: 2
+    bit_size: 1
+  - name: PTYP
+    description: Memory type
+    bit_offset: 3
+    bit_size: 1
+    enum: PTYP
+  - name: PWID
+    description: Data bus width
+    bit_offset: 4
+    bit_size: 2
+    enum: PWID
+  - name: ECCEN
+    description: ECC computation logic enable bit
+    bit_offset: 6
+    bit_size: 1
+  - name: TCLR
+    description: CLE to RE delay
+    bit_offset: 9
+    bit_size: 4
+  - name: TAR
+    description: ALE to RE delay
+    bit_offset: 13
+    bit_size: 4
+  - name: ECCPS
+    description: ECC page size
+    bit_offset: 17
+    bit_size: 3
+    enum: ECCPS
 fieldset/PMEM:
  description: Common memory space timing register
  fields:
-    - name: MEMSET
-      description: Common memory x setup time
-      bit_offset: 0
-      bit_size: 8
-    - name: MEMWAIT
-      description: Common memory wait time
-      bit_offset: 8
-      bit_size: 8
-    - name: MEMHOLD
-      description: Common memory hold time
-      bit_offset: 16
-      bit_size: 8
-    - name: MEMHIZ
-      description: Common memory x data bus Hi-Z time
-      bit_offset: 24
-      bit_size: 8
+  - name: MEMSET
+    description: Common memory x setup time
+    bit_offset: 0
+    bit_size: 8
+  - name: MEMWAIT
+    description: Common memory wait time
+    bit_offset: 8
+    bit_size: 8
+  - name: MEMHOLD
+    description: Common memory hold time
+    bit_offset: 16
+    bit_size: 8
+  - name: MEMHIZ
+    description: Common memory x data bus Hi-Z time
+    bit_offset: 24
+    bit_size: 8
 fieldset/SR:
  description: FIFO status and interrupt register
  fields:
-    - name: IRS
-      description: Interrupt rising edge status
-      bit_offset: 0
-      bit_size: 1
-    - name: ILS
-      description: Interrupt high-level status
-      bit_offset: 1
-      bit_size: 1
-    - name: IFS
-      description: Interrupt falling edge status
-      bit_offset: 2
-      bit_size: 1
-    - name: IREN
-      description: Interrupt rising edge detection enable bit
-      bit_offset: 3
-      bit_size: 1
-    - name: ILEN
-      description: Interrupt high-level detection enable bit
-      bit_offset: 4
-      bit_size: 1
-    - name: IFEN
-      description: Interrupt falling edge detection enable bit
-      bit_offset: 5
-      bit_size: 1
-    - name: FEMPT
-      description: FIFO empty status
-      bit_offset: 6
-      bit_size: 1
+  - name: IRS
+    description: Interrupt rising edge status
+    bit_offset: 0
+    bit_size: 1
+  - name: ILS
+    description: Interrupt high-level status
+    bit_offset: 1
+    bit_size: 1
+  - name: IFS
+    description: Interrupt falling edge status
+    bit_offset: 2
+    bit_size: 1
+  - name: IREN
+    description: Interrupt rising edge detection enable bit
+    bit_offset: 3
+    bit_size: 1
+  - name: ILEN
+    description: Interrupt high-level detection enable bit
+    bit_offset: 4
+    bit_size: 1
+  - name: IFEN
+    description: Interrupt falling edge detection enable bit
+    bit_offset: 5
+    bit_size: 1
+  - name: FEMPT
+    description: FIFO empty status
+    bit_offset: 6
+    bit_size: 1
 enum/ACCMOD:
  bit_size: 2
  variants:
-    - name: A
-      description: Access mode A
-      value: 0
-    - name: B
-      description: Access mode B
-      value: 1
-    - name: C
-      description: Access mode C
-      value: 2
-    - name: D
-      description: Access mode D
-      value: 3
+  - name: A
+    description: Access mode A
+    value: 0
+  - name: B
+    description: Access mode B
+    value: 1
+  - name: C
+    description: Access mode C
+    value: 2
+  - name: D
+    description: Access mode D
+    value: 3
 enum/CPSIZE:
  bit_size: 3
  variants:
-    - name: NoBurstSplit
-      description: No burst split when crossing page boundary
-      value: 0
-    - name: Bytes128
-      description: 128 bytes CRAM page size
-      value: 1
-    - name: Bytes256
-      description: 256 bytes CRAM page size
-      value: 2
-    - name: Bytes512
-      description: 512 bytes CRAM page size
-      value: 3
-    - name: Bytes1024
-      description: 1024 bytes CRAM page size
-      value: 4
+  - name: NoBurstSplit
+    description: No burst split when crossing page boundary
+    value: 0
+  - name: Bytes128
+    description: 128 bytes CRAM page size
+    value: 1
+  - name: Bytes256
+    description: 256 bytes CRAM page size
+    value: 2
+  - name: Bytes512
+    description: 512 bytes CRAM page size
+    value: 3
+  - name: Bytes1024
+    description: 1024 bytes CRAM page size
+    value: 4
 enum/ECCPS:
  bit_size: 3
  variants:
-    - name: Bytes256
-      description: ECC page size 256 bytes
-      value: 0
-    - name: Bytes512
-      description: ECC page size 512 bytes
-      value: 1
-    - name: Bytes1024
-      description: ECC page size 1024 bytes
-      value: 2
-    - name: Bytes2048
-      description: ECC page size 2048 bytes
-      value: 3
-    - name: Bytes4096
-      description: ECC page size 4096 bytes
-      value: 4
-    - name: Bytes8192
-      description: ECC page size 8192 bytes
-      value: 5
+  - name: Bytes256
+    description: ECC page size 256 bytes
+    value: 0
+  - name: Bytes512
+    description: ECC page size 512 bytes
+    value: 1
+  - name: Bytes1024
+    description: ECC page size 1024 bytes
+    value: 2
+  - name: Bytes2048
+    description: ECC page size 2048 bytes
+    value: 3
+  - name: Bytes4096
+    description: ECC page size 4096 bytes
+    value: 4
+  - name: Bytes8192
+    description: ECC page size 8192 bytes
+    value: 5
 enum/MTYP:
  bit_size: 2
  variants:
-    - name: SRAM
-      description: SRAM memory type
-      value: 0
-    - name: PSRAM
-      description: PSRAM (CRAM) memory type
-      value: 1
-    - name: Flash
-      description: NOR Flash/OneNAND Flash
-      value: 2
+  - name: SRAM
+    description: SRAM memory type
+    value: 0
+  - name: PSRAM
+    description: PSRAM (CRAM) memory type
+    value: 1
+  - name: Flash
+    description: NOR Flash/OneNAND Flash
+    value: 2
 enum/MWID:
  bit_size: 2
  variants:
-    - name: Bits8
-      description: Memory data bus width 8 bits
-      value: 0
-    - name: Bits16
-      description: Memory data bus width 16 bits
-      value: 1
-    - name: Bits32
-      description: Memory data bus width 32 bits
-      value: 2
+  - name: Bits8
+    description: Memory data bus width 8 bits
+    value: 0
+  - name: Bits16
+    description: Memory data bus width 16 bits
+    value: 1
+  - name: Bits32
+    description: Memory data bus width 32 bits
+    value: 2
 enum/PTYP:
  bit_size: 1
  variants:
-    - name: NANDFlash
-      description: NAND Flash
-      value: 1
+  - name: NANDFlash
+    description: NAND Flash
+    value: 1
 enum/PWID:
  bit_size: 2
  variants:
-    - name: Bits8
-      description: External memory device width 8 bits
-      value: 0
-    - name: Bits16
-      description: External memory device width 16 bits
-      value: 1
+  - name: Bits8
+    description: External memory device width 8 bits
+    value: 0
+  - name: Bits16
+    description: External memory device width 16 bits
+    value: 1
 enum/WAITCFG:
  bit_size: 1
  variants:
-    - name: BeforeWaitState
-      description: NWAIT signal is active one data cycle before wait state
-      value: 0
-    - name: DuringWaitState
-      description: NWAIT signal is active during wait state
-      value: 1
+  - name: BeforeWaitState
+    description: NWAIT signal is active one data cycle before wait state
+    value: 0
+  - name: DuringWaitState
+    description: NWAIT signal is active during wait state
+    value: 1
 enum/WAITPOL:
  bit_size: 1
  variants:
-    - name: ActiveLow
-      description: NWAIT active low
-      value: 0
-    - name: ActiveHigh
-      description: NWAIT active high
-      value: 1
+  - name: ActiveLow
+    description: NWAIT active low
+    value: 0
+  - name: ActiveHigh
+    description: NWAIT active high
+    value: 1
--- a/data/registers/fsmc_v4x1.yaml
+++ b/data/registers/fsmc_v4x1.yaml
@ -1,514 +1,513 @@
---
 block/FSMC:
  description: Flexible static memory controller
  items:
-    - name: BCR1
-      description: SRAM/NOR-Flash chip-select control register 1
-      byte_offset: 0
-      fieldset: BCR1
-    - name: BTR
-      description: SRAM/NOR-Flash chip-select timing register 1-4
-      array:
-        len: 4
-        stride: 8
-      byte_offset: 4
-      fieldset: BTR
-    - name: BCR
-      description: SRAM/NOR-Flash chip-select control register 2-4
-      array:
-        len: 3
-        stride: 8
-      byte_offset: 8
-      fieldset: BCR
-    - name: PCSCNTR
-      description: PSRAM chip select counter register
-      byte_offset: 32
-      fieldset: PCSCNTR
-    - name: PCR
-      description: PC Card/NAND Flash control register
-      byte_offset: 128
-      fieldset: PCR
-    - name: SR
-      description: FIFO status and interrupt register
-      byte_offset: 132
-      fieldset: SR
-    - name: PMEM
-      description: Common memory space timing register
-      byte_offset: 136
-      fieldset: PMEM
-    - name: PATT
-      description: Attribute memory space timing register
-      byte_offset: 140
-      fieldset: PATT
-    - name: ECCR
-      description: ECC result register
-      byte_offset: 148
-      access: Read
-      fieldset: ECCR
-    - name: BWTR
-      description: SRAM/NOR-Flash write timing registers 1-4
-      array:
-        len: 4
-        stride: 8
-      byte_offset: 260
-      fieldset: BWTR
+  - name: BCR1
+    description: SRAM/NOR-Flash chip-select control register 1
+    byte_offset: 0
+    fieldset: BCR1
+  - name: BTR
+    description: SRAM/NOR-Flash chip-select timing register 1-4
+    array:
+      len: 4
+      stride: 8
+    byte_offset: 4
+    fieldset: BTR
+  - name: BCR
+    description: SRAM/NOR-Flash chip-select control register 2-4
+    array:
+      len: 3
+      stride: 8
+    byte_offset: 8
+    fieldset: BCR
+  - name: PCSCNTR
+    description: PSRAM chip select counter register
+    byte_offset: 32
+    fieldset: PCSCNTR
+  - name: PCR
+    description: PC Card/NAND Flash control register
+    byte_offset: 128
+    fieldset: PCR
+  - name: SR
+    description: FIFO status and interrupt register
+    byte_offset: 132
+    fieldset: SR
+  - name: PMEM
+    description: Common memory space timing register
+    byte_offset: 136
+    fieldset: PMEM
+  - name: PATT
+    description: Attribute memory space timing register
+    byte_offset: 140
+    fieldset: PATT
+  - name: ECCR
+    description: ECC result register
+    byte_offset: 148
+    access: Read
+    fieldset: ECCR
+  - name: BWTR
+    description: SRAM/NOR-Flash write timing registers 1-4
+    array:
+      len: 4
+      stride: 8
+    byte_offset: 260
+    fieldset: BWTR
 fieldset/BCR:
  description: SRAM/NOR-Flash chip-select control register 2-4
  fields:
-    - name: MBKEN
-      description: Memory bank enable bit
-      bit_offset: 0
-      bit_size: 1
-    - name: MUXEN
-      description: Address/data multiplexing enable bit
-      bit_offset: 1
-      bit_size: 1
-    - name: MTYP
-      description: Memory type
-      bit_offset: 2
-      bit_size: 2
-      enum: MTYP
-    - name: MWID
-      description: Memory data bus width
-      bit_offset: 4
-      bit_size: 2
-      enum: MWID
-    - name: FACCEN
-      description: Flash access enable
-      bit_offset: 6
-      bit_size: 1
-    - name: BURSTEN
-      description: Burst enable bit
-      bit_offset: 8
-      bit_size: 1
-    - name: WAITPOL
-      description: Wait signal polarity bit
-      bit_offset: 9
-      bit_size: 1
-      enum: WAITPOL
-    - name: WAITCFG
-      description: Wait timing configuration
-      bit_offset: 11
-      bit_size: 1
-      enum: WAITCFG
-    - name: WREN
-      description: Write enable bit
-      bit_offset: 12
-      bit_size: 1
-    - name: WAITEN
-      description: Wait enable bit
-      bit_offset: 13
-      bit_size: 1
-    - name: EXTMOD
-      description: Extended mode enable
-      bit_offset: 14
-      bit_size: 1
-    - name: ASYNCWAIT
-      description: Wait signal during asynchronous transfers
-      bit_offset: 15
-      bit_size: 1
-    - name: CPSIZE
-      description: CRAM page size
-      bit_offset: 16
-      bit_size: 3
-      enum: CPSIZE
-    - name: CBURSTRW
-      description: Write burst enable
-      bit_offset: 19
-      bit_size: 1
-    - name: NBLSET
-      description: Byte lane (NBL) setup
-      bit_offset: 22
-      bit_size: 2
+  - name: MBKEN
+    description: Memory bank enable bit
+    bit_offset: 0
+    bit_size: 1
+  - name: MUXEN
+    description: Address/data multiplexing enable bit
+    bit_offset: 1
+    bit_size: 1
+  - name: MTYP
+    description: Memory type
+    bit_offset: 2
+    bit_size: 2
+    enum: MTYP
+  - name: MWID
+    description: Memory data bus width
+    bit_offset: 4
+    bit_size: 2
+    enum: MWID
+  - name: FACCEN
+    description: Flash access enable
+    bit_offset: 6
+    bit_size: 1
+  - name: BURSTEN
+    description: Burst enable bit
+    bit_offset: 8
+    bit_size: 1
+  - name: WAITPOL
+    description: Wait signal polarity bit
+    bit_offset: 9
+    bit_size: 1
+    enum: WAITPOL
+  - name: WAITCFG
+    description: Wait timing configuration
+    bit_offset: 11
+    bit_size: 1
+    enum: WAITCFG
+  - name: WREN
+    description: Write enable bit
+    bit_offset: 12
+    bit_size: 1
+  - name: WAITEN
+    description: Wait enable bit
+    bit_offset: 13
+    bit_size: 1
+  - name: EXTMOD
+    description: Extended mode enable
+    bit_offset: 14
+    bit_size: 1
+  - name: ASYNCWAIT
+    description: Wait signal during asynchronous transfers
+    bit_offset: 15
+    bit_size: 1
+  - name: CPSIZE
+    description: CRAM page size
+    bit_offset: 16
+    bit_size: 3
+    enum: CPSIZE
+  - name: CBURSTRW
+    description: Write burst enable
+    bit_offset: 19
+    bit_size: 1
+  - name: NBLSET
+    description: Byte lane (NBL) setup
+    bit_offset: 22
+    bit_size: 2
 fieldset/BCR1:
  description: SRAM/NOR-Flash chip-select control register 1
  fields:
-    - name: MBKEN
-      description: Memory bank enable bit
-      bit_offset: 0
-      bit_size: 1
-    - name: MUXEN
-      description: Address/data multiplexing enable bit
-      bit_offset: 1
-      bit_size: 1
-    - name: MTYP
-      description: Memory type
-      bit_offset: 2
-      bit_size: 2
-      enum: MTYP
-    - name: MWID
-      description: Memory data bus width
-      bit_offset: 4
-      bit_size: 2
-      enum: MWID
-    - name: FACCEN
-      description: Flash access enable
-      bit_offset: 6
-      bit_size: 1
-    - name: BURSTEN
-      description: Burst enable bit
-      bit_offset: 8
-      bit_size: 1
-    - name: WAITPOL
-      description: Wait signal polarity bit
-      bit_offset: 9
-      bit_size: 1
-      enum: WAITPOL
-    - name: WAITCFG
-      description: Wait timing configuration
-      bit_offset: 11
-      bit_size: 1
-      enum: WAITCFG
-    - name: WREN
-      description: Write enable bit
-      bit_offset: 12
-      bit_size: 1
-    - name: WAITEN
-      description: Wait enable bit
-      bit_offset: 13
-      bit_size: 1
-    - name: EXTMOD
-      description: Extended mode enable
-      bit_offset: 14
-      bit_size: 1
-    - name: ASYNCWAIT
-      description: Wait signal during asynchronous transfers
-      bit_offset: 15
-      bit_size: 1
-    - name: CPSIZE
-      description: CRAM page size
-      bit_offset: 16
-      bit_size: 3
-      enum: CPSIZE
-    - name: CBURSTRW
-      description: Write burst enable
-      bit_offset: 19
-      bit_size: 1
-    - name: CCLKEN
-      description: Continuous clock enable
-      bit_offset: 20
-      bit_size: 1
-    - name: WFDIS
-      description: Write FIFO disable
-      bit_offset: 21
-      bit_size: 1
-    - name: NBLSET
-      description: Byte lane (NBL) setup
-      bit_offset: 22
-      bit_size: 2
-    - name: FMCEN
-      description: FMC controller enable
-      bit_offset: 31
-      bit_size: 1
+  - name: MBKEN
+    description: Memory bank enable bit
+    bit_offset: 0
+    bit_size: 1
+  - name: MUXEN
+    description: Address/data multiplexing enable bit
+    bit_offset: 1
+    bit_size: 1
+  - name: MTYP
+    description: Memory type
+    bit_offset: 2
+    bit_size: 2
+    enum: MTYP
+  - name: MWID
+    description: Memory data bus width
+    bit_offset: 4
+    bit_size: 2
+    enum: MWID
+  - name: FACCEN
+    description: Flash access enable
+    bit_offset: 6
+    bit_size: 1
+  - name: BURSTEN
+    description: Burst enable bit
+    bit_offset: 8
+    bit_size: 1
+  - name: WAITPOL
+    description: Wait signal polarity bit
+    bit_offset: 9
+    bit_size: 1
+    enum: WAITPOL
+  - name: WAITCFG
+    description: Wait timing configuration
+    bit_offset: 11
+    bit_size: 1
+    enum: WAITCFG
+  - name: WREN
+    description: Write enable bit
+    bit_offset: 12
+    bit_size: 1
+  - name: WAITEN
+    description: Wait enable bit
+    bit_offset: 13
+    bit_size: 1
+  - name: EXTMOD
+    description: Extended mode enable
+    bit_offset: 14
+    bit_size: 1
+  - name: ASYNCWAIT
+    description: Wait signal during asynchronous transfers
+    bit_offset: 15
+    bit_size: 1
+  - name: CPSIZE
+    description: CRAM page size
+    bit_offset: 16
+    bit_size: 3
+    enum: CPSIZE
+  - name: CBURSTRW
+    description: Write burst enable
+    bit_offset: 19
+    bit_size: 1
+  - name: CCLKEN
+    description: Continuous clock enable
+    bit_offset: 20
+    bit_size: 1
+  - name: WFDIS
+    description: Write FIFO disable
+    bit_offset: 21
+    bit_size: 1
+  - name: NBLSET
+    description: Byte lane (NBL) setup
+    bit_offset: 22
+    bit_size: 2
+  - name: FMCEN
+    description: FMC controller enable
+    bit_offset: 31
+    bit_size: 1
 fieldset/BTR:
  description: SRAM/NOR-Flash chip-select timing register
  fields:
-    - name: ADDSET
-      description: Address setup phase duration
-      bit_offset: 0
-      bit_size: 4
-    - name: ADDHLD
-      description: Address-hold phase duration
-      bit_offset: 4
-      bit_size: 4
-    - name: DATAST
-      description: Data-phase duration
-      bit_offset: 8
-      bit_size: 8
-    - name: BUSTURN
-      description: Bus turnaround phase duration
-      bit_offset: 16
-      bit_size: 4
-    - name: CLKDIV
-      description: Clock divide ratio (for FMC_CLK signal)
-      bit_offset: 20
-      bit_size: 4
-    - name: DATLAT
-      description: Data latency for synchronous memory
-      bit_offset: 24
-      bit_size: 4
-    - name: ACCMOD
-      description: Access mode
-      bit_offset: 28
-      bit_size: 2
-      enum: ACCMOD
-    - name: DATAHLD
-      description: Data hold phase duration
-      bit_offset: 30
-      bit_size: 2
+  - name: ADDSET
+    description: Address setup phase duration
+    bit_offset: 0
+    bit_size: 4
+  - name: ADDHLD
+    description: Address-hold phase duration
+    bit_offset: 4
+    bit_size: 4
+  - name: DATAST
+    description: Data-phase duration
+    bit_offset: 8
+    bit_size: 8
+  - name: BUSTURN
+    description: Bus turnaround phase duration
+    bit_offset: 16
+    bit_size: 4
+  - name: CLKDIV
+    description: Clock divide ratio (for FMC_CLK signal)
+    bit_offset: 20
+    bit_size: 4
+  - name: DATLAT
+    description: Data latency for synchronous memory
+    bit_offset: 24
+    bit_size: 4
+  - name: ACCMOD
+    description: Access mode
+    bit_offset: 28
+    bit_size: 2
+    enum: ACCMOD
+  - name: DATAHLD
+    description: Data hold phase duration
+    bit_offset: 30
+    bit_size: 2
 fieldset/BWTR:
  description: SRAM/NOR-Flash write timing registers
  fields:
-    - name: ADDSET
-      description: Address setup phase duration
-      bit_offset: 0
-      bit_size: 4
-    - name: ADDHLD
-      description: Address-hold phase duration
-      bit_offset: 4
-      bit_size: 4
-    - name: DATAST
-      description: Data-phase duration
-      bit_offset: 8
-      bit_size: 8
-    - name: BUSTURN
-      description: Bus turnaround phase duration
-      bit_offset: 16
-      bit_size: 4
-    - name: ACCMOD
-      description: Access mode
-      bit_offset: 28
-      bit_size: 2
-      enum: ACCMOD
-    - name: DATAHLD
-      description: Data hold phase duration
-      bit_offset: 30
-      bit_size: 2
+  - name: ADDSET
+    description: Address setup phase duration
+    bit_offset: 0
+    bit_size: 4
+  - name: ADDHLD
+    description: Address-hold phase duration
+    bit_offset: 4
+    bit_size: 4
+  - name: DATAST
+    description: Data-phase duration
+    bit_offset: 8
+    bit_size: 8
+  - name: BUSTURN
+    description: Bus turnaround phase duration
+    bit_offset: 16
+    bit_size: 4
+  - name: ACCMOD
+    description: Access mode
+    bit_offset: 28
+    bit_size: 2
+    enum: ACCMOD
+  - name: DATAHLD
+    description: Data hold phase duration
+    bit_offset: 30
+    bit_size: 2
 fieldset/ECCR:
  description: ECC result register
  fields:
-    - name: ECC
-      description: ECC computation result value
-      bit_offset: 0
-      bit_size: 32
+  - name: ECC
+    description: ECC computation result value
+    bit_offset: 0
+    bit_size: 32
 fieldset/PATT:
  description: Attribute memory space timing register
  fields:
-    - name: ATTSET
-      description: Attribute memory setup time
-      bit_offset: 0
-      bit_size: 8
-    - name: ATTWAIT
-      description: Attribute memory wait time
-      bit_offset: 8
-      bit_size: 8
-    - name: ATTHOLD
-      description: Attribute memory hold time
-      bit_offset: 16
-      bit_size: 8
-    - name: ATTHIZ
-      description: Attribute memory data bus Hi-Z time
-      bit_offset: 24
-      bit_size: 8
+  - name: ATTSET
+    description: Attribute memory setup time
+    bit_offset: 0
+    bit_size: 8
+  - name: ATTWAIT
+    description: Attribute memory wait time
+    bit_offset: 8
+    bit_size: 8
+  - name: ATTHOLD
+    description: Attribute memory hold time
+    bit_offset: 16
+    bit_size: 8
+  - name: ATTHIZ
+    description: Attribute memory data bus Hi-Z time
+    bit_offset: 24
+    bit_size: 8
 fieldset/PCR:
  description: PC Card/NAND Flash control register
  fields:
-    - name: PWAITEN
-      description: Wait feature enable bit
-      bit_offset: 1
-      bit_size: 1
-    - name: PBKEN
-      description: NAND Flash memory bank enable bit
-      bit_offset: 2
-      bit_size: 1
-    - name: PTYP
-      description: Memory type
-      bit_offset: 3
-      bit_size: 1
-      enum: PTYP
-    - name: PWID
-      description: Data bus width
-      bit_offset: 4
-      bit_size: 2
-      enum: PWID
-    - name: ECCEN
-      description: ECC computation logic enable bit
-      bit_offset: 6
-      bit_size: 1
-    - name: TCLR
-      description: CLE to RE delay
-      bit_offset: 9
-      bit_size: 4
-    - name: TAR
-      description: ALE to RE delay
-      bit_offset: 13
-      bit_size: 4
-    - name: ECCPS
-      description: ECC page size
-      bit_offset: 17
-      bit_size: 3
-      enum: ECCPS
+  - name: PWAITEN
+    description: Wait feature enable bit
+    bit_offset: 1
+    bit_size: 1
+  - name: PBKEN
+    description: NAND Flash memory bank enable bit
+    bit_offset: 2
+    bit_size: 1
+  - name: PTYP
+    description: Memory type
+    bit_offset: 3
+    bit_size: 1
+    enum: PTYP
+  - name: PWID
+    description: Data bus width
+    bit_offset: 4
+    bit_size: 2
+    enum: PWID
+  - name: ECCEN
+    description: ECC computation logic enable bit
+    bit_offset: 6
+    bit_size: 1
+  - name: TCLR
+    description: CLE to RE delay
+    bit_offset: 9
+    bit_size: 4
+  - name: TAR
+    description: ALE to RE delay
+    bit_offset: 13
+    bit_size: 4
+  - name: ECCPS
+    description: ECC page size
+    bit_offset: 17
+    bit_size: 3
+    enum: ECCPS
 fieldset/PCSCNTR:
  description: PSRAM chip select counter register
  fields:
-    - name: CSCOUNT
-      description: Chip select counter
-      bit_offset: 0
-      bit_size: 16
-    - name: CNTB1EN
-      description: Counter Bank 1 enable
-      bit_offset: 16
-      bit_size: 1
-    - name: CNTB2EN
-      description: Counter Bank 2 enable
-      bit_offset: 17
-      bit_size: 1
-    - name: CNTB3EN
-      description: Counter Bank 3 enable
-      bit_offset: 18
-      bit_size: 1
-    - name: CNTB4EN
-      description: Counter Bank 4 enable
-      bit_offset: 19
-      bit_size: 1
+  - name: CSCOUNT
+    description: Chip select counter
+    bit_offset: 0
+    bit_size: 16
+  - name: CNTB1EN
+    description: Counter Bank 1 enable
+    bit_offset: 16
+    bit_size: 1
+  - name: CNTB2EN
+    description: Counter Bank 2 enable
+    bit_offset: 17
+    bit_size: 1
+  - name: CNTB3EN
+    description: Counter Bank 3 enable
+    bit_offset: 18
+    bit_size: 1
+  - name: CNTB4EN
+    description: Counter Bank 4 enable
+    bit_offset: 19
+    bit_size: 1
 fieldset/PMEM:
  description: Common memory space timing register
  fields:
-    - name: MEMSET
-      description: Common memory x setup time
-      bit_offset: 0
-      bit_size: 8
-    - name: MEMWAIT
-      description: Common memory wait time
-      bit_offset: 8
-      bit_size: 8
-    - name: MEMHOLD
-      description: Common memory hold time
-      bit_offset: 16
-      bit_size: 8
-    - name: MEMHIZ
-      description: Common memory x data bus Hi-Z time
-      bit_offset: 24
-      bit_size: 8
+  - name: MEMSET
+    description: Common memory x setup time
+    bit_offset: 0
+    bit_size: 8
+  - name: MEMWAIT
+    description: Common memory wait time
+    bit_offset: 8
+    bit_size: 8
+  - name: MEMHOLD
+    description: Common memory hold time
+    bit_offset: 16
+    bit_size: 8
+  - name: MEMHIZ
+    description: Common memory x data bus Hi-Z time
+    bit_offset: 24
+    bit_size: 8
 fieldset/SR:
  description: FIFO status and interrupt register
  fields:
-    - name: IRS
-      description: Interrupt rising edge status
-      bit_offset: 0
-      bit_size: 1
-    - name: ILS
-      description: Interrupt high-level status
-      bit_offset: 1
-      bit_size: 1
-    - name: IFS
-      description: Interrupt falling edge status
-      bit_offset: 2
-      bit_size: 1
-    - name: IREN
-      description: Interrupt rising edge detection enable bit
-      bit_offset: 3
-      bit_size: 1
-    - name: ILEN
-      description: Interrupt high-level detection enable bit
-      bit_offset: 4
-      bit_size: 1
-    - name: IFEN
-      description: Interrupt falling edge detection enable bit
-      bit_offset: 5
-      bit_size: 1
-    - name: FEMPT
-      description: FIFO empty status
-      bit_offset: 6
-      bit_size: 1
+  - name: IRS
+    description: Interrupt rising edge status
+    bit_offset: 0
+    bit_size: 1
+  - name: ILS
+    description: Interrupt high-level status
+    bit_offset: 1
+    bit_size: 1
+  - name: IFS
+    description: Interrupt falling edge status
+    bit_offset: 2
+    bit_size: 1
+  - name: IREN
+    description: Interrupt rising edge detection enable bit
+    bit_offset: 3
+    bit_size: 1
+  - name: ILEN
+    description: Interrupt high-level detection enable bit
+    bit_offset: 4
+    bit_size: 1
+  - name: IFEN
+    description: Interrupt falling edge detection enable bit
+    bit_offset: 5
+    bit_size: 1
+  - name: FEMPT
+    description: FIFO empty status
+    bit_offset: 6
+    bit_size: 1
 enum/ACCMOD:
  bit_size: 2
  variants:
-    - name: A
-      description: Access mode A
-      value: 0
-    - name: B
-      description: Access mode B
-      value: 1
-    - name: C
-      description: Access mode C
-      value: 2
-    - name: D
-      description: Access mode D
-      value: 3
+  - name: A
+    description: Access mode A
+    value: 0
+  - name: B
+    description: Access mode B
+    value: 1
+  - name: C
+    description: Access mode C
+    value: 2
+  - name: D
+    description: Access mode D
+    value: 3
 enum/CPSIZE:
  bit_size: 3
  variants:
-    - name: NoBurstSplit
-      description: No burst split when crossing page boundary
-      value: 0
-    - name: Bytes128
-      description: 128 bytes CRAM page size
-      value: 1
-    - name: Bytes256
-      description: 256 bytes CRAM page size
-      value: 2
-    - name: Bytes512
-      description: 512 bytes CRAM page size
-      value: 3
-    - name: Bytes1024
-      description: 1024 bytes CRAM page size
-      value: 4
+  - name: NoBurstSplit
+    description: No burst split when crossing page boundary
+    value: 0
+  - name: Bytes128
+    description: 128 bytes CRAM page size
+    value: 1
+  - name: Bytes256
+    description: 256 bytes CRAM page size
+    value: 2
+  - name: Bytes512
+    description: 512 bytes CRAM page size
+    value: 3
+  - name: Bytes1024
+    description: 1024 bytes CRAM page size
+    value: 4
 enum/ECCPS:
  bit_size: 3
  variants:
-    - name: Bytes256
-      description: ECC page size 256 bytes
-      value: 0
-    - name: Bytes512
-      description: ECC page size 512 bytes
-      value: 1
-    - name: Bytes1024
-      description: ECC page size 1024 bytes
-      value: 2
-    - name: Bytes2048
-      description: ECC page size 2048 bytes
-      value: 3
-    - name: Bytes4096
-      description: ECC page size 4096 bytes
-      value: 4
-    - name: Bytes8192
-      description: ECC page size 8192 bytes
-      value: 5
+  - name: Bytes256
+    description: ECC page size 256 bytes
+    value: 0
+  - name: Bytes512
+    description: ECC page size 512 bytes
+    value: 1
+  - name: Bytes1024
+    description: ECC page size 1024 bytes
+    value: 2
+  - name: Bytes2048
+    description: ECC page size 2048 bytes
+    value: 3
+  - name: Bytes4096
+    description: ECC page size 4096 bytes
+    value: 4
+  - name: Bytes8192
+    description: ECC page size 8192 bytes
+    value: 5
 enum/MTYP:
  bit_size: 2
  variants:
-    - name: SRAM
-      description: SRAM memory type
-      value: 0
-    - name: PSRAM
-      description: PSRAM (CRAM) memory type
-      value: 1
-    - name: Flash
-      description: NOR Flash/OneNAND Flash
-      value: 2
+  - name: SRAM
+    description: SRAM memory type
+    value: 0
+  - name: PSRAM
+    description: PSRAM (CRAM) memory type
+    value: 1
+  - name: Flash
+    description: NOR Flash/OneNAND Flash
+    value: 2
 enum/MWID:
  bit_size: 2
  variants:
-    - name: Bits8
-      description: Memory data bus width 8 bits
-      value: 0
-    - name: Bits16
-      description: Memory data bus width 16 bits
-      value: 1
-    - name: Bits32
-      description: Memory data bus width 32 bits
-      value: 2
+  - name: Bits8
+    description: Memory data bus width 8 bits
+    value: 0
+  - name: Bits16
+    description: Memory data bus width 16 bits
+    value: 1
+  - name: Bits32
+    description: Memory data bus width 32 bits
+    value: 2
 enum/PTYP:
  bit_size: 1
  variants:
-    - name: NANDFlash
-      description: NAND Flash
-      value: 1
+  - name: NANDFlash
+    description: NAND Flash
+    value: 1
 enum/PWID:
  bit_size: 2
  variants:
-    - name: Bits8
-      description: External memory device width 8 bits
-      value: 0
-    - name: Bits16
-      description: External memory device width 16 bits
-      value: 1
+  - name: Bits8
+    description: External memory device width 8 bits
+    value: 0
+  - name: Bits16
+    description: External memory device width 16 bits
+    value: 1
 enum/WAITCFG:
  bit_size: 1
  variants:
-    - name: BeforeWaitState
-      description: NWAIT signal is active one data cycle before wait state
-      value: 0
-    - name: DuringWaitState
-      description: NWAIT signal is active during wait state
-      value: 1
+  - name: BeforeWaitState
+    description: NWAIT signal is active one data cycle before wait state
+    value: 0
+  - name: DuringWaitState
+    description: NWAIT signal is active during wait state
+    value: 1
 enum/WAITPOL:
  bit_size: 1
  variants:
-    - name: ActiveLow
-      description: NWAIT active low
-      value: 0
-    - name: ActiveHigh
-      description: NWAIT active high
-      value: 1
+  - name: ActiveLow
+    description: NWAIT active low
+    value: 0
+  - name: ActiveHigh
+    description: NWAIT active high
+    value: 1
--- a/data/registers/fsmc_v5x1.yaml
+++ b/data/registers/fsmc_v5x1.yaml
@ -1,514 +1,513 @@
---
 block/FSMC:
  description: Flexible static memory controller
  items:
-    - name: BCR1
-      description: SRAM/NOR-Flash chip-select control register 1
-      byte_offset: 0
-      fieldset: BCR1
-    - name: BTR
-      description: SRAM/NOR-Flash chip-select timing register 1-4
-      array:
-        len: 4
-        stride: 8
-      byte_offset: 4
-      fieldset: BTR
-    - name: BCR
-      description: SRAM/NOR-Flash chip-select control register 2-4
-      array:
-        len: 3
-        stride: 8
-      byte_offset: 8
-      fieldset: BCR
-    - name: PCSCNTR
-      description: PSRAM chip select counter register
-      byte_offset: 32
-      fieldset: PCSCNTR
-    - name: PCR
-      description: PC Card/NAND Flash control register
-      byte_offset: 128
-      fieldset: PCR
-    - name: SR
-      description: FIFO status and interrupt register
-      byte_offset: 132
-      fieldset: SR
-    - name: PMEM
-      description: Common memory space timing register
-      byte_offset: 136
-      fieldset: PMEM
-    - name: PATT
-      description: Attribute memory space timing register
-      byte_offset: 140
-      fieldset: PATT
-    - name: ECCR
-      description: ECC result register
-      byte_offset: 148
-      access: Read
-      fieldset: ECCR
-    - name: BWTR
-      description: SRAM/NOR-Flash write timing registers 1-4
-      array:
-        len: 4
-        stride: 8
-      byte_offset: 260
-      fieldset: BWTR
+  - name: BCR1
+    description: SRAM/NOR-Flash chip-select control register 1
+    byte_offset: 0
+    fieldset: BCR1
+  - name: BTR
+    description: SRAM/NOR-Flash chip-select timing register 1-4
+    array:
+      len: 4
+      stride: 8
+    byte_offset: 4
+    fieldset: BTR
+  - name: BCR
+    description: SRAM/NOR-Flash chip-select control register 2-4
+    array:
+      len: 3
+      stride: 8
+    byte_offset: 8
+    fieldset: BCR
+  - name: PCSCNTR
+    description: PSRAM chip select counter register
+    byte_offset: 32
+    fieldset: PCSCNTR
+  - name: PCR
+    description: PC Card/NAND Flash control register
+    byte_offset: 128
+    fieldset: PCR
+  - name: SR
+    description: FIFO status and interrupt register
+    byte_offset: 132
+    fieldset: SR
+  - name: PMEM
+    description: Common memory space timing register
+    byte_offset: 136
+    fieldset: PMEM
+  - name: PATT
+    description: Attribute memory space timing register
+    byte_offset: 140
+    fieldset: PATT
+  - name: ECCR
+    description: ECC result register
+    byte_offset: 148
+    access: Read
+    fieldset: ECCR
+  - name: BWTR
+    description: SRAM/NOR-Flash write timing registers 1-4
+    array:
+      len: 4
+      stride: 8
+    byte_offset: 260
+    fieldset: BWTR
 fieldset/BCR:
  description: SRAM/NOR-Flash chip-select control register 2-4
  fields:
-    - name: MBKEN
-      description: Memory bank enable bit
-      bit_offset: 0
-      bit_size: 1
-    - name: MUXEN
-      description: Address/data multiplexing enable bit
-      bit_offset: 1
-      bit_size: 1
-    - name: MTYP
-      description: Memory type
-      bit_offset: 2
-      bit_size: 2
-      enum: MTYP
-    - name: MWID
-      description: Memory data bus width
-      bit_offset: 4
-      bit_size: 2
-      enum: MWID
-    - name: FACCEN
-      description: Flash access enable
-      bit_offset: 6
-      bit_size: 1
-    - name: BURSTEN
-      description: Burst enable bit
-      bit_offset: 8
-      bit_size: 1
-    - name: WAITPOL
-      description: Wait signal polarity bit
-      bit_offset: 9
-      bit_size: 1
-      enum: WAITPOL
-    - name: WAITCFG
-      description: Wait timing configuration
-      bit_offset: 11
-      bit_size: 1
-      enum: WAITCFG
-    - name: WREN
-      description: Write enable bit
-      bit_offset: 12
-      bit_size: 1
-    - name: WAITEN
-      description: Wait enable bit
-      bit_offset: 13
-      bit_size: 1
-    - name: EXTMOD
-      description: Extended mode enable
-      bit_offset: 14
-      bit_size: 1
-    - name: ASYNCWAIT
-      description: Wait signal during asynchronous transfers
-      bit_offset: 15
-      bit_size: 1
-    - name: CPSIZE
-      description: CRAM page size
-      bit_offset: 16
-      bit_size: 3
-      enum: CPSIZE
-    - name: CBURSTRW
-      description: Write burst enable
-      bit_offset: 19
-      bit_size: 1
-    - name: NBLSET
-      description: Byte lane (NBL) setup
-      bit_offset: 22
-      bit_size: 2
+  - name: MBKEN
+    description: Memory bank enable bit
+    bit_offset: 0
+    bit_size: 1
+  - name: MUXEN
+    description: Address/data multiplexing enable bit
+    bit_offset: 1
+    bit_size: 1
+  - name: MTYP
+    description: Memory type
+    bit_offset: 2
+    bit_size: 2
+    enum: MTYP
+  - name: MWID
+    description: Memory data bus width
+    bit_offset: 4
+    bit_size: 2
+    enum: MWID
+  - name: FACCEN
+    description: Flash access enable
+    bit_offset: 6
+    bit_size: 1
+  - name: BURSTEN
+    description: Burst enable bit
+    bit_offset: 8
+    bit_size: 1
+  - name: WAITPOL
+    description: Wait signal polarity bit
+    bit_offset: 9
+    bit_size: 1
+    enum: WAITPOL
+  - name: WAITCFG
+    description: Wait timing configuration
+    bit_offset: 11
+    bit_size: 1
+    enum: WAITCFG
+  - name: WREN
+    description: Write enable bit
+    bit_offset: 12
+    bit_size: 1
+  - name: WAITEN
+    description: Wait enable bit
+    bit_offset: 13
+    bit_size: 1
+  - name: EXTMOD
+    description: Extended mode enable
+    bit_offset: 14
+    bit_size: 1
+  - name: ASYNCWAIT
+    description: Wait signal during asynchronous transfers
+    bit_offset: 15
+    bit_size: 1
+  - name: CPSIZE
+    description: CRAM page size
+    bit_offset: 16
+    bit_size: 3
+    enum: CPSIZE
+  - name: CBURSTRW
+    description: Write burst enable
+    bit_offset: 19
+    bit_size: 1
+  - name: NBLSET
+    description: Byte lane (NBL) setup
+    bit_offset: 22
+    bit_size: 2
 fieldset/BCR1:
  description: SRAM/NOR-Flash chip-select control register 1
  fields:
-    - name: MBKEN
-      description: Memory bank enable bit
-      bit_offset: 0
-      bit_size: 1
-    - name: MUXEN
-      description: Address/data multiplexing enable bit
-      bit_offset: 1
-      bit_size: 1
-    - name: MTYP
-      description: Memory type
-      bit_offset: 2
-      bit_size: 2
-      enum: MTYP
-    - name: MWID
-      description: Memory data bus width
-      bit_offset: 4
-      bit_size: 2
-      enum: MWID
-    - name: FACCEN
-      description: Flash access enable
-      bit_offset: 6
-      bit_size: 1
-    - name: BURSTEN
-      description: Burst enable bit
-      bit_offset: 8
-      bit_size: 1
-    - name: WAITPOL
-      description: Wait signal polarity bit
-      bit_offset: 9
-      bit_size: 1
-      enum: WAITPOL
-    - name: WAITCFG
-      description: Wait timing configuration
-      bit_offset: 11
-      bit_size: 1
-      enum: WAITCFG
-    - name: WREN
-      description: Write enable bit
-      bit_offset: 12
-      bit_size: 1
-    - name: WAITEN
-      description: Wait enable bit
-      bit_offset: 13
-      bit_size: 1
-    - name: EXTMOD
-      description: Extended mode enable
-      bit_offset: 14
-      bit_size: 1
-    - name: ASYNCWAIT
-      description: Wait signal during asynchronous transfers
-      bit_offset: 15
-      bit_size: 1
-    - name: CPSIZE
-      description: CRAM page size
-      bit_offset: 16
-      bit_size: 3
-      enum: CPSIZE
-    - name: CBURSTRW
-      description: Write burst enable
-      bit_offset: 19
-      bit_size: 1
-    - name: CCLKEN
-      description: Continuous clock enable
-      bit_offset: 20
-      bit_size: 1
-    - name: WFDIS
-      description: Write FIFO disable
-      bit_offset: 21
-      bit_size: 1
-    - name: NBLSET
-      description: Byte lane (NBL) setup
-      bit_offset: 22
-      bit_size: 2
-    - name: FMCEN
-      description: FMC controller enable
-      bit_offset: 31
-      bit_size: 1
+  - name: MBKEN
+    description: Memory bank enable bit
+    bit_offset: 0
+    bit_size: 1
+  - name: MUXEN
+    description: Address/data multiplexing enable bit
+    bit_offset: 1
+    bit_size: 1
+  - name: MTYP
+    description: Memory type
+    bit_offset: 2
+    bit_size: 2
+    enum: MTYP
+  - name: MWID
+    description: Memory data bus width
+    bit_offset: 4
+    bit_size: 2
+    enum: MWID
+  - name: FACCEN
+    description: Flash access enable
+    bit_offset: 6
+    bit_size: 1
+  - name: BURSTEN
+    description: Burst enable bit
+    bit_offset: 8
+    bit_size: 1
+  - name: WAITPOL
+    description: Wait signal polarity bit
+    bit_offset: 9
+    bit_size: 1
+    enum: WAITPOL
+  - name: WAITCFG
+    description: Wait timing configuration
+    bit_offset: 11
+    bit_size: 1
+    enum: WAITCFG
+  - name: WREN
+    description: Write enable bit
+    bit_offset: 12
+    bit_size: 1
+  - name: WAITEN
+    description: Wait enable bit
+    bit_offset: 13
+    bit_size: 1
+  - name: EXTMOD
+    description: Extended mode enable
+    bit_offset: 14
+    bit_size: 1
+  - name: ASYNCWAIT
+    description: Wait signal during asynchronous transfers
+    bit_offset: 15
+    bit_size: 1
+  - name: CPSIZE
+    description: CRAM page size
+    bit_offset: 16
+    bit_size: 3
+    enum: CPSIZE
+  - name: CBURSTRW
+    description: Write burst enable
+    bit_offset: 19
+    bit_size: 1
+  - name: CCLKEN
+    description: Continuous clock enable
+    bit_offset: 20
+    bit_size: 1
+  - name: WFDIS
+    description: Write FIFO disable
+    bit_offset: 21
+    bit_size: 1
+  - name: NBLSET
+    description: Byte lane (NBL) setup
+    bit_offset: 22
+    bit_size: 2
+  - name: FMCEN
+    description: FMC controller enable
+    bit_offset: 31
+    bit_size: 1
 fieldset/BTR:
  description: SRAM/NOR-Flash chip-select timing register
  fields:
-    - name: ADDSET
-      description: Address setup phase duration
-      bit_offset: 0
-      bit_size: 4
-    - name: ADDHLD
-      description: Address-hold phase duration
-      bit_offset: 4
-      bit_size: 4
-    - name: DATAST
-      description: Data-phase duration
-      bit_offset: 8
-      bit_size: 8
-    - name: BUSTURN
-      description: Bus turnaround phase duration
-      bit_offset: 16
-      bit_size: 4
-    - name: CLKDIV
-      description: Clock divide ratio (for FMC_CLK signal)
-      bit_offset: 20
-      bit_size: 4
-    - name: DATLAT
-      description: Data latency for synchronous memory
-      bit_offset: 24
-      bit_size: 4
-    - name: ACCMOD
-      description: Access mode
-      bit_offset: 28
-      bit_size: 2
-      enum: ACCMOD
-    - name: DATAHLD
-      description: Data hold phase duration
-      bit_offset: 30
-      bit_size: 2
+  - name: ADDSET
+    description: Address setup phase duration
+    bit_offset: 0
+    bit_size: 4
+  - name: ADDHLD
+    description: Address-hold phase duration
+    bit_offset: 4
+    bit_size: 4
+  - name: DATAST
+    description: Data-phase duration
+    bit_offset: 8
+    bit_size: 8
+  - name: BUSTURN
+    description: Bus turnaround phase duration
+    bit_offset: 16
+    bit_size: 4
+  - name: CLKDIV
+    description: Clock divide ratio (for FMC_CLK signal)
+    bit_offset: 20
+    bit_size: 4
+  - name: DATLAT
+    description: Data latency for synchronous memory
+    bit_offset: 24
+    bit_size: 4
+  - name: ACCMOD
+    description: Access mode
+    bit_offset: 28
+    bit_size: 2
+    enum: ACCMOD
+  - name: DATAHLD
+    description: Data hold phase duration
+    bit_offset: 30
+    bit_size: 2
 fieldset/BWTR:
  description: SRAM/NOR-Flash write timing registers
  fields:
-    - name: ADDSET
-      description: Address setup phase duration
-      bit_offset: 0
-      bit_size: 4
-    - name: ADDHLD
-      description: Address-hold phase duration
-      bit_offset: 4
-      bit_size: 4
-    - name: DATAST
-      description: Data-phase duration
-      bit_offset: 8
-      bit_size: 8
-    - name: BUSTURN
-      description: Bus turnaround phase duration
-      bit_offset: 16
-      bit_size: 4
-    - name: ACCMOD
-      description: Access mode
-      bit_offset: 28
-      bit_size: 2
-      enum: ACCMOD
-    - name: DATAHLD
-      description: Data hold phase duration
-      bit_offset: 30
-      bit_size: 2
+  - name: ADDSET
+    description: Address setup phase duration
+    bit_offset: 0
+    bit_size: 4
+  - name: ADDHLD
+    description: Address-hold phase duration
+    bit_offset: 4
+    bit_size: 4
+  - name: DATAST
+    description: Data-phase duration
+    bit_offset: 8
+    bit_size: 8
+  - name: BUSTURN
+    description: Bus turnaround phase duration
+    bit_offset: 16
+    bit_size: 4
+  - name: ACCMOD
+    description: Access mode
+    bit_offset: 28
+    bit_size: 2
+    enum: ACCMOD
+  - name: DATAHLD
+    description: Data hold phase duration
+    bit_offset: 30
+    bit_size: 2
 fieldset/ECCR:
  description: ECC result register
  fields:
-    - name: ECC
-      description: ECC computation result value
-      bit_offset: 0
-      bit_size: 32
+  - name: ECC
+    description: ECC computation result value
+    bit_offset: 0
+    bit_size: 32
 fieldset/PATT:
  description: Attribute memory space timing register
  fields:
-    - name: ATTSET
-      description: Attribute memory setup time
-      bit_offset: 0
-      bit_size: 8
-    - name: ATTWAIT
-      description: Attribute memory wait time
-      bit_offset: 8
-      bit_size: 8
-    - name: ATTHOLD
-      description: Attribute memory hold time
-      bit_offset: 16
-      bit_size: 8
-    - name: ATTHIZ
-      description: Attribute memory data bus Hi-Z time
-      bit_offset: 24
-      bit_size: 8
+  - name: ATTSET
+    description: Attribute memory setup time
+    bit_offset: 0
+    bit_size: 8
+  - name: ATTWAIT
+    description: Attribute memory wait time
+    bit_offset: 8
+    bit_size: 8
+  - name: ATTHOLD
+    description: Attribute memory hold time
+    bit_offset: 16
+    bit_size: 8
+  - name: ATTHIZ
+    description: Attribute memory data bus Hi-Z time
+    bit_offset: 24
+    bit_size: 8
 fieldset/PCR:
  description: PC Card/NAND Flash control register
  fields:
-    - name: PWAITEN
-      description: Wait feature enable bit
-      bit_offset: 1
-      bit_size: 1
-    - name: PBKEN
-      description: NAND Flash memory bank enable bit
-      bit_offset: 2
-      bit_size: 1
-    - name: PTYP
-      description: Memory type
-      bit_offset: 3
-      bit_size: 1
-      enum: PTYP
-    - name: PWID
-      description: Data bus width
-      bit_offset: 4
-      bit_size: 2
-      enum: PWID
-    - name: ECCEN
-      description: ECC computation logic enable bit
-      bit_offset: 6
-      bit_size: 1
-    - name: TCLR
-      description: CLE to RE delay
-      bit_offset: 9
-      bit_size: 4
-    - name: TAR
-      description: ALE to RE delay
-      bit_offset: 13
-      bit_size: 4
-    - name: ECCPS
-      description: ECC page size
-      bit_offset: 17
-      bit_size: 3
-      enum: ECCPS
+  - name: PWAITEN
+    description: Wait feature enable bit
+    bit_offset: 1
+    bit_size: 1
+  - name: PBKEN
+    description: NAND Flash memory bank enable bit
+    bit_offset: 2
+    bit_size: 1
+  - name: PTYP
+    description: Memory type
+    bit_offset: 3
+    bit_size: 1
+    enum: PTYP
+  - name: PWID
+    description: Data bus width
+    bit_offset: 4
+    bit_size: 2
+    enum: PWID
+  - name: ECCEN
+    description: ECC computation logic enable bit
+    bit_offset: 6
+    bit_size: 1
+  - name: TCLR
+    description: CLE to RE delay
+    bit_offset: 9
+    bit_size: 4
+  - name: TAR
+    description: ALE to RE delay
+    bit_offset: 13
+    bit_size: 4
+  - name: ECCPS
+    description: ECC page size
+    bit_offset: 17
+    bit_size: 3
+    enum: ECCPS
 fieldset/PCSCNTR:
  description: PSRAM chip select counter register
  fields:
-    - name: CSCOUNT
-      description: Chip select counter
-      bit_offset: 0
-      bit_size: 16
-    - name: CNTB1EN
-      description: Counter Bank 1 enable
-      bit_offset: 16
-      bit_size: 1
-    - name: CNTB2EN
-      description: Counter Bank 2 enable
-      bit_offset: 17
-      bit_size: 1
-    - name: CNTB3EN
-      description: Counter Bank 3 enable
-      bit_offset: 18
-      bit_size: 1
-    - name: CNTB4EN
-      description: Counter Bank 4 enable
-      bit_offset: 19
-      bit_size: 1
+  - name: CSCOUNT
+    description: Chip select counter
+    bit_offset: 0
+    bit_size: 16
+  - name: CNTB1EN
+    description: Counter Bank 1 enable
+    bit_offset: 16
+    bit_size: 1
+  - name: CNTB2EN
+    description: Counter Bank 2 enable
+    bit_offset: 17
+    bit_size: 1
+  - name: CNTB3EN
+    description: Counter Bank 3 enable
+    bit_offset: 18
+    bit_size: 1
+  - name: CNTB4EN
+    description: Counter Bank 4 enable
+    bit_offset: 19
+    bit_size: 1
 fieldset/PMEM:
  description: Common memory space timing register
  fields:
-    - name: MEMSET
-      description: Common memory x setup time
-      bit_offset: 0
-      bit_size: 8
-    - name: MEMWAIT
-      description: Common memory wait time
-      bit_offset: 8
-      bit_size: 8
-    - name: MEMHOLD
-      description: Common memory hold time
-      bit_offset: 16
-      bit_size: 8
-    - name: MEMHIZ
-      description: Common memory x data bus Hi-Z time
-      bit_offset: 24
-      bit_size: 8
+  - name: MEMSET
+    description: Common memory x setup time
+    bit_offset: 0
+    bit_size: 8
+  - name: MEMWAIT
+    description: Common memory wait time
+    bit_offset: 8
+    bit_size: 8
+  - name: MEMHOLD
+    description: Common memory hold time
+    bit_offset: 16
+    bit_size: 8
+  - name: MEMHIZ
+    description: Common memory x data bus Hi-Z time
+    bit_offset: 24
+    bit_size: 8
 fieldset/SR:
  description: FIFO status and interrupt register
  fields:
-    - name: IRS
-      description: Interrupt rising edge status
-      bit_offset: 0
-      bit_size: 1
-    - name: ILS
-      description: Interrupt high-level status
-      bit_offset: 1
-      bit_size: 1
-    - name: IFS
-      description: Interrupt falling edge status
-      bit_offset: 2
-      bit_size: 1
-    - name: IREN
-      description: Interrupt rising edge detection enable bit
-      bit_offset: 3
-      bit_size: 1
-    - name: ILEN
-      description: Interrupt high-level detection enable bit
-      bit_offset: 4
-      bit_size: 1
-    - name: IFEN
-      description: Interrupt falling edge detection enable bit
-      bit_offset: 5
-      bit_size: 1
-    - name: FEMPT
-      description: FIFO empty status
-      bit_offset: 6
-      bit_size: 1
+  - name: IRS
+    description: Interrupt rising edge status
+    bit_offset: 0
+    bit_size: 1
+  - name: ILS
+    description: Interrupt high-level status
+    bit_offset: 1
+    bit_size: 1
+  - name: IFS
+    description: Interrupt falling edge status
+    bit_offset: 2
+    bit_size: 1
+  - name: IREN
+    description: Interrupt rising edge detection enable bit
+    bit_offset: 3
+    bit_size: 1
+  - name: ILEN
+    description: Interrupt high-level detection enable bit
+    bit_offset: 4
+    bit_size: 1
+  - name: IFEN
+    description: Interrupt falling edge detection enable bit
+    bit_offset: 5
+    bit_size: 1
+  - name: FEMPT
+    description: FIFO empty status
+    bit_offset: 6
+    bit_size: 1
 enum/ACCMOD:
  bit_size: 2
  variants:
-    - name: A
-      description: Access mode A
-      value: 0
-    - name: B
-      description: Access mode B
-      value: 1
-    - name: C
-      description: Access mode C
-      value: 2
-    - name: D
-      description: Access mode D
-      value: 3
+  - name: A
+    description: Access mode A
+    value: 0
+  - name: B
+    description: Access mode B
+    value: 1
+  - name: C
+    description: Access mode C
+    value: 2
+  - name: D
+    description: Access mode D
+    value: 3
 enum/CPSIZE:
  bit_size: 3
  variants:
-    - name: NoBurstSplit
-      description: No burst split when crossing page boundary
-      value: 0
-    - name: Bytes128
-      description: 128 bytes CRAM page size
-      value: 1
-    - name: Bytes256
-      description: 256 bytes CRAM page size
-      value: 2
-    - name: Bytes512
-      description: 512 bytes CRAM page size
-      value: 3
-    - name: Bytes1024
-      description: 1024 bytes CRAM page size
-      value: 4
+  - name: NoBurstSplit
+    description: No burst split when crossing page boundary
+    value: 0
+  - name: Bytes128
+    description: 128 bytes CRAM page size
+    value: 1
+  - name: Bytes256
+    description: 256 bytes CRAM page size
+    value: 2
+  - name: Bytes512
+    description: 512 bytes CRAM page size
+    value: 3
+  - name: Bytes1024
+    description: 1024 bytes CRAM page size
+    value: 4
 enum/ECCPS:
  bit_size: 3
  variants:
-    - name: Bytes256
-      description: ECC page size 256 bytes
-      value: 0
-    - name: Bytes512
-      description: ECC page size 512 bytes
-      value: 1
-    - name: Bytes1024
-      description: ECC page size 1024 bytes
-      value: 2
-    - name: Bytes2048
-      description: ECC page size 2048 bytes
-      value: 3
-    - name: Bytes4096
-      description: ECC page size 4096 bytes
-      value: 4
-    - name: Bytes8192
-      description: ECC page size 8192 bytes
-      value: 5
+  - name: Bytes256
+    description: ECC page size 256 bytes
+    value: 0
+  - name: Bytes512
+    description: ECC page size 512 bytes
+    value: 1
+  - name: Bytes1024
+    description: ECC page size 1024 bytes
+    value: 2
+  - name: Bytes2048
+    description: ECC page size 2048 bytes
+    value: 3
+  - name: Bytes4096
+    description: ECC page size 4096 bytes
+    value: 4
+  - name: Bytes8192
+    description: ECC page size 8192 bytes
+    value: 5
 enum/MTYP:
  bit_size: 2
  variants:
-    - name: SRAM
-      description: SRAM memory type
-      value: 0
-    - name: PSRAM
-      description: PSRAM (CRAM) memory type
-      value: 1
-    - name: Flash
-      description: NOR Flash/OneNAND Flash
-      value: 2
+  - name: SRAM
+    description: SRAM memory type
+    value: 0
+  - name: PSRAM
+    description: PSRAM (CRAM) memory type
+    value: 1
+  - name: Flash
+    description: NOR Flash/OneNAND Flash
+    value: 2
 enum/MWID:
  bit_size: 2
  variants:
-    - name: Bits8
-      description: Memory data bus width 8 bits
-      value: 0
-    - name: Bits16
-      description: Memory data bus width 16 bits
-      value: 1
-    - name: Bits32
-      description: Memory data bus width 32 bits
-      value: 2
+  - name: Bits8
+    description: Memory data bus width 8 bits
+    value: 0
+  - name: Bits16
+    description: Memory data bus width 16 bits
+    value: 1
+  - name: Bits32
+    description: Memory data bus width 32 bits
+    value: 2
 enum/PTYP:
  bit_size: 1
  variants:
-    - name: NANDFlash
-      description: NAND Flash
-      value: 1
+  - name: NANDFlash
+    description: NAND Flash
+    value: 1
 enum/PWID:
  bit_size: 2
  variants:
-    - name: Bits8
-      description: External memory device width 8 bits
-      value: 0
-    - name: Bits16
-      description: External memory device width 16 bits
-      value: 1
+  - name: Bits8
+    description: External memory device width 8 bits
+    value: 0
+  - name: Bits16
+    description: External memory device width 16 bits
+    value: 1
 enum/WAITCFG:
  bit_size: 1
  variants:
-    - name: BeforeWaitState
-      description: NWAIT signal is active one data cycle before wait state
-      value: 0
-    - name: DuringWaitState
-      description: NWAIT signal is active during wait state
-      value: 1
+  - name: BeforeWaitState
+    description: NWAIT signal is active one data cycle before wait state
+    value: 0
+  - name: DuringWaitState
+    description: NWAIT signal is active during wait state
+    value: 1
 enum/WAITPOL:
  bit_size: 1
  variants:
-    - name: ActiveLow
-      description: NWAIT active low
-      value: 0
-    - name: ActiveHigh
-      description: NWAIT active high
-      value: 1
+  - name: ActiveLow
+    description: NWAIT active low
+    value: 0
+  - name: ActiveHigh
+    description: NWAIT active high
+    value: 1
--- a/data/registers/gpdma_v1.yaml
+++ b/data/registers/gpdma_v1.yaml
--- a/data/registers/gpio_v1.yaml
+++ b/data/registers/gpio_v1.yaml
@ -1,204 +1,203 @@
---
 block/GPIO:
  description: General purpose I/O
  items:
-    - name: CR
-      description: Port configuration register low (GPIOn_CRL)
-      array:
-        len: 2
-        stride: 4
-      byte_offset: 0
-      fieldset: CR
-    - name: IDR
-      description: Port input data register (GPIOn_IDR)
-      byte_offset: 8
-      access: Read
-      fieldset: IDR
-    - name: ODR
-      description: Port output data register (GPIOn_ODR)
-      byte_offset: 12
-      fieldset: ODR
-    - name: BSRR
-      description: Port bit set/reset register (GPIOn_BSRR)
-      byte_offset: 16
-      access: Write
-      fieldset: BSRR
-    - name: BRR
-      description: Port bit reset register (GPIOn_BRR)
-      byte_offset: 20
-      access: Write
-      fieldset: BRR
-    - name: LCKR
-      description: Port configuration lock register
-      byte_offset: 24
-      fieldset: LCKR
+  - name: CR
+    description: Port configuration register low (GPIOn_CRL)
+    array:
+      len: 2
+      stride: 4
+    byte_offset: 0
+    fieldset: CR
+  - name: IDR
+    description: Port input data register (GPIOn_IDR)
+    byte_offset: 8
+    access: Read
+    fieldset: IDR
+  - name: ODR
+    description: Port output data register (GPIOn_ODR)
+    byte_offset: 12
+    fieldset: ODR
+  - name: BSRR
+    description: Port bit set/reset register (GPIOn_BSRR)
+    byte_offset: 16
+    access: Write
+    fieldset: BSRR
+  - name: BRR
+    description: Port bit reset register (GPIOn_BRR)
+    byte_offset: 20
+    access: Write
+    fieldset: BRR
+  - name: LCKR
+    description: Port configuration lock register
+    byte_offset: 24
+    fieldset: LCKR
 fieldset/BRR:
  description: Port bit reset register (GPIOn_BRR)
  fields:
-    - name: BR
-      description: Reset bit
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 16
-        stride: 1
+  - name: BR
+    description: Reset bit
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 16
+      stride: 1
 fieldset/BSRR:
  description: Port bit set/reset register (GPIOn_BSRR)
  fields:
-    - name: BS
-      description: Set bit
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 16
-        stride: 1
-    - name: BR
-      description: Reset bit
-      bit_offset: 16
-      bit_size: 1
-      array:
-        len: 16
-        stride: 1
+  - name: BS
+    description: Set bit
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 16
+      stride: 1
+  - name: BR
+    description: Reset bit
+    bit_offset: 16
+    bit_size: 1
+    array:
+      len: 16
+      stride: 1
 fieldset/CR:
  description: Port configuration register (GPIOn_CRx)
  fields:
-    - name: MODE
-      description: Port n mode bits
-      bit_offset: 0
-      bit_size: 2
-      array:
-        len: 8
-        stride: 4
-      enum: MODE
-    - name: CNF_IN
-      description: "Port n configuration bits, for input mode"
-      bit_offset: 2
-      bit_size: 2
-      array:
-        len: 8
-        stride: 4
-      enum: CNF_IN
-    - name: CNF_OUT
-      description: "Port n configuration bits, for output mode"
-      bit_offset: 2
-      bit_size: 2
-      array:
-        len: 8
-        stride: 4
-      enum: CNF_OUT
+  - name: MODE
+    description: Port n mode bits
+    bit_offset: 0
+    bit_size: 2
+    array:
+      len: 8
+      stride: 4
+    enum: MODE
+  - name: CNF_IN
+    description: Port n configuration bits, for input mode
+    bit_offset: 2
+    bit_size: 2
+    array:
+      len: 8
+      stride: 4
+    enum: CNF_IN
+  - name: CNF_OUT
+    description: Port n configuration bits, for output mode
+    bit_offset: 2
+    bit_size: 2
+    array:
+      len: 8
+      stride: 4
+    enum: CNF_OUT
 fieldset/IDR:
  description: Port input data register (GPIOn_IDR)
  fields:
-    - name: IDR
-      description: Port input data
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 16
-        stride: 1
-      enum: IDR
+  - name: IDR
+    description: Port input data
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 16
+      stride: 1
+    enum: IDR
 fieldset/LCKR:
  description: Port configuration lock register
  fields:
-    - name: LCK
-      description: Port A Lock bit
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 16
-        stride: 1
-      enum: LCK
-    - name: LCKK
-      description: Lock key
-      bit_offset: 16
-      bit_size: 1
-      enum: LCKK
+  - name: LCK
+    description: Port A Lock bit
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 16
+      stride: 1
+    enum: LCK
+  - name: LCKK
+    description: Lock key
+    bit_offset: 16
+    bit_size: 1
+    enum: LCKK
 fieldset/ODR:
  description: Port output data register (GPIOn_ODR)
  fields:
-    - name: ODR
-      description: Port output data
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 16
-        stride: 1
-      enum: ODR
+  - name: ODR
+    description: Port output data
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 16
+      stride: 1
+    enum: ODR
 enum/CNF_IN:
  bit_size: 2
  variants:
-    - name: Analog
-      description: Analog mode
-      value: 0
-    - name: Floating
-      description: Floating input (reset state)
-      value: 1
-    - name: Pull
-      description: Input with pull-up/pull-down
-      value: 2
+  - name: Analog
+    description: Analog mode
+    value: 0
+  - name: Floating
+    description: Floating input (reset state)
+    value: 1
+  - name: Pull
+    description: Input with pull-up/pull-down
+    value: 2
 enum/CNF_OUT:
  bit_size: 2
  variants:
-    - name: PushPull
-      description: Push-Pull mode
-      value: 0
-    - name: OpenDrain
-      description: Open Drain-Mode
-      value: 1
-    - name: AltPushPull
-      description: Alternate Function Push-Pull Mode
-      value: 2
-    - name: AltOpenDrain
-      description: Alternate Function Open-Drain Mode
-      value: 3
+  - name: PushPull
+    description: Push-Pull mode
+    value: 0
+  - name: OpenDrain
+    description: Open Drain-Mode
+    value: 1
+  - name: AltPushPull
+    description: Alternate Function Push-Pull Mode
+    value: 2
+  - name: AltOpenDrain
+    description: Alternate Function Open-Drain Mode
+    value: 3
 enum/IDR:
  bit_size: 1
  variants:
-    - name: Low
-      description: Input is logic low
-      value: 0
-    - name: High
-      description: Input is logic high
-      value: 1
+  - name: Low
+    description: Input is logic low
+    value: 0
+  - name: High
+    description: Input is logic high
+    value: 1
 enum/LCK:
  bit_size: 1
  variants:
-    - name: Unlocked
-      description: Port configuration not locked
-      value: 0
-    - name: Locked
-      description: Port configuration locked
-      value: 1
+  - name: Unlocked
+    description: Port configuration not locked
+    value: 0
+  - name: Locked
+    description: Port configuration locked
+    value: 1
 enum/LCKK:
  bit_size: 1
  variants:
-    - name: NotActive
-      description: Port configuration lock key not active
-      value: 0
-    - name: Active
-      description: Port configuration lock key active
-      value: 1
+  - name: NotActive
+    description: Port configuration lock key not active
+    value: 0
+  - name: Active
+    description: Port configuration lock key active
+    value: 1
 enum/MODE:
  bit_size: 2
  variants:
-    - name: Input
-      description: Input mode (reset state)
-      value: 0
-    - name: Output10Mhz
-      description: Output mode 10 MHz
-      value: 1
-    - name: Output2Mhz
-      description: Output mode 2 MHz
-      value: 2
-    - name: Output50Mhz
-      description: Output mode 50 MHz
-      value: 3
+  - name: Input
+    description: Input mode (reset state)
+    value: 0
+  - name: Output10Mhz
+    description: Output mode 10 MHz
+    value: 1
+  - name: Output2Mhz
+    description: Output mode 2 MHz
+    value: 2
+  - name: Output50Mhz
+    description: Output mode 50 MHz
+    value: 3
 enum/ODR:
  bit_size: 1
  variants:
-    - name: Low
-      description: Set output to logic low
-      value: 0
-    - name: High
-      description: Set output to logic high
-      value: 1
+  - name: Low
+    description: Set output to logic low
+    value: 0
+  - name: High
+    description: Set output to logic high
+    value: 1
--- a/data/registers/gpio_v2.yaml
+++ b/data/registers/gpio_v2.yaml
@ -1,241 +1,240 @@
---
 block/GPIO:
  description: General-purpose I/Os
  items:
-    - name: MODER
-      description: GPIO port mode register
-      byte_offset: 0
-      fieldset: MODER
-    - name: OTYPER
-      description: GPIO port output type register
-      byte_offset: 4
-      fieldset: OTYPER
-    - name: OSPEEDR
-      description: GPIO port output speed register
-      byte_offset: 8
-      fieldset: OSPEEDR
-    - name: PUPDR
-      description: GPIO port pull-up/pull-down register
-      byte_offset: 12
-      fieldset: PUPDR
-    - name: IDR
-      description: GPIO port input data register
-      byte_offset: 16
-      access: Read
-      fieldset: IDR
-    - name: ODR
-      description: GPIO port output data register
-      byte_offset: 20
-      fieldset: ODR
-    - name: BSRR
-      description: GPIO port bit set/reset register
-      byte_offset: 24
-      access: Write
-      fieldset: BSRR
-    - name: LCKR
-      description: GPIO port configuration lock register
-      byte_offset: 28
-      fieldset: LCKR
-    - name: AFR
-      description: "GPIO alternate function registers. The register described in the datasheet as AFRL is index 0 in this array, and AFRH is index 1. Note that when operating on AFRH, you need to subtract 8 from any operations on the field array it contains -- the alternate function for pin 9 is at index 1, for instance."
-      array:
-        len: 2
-        stride: 4
-      byte_offset: 32
-      fieldset: AFR
+  - name: MODER
+    description: GPIO port mode register
+    byte_offset: 0
+    fieldset: MODER
+  - name: OTYPER
+    description: GPIO port output type register
+    byte_offset: 4
+    fieldset: OTYPER
+  - name: OSPEEDR
+    description: GPIO port output speed register
+    byte_offset: 8
+    fieldset: OSPEEDR
+  - name: PUPDR
+    description: GPIO port pull-up/pull-down register
+    byte_offset: 12
+    fieldset: PUPDR
+  - name: IDR
+    description: GPIO port input data register
+    byte_offset: 16
+    access: Read
+    fieldset: IDR
+  - name: ODR
+    description: GPIO port output data register
+    byte_offset: 20
+    fieldset: ODR
+  - name: BSRR
+    description: GPIO port bit set/reset register
+    byte_offset: 24
+    access: Write
+    fieldset: BSRR
+  - name: LCKR
+    description: GPIO port configuration lock register
+    byte_offset: 28
+    fieldset: LCKR
+  - name: AFR
+    description: GPIO alternate function registers. The register described in the datasheet as AFRL is index 0 in this array, and AFRH is index 1. Note that when operating on AFRH, you need to subtract 8 from any operations on the field array it contains -- the alternate function for pin 9 is at index 1, for instance.
+    array:
+      len: 2
+      stride: 4
+    byte_offset: 32
+    fieldset: AFR
 fieldset/AFR:
-  description: "GPIO alternate function register. This contains an array of 8 fields, which correspond to pins 0-7 of the port (for AFRL) or pins 8-15 of the port (for AFRH)."
+  description: GPIO alternate function register. This contains an array of 8 fields, which correspond to pins 0-7 of the port (for AFRL) or pins 8-15 of the port (for AFRH).
  fields:
-    - name: AFR
-      description: Alternate function selection for one of the pins controlled by this register (0-7).
-      bit_offset: 0
-      bit_size: 4
-      array:
-        len: 8
-        stride: 4
+  - name: AFR
+    description: Alternate function selection for one of the pins controlled by this register (0-7).
+    bit_offset: 0
+    bit_size: 4
+    array:
+      len: 8
+      stride: 4
 fieldset/BSRR:
  description: GPIO port bit set/reset register
  fields:
-    - name: BS
-      description: Port x set bit y (y= 0..15)
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 16
-        stride: 1
-    - name: BR
-      description: Port x set bit y (y= 0..15)
-      bit_offset: 16
-      bit_size: 1
-      array:
-        len: 16
-        stride: 1
+  - name: BS
+    description: Port x set bit y (y= 0..15)
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 16
+      stride: 1
+  - name: BR
+    description: Port x set bit y (y= 0..15)
+    bit_offset: 16
+    bit_size: 1
+    array:
+      len: 16
+      stride: 1
 fieldset/IDR:
  description: GPIO port input data register
  fields:
-    - name: IDR
-      description: Port input data (y = 0..15)
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 16
-        stride: 1
-      enum: IDR
+  - name: IDR
+    description: Port input data (y = 0..15)
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 16
+      stride: 1
+    enum: IDR
 fieldset/LCKR:
  description: GPIO port configuration lock register
  fields:
-    - name: LCK
-      description: Port x lock bit y (y= 0..15)
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 16
-        stride: 1
-      enum: LCK
-    - name: LCKK
-      description: Port x lock bit y (y= 0..15)
-      bit_offset: 16
-      bit_size: 1
-      enum: LCKK
+  - name: LCK
+    description: Port x lock bit y (y= 0..15)
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 16
+      stride: 1
+    enum: LCK
+  - name: LCKK
+    description: Port x lock bit y (y= 0..15)
+    bit_offset: 16
+    bit_size: 1
+    enum: LCKK
 fieldset/MODER:
  description: GPIO port mode register
  fields:
-    - name: MODER
-      description: Port x configuration bits (y = 0..15)
-      bit_offset: 0
-      bit_size: 2
-      array:
-        len: 16
-        stride: 2
-      enum: MODER
+  - name: MODER
+    description: Port x configuration bits (y = 0..15)
+    bit_offset: 0
+    bit_size: 2
+    array:
+      len: 16
+      stride: 2
+    enum: MODER
 fieldset/ODR:
  description: GPIO port output data register
  fields:
-    - name: ODR
-      description: Port output data (y = 0..15)
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 16
-        stride: 1
-      enum: ODR
+  - name: ODR
+    description: Port output data (y = 0..15)
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 16
+      stride: 1
+    enum: ODR
 fieldset/OSPEEDR:
  description: GPIO port output speed register
  fields:
-    - name: OSPEEDR
-      description: Port x configuration bits (y = 0..15)
-      bit_offset: 0
-      bit_size: 2
-      array:
-        len: 16
-        stride: 2
-      enum: OSPEEDR
+  - name: OSPEEDR
+    description: Port x configuration bits (y = 0..15)
+    bit_offset: 0
+    bit_size: 2
+    array:
+      len: 16
+      stride: 2
+    enum: OSPEEDR
 fieldset/OTYPER:
  description: GPIO port output type register
  fields:
-    - name: OT
-      description: Port x configuration bits (y = 0..15)
-      bit_offset: 0
-      bit_size: 1
-      array:
-        len: 16
-        stride: 1
-      enum: OT
+  - name: OT
+    description: Port x configuration bits (y = 0..15)
+    bit_offset: 0
+    bit_size: 1
+    array:
+      len: 16
+      stride: 1
+    enum: OT
 fieldset/PUPDR:
  description: GPIO port pull-up/pull-down register
  fields:
-    - name: PUPDR
-      description: Port x configuration bits (y = 0..15)
-      bit_offset: 0
-      bit_size: 2
-      array:
-        len: 16
-        stride: 2
-      enum: PUPDR
+  - name: PUPDR
+    description: Port x configuration bits (y = 0..15)
+    bit_offset: 0
+    bit_size: 2
+    array:
+      len: 16
+      stride: 2
+    enum: PUPDR
 enum/IDR:
  bit_size: 1
  variants:
-    - name: Low
-      description: Input is logic low
-      value: 0
-    - name: High
-      description: Input is logic high
-      value: 1
+  - name: Low
+    description: Input is logic low
+    value: 0
+  - name: High
+    description: Input is logic high
+    value: 1
 enum/LCK:
  bit_size: 1
  variants:
-    - name: Unlocked
-      description: Port configuration not locked
-      value: 0
-    - name: Locked
-      description: Port configuration locked
-      value: 1
+  - name: Unlocked
+    description: Port configuration not locked
+    value: 0
+  - name: Locked
+    description: Port configuration locked
+    value: 1
 enum/LCKK:
  bit_size: 1
  variants:
-    - name: NotActive
-      description: Port configuration lock key not active
-      value: 0
-    - name: Active
-      description: Port configuration lock key active
-      value: 1
+  - name: NotActive
+    description: Port configuration lock key not active
+    value: 0
+  - name: Active
+    description: Port configuration lock key active
+    value: 1
 enum/MODER:
  bit_size: 2
  variants:
-    - name: Input
-      description: Input mode (reset state)
-      value: 0
-    - name: Output
-      description: General purpose output mode
-      value: 1
-    - name: Alternate
-      description: Alternate function mode
-      value: 2
-    - name: Analog
-      description: Analog mode
-      value: 3
+  - name: Input
+    description: Input mode (reset state)
+    value: 0
+  - name: Output
+    description: General purpose output mode
+    value: 1
+  - name: Alternate
+    description: Alternate function mode
+    value: 2
+  - name: Analog
+    description: Analog mode
+    value: 3
 enum/ODR:
  bit_size: 1
  variants:
-    - name: Low
-      description: Set output to logic low
-      value: 0
-    - name: High
-      description: Set output to logic high
-      value: 1
+  - name: Low
+    description: Set output to logic low
+    value: 0
+  - name: High
+    description: Set output to logic high
+    value: 1
 enum/OSPEEDR:
  bit_size: 2
  variants:
-    - name: LowSpeed
-      description: Low speed
-      value: 0
-    - name: MediumSpeed
-      description: Medium speed
-      value: 1
-    - name: HighSpeed
-      description: High speed
-      value: 2
-    - name: VeryHighSpeed
-      description: Very high speed
-      value: 3
+  - name: LowSpeed
+    description: Low speed
+    value: 0
+  - name: MediumSpeed
+    description: Medium speed
+    value: 1
+  - name: HighSpeed
+    description: High speed
+    value: 2
+  - name: VeryHighSpeed
+    description: Very high speed
+    value: 3
 enum/OT:
  bit_size: 1
  variants:
-    - name: PushPull
-      description: Output push-pull (reset state)
-      value: 0
-    - name: OpenDrain
-      description: Output open-drain
-      value: 1
+  - name: PushPull
+    description: Output push-pull (reset state)
+    value: 0
+  - name: OpenDrain
+    description: Output open-drain
+    value: 1
 enum/PUPDR:
  bit_size: 2
  variants:
-    - name: Floating
-      description: "No pull-up, pull-down"
-      value: 0
-    - name: PullUp
-      description: Pull-up
-      value: 1
-    - name: PullDown
-      description: Pull-down
-      value: 2
+  - name: Floating
+    description: No pull-up, pull-down
+    value: 0
+  - name: PullUp
+    description: Pull-up
+    value: 1
+  - name: PullDown
+    description: Pull-down
+    value: 2
--- a/data/registers/hrtim_v1.yaml
+++ b/data/registers/hrtim_v1.yaml
--- a/data/registers/hrtim_v2.yaml
+++ b/data/registers/hrtim_v2.yaml
--- a/Show More
+++ b/Show More