From 7a95245738e11d32e4156390e4289300d98c4763 Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Wed, 5 Apr 2023 05:48:41 +0200
Subject: [PATCH] h5: fix usb.

---
 data/registers/rcc_h5.yaml   | 20 ++++++++++----------
 stm32-data-gen/src/header.rs |  1 +
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/data/registers/rcc_h5.yaml b/data/registers/rcc_h5.yaml
index 86ef5af..b4d23bd 100644
--- a/data/registers/rcc_h5.yaml
+++ b/data/registers/rcc_h5.yaml
@@ -1079,8 +1079,8 @@ fieldset/APB2ENR:
       description: "SAI2 clock enable\r Set and cleared by software."
       bit_offset: 22
       bit_size: 1
-    - name: USBFSEN
-      description: "USBFS clock enable\r Set and reset by software."
+    - name: USBEN
+      description: "USB clock enable\r Set and reset by software."
       bit_offset: 24
       bit_size: 1
 fieldset/APB2LPENR:
@@ -1130,8 +1130,8 @@ fieldset/APB2LPENR:
       description: "SAI2 clock enable during sleep mode\r Set and reset by software."
       bit_offset: 22
       bit_size: 1
-    - name: USBFSLPEN
-      description: "USBFS clock enable during sleep mode\r Set and reset by software."
+    - name: USBLPEN
+      description: "USB clock enable during sleep mode\r Set and reset by software."
       bit_offset: 24
       bit_size: 1
 fieldset/APB2RSTR:
@@ -1181,8 +1181,8 @@ fieldset/APB2RSTR:
       description: "SAI2 block reset\r Set and reset by software."
       bit_offset: 22
       bit_size: 1
-    - name: USBFSRST
-      description: "USBFS block reset\r Set and reset by software."
+    - name: USBRST
+      description: "USB block reset\r Set and reset by software."
       bit_offset: 24
       bit_size: 1
 fieldset/APB3ENR:
@@ -1549,11 +1549,11 @@ fieldset/CCIPR4:
       bit_offset: 2
       bit_size: 2
       enum: SYSTICKSEL
-    - name: USBFSSEL
-      description: USBFS kernel clock source selection
+    - name: USBSEL
+      description: USB kernel clock source selection
       bit_offset: 4
       bit_size: 2
-      enum: USBFSSEL
+      enum: USBSEL
     - name: SDMMC1SEL
       description: SDMMC1 kernel clock source selection
       bit_offset: 6
@@ -2740,7 +2740,7 @@ enum/USARTSEL:
     - name: LSE
       description: LSE selected as peripheral clock
       value: 5
-enum/USBFSSEL:
+enum/USBSEL:
   bit_size: 2
   variants:
     - name: DISABLE
diff --git a/stm32-data-gen/src/header.rs b/stm32-data-gen/src/header.rs
index dbef37a..00f3c17 100644
--- a/stm32-data-gen/src/header.rs
+++ b/stm32-data-gen/src/header.rs
@@ -168,6 +168,7 @@ impl Defines {
             ("CAN", &["CAN_BASE", "CAN1_BASE"]),
             ("FMC", &["FMC_BASE", "FMC_R_BASE"]),
             ("FSMC", &["FSMC_R_BASE"]),
+            ("USB", &["USB_DRD_BASE"]),
         ];
         let alt_peri_defines: HashMap<_, _> = ALT_PERI_DEFINES.iter().copied().collect();