Merge pull request #434 from eZioPan/update-cordic

Update cordic

data/registers/cordic_v1.yaml

@@ -44,35 +44,26 @@ fieldset/CSR:
     description: Number of results in the RDATA register.
     bit_offset: 19
     bit_size: 1
-    enum: NRES
+    enum: Num
   - name: NARGS
     description: Number of arguments expected by the WDATA register.
     bit_offset: 20
     bit_size: 1
-    enum: NARGS
+    enum: Num
   - name: RESSIZE
     description: Width of output data.
     bit_offset: 21
     bit_size: 1
-    enum: RESSIZE
+    enum: Size
   - name: ARGSIZE
     description: Width of input data.
     bit_offset: 22
     bit_size: 1
-    enum: ARGSIZE
+    enum: Size
   - name: RRDY
     description: Result ready flag.
     bit_offset: 31
     bit_size: 1
-enum/ARGSIZE:
-  bit_size: 1
-  variants:
-  - name: Bits32
-    description: Use 32 bit input values.
-    value: 0
-  - name: Bits16
-    description: Use 16 bit input values.
-    value: 1
 enum/FUNC:
   bit_size: 4
   variants:
@@ -106,23 +97,14 @@ enum/FUNC:
   - name: SquareRoot
     description: Square Root function.
     value: 9
-enum/NARGS:
+enum/Num:
   bit_size: 1
   variants:
   - name: Num1
-    description: Only single argument write is needed for next calculation.
+    description: 1 input/output
     value: 0
   - name: Num2
-    description: Two argument writes need to be performed for next calculation.
+    description: 2 input/output
-    value: 1
-enum/NRES:
-  bit_size: 1
-  variants:
-  - name: Num1
-    description: Only single result value will be returned. After a single read RRDY will be automatically cleared.
-    value: 0
-  - name: Num2
-    description: Two return reads need to be performed. After two reads RRDY will be automatically cleared.
     value: 1
 enum/PRECISION:
   bit_size: 4
@@ -172,12 +154,12 @@ enum/PRECISION:
   - name: Iters60
     description: 60 iterations.
     value: 15
-enum/RESSIZE:
+enum/Size:
   bit_size: 1
   variants:
   - name: Bits32
-    description: Use 32 bit output values.
+    description: Use 32 bit input/output values.
     value: 0
   - name: Bits16
-    description: Use 16 bit output values.
+    description: Use 16 bit input/output values.
     value: 1

transforms/CORDIC.yaml

@@ -0,0 +1,8 @@
+transforms:
+  - !MergeEnums
+    from: (ARG|RES)SIZE
+    to: Size
+
+  - !MergeEnums
+    from: N(ARGS|RES)
+    to: Num