Remove ordering requirements for DMA and MAC. They were likely a manifestation of #57

Author: datdenkikniet

src/dma/mod.rs

@@ -4,10 +4,7 @@ use core::borrow::Borrow;
 
 use cortex_m::peripheral::NVIC;
 
-use crate::{
-    peripherals::{ETHERNET_DMA, ETHERNET_MAC},
-    stm32::Interrupt,
-};
+use crate::{peripherals::ETHERNET_DMA, stm32::Interrupt};
 
 #[cfg(feature = "smoltcp-phy")]
 mod smoltcp_phy;
@@ -45,11 +42,6 @@ impl<'rx, 'tx> EthernetDMA<'rx, 'tx> {
     /// usually not accessible.
     pub(crate) fn new(
         eth_dma: ETHERNET_DMA,
-        // Take a reference to ETHERNET_MAC to ensure that
-        // this function cannot be called before `EthernetMAC::new`.
-        // If we do that, shenanigans ensues (presumably clock and wait
-        // condition mismatch)
-        #[allow(unused_variables)] eth_mac: &ETHERNET_MAC,
         rx_buffer: &'rx mut [RxRingEntry],
         tx_buffer: &'tx mut [TxRingEntry],
     ) -> Self {

src/lib.rs

@@ -107,13 +107,10 @@ where
     let eth_mac = eth_mac.into();
 
     // Congfigure and start up the ethernet DMA.
-    // Note: this _must_ happen before configuring the MAC.
-    // It's not entirely clear why, but no interrupts are
-    // generated if the order is reversed.
-    let dma = EthernetDMA::new(eth_dma.into(), &eth_mac, rx_buffer, tx_buffer);
+    let dma = EthernetDMA::new(eth_dma.into(), rx_buffer, tx_buffer);
 
     // Configure the ethernet MAC
-    let mac = EthernetMAC::new(eth_mac, eth_mmc, &dma, clocks, Speed::FullDuplexBase100Tx)?;
+    let mac = EthernetMAC::new(eth_mac, eth_mmc, clocks, Speed::FullDuplexBase100Tx)?;
 
     Ok((dma, mac))
 }
@@ -170,14 +167,11 @@ where
     let eth_mac = eth_mac.into();
 
     // Congfigure and start up the ethernet DMA.
-    // Note: this _must_ happen before configuring the MAC.
-    // It's not entirely clear why, but no interrupts are
-    // generated if the order is reversed.
-    let dma = EthernetDMA::new(eth_dma.into(), &eth_mac, rx_buffer, tx_buffer);
+    let dma = EthernetDMA::new(eth_dma.into(), rx_buffer, tx_buffer);
 
     // Configure the ethernet MAC
-    let mac = EthernetMAC::new(eth_mac, eth_mmc, &dma, clocks, Speed::FullDuplexBase100Tx)?
-        .with_mii(mdio, mdc);
+    let mac =
+        EthernetMAC::new(eth_mac, eth_mmc, clocks, Speed::FullDuplexBase100Tx)?.with_mii(mdio, mdc);
 
     Ok((dma, mac))
 }

src/mac/mod.rs

@@ -2,7 +2,7 @@
 
 use core::ops::{Deref, DerefMut};
 
-use crate::{hal::rcc::Clocks, peripherals::ETHERNET_MAC, stm32::ETHERNET_MMC, EthernetDMA};
+use crate::{hal::rcc::Clocks, peripherals::ETHERNET_MAC, stm32::ETHERNET_MMC};
 
 mod miim;
 pub use miim::*;
@@ -59,10 +59,6 @@ impl EthernetMAC {
     pub(crate) fn new(
         eth_mac: ETHERNET_MAC,
         eth_mmc: ETHERNET_MMC,
-        // Take a reference to EthernetDMA to ensure
-        // that `EthernetDMA` has been called before
-        // this function.
-        #[allow(unused)] eth_dma: &EthernetDMA,
         clocks: Clocks,
         initial_speed: Speed,
     ) -> Result<Self, WrongClock> {