Update dependencies

Disasm · Disasm · commit 5aab1f126884 · 2025-09-08T13:42:47.000+03:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,11 +11,7 @@ members = [
     "example-stlinkv3-board",
     "example-xcore407i-board",
     "stm32-log",
-    "stm32f7xx-hal",
-    "synopsys-usb-otg",
 ]
 
 [patch.crates-io]
 stm32-log = { path = "stm32-log" }
-synopsys-usb-otg = { path = "synopsys-usb-otg" }
-stm32f7xx-hal = { path = "stm32f7xx-hal" }
diff --git a/example-f401-board/Cargo.toml b/example-f401-board/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 panic-semihosting = "0.5.2"
-cortex-m-rt = "0.7.1"
+cortex-m-rt = "0.7.5"
 usbd-serial = "0.2.0"
-stm32f4xx-hal = { version = "0.17.1", features = ["stm32f401", "usb_fs"] }
+stm32f4xx-hal = { version = "0.22.1", features = ["stm32f401", "usb_fs"] }
 usb-device = "0.3.0"
diff --git a/example-f407-board/Cargo.toml b/example-f407-board/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 panic-semihosting = "0.5.2"
-cortex-m-rt = "0.7.1"
+cortex-m-rt = "0.7.5"
 usbd-serial = "0.2.0"
-stm32f4xx-hal = { version = "0.17.1", features = ["stm32f407", "usb_fs"] }
+stm32f4xx-hal = { version = "0.22.1", features = ["stm32f407", "usb_fs"] }
 usb-device = "0.3.0"
diff --git a/example-f429zi-board/Cargo.toml b/example-f429zi-board/Cargo.toml
@@ -6,9 +6,9 @@ edition = "2018"
 
 [dependencies]
 panic-semihosting = "0.5.2"
-cortex-m-rt = "0.7.1"
+cortex-m-rt = "0.7.5"
 usbd-serial = "0.2.0"
-stm32f4xx-hal = { version = "0.17.1", features = ["stm32f429"] }
+stm32f4xx-hal = { version = "0.22.1", features = ["stm32f429"] }
 usb-device = "0.3.0"
 
 [features]
diff --git a/example-f446re-board/Cargo.toml b/example-f446re-board/Cargo.toml
@@ -6,9 +6,9 @@ edition = "2018"
 
 [dependencies]
 panic-semihosting = "0.5.2"
-cortex-m-rt = "0.7.1"
+cortex-m-rt = "0.7.5"
 usbd-serial = "0.2.0"
-stm32f4xx-hal = { version = "0.17.1", features = ["stm32f446"] }
+stm32f4xx-hal = { version = "0.22.1", features = ["stm32f446"] }
 usb-device = "0.3.0"
 
 [features]
diff --git a/example-f446ze-board/Cargo.toml b/example-f446ze-board/Cargo.toml
@@ -6,9 +6,9 @@ edition = "2018"
 
 [dependencies]
 panic-semihosting = "0.5.2"
-cortex-m-rt = "0.7.1"
+cortex-m-rt = "0.7.5"
 usbd-serial = "0.2.0"
-stm32f4xx-hal = { version = "0.17.1", features = ["stm32f446"] }
+stm32f4xx-hal = { version = "0.22.1", features = ["stm32f446"] }
 usb-device = "0.3.0"
 
 [features]
diff --git a/example-f723e-disco-board/Cargo.toml b/example-f723e-disco-board/Cargo.toml
@@ -5,11 +5,8 @@ authors = ["Vadim Kaushan <admin@disasm.info>"]
 edition = "2018"
 
 [dependencies]
-panic-halt = "0.2.0"
-cortex-m = "0.7.4"
-cortex-m-rt = "0.7.1"
-stm32f7xx-hal = { version = "0.6.0", features = ["stm32f723"] }
-nb = "0.1.2"
+cortex-m-rt = "0.7.5"
+stm32f7xx-hal = { version = "0.8.0", features = ["stm32f723"] }
 rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 panic-rtt-target = { version = "0.1.2", features = ["cortex-m"] }
 usbd-serial = "0.2.0"
diff --git a/example-f723e-disco-board/examples/serial.rs b/example-f723e-disco-board/examples/serial.rs
@@ -45,7 +45,7 @@ fn main() -> ! {
         dp.OTG_FS_DEVICE,
         dp.OTG_FS_PWRCLK,
         (gpioa.pa11.into_alternate(), gpioa.pa12.into_alternate()),
-        clocks,
+        &clocks,
     );
     #[cfg(feature = "hs")]
     let usb = USB::new_with_internal_hs_phy(
@@ -54,7 +54,7 @@ fn main() -> ! {
         dp.OTG_HS_PWRCLK,
         dp.USBPHYC,
         (gpiob.pb14.into_alternate(), gpiob.pb15.into_alternate()),
-        clocks,
+        &clocks,
     );
 
     let usb_bus = UsbBus::new(usb, unsafe { &mut EP_MEMORY });
diff --git a/example-f723e-disco-board/examples/test_class.rs b/example-f723e-disco-board/examples/test_class.rs
@@ -40,7 +40,7 @@ fn main() -> ! {
         dp.OTG_FS_DEVICE,
         dp.OTG_FS_PWRCLK,
         (gpioa.pa11.into_alternate(), gpioa.pa12.into_alternate()),
-        clocks,
+        &clocks,
     );
     #[cfg(feature = "hs")]
     let usb = USB::new_with_internal_hs_phy(
@@ -49,7 +49,7 @@ fn main() -> ! {
         dp.OTG_HS_PWRCLK,
         dp.USBPHYC,
         (gpiob.pb14.into_alternate(), gpiob.pb15.into_alternate()),
-        clocks,
+        &clocks,
     );
 
     let usb_bus = UsbBus::new(usb, unsafe { &mut EP_MEMORY });
diff --git a/example-longan-nano-board/Cargo.toml b/example-longan-nano-board/Cargo.toml
@@ -10,4 +10,4 @@ riscv-rt = "0.6.1"
 gd32vf103xx-hal = "0.2.3"
 panic-halt = "0.2.0"
 usb-device = "0.3.0"
-synopsys-usb-otg = { version = "0.3.2", features = ["riscv", "fs"] }
+synopsys-usb-otg = { version = "0.4.0", features = ["riscv", "fs"] }
diff --git a/example-stlinkv3-board/Cargo.toml b/example-stlinkv3-board/Cargo.toml
@@ -5,11 +5,9 @@ authors = ["Vadim Kaushan <admin@disasm.info>"]
 edition = "2018"
 
 [dependencies]
-panic-halt = "0.2.0"
-cortex-m = "0.7.4"
-cortex-m-rt = "0.7.1"
-stm32f7xx-hal = { version = "0.6.0", features = ["stm32f723"] }
-nb = "0.1.2"
+cortex-m = "0.7.7"
+cortex-m-rt = "0.7.5"
+stm32f7xx-hal = { version = "0.8.0", features = ["stm32f723"] }
 rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 panic-rtt-target = { version = "0.1.2", features = ["cortex-m"] }
 usbd-serial = "0.2.0"
diff --git a/example-stlinkv3-board/examples/serial.rs b/example-stlinkv3-board/examples/serial.rs
@@ -53,7 +53,7 @@ fn main() -> ! {
         dp.OTG_FS_DEVICE,
         dp.OTG_FS_PWRCLK,
         (gpioa.pa11.into_alternate(), gpioa.pa12.into_alternate()),
-        clocks,
+        &clocks,
     );
     #[cfg(feature = "hs")]
     let usb = USB::new_with_internal_hs_phy(
@@ -62,7 +62,7 @@ fn main() -> ! {
         dp.OTG_HS_PWRCLK,
         dp.USBPHYC,
         (gpiob.pb14.into_alternate(), gpiob.pb15.into_alternate()),
-        clocks,
+        &clocks,
     );
 
     let usb_bus = UsbBus::new(usb, unsafe { &mut EP_MEMORY });
diff --git a/example-stlinkv3-board/examples/test_class.rs b/example-stlinkv3-board/examples/test_class.rs
@@ -48,7 +48,7 @@ fn main() -> ! {
         dp.OTG_FS_DEVICE,
         dp.OTG_FS_PWRCLK,
         (gpioa.pa11.into_alternate(), gpioa.pa12.into_alternate()),
-        clocks,
+        &clocks,
     );
     #[cfg(feature = "hs")]
     let usb = USB::new_with_internal_hs_phy(
@@ -57,7 +57,7 @@ fn main() -> ! {
         dp.OTG_HS_PWRCLK,
         dp.USBPHYC,
         (gpiob.pb14.into_alternate(), gpiob.pb15.into_alternate()),
-        clocks,
+        &clocks,
     );
 
     let usb_bus = UsbBus::new(usb, unsafe { &mut EP_MEMORY });
diff --git a/example-xcore407i-board/Cargo.toml b/example-xcore407i-board/Cargo.toml
@@ -7,12 +7,12 @@ edition = "2018"
 [dependencies]
 rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 panic-rtt-target = { version = "0.1.2", features = ["cortex-m"] }
-cortex-m = "0.7.4"
-cortex-m-rt = "0.7.1"
+cortex-m = "0.7.7"
+cortex-m-rt = "0.7.5"
 usbd-serial = "0.2.0"
-stm32f4xx-hal = { version = "0.17.1", features = ["stm32f407"] }
+stm32f4xx-hal = { version = "0.22.1", features = ["stm32f407"] }
 usb-device = "0.3.0"
-synopsys-usb-otg = { version = "0.3.2", features = ["cortex-m"] }
+synopsys-usb-otg = { version = "0.4.0", features = ["cortex-m"] }
 
 [features]
 fs = ["stm32f4xx-hal/usb_fs", "synopsys-usb-otg/fs"]
diff --git a/example-xcore407i-board/src/otg_hs.rs b/example-xcore407i-board/src/otg_hs.rs
@@ -48,14 +48,14 @@ unsafe impl UsbPeripheral for USB {
 
         cortex_m::interrupt::free(|_| {
             // Enable USB peripheral
-            rcc.ahb1enr.modify(|_, w| w.otghsen().set_bit());
+            rcc.ahb1enr().modify(|_, w| w.otghsen().set_bit());
 
             // Enable ULPI clock
-            rcc.ahb1enr.modify(|_, w| w.otghsulpien().set_bit());
+            rcc.ahb1enr().modify(|_, w| w.otghsulpien().set_bit());
 
             // Reset USB peripheral
-            rcc.ahb1rstr.modify(|_, w| w.otghsrst().set_bit());
-            rcc.ahb1rstr.modify(|_, w| w.otghsrst().clear_bit());
+            rcc.ahb1rstr().modify(|_, w| w.otghsrst().set_bit());
+            rcc.ahb1rstr().modify(|_, w| w.otghsrst().clear_bit());
         });
     }
 
diff --git a/stm32-log/Cargo.toml b/stm32-log/Cargo.toml
@@ -5,8 +5,8 @@ authors = ["Vadim Kaushan <admin@disasm.info>"]
 edition = "2018"
 
 [dependencies]
-cortex-m = "0.7.4"
-stm32f4xx-hal = { version = "0.17.1", optional = true }
+cortex-m = "0.7.7"
+stm32f4xx-hal = { version = "0.22.1", optional = true }
 log = "0.4.8"
 heapless = "0.7.0"
 bbqueue = "0.3.2"
