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

Implemented suggestions from @Dirbaio

Browse Source
This commit is contained in:
Davide Della Giustina 2023-02-28 17:39:02 +00:00
parent c1e93c0904
commit 485bb76e46
No known key found for this signature in database
2 changed files with 11 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
embassy-stm32/src/eth/mod.rs
View File

@ -5,6 +5,7 @@
mod _version; mod _version;
pub mod generic_smi; pub mod generic_smi;
use core::mem::MaybeUninit;
use core::task::Context; use core::task::Context;
use embassy_net_driver::{Capabilities, LinkState}; use embassy_net_driver::{Capabilities, LinkState};
@ -30,43 +31,19 @@ pub struct PacketQueue<const TX: usize, const RX: usize> {
impl<const TX: usize, const RX: usize> PacketQueue<TX, RX> { impl<const TX: usize, const RX: usize> PacketQueue<TX, RX> {
pub const fn new() -> Self { pub const fn new() -> Self {
#[cfg(feature = "nightly")] const NEW_TDES: TDes = TDes::new();
{ const NEW_RDES: RDes = RDes::new();
let mut this = core::mem::MaybeUninit::uninit(); Self {
unsafe { tx_desc: [NEW_TDES; TX],
Self::init(&mut this); rx_desc: [NEW_RDES; RX],
this.assume_init() tx_buf: [Packet([0; TX_BUFFER_SIZE]); TX],
} rx_buf: [Packet([0; RX_BUFFER_SIZE]); RX],
}
#[cfg(not(feature = "nightly"))]
{
const NEW_TDES: TDes = TDes::new();
const NEW_RDES: RDes = RDes::new();
Self {
tx_desc: [NEW_TDES; TX],
rx_desc: [NEW_RDES; RX],
tx_buf: [Packet([0; TX_BUFFER_SIZE]); TX],
rx_buf: [Packet([0; RX_BUFFER_SIZE]); RX],
}
} }
} }
// Allow to initialize a Self without requiring it to go on the stack // Allow to initialize a Self without requiring it to go on the stack
#[cfg(feature = "nightly")] pub unsafe fn init(this: &mut MaybeUninit<Self>) {
pub const unsafe fn init(this: &mut core::mem::MaybeUninit<Self>) { this.as_mut_ptr().write_bytes(0u8, core::mem::size_of::<Self>());
let this: &mut Self = unsafe { this.assume_init_mut() };
let mut i = 0;
while i < TX {
this.tx_desc[i] = TDes::new();
this.tx_buf[i] = Packet([0; TX_BUFFER_SIZE]);
i += 1;
}
i = 0;
while i < RX {
this.rx_desc[i] = RDes::new();
this.rx_buf[i] = Packet([0; RX_BUFFER_SIZE]);
i += 1;
}
} }
} }

8
embassy-stm32/src/lib.rs
View File

@ -1,13 +1,7 @@
#![no_std] #![no_std]
#![cfg_attr( #![cfg_attr(
feature = "nightly", feature = "nightly",
feature( feature(type_alias_impl_trait, async_fn_in_trait, impl_trait_projections)
type_alias_impl_trait,
async_fn_in_trait,
impl_trait_projections,
const_mut_refs,
const_maybe_uninit_assume_init
)
)] )]
#![cfg_attr(feature = "nightly", allow(incomplete_features))] #![cfg_attr(feature = "nightly", allow(incomplete_features))]