From 18247d9900a16e94e0983e6ee80dda13f012b1a4 Mon Sep 17 00:00:00 2001 From: xoviat Date: Mon, 15 Dec 2025 10:53:32 -0600 Subject: wpan: update stm32wb-hci --- embassy-stm32-wpan/Cargo.toml | 2 +- embassy-stm32-wpan/src/wb55/sub/ble.rs | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/embassy-stm32-wpan/Cargo.toml b/embassy-stm32-wpan/Cargo.toml index 9624c7932..1be48e893 100644 --- a/embassy-stm32-wpan/Cargo.toml +++ b/embassy-stm32-wpan/Cargo.toml @@ -46,7 +46,7 @@ critical-section = "1.2" bit_field = "0.10.2" stm32-device-signature = { version = "0.3.3", features = ["stm32wb5x"] } -stm32wb-hci = { version = "0.17.0", optional = true } +stm32wb-hci = { version = "0.17.3", optional = true } futures-util = { version = "0.3.30", default-features = false } bitflags = { version = "2.3.3", optional = true } diff --git a/embassy-stm32-wpan/src/wb55/sub/ble.rs b/embassy-stm32-wpan/src/wb55/sub/ble.rs index a2558d735..a822d6530 100644 --- a/embassy-stm32-wpan/src/wb55/sub/ble.rs +++ b/embassy-stm32-wpan/src/wb55/sub/ble.rs @@ -130,12 +130,8 @@ impl<'a> hci::Controller for Ble<'a> { self.tl_write(opcode.0, payload).await; } - #[allow(invalid_reference_casting)] - async fn controller_read_into(&self, buf: &mut [u8]) { - // A complete hack since I cannot update the trait - let s = unsafe { &mut *(self as *const _ as *mut Ble) }; - - let evt_box = s.tl_read().await; + async fn controller_read_into(&mut self, buf: &mut [u8]) { + let evt_box = self.tl_read().await; let evt_serial = evt_box.serial(); buf[..evt_serial.len()].copy_from_slice(evt_serial); -- cgit From 4a1dfb8a249741c13dbe30d1fbca7b7dab4f6e12 Mon Sep 17 00:00:00 2001 From: xoviat Date: Mon, 15 Dec 2025 10:59:48 -0600 Subject: update bitflags --- embassy-nrf/Cargo.toml | 2 +- embassy-stm32/Cargo.toml | 2 +- embassy-usb-dfu/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/embassy-nrf/Cargo.toml b/embassy-nrf/Cargo.toml index c60aac8b8..9a5fdc809 100644 --- a/embassy-nrf/Cargo.toml +++ b/embassy-nrf/Cargo.toml @@ -226,7 +226,7 @@ rand-core-09 = { package = "rand_core", version = "0.9" } nrf-pac = { version = "0.2.0" } defmt = { version = "1.0.1", optional = true } -bitflags = "2.4.2" +bitflags = "2.10.0" log = { version = "0.4.14", optional = true } cortex-m-rt = ">=0.6.15,<0.8" cortex-m = "0.7.6" diff --git a/embassy-stm32/Cargo.toml b/embassy-stm32/Cargo.toml index 7989fc5d7..0de8552c7 100644 --- a/embassy-stm32/Cargo.toml +++ b/embassy-stm32/Cargo.toml @@ -193,7 +193,7 @@ document-features = "0.2.7" static_assertions = { version = "1.1" } volatile-register = { version = "0.2.1" } -bitflags = "2.4.2" +bitflags = "2.10.0" block-device-driver = { version = "0.2" } aligned = "0.4.1" diff --git a/embassy-usb-dfu/Cargo.toml b/embassy-usb-dfu/Cargo.toml index 8b32582c0..4f952a047 100644 --- a/embassy-usb-dfu/Cargo.toml +++ b/embassy-usb-dfu/Cargo.toml @@ -35,7 +35,7 @@ features = ["defmt", "cortex-m", "dfu"] defmt = { version = "1.0.1", optional = true } log = { version = "0.4.17", optional = true } -bitflags = "2.4.1" +bitflags = "2.10.0" cortex-m = { version = "0.7.7", features = ["inline-asm"], optional = true } embassy-boot = { version = "0.6.1", path = "../embassy-boot" } embassy-futures = { version = "0.1.2", path = "../embassy-futures" } -- cgit