From 3933cee6fc239870e87e4164afd7e4f34d9c119b Mon Sep 17 00:00:00 2001 From: ROMemories Date: Mon, 18 Dec 2023 11:04:15 +0100 Subject: [PATCH] refactor(riot-rs-embassy): rename MTU to ETHERNET_MTU --- src/riot-rs-embassy/src/lib.rs | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/riot-rs-embassy/src/lib.rs b/src/riot-rs-embassy/src/lib.rs index aa10b3b54..a63a07ef6 100644 --- a/src/riot-rs-embassy/src/lib.rs +++ b/src/riot-rs-embassy/src/lib.rs @@ -16,7 +16,7 @@ pub type Task = fn(Spawner, TaskArgs); #[derive(Copy, Clone)] pub struct TaskArgs { #[cfg(feature = "net")] - pub stack: &'static Stack>, + pub stack: &'static Stack>, } pub static EXECUTOR: InterruptExecutor = InterruptExecutor::new(); @@ -111,25 +111,28 @@ async fn usb_task(mut device: UsbDevice<'static, UsbDriver>) -> ! { #[cfg(feature = "net")] // -// usb net begin -#[cfg(feature = "net")] -const MTU: usize = 1514; +// net begin +const ETHERNET_MTU: usize = 1514; #[cfg(feature = "net")] use embassy_net::{Stack, StackResources}; +// net end +// +// +// usb net begin #[cfg(feature = "usb_ethernet")] use embassy_usb::class::cdc_ncm::embassy_net::{Device, Runner}; #[cfg(feature = "usb_ethernet")] #[embassy_executor::task] -async fn usb_ncm_task(class: Runner<'static, UsbDriver, MTU>) -> ! { +async fn usb_ncm_task(class: Runner<'static, UsbDriver, ETHERNET_MTU>) -> ! { class.run().await } #[cfg(feature = "usb_ethernet")] #[embassy_executor::task] -async fn net_task(stack: &'static Stack>) -> ! { +async fn net_task(stack: &'static Stack>) -> ! { stack.run().await } // usb net end @@ -233,8 +236,10 @@ async fn init_task(peripherals: arch::Peripherals) { #[cfg(feature = "usb_ethernet")] let device = { use embassy_usb::class::cdc_ncm::embassy_net::State as NetState; - let (runner, device) = usb_cdc_ecm - .into_embassy_net_device::(make_static!(NetState::new()), our_mac_addr); + let (runner, device) = usb_cdc_ecm.into_embassy_net_device::( + make_static!(NetState::new()), + our_mac_addr, + ); spawner.spawn(usb_ncm_task(runner)).unwrap();