Merge pull request #338 from eZioPan/adc-cleanup

Adc cleanup

data/registers/adc_v2.yaml

@@ -302,35 +302,29 @@ fieldset/SR:
   description: status register
   fields:
   - name: AWD
-    description: Analog watchdog flag
+    description: Analog watchdog event occurred
     bit_offset: 0
     bit_size: 1
-    enum: AWD
   - name: EOC
     description: Regular channel end of conversion
     bit_offset: 1
     bit_size: 1
-    enum: EOC
   - name: JEOC
     description: Injected channel end of conversion
     bit_offset: 2
     bit_size: 1
-    enum: JEOC
   - name: JSTRT
-    description: Injected channel start flag
+    description: Injected channel conversion has started
     bit_offset: 3
     bit_size: 1
-    enum: JSTRT
   - name: STRT
-    description: Regular channel start flag
+    description: Regular channel conversion has started
     bit_offset: 4
     bit_size: 1
-    enum: STRT
   - name: OVR
-    description: Overrun
+    description: Overrun occurred
     bit_offset: 5
     bit_size: 1
-    enum: OVR
 enum/ALIGN:
   bit_size: 1
   variants:
@@ -340,15 +334,6 @@ enum/ALIGN:
   - name: Left
     description: Left alignment
     value: 1
-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
 enum/AWDSGL:
   bit_size: 1
   variants:
@@ -376,15 +361,6 @@ enum/DDS:
   - name: Continuous
     description: DMA requests are issued as long as data are converted and DMA=1
     value: 1
-enum/EOC:
-  bit_size: 1
-  variants:
-  - name: NotComplete
-    description: Conversion is not complete
-    value: 0
-  - name: Complete
-    description: Conversion complete
-    value: 1
 enum/EOCS:
   bit_size: 1
   variants:
@@ -409,15 +385,6 @@ enum/EXTEN:
   - name: BothEdges
     description: Trigger detection on both the rising and falling edges
     value: 3
-enum/JEOC:
-  bit_size: 1
-  variants:
-  - name: NotComplete
-    description: Conversion is not complete
-    value: 0
-  - name: Complete
-    description: Conversion complete
-    value: 1
 enum/JEXTEN:
   bit_size: 2
   variants:
@@ -433,24 +400,6 @@ enum/JEXTEN:
   - name: BothEdges
     description: Trigger detection on both the rising and falling edges
     value: 3
-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
-enum/OVR:
-  bit_size: 1
-  variants:
-  - name: NoOverrun
-    description: No overrun occurred
-    value: 0
-  - name: Overrun
-    description: Overrun occurred
-    value: 1
 enum/RES:
   bit_size: 2
   variants:
@@ -520,12 +469,3 @@ enum/SMPR_SMPx_x:
   - name: Cycles480
     description: 480 cycles
     value: 7
-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

data/registers/adccommon_f3.yaml

@@ -75,52 +75,30 @@ fieldset/CSR:
     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
@@ -129,62 +107,44 @@ fieldset/CSR:
     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: AWD_MST
-enum/AWD:
+    description: Analog watchdog flag of the master ADC
-  description: Analog watchdog flag
+    bit_offset: 7
-  bit_size: 1
+    bit_size: 1
-  variants:
+    array:
-  - name: NoEvent
+      len: 3
-    description: No analog watchdog event occurred
+      stride: 1
-    value: 0
+  - name: AWD_SLV
-  - name: Event
+    description: Analog watchdog flag of the slave ADC
-    description: Analog watchdog event occurred
+    bit_offset: 23
-    value: 1
+    bit_size: 1
+    array:
+      len: 3
+      stride: 1
 enum/CKMODE:
   description: ADC clock mode
   bit_size: 2
@@ -239,26 +199,6 @@ enum/DUAL:
   - 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
@@ -272,13 +212,3 @@ enum/MDMA:
   - 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

data/registers/adccommon_v2.yaml

@@ -64,53 +64,47 @@ fieldset/CSR:
   description: ADC common status register
   fields:
   - name: AWD
-    description: Analog watchdog flag of ADC 1
+    description: Analog watchdog event occurred
     bit_offset: 0
     bit_size: 1
     array:
       len: 3
       stride: 8
-    enum: AWD
   - name: EOC
-    description: End of conversion of ADC 1
+    description: End of conversion of ADC
     bit_offset: 1
     bit_size: 1
     array:
       len: 3
       stride: 8
-    enum: EOC
   - name: JEOC
-    description: Injected channel end of conversion of ADC 1
+    description: Injected channel end of conversion of ADC
     bit_offset: 2
     bit_size: 1
     array:
       len: 3
       stride: 8
-    enum: JEOC
   - name: JSTRT
-    description: Injected channel Start flag of ADC 1
+    description: Injected channel conversion started
     bit_offset: 3
     bit_size: 1
     array:
       len: 3
       stride: 8
-    enum: JSTRT
   - name: STRT
-    description: Regular channel Start flag of ADC 1
+    description: regular channel conversion started
     bit_offset: 4
     bit_size: 1
     array:
       len: 3
       stride: 8
-    enum: STRT
   - name: OVR
-    description: Overrun flag of ADC 1
+    description: Overrun occurred
     bit_offset: 5
     bit_size: 1
     array:
       len: 3
       stride: 8
-    enum: OVR
 enum/ADCPRE:
   bit_size: 2
   variants:
@@ -126,15 +120,6 @@ enum/ADCPRE:
   - 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
 enum/DDS:
   bit_size: 1
   variants:
@@ -159,33 +144,6 @@ enum/DMA:
   - 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
-enum/JEOC:
-  bit_size: 1
-  variants:
-  - 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
 enum/MULTI:
   bit_size: 5
   variants:
@@ -228,21 +186,3 @@ enum/MULTI:
   - 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
-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

data/registers/adccommon_v3.yaml

@@ -92,18 +92,6 @@ fieldset/CSR:
     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
@@ -136,19 +124,21 @@ fieldset/CSR:
     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: AWD_MST
+    description: Analog watchdog flag of the master ADC
+    bit_offset: 7
+    bit_size: 1
+    array:
+      len: 3
+      stride: 1
+  - name: AWD_SLV
+    description: Analog watchdog 1 flag of the slave ADC
+    bit_offset: 23
+    bit_size: 1
+    array:
+      len: 3
+      stride: 1

data/registers/adccommon_v4.yaml

@@ -84,130 +84,80 @@ fieldset/CSR:
     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: AWD_MST
-enum/ADRDY_MST:
+    description: Analog watchdog flag of the master ADC
-  bit_size: 1
+    bit_offset: 7
-  variants:
+    bit_size: 1
-  - name: NotReady
+    array:
-    description: ADC is not ready to start conversion
+      len: 3
-    value: 0
+      stride: 1
-  - name: Ready
+  - name: AWD_SLV
-    description: ADC is ready to start conversion
+    description: Analog watchdog flag of the slave ADC
-    value: 1
+    bit_offset: 23
-enum/AWD1_MST:
+    bit_size: 1
-  bit_size: 1
+    array:
-  variants:
+      len: 3
-  - name: NoEvent
+      stride: 1
-    description: No analog watchdog event occurred
-    value: 0
-  - name: Event
-    description: Analog watchdog event occurred
-    value: 1
 enum/CKMODE:
   bit_size: 2
   variants:
@@ -262,69 +212,6 @@ enum/DUAL:
   - 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
-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
-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
-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
-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
-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
-enum/OVR_MST:
-  bit_size: 1
-  variants:
-  - name: NoOverrun
-    description: No overrun occurred
-    value: 0
-  - name: Overrun
-    description: Overrun occurred
-    value: 1
 enum/PRESC:
   bit_size: 4
   variants:

transforms/ADC.yaml

@@ -0,0 +1,13 @@
+transforms:
+  - !DeleteEnums
+    from: ^(AWD1?|J?EOC|JEOS|J?STRT|OVR|ADRDY|EOS(MP)?|JQOVF|ENDED)(_MST)?$
+
+  - !MakeFieldArray
+    fieldsets: CSR
+    from: AWD[1-3]_MST
+    to: AWD_MST
+
+  - !MakeFieldArray
+    fieldsets: CSR
+    from: AWD[1-3]_SLV
+    to: AWD_SLV