Move responsiblity for getting timestamps from a descriptor to the descriptor

Author: datdenkikniet

src/dma/rx/f_series_desc.rs

@@ -166,6 +166,12 @@ impl RxDescriptor {
 
     /// Get PTP timestamps if available
     pub(super) fn read_timestamp(&self) -> Option<Timestamp> {
+        #[cfg(any(feature = "stm32f4xx-hal", feature = "stm32f7xx-hal"))]
+        let (high, low) = { (self.inner_raw.read(7), self.inner_raw.read(6)) };
+
+        #[cfg(feature = "stm32f1xx-hal")]
+        let (high, low) = { (self.inner_raw.read(3), self.inner_raw.read(2)) };
+
         #[cfg(not(feature = "stm32f1xx-hal"))]
         let is_valid = {
             /// RX timestamp
@@ -174,14 +180,15 @@ impl RxDescriptor {
         };
 
         #[cfg(feature = "stm32f1xx-hal")]
-        // There is no "timestamp valid" indicator bit
-        // on STM32F1XX
-        let is_valid = true;
+        // There is no direct "timestamp valid" indicator bit
+        // on STM32F1XX, but if it's invalid it will be written
+        // as all ones.
+        let is_valid = high != 0xFFFF_FFFF || low != 0xFFFF_FFFF;
 
-        let timestamp = Timestamp::from_descriptor(&self.inner_raw);
+        let timestamp = Timestamp::from_parts(high, low);
 
         if is_valid && self.is_last() {
-            timestamp
+            Some(timestamp)
         } else {
             None
         }

src/dma/tx/f_series_desc.rs

@@ -162,7 +162,13 @@ impl TxDescriptor {
         let contains_timestamp = (tdes0 & TXDESC_0_TIMESTAMP_STATUS) == TXDESC_0_TIMESTAMP_STATUS;
 
         if !self.is_owned() && contains_timestamp && Self::is_last(tdes0) {
-            Timestamp::from_descriptor(&self.inner_raw)
+            #[cfg(any(feature = "stm32f4xx-hal", feature = "stm32f7xx-hal"))]
+            let (high, low) = { (self.inner_raw.read(7), self.inner_raw.read(6)) };
+
+            #[cfg(feature = "stm32f1xx-hal")]
+            let (high, low) = { (self.inner_raw.read(3), self.inner_raw.read(2)) };
+
+            Some(Timestamp::from_parts(high, low))
         } else {
             None
         }

src/ptp/timestamp.rs

@@ -1,5 +1,3 @@
-use crate::dma::raw_descriptor::RawDescriptor;
-
 use super::Subseconds;
 
 /// A timestamp produced by the PTP periperhal
@@ -96,28 +94,6 @@ impl Timestamp {
 
         Timestamp::new_unchecked(negative, high, subseconds)
     }
-
-    /// Create a timestamp from the given descriptor
-    pub fn from_descriptor(desc: &RawDescriptor) -> Option<Self> {
-        #[cfg(not(feature = "stm32f1xx-hal"))]
-        {
-            let (high, low) = { (desc.read(7), desc.read(6)) };
-            Some(Self::from_parts(high, low))
-        }
-
-        #[cfg(feature = "stm32f1xx-hal")]
-        {
-            let (high, low) = { (desc.read(3), desc.read(2)) };
-
-            // The timestamp registers are written to all-ones if
-            // timestamping was no succesfull
-            if high == 0xFFFF_FFFF && low == 0xFFFF_FFFF {
-                None
-            } else {
-                Some(Self::from_parts(high, low))
-            }
-        }
-    }
 }
 
 impl core::ops::Add<Timestamp> for Timestamp {