unify OTGHS and OTGFS.

data/registers/otg_v1.yaml

@@ -1,6 +1,6 @@
 ---
-block/OTG_HS:
+block/OTG:
-  description: USB on the go high speed
+  description: USB on the go
   items:
     - name: GOTGCTL
       description: Control and status register
@@ -61,10 +61,14 @@ block/OTG_HS:
       description: OTG I2C access register
       byte_offset: 48
       fieldset: GI2CCTL
-    - name: GCCFG
+    - name: GCCFG_V1
-      description: General core configuration register
+      description: General core configuration register, for core_id 0x0000_1xxx
       byte_offset: 56
-      fieldset: GCCFG
+      fieldset: GCCFG_V1
+    - name: GCCFG_V2
+      description: General core configuration register, for core_id 0x0000_[23]xxx
+      byte_offset: 56
+      fieldset: GCCFG_V2
     - name: CID
       description: Core ID register
       byte_offset: 60
@@ -664,7 +668,30 @@ fieldset/GAHBCFG:
       description: Periodic TxFIFO empty level
       bit_offset: 8
       bit_size: 1
-fieldset/GCCFG:
+fieldset/GCCFG_V1:
+  description: General core configuration register
+  fields:
+    - name: PWRDWN
+      description: Power down
+      bit_offset: 16
+      bit_size: 1
+    - name: VBUSASEN
+      description: Enable the VBUS "A" sensing device
+      bit_offset: 18
+      bit_size: 1
+    - name: VBUSBSEN
+      description: Enable the VBUS "B" sensing device
+      bit_offset: 19
+      bit_size: 1
+    - name: SOFOUTEN
+      description: SOF output enable
+      bit_offset: 20
+      bit_size: 1
+    - name: NOVBUSSENS
+      description: VBUS sensing disable
+      bit_offset: 21
+      bit_size: 1
+fieldset/GCCFG_V2:
   description: General core configuration register
   fields:
     - name: DCDET
@@ -703,10 +730,6 @@ fieldset/GCCFG:
       description: Secondary detection (SD) mode enable
       bit_offset: 20
       bit_size: 1
-    - name: NOVBUSSENS
-      description: VBUS sensing disable
-      bit_offset: 21
-      bit_size: 1
     - name: VBDEN
       description: USB VBUS detection enable
       bit_offset: 21
@@ -809,6 +832,10 @@ fieldset/GINTMSK:
       description: End of periodic frame interrupt mask
       bit_offset: 15
       bit_size: 1
+    - name: EPMISM
+      description: Endpoint mismatch interrupt mask
+      bit_offset: 17
+      bit_size: 1
     - name: IEPINT
       description: IN endpoints interrupt mask
       bit_offset: 18
@@ -1295,6 +1322,10 @@ fieldset/GUSBCFG:
       description: Force device mode
       bit_offset: 30
       bit_size: 1
+    - name: CTXPKT
+      description: Corrupt Tx packet
+      bit_offset: 31
+      bit_size: 1
 fieldset/HAINT:
   description: Host all channels interrupt register
   fields:

src/chips.rs

@@ -217,8 +217,8 @@ impl PeriMatcher {
             ("STM32G0[BC]1.*:USB:.*", ("usb", "v4", "USB")),
             (".*:USB:.*", ("usb", "v3", "USB")),
             // # USB OTG
-            (".*:USB_OTG_FS:otgfs1_.*", ("otgfs", "v1", "OTG_FS")),
+            (".*:USB_OTG_FS:otgfs1_.*", ("otg", "v1", "OTG")),
-            (".*:USB_OTG_HS:otghs1_.*", ("otghs", "v1", "OTG_HS")),
+            (".*:USB_OTG_HS:otghs1_.*", ("otg", "v1", "OTG")),
             ("STM32F0.*:RCC:.*", ("rcc", "f0", "RCC")),
             ("STM32F100.*:RCC:.*", ("rcc", "f100", "RCC")),
             ("STM32F10[123].*:RCC:.*", ("rcc", "f1", "RCC")),