Make packetcounter standalone

Author: datdenkikniet

src/dma/mod.rs

@@ -47,7 +47,7 @@ pub struct EthernetDMA<'rx, 'tx> {
     pub(crate) tx_ring: TxRing<'tx>,
 
     #[cfg(feature = "ptp")]
-    packet_id_counter: u32,
+    packet_id_counter: PacketIdCounter,
 }
 
 impl<'rx, 'tx> EthernetDMA<'rx, 'tx> {
@@ -125,7 +125,7 @@ impl<'rx, 'tx> EthernetDMA<'rx, 'tx> {
             tx_ring: TxRing::new(tx_buffer),
 
             #[cfg(feature = "ptp")]
-            packet_id_counter: 0,
+            packet_id_counter: PacketIdCounter(0),
         };
 
         dma.rx_ring.start(&dma.eth_dma);
@@ -375,9 +375,7 @@ impl EthernetDMA<'_, '_> {
 
     /// Get the next packet ID.
     pub fn next_packet_id(&mut self) -> PacketId {
-        let id = PacketId(self.packet_id_counter);
-        self.packet_id_counter = self.packet_id_counter.wrapping_add(1);
-        id
+        self.packet_id_counter.next()
     }
 }
 
@@ -393,3 +391,15 @@ pub struct InterruptReasonSummary {
     /// The interrupt was caused by an error event.
     pub is_error: bool,
 }
+
+#[cfg(feature = "ptp")]
+struct PacketIdCounter(u32);
+
+#[cfg(feature = "ptp")]
+impl PacketIdCounter {
+    pub fn next(&mut self) -> PacketId {
+        let id = PacketId(self.0);
+        self.0 = self.0.wrapping_add(1);
+        id
+    }
+}

src/dma/smoltcp_phy.rs

@@ -28,13 +28,17 @@ impl<'a, 'rx, 'tx> Device for &'a mut EthernetDMA<'rx, 'tx> {
     }
 
     fn receive(&mut self, _timestamp: Instant) -> Option<(Self::RxToken<'_>, Self::TxToken<'_>)> {
-        if self.tx_available() && self.rx_available() {
+        let EthernetDMA {
+            rx_ring,
+            tx_ring,
             #[cfg(feature = "ptp")]
-            let rx_packet_id = self.next_packet_id();
+            packet_id_counter,
+            ..
+        } = self;
 
-            let EthernetDMA {
-                rx_ring, tx_ring, ..
-            } = self;
+        if tx_ring.next_entry_available() && rx_ring.next_entry_available() {
+            #[cfg(feature = "ptp")]
+            let rx_packet_id = packet_id_counter.next();
 
             let rx = EthRxToken {
                 rx_ring,