max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix stm32 ethernet

Browse Source
This commit is contained in:
Liam Murphy 2021-07-05 18:18:05 +10:00
parent 3d96b10b0c
commit fc1ef4947d
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embassy-extras/src/peripheral.rs
View File

@ -6,8 +6,8 @@ use core::ptr;
use embassy::interrupt::{Interrupt, InterruptExt}; use embassy::interrupt::{Interrupt, InterruptExt};
/// # Safety /// # Safety
/// When types implementing this trait are used with `Peripheral` or `PeripheralMutex`, /// When types implementing this trait are used with `PeripheralMutex`,
/// their lifetime must not end without first calling `Drop` on the `Peripheral` or `PeripheralMutex`. /// no fields referenced by `on_interrupt`'s lifetimes must end without first calling `Drop` on the `PeripheralMutex`.
pub unsafe trait PeripheralStateUnchecked { pub unsafe trait PeripheralStateUnchecked {
type Interrupt: Interrupt; type Interrupt: Interrupt;
fn on_interrupt(&mut self); fn on_interrupt(&mut self);

4
embassy-extras/src/peripheral_shared.rs
View File

@ -5,8 +5,8 @@ use core::ptr;
use embassy::interrupt::{Interrupt, InterruptExt}; use embassy::interrupt::{Interrupt, InterruptExt};
/// # Safety /// # Safety
/// When types implementing this trait are used with `Peripheral` or `PeripheralMutex`, /// When types implementing this trait are used with `Peripheral`,
/// their lifetime must not end without first calling `Drop` on the `Peripheral` or `PeripheralMutex`. /// no fields referenced by `on_interrupt`'s lifetimes must end without first calling `Drop` on the `Peripheral`.
pub unsafe trait PeripheralStateUnchecked { pub unsafe trait PeripheralStateUnchecked {
type Interrupt: Interrupt; type Interrupt: Interrupt;
fn on_interrupt(&self); fn on_interrupt(&self);

3
embassy-stm32/src/eth/v2/mod.rs
View File

@ -343,7 +343,8 @@ impl<'d, const TX: usize, const RX: usize> Inner<'d, TX, RX> {
} }
} }
impl<'d, const TX: usize, const RX: usize> PeripheralState for Inner<'d, TX, RX> { // SAFETY: The lifetime of `Inner` is only due to `PhantomData`; it isn't actually referencing any data with that lifetime.
unsafe impl<'d, const TX: usize, const RX: usize> PeripheralStateUnchecked for Inner<'d, TX, RX> {
type Interrupt = crate::interrupt::ETH; type Interrupt = crate::interrupt::ETH;
fn on_interrupt(&mut self) { fn on_interrupt(&mut self) {