Skip to content

Commit 1758e45

Browse files
committed
Cargo: Bump stm32f7xx-hal and stm32f4xx-hal version
stm32f4xx-hal from 0.8.3 to 0.10.1 stm32f7xx-hal from 0.2.0 to 0.6.0 Signed-off-by: Moritz Scheuren <moritz.scheuren@systec-electronic.com>
1 parent 9227208 commit 1758e45

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ features = [ "smi", "smoltcp-phy", "stm32f429" ]
2020
[dependencies]
2121
volatile-register = "0.2"
2222
aligned = "0.3"
23-
stm32f7xx-hal = {version = "0.5.0", optional = true}
24-
stm32f4xx-hal = {version = "0.8.3", optional = true}
25-
cortex-m = "0.6.2"
23+
stm32f7xx-hal = {version = "0.6.0", optional = true}
24+
stm32f4xx-hal = {version = "0.10.1", optional = true}
25+
cortex-m = "0.7"
2626
log = { version = "0.4", optional = true }
2727

2828
[dependencies.smoltcp]
@@ -58,11 +58,11 @@ stm32f779 = ["stm32f7xx-hal/stm32f779", "device-selected", "fence"]
5858
smoltcp-phy = ["smoltcp"]
5959

6060
[dev-dependencies]
61-
cortex-m = "0.6.2"
62-
cortex-m-rt = "0.6"
61+
cortex-m = "0.7"
62+
cortex-m-rt = ">=0.6.15, <0.8"
6363
panic-itm = "0.4"
6464
cortex-m-semihosting = "0.3.5"
65-
stm32f4xx-hal = {version = "0.8.3", features = ["rt"] }
65+
stm32f4xx-hal = {version = "0.10.1", features = ["rt"] }
6666

6767
[[example]]
6868
name = "pktgen"

src/rx.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,9 @@ impl<'a> RxRing<'a> {
237237
self.next_entry = 0;
238238
let ring_ptr = self.entries[0].desc() as *const RxDescriptor;
239239
// Register RxDescriptor
240-
eth_dma.dmardlar.write(|w| w.srl().bits(ring_ptr as u32));
240+
eth_dma
241+
.dmardlar
242+
.write(|w| unsafe { w.srl().bits(ring_ptr as u32) });
241243

242244
// We already have fences in `set_owned`, which is called in `setup`
243245

src/setup.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ macro_rules! impl_pins {
170170

171171
impl AlternateVeryHighSpeed for $pin {
172172
fn into_af11_very_high_speed(self) {
173-
self.into_alternate_af11().set_speed(VeryHigh);
173+
self.into_alternate::<11>().set_speed(VeryHigh);
174174
}
175175
}
176176
)+

src/tx.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,9 @@ impl<'a> TxRing<'a> {
212212

213213
let ring_ptr = self.entries[0].desc() as *const TxDescriptor;
214214
// Register TxDescriptor
215-
eth_dma.dmatdlar.write(|w| w.stl().bits(ring_ptr as u32));
215+
eth_dma
216+
.dmatdlar
217+
.write(|w| unsafe { w.stl().bits(ring_ptr as u32) });
216218

217219
// "Preceding reads and writes cannot be moved past subsequent writes."
218220
#[cfg(feature = "fence")]

0 commit comments

Comments
 (0)