Merge pull request #3 from pazmank/main

fix for issue #114447 <rust-lang/rust#114447>
antoinevg · Aug 22, 2024 · 04b9876 · 04b9876
2 parents d2c5e12 + 712a646
commit 04b9876
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/examples/ethernet_hal.rs b/examples/ethernet_hal.rs
@@ -119,7 +119,7 @@ fn main() -> ! {
             dp.ETHERNET_MAC,
             dp.ETHERNET_MTL,
             dp.ETHERNET_DMA,
-            &mut ETHERNET_DESCRIPTOR_RING,
+            &mut *core::ptr::addr_of_mut!(ETHERNET_DESCRIPTOR_RING),
             mac_addr.clone(),
             ccdr.peripheral.ETH1MAC,
             &ccdr.clocks,

diff --git a/src/ethernet.rs b/src/ethernet.rs
@@ -187,7 +187,7 @@ impl<'a> EthernetInterface<'a> {
 
         let mut interface = EthernetInterface::new(pins);
         let timeout_timer = match interface.up(
-            unsafe { &mut ETHERNET_STORAGE },
+            unsafe { &mut *core::ptr::addr_of_mut!(ETHERNET_STORAGE) },
             mac_address,
             ip_address,
             eth1mac,
@@ -248,7 +248,7 @@ impl<'a> EthernetInterface<'a> {
                 dp.ETHERNET_MAC,
                 dp.ETHERNET_MTL,
                 dp.ETHERNET_DMA,
-                &mut ETHERNET_DESCRIPTOR_RING,
+                &mut *core::ptr::addr_of_mut!(ETHERNET_DESCRIPTOR_RING),
                 ethernet_address,
                 eth1mac,
                 ccdr_clocks,