Make sure this fits in 32K and don't wfi, it breaks defmt

Author: Johannes Draaijer

examples/arp.rs

@@ -14,7 +14,6 @@ use core::cell::RefCell;
 use core::default::Default;
 use cortex_m_rt::{entry, exception};
 
-use cortex_m::asm;
 use cortex_m::interrupt::Mutex;
 use stm32_eth::{
     mac::{phy::BarePhy, Phy},
@@ -43,8 +42,9 @@ fn main() -> ! {
 
     let (eth_pins, mdio, mdc) = common::setup_pins(gpio);
 
-    let mut rx_ring: [RingEntry<_>; 16] = Default::default();
-    let mut tx_ring: [RingEntry<_>; 8] = Default::default();
+    let mut rx_ring: [RingEntry<_>; 2] = Default::default();
+    let mut tx_ring: [RingEntry<_>; 2] = Default::default();
+
     let (mut eth_dma, eth_mac) = stm32_eth::new(
         ethernet.mac,
         ethernet.mmc,
@@ -118,10 +118,6 @@ fn main() -> ! {
         cortex_m::interrupt::free(|cs| {
             let mut eth_pending = ETH_PENDING.borrow(cs).borrow_mut();
             *eth_pending = false;
-
-            if !*eth_pending {
-                asm::wfi();
-            }
         });
     }
 }

examples/ip.rs

@@ -9,7 +9,6 @@
 use defmt_rtt as _;
 use panic_probe as _;
 
-use cortex_m::asm;
 use cortex_m_rt::{entry, exception};
 use stm32_eth::stm32::{interrupt, CorePeripherals, Peripherals, SYST};
 
@@ -43,7 +42,7 @@ fn main() -> ! {
 
     let (eth_pins, _mdio, _mdc) = common::setup_pins(gpio);
 
-    let mut rx_ring: [RingEntry<_>; 8] = Default::default();
+    let mut rx_ring: [RingEntry<_>; 2] = Default::default();
     let mut tx_ring: [RingEntry<_>; 2] = Default::default();
     let (mut eth_dma, _eth_mac) = stm32_eth::new(
         ethernet.mac,
@@ -71,8 +70,8 @@ fn main() -> ! {
         .neighbor_cache(neighbor_cache)
         .finalize();
 
-    let mut server_rx_buffer = [0; 2048];
-    let mut server_tx_buffer = [0; 2048];
+    let mut server_rx_buffer = [0; 512];
+    let mut server_tx_buffer = [0; 512];
     let server_socket = TcpSocket::new(
         TcpSocketBuffer::new(&mut server_rx_buffer[..]),
         TcpSocketBuffer::new(&mut server_tx_buffer[..]),
@@ -101,16 +100,7 @@ fn main() -> ! {
                     }
                 }
             }
-            Ok(false) => {
-                // Sleep if no ethernet work is pending
-                cortex_m::interrupt::free(|cs| {
-                    let eth_pending = ETH_PENDING.borrow(cs).borrow_mut();
-                    if !*eth_pending {
-                        asm::wfi();
-                        // Awaken by interrupt
-                    }
-                });
-            }
+            Ok(false) => {}
             Err(e) =>
             // Ignore malformed packets
             {

examples/rtic-echo.rs

@@ -56,8 +56,8 @@ mod app {
     }
 
     #[init(local = [
-        rx_ring: [RxRingEntry; 4] = [RxRingEntry::new(),RxRingEntry::new(),RxRingEntry::new(),RxRingEntry::new()],
-        tx_ring: [TxRingEntry; 4] = [TxRingEntry::new(),TxRingEntry::new(),TxRingEntry::new(),TxRingEntry::new()],
+        rx_ring: [RxRingEntry; 2] = [RxRingEntry::new(),RxRingEntry::new()],
+        tx_ring: [TxRingEntry; 2] = [TxRingEntry::new(),TxRingEntry::new()],
         storage: NetworkStorage = NetworkStorage::new(),
         dma: core::mem::MaybeUninit<EthernetDMA<'static, 'static>> = core::mem::MaybeUninit::uninit(),
     ])]