Small fixes

Author: datdenkikniet

examples/common.rs

@@ -23,24 +23,26 @@ pub use pins::{setup_pins, Gpio};
 use fugit::RateExtU32;
 use stm32_eth::hal::rcc::RccExt;
 
+const NUM_DESCRIPTORS: usize = 4;
+
 /// On H7s, the ethernet DMA does not have access to the normal ram
 /// so we must explicitly put them in SRAM.
 #[cfg_attr(feature = "stm32h7xx-hal", link_section = ".sram1.eth")]
-static mut TX_DESCRIPTORS: MaybeUninit<[TxDescriptor; 4]> = MaybeUninit::uninit();
+static mut TX_DESCRIPTORS: MaybeUninit<[TxDescriptor; NUM_DESCRIPTORS]> = MaybeUninit::uninit();
+#[cfg_attr(feature = "stm32h7xx-hal", link_section = ".sram1.eth")]
+static mut TX_BUFFERS: MaybeUninit<[[u8; MTU + 2]; NUM_DESCRIPTORS]> = MaybeUninit::uninit();
+#[cfg_attr(feature = "stm32h7xx-hal", link_section = ".sram1.eth")]
+static mut RX_DESCRIPTORS: MaybeUninit<[RxDescriptor; NUM_DESCRIPTORS]> = MaybeUninit::uninit();
 #[cfg_attr(feature = "stm32h7xx-hal", link_section = ".sram1.eth")]
-static mut TX_BUFFERS: MaybeUninit<[[u8; MTU + 2]; 4]> = MaybeUninit::uninit();
-#[cfg_attr(feature = "stm32h7xx-hal", link_section = ".sram1.eth2")]
-static mut RX_DESCRIPTORS: MaybeUninit<[RxDescriptor; 4]> = MaybeUninit::uninit();
-#[cfg_attr(feature = "stm32h7xx-hal", link_section = ".sram1.eth2")]
-static mut RX_BUFFERS: MaybeUninit<[[u8; MTU + 2]; 4]> = MaybeUninit::uninit();
+static mut RX_BUFFERS: MaybeUninit<[[u8; MTU + 2]; NUM_DESCRIPTORS]> = MaybeUninit::uninit();
 
 /// Set up the buffers to be used
 pub fn setup_rings() -> (TxDescriptorRing<'static>, RxDescriptorRing<'static>) {
-    let tx_desc = unsafe { TX_DESCRIPTORS.write([TxDescriptor::new(); 4]) };
-    let tx_buf = unsafe { TX_BUFFERS.write([[0u8; MTU + 2]; 4]) };
+    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(); 4]) };
-    let rx_buf = unsafe { RX_BUFFERS.write([[0u8; MTU + 2]; 4]) };
+    let rx_desc = unsafe { RX_DESCRIPTORS.write([RxDescriptor::new(); NUM_DESCRIPTORS]) };
+    let rx_buf = unsafe { RX_BUFFERS.write([[0u8; MTU + 2]; NUM_DESCRIPTORS]) };
 
     (
         TxDescriptorRing::new(tx_desc, tx_buf),

src/ptp/mod.rs

@@ -136,7 +136,7 @@ impl EthernetPTP {
             mac.macssir
                 .write(|w| unsafe { w.ssinc().bits(stssi.raw() as u8) });
 
-            Self {}
+            me
         };
 
         me.set_addend(tsa);