aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxoviat <[email protected]>2025-12-15 17:14:48 +0000
committerGitHub <[email protected]>2025-12-15 17:14:48 +0000
commitc33a86190c3602ba23a6d5757caaa86b9bcea626 (patch)
tree6c7373c719ed74aeebd59e343947f0c6ba3b5e1f
parentc56f56fdffeaeee98bb4ae50fc464f311c689bed (diff)
parent4a1dfb8a249741c13dbe30d1fbca7b7dab4f6e12 (diff)
Merge pull request #5074 from xoviat/wpa
wpan: update stm32wb-hci
-rw-r--r--embassy-nrf/Cargo.toml2
-rw-r--r--embassy-stm32-wpan/Cargo.toml2
-rw-r--r--embassy-stm32-wpan/src/wb55/sub/ble.rs8
-rw-r--r--embassy-stm32/Cargo.toml2
-rw-r--r--embassy-usb-dfu/Cargo.toml2
5 files changed, 6 insertions, 10 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" }
226nrf-pac = { version = "0.2.0" } 226nrf-pac = { version = "0.2.0" }
227 227
228defmt = { version = "1.0.1", optional = true } 228defmt = { version = "1.0.1", optional = true }
229bitflags = "2.4.2" 229bitflags = "2.10.0"
230log = { version = "0.4.14", optional = true } 230log = { version = "0.4.14", optional = true }
231cortex-m-rt = ">=0.6.15,<0.8" 231cortex-m-rt = ">=0.6.15,<0.8"
232cortex-m = "0.7.6" 232cortex-m = "0.7.6"
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"
46 46
47bit_field = "0.10.2" 47bit_field = "0.10.2"
48stm32-device-signature = { version = "0.3.3", features = ["stm32wb5x"] } 48stm32-device-signature = { version = "0.3.3", features = ["stm32wb5x"] }
49stm32wb-hci = { version = "0.17.0", optional = true } 49stm32wb-hci = { version = "0.17.3", optional = true }
50futures-util = { version = "0.3.30", default-features = false } 50futures-util = { version = "0.3.30", default-features = false }
51bitflags = { version = "2.3.3", optional = true } 51bitflags = { version = "2.3.3", optional = true }
52 52
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> {
130 self.tl_write(opcode.0, payload).await; 130 self.tl_write(opcode.0, payload).await;
131 } 131 }
132 132
133 #[allow(invalid_reference_casting)] 133 async fn controller_read_into(&mut self, buf: &mut [u8]) {
134 async fn controller_read_into(&self, buf: &mut [u8]) { 134 let evt_box = self.tl_read().await;
135 // A complete hack since I cannot update the trait
136 let s = unsafe { &mut *(self as *const _ as *mut Ble) };
137
138 let evt_box = s.tl_read().await;
139 let evt_serial = evt_box.serial(); 135 let evt_serial = evt_box.serial();
140 136
141 buf[..evt_serial.len()].copy_from_slice(evt_serial); 137 buf[..evt_serial.len()].copy_from_slice(evt_serial);
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"
193 193
194static_assertions = { version = "1.1" } 194static_assertions = { version = "1.1" }
195volatile-register = { version = "0.2.1" } 195volatile-register = { version = "0.2.1" }
196bitflags = "2.4.2" 196bitflags = "2.10.0"
197 197
198block-device-driver = { version = "0.2" } 198block-device-driver = { version = "0.2" }
199aligned = "0.4.1" 199aligned = "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"]
35defmt = { version = "1.0.1", optional = true } 35defmt = { version = "1.0.1", optional = true }
36log = { version = "0.4.17", optional = true } 36log = { version = "0.4.17", optional = true }
37 37
38bitflags = "2.4.1" 38bitflags = "2.10.0"
39cortex-m = { version = "0.7.7", features = ["inline-asm"], optional = true } 39cortex-m = { version = "0.7.7", features = ["inline-asm"], optional = true }
40embassy-boot = { version = "0.6.1", path = "../embassy-boot" } 40embassy-boot = { version = "0.6.1", path = "../embassy-boot" }
41embassy-futures = { version = "0.1.2", path = "../embassy-futures" } 41embassy-futures = { version = "0.1.2", path = "../embassy-futures" }