Remove borrowing from ethernet DMA

embed-rs · Apr 9, 2019 · 077a665 · 077a665
1 parent 5ed7599
commit 077a665
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/bin/async-await.rs b/src/bin/async-await.rs
@@ -494,7 +494,7 @@ where
             &mut self.rcc,
             &mut self.syscfg,
             &mut self.ethernet_mac,
-            &mut self.ethernet_dma,
+            self.ethernet_dma,
             ETH_ADDR,
         )
         .map(|device| device.into_interface(Ipv4Address::new(192, 168, 42, 69)));

diff --git a/src/bin/polling.rs b/src/bin/polling.rs
@@ -63,7 +63,7 @@ fn main() -> ! {
     let mut sdmmc = peripherals.SDMMC1;
     let mut syscfg = peripherals.SYSCFG;
     let mut ethernet_mac = peripherals.ETHERNET_MAC;
-    let mut ethernet_dma = peripherals.ETHERNET_DMA;
+    let ethernet_dma = peripherals.ETHERNET_DMA;
 
     init::init_system_clock_216mhz(&mut rcc, &mut pwr, &mut flash);
     init::enable_gpio_ports(&mut rcc);
@@ -138,7 +138,7 @@ fn main() -> ! {
         &mut rcc,
         &mut syscfg,
         &mut ethernet_mac,
-        &mut ethernet_dma,
+        ethernet_dma,
         ETH_ADDR,
     )
     .map(|device| {

diff --git a/src/ethernet/mod.rs b/src/ethernet/mod.rs
@@ -24,14 +24,14 @@ pub const MTU: usize = 1536;
 /// Represents an ethernet device that allows sending and receiving packets.
 ///
 /// This struct implements the [smoltcp::phy::Device] trait.
-pub struct EthernetDevice<'d> {
+pub struct EthernetDevice {
     rx: RxDevice,
     tx: TxDevice,
-    ethernet_dma: &'d mut ETHERNET_DMA,
+    ethernet_dma: ETHERNET_DMA,
     ethernet_address: EthernetAddress,
 }
 
-impl<'d> EthernetDevice<'d> {
+impl EthernetDevice {
     /// Creates and initializes a new `EthernetDevice`.
     ///
     /// This function takes the following parameters:
@@ -48,12 +48,12 @@ impl<'d> EthernetDevice<'d> {
         rcc: &mut RCC,
         syscfg: &mut SYSCFG,
         ethernet_mac: &mut ETHERNET_MAC,
-        ethernet_dma: &'d mut ETHERNET_DMA,
+        mut ethernet_dma: ETHERNET_DMA,
         ethernet_address: EthernetAddress,
     ) -> Result<Self, PhyError> {
         use byteorder::{ByteOrder, LittleEndian};
 
-        init::init(rcc, syscfg, ethernet_mac, ethernet_dma)?;
+        init::init(rcc, syscfg, ethernet_mac, &mut ethernet_dma)?;
 
         let rx_device = RxDevice::new(rx_config)?;
         let tx_device = TxDevice::new(tx_config);
@@ -75,7 +75,7 @@ impl<'d> EthernetDevice<'d> {
             .maca0hr
             .write(|w| w.maca0h().bits(LittleEndian::read_u16(&eth_bytes[4..])));
 
-        init::start(ethernet_mac, ethernet_dma);
+        init::start(ethernet_mac, &mut ethernet_dma);
         Ok(EthernetDevice {
             rx: rx_device,
             tx: tx_device,
@@ -104,14 +104,14 @@ impl<'d> EthernetDevice<'d> {
     }
 }
 
-impl<'d> Drop for EthernetDevice<'d> {
+impl Drop for EthernetDevice {
     fn drop(&mut self) {
         // TODO stop ethernet device and wait for idle
         unimplemented!();
     }
 }
 
-impl<'a, 'd> Device<'a> for EthernetDevice<'d> {
+impl<'a> Device<'a> for EthernetDevice {
     type RxToken = RxToken<'a>;
     type TxToken = TxToken<'a>;