735 fix

examples/ethernet-rtic-stm32h735g-dk.rs

@@ -44,8 +44,22 @@ static TIME: AtomicU32 = AtomicU32::new(0);
 const MAC_ADDRESS: [u8; 6] = [0x02, 0x00, 0x11, 0x22, 0x33, 0x44];
 
 /// Ethernet descriptor rings are a global singleton
-#[link_section = ".axisram.eth"]
-static mut DES_RING: ethernet::DesRing<4, 4> = ethernet::DesRing::new();
+#[link_section = ".sram3.eth"]
+/// Doc
+static mut TX_DESCRIPTORS: [TxDescriptor; NUM_DESCRIPTORS] =
+    [TxDescriptor::new(); NUM_DESCRIPTORS];
+#[link_section = ".sram3.eth"]
+/// Doc
+static mut TX_BUFFERS: [[u8; MTU + 2]; NUM_DESCRIPTORS] =
+    [[0u8; MTU + 2]; NUM_DESCRIPTORS];
+#[link_section = ".sram3.eth"]
+/// Doc
+static mut RX_DESCRIPTORS: [RxDescriptor; NUM_DESCRIPTORS] =
+    [RxDescriptor::new(); NUM_DESCRIPTORS];
+#[link_section = ".sram3.eth"]
+/// Doc
+static mut RX_BUFFERS: [[u8; MTU + 2]; NUM_DESCRIPTORS] =
+    [[0u8; MTU + 2]; NUM_DESCRIPTORS];
 
 // This data will be held by Net through a mutable reference
 pub struct NetStorageStatic<'a> {
@@ -156,36 +170,57 @@ mod app {
         assert_eq!(ccdr.clocks.pclk4().raw(), 100_000_000); // PCLK 100MHz
 
         let mac_addr = smoltcp::wire::EthernetAddress::from_bytes(&MAC_ADDRESS);
-        let (eth_dma, eth_mac) = unsafe {
-            ethernet::new(
-                ctx.device.ETHERNET_MAC,
-                ctx.device.ETHERNET_MTL,
-                ctx.device.ETHERNET_DMA,
-                (
-                    rmii_ref_clk,
-                    rmii_mdio,
-                    rmii_mdc,
-                    rmii_crs_dv,
-                    rmii_rxd0,
-                    rmii_rxd1,
-                    rmii_tx_en,
-                    rmii_txd0,
-                    rmii_txd1,
-                ),
-                &mut DES_RING,
-                mac_addr,
-                ccdr.peripheral.ETH1MAC,
-                &ccdr.clocks,
+        let (rx_ring, tx_ring) = {
+            // let tx_desc = unsafe { TX_DESCRIPTORS.write([TxDescriptor::new(); NUM_DESCRIPTORS]) };
+            // let tx_buf = unsafe { TX_BUFFERS.write([[0u8; MTU + 2]; NUM_DESCRIPTORS]) };
+
+            // let rx_desc = unsafe { RX_DESCRIPTORS.write([RxDescriptor::new(); NUM_DESCRIPTORS]) };
+            // let rx_buf = unsafe { RX_BUFFERS.write([[0u8; MTU + 2]; NUM_DESCRIPTORS]) };
+
+            (
+                RxDescriptorRing::new(unsafe { &mut RX_DESCRIPTORS }, unsafe {
+                    &mut RX_BUFFERS
+                }),
+                TxDescriptorRing::new(unsafe { &mut TX_DESCRIPTORS }, unsafe {
+                    &mut TX_BUFFERS
+                }),
             )
         };
 
+        let ethernet::Parts {
+            dma: mut eth_dma,
+            mac: mut eth_mac,
+            ptp,
+        } = ethernet::new(
+            dp.ETHERNET_MAC,
+            dp.ETHERNET_MTL,
+            dp.ETHERNET_DMA,                
+            (
+                rmii_ref_clk,
+                rmii_mdio,
+                rmii_mdc,
+                rmii_crs_dv,
+                rmii_rxd0,
+                rmii_rxd1,
+                rmii_tx_en,
+                rmii_txd0,
+                rmii_txd1,
+            ),
+            rx_ring,
+            tx_ring,
+            mac_addr,
+            ccdr.peripheral.ETH1MAC,
+            &ccdr.clocks,
+        );
+        let start_addend = ptp.addend();
+        eth_dma.enable_interrupt();
+
         // Initialise ethernet PHY...
         let mut lan8742a = ethernet::phy::LAN8742A::new(eth_mac);
         lan8742a.phy_reset();
         lan8742a.phy_init();
         // The eth_dma should not be used until the PHY reports the link is up
 
-        unsafe { ethernet::enable_interrupt() };
 
         // unsafe: mutable reference to static storage, we only do this once
         let store = unsafe {