Merge pull request #497 from stm32-rs/f303-dac2

adamgreig · web-flow · commit cfc8f88e8e5f · 2021-02-13T16:32:49.000Z
F303: Rename DAC to DAC1, add DAC2
diff --git a/devices/common_patches/f3_syscfg.yaml b/devices/common_patches/f3_syscfg.yaml
@@ -8,8 +8,9 @@ SYSCFG:
   _strip:
     - SYSCFG_
   _delete:
-    - OPAMP*
-    - COMP*
+    _registers:
+      - OPAMP*
+      - COMP*
   CFGR1:
     _modify:
       TIM1_ITR_RMP:
diff --git a/devices/stm32f303.yaml b/devices/stm32f303.yaml
@@ -5,6 +5,10 @@ _modify:
   Flash:
     name: FLASH
 
+  # Rename DAC to DAC1 in accordance with the reference manual.
+  DAC:
+    name: DAC1
+
 PWR:
   CSR:
     _add:
@@ -26,6 +30,13 @@ PWR:
       TIFRFE:
         name: "FRE"
 
+_add:
+  # DAC2 exists on F303x6/8 and F328x8 devices, and only has one channel.
+  DAC2:
+    derivedFrom: DAC1
+    baseAddress: "0x40009800"
+
+
 RCC:
   APB1RSTR:
     _add:
@@ -44,8 +55,6 @@ SYSCFG:
   _delete:
     _interrupts:
       - "COMP*"
-
-SYSCFG:
   _strip:
     - SYSCFG_
   _add:
