Generate timestamps if available

Author: bugadani

src/dap.rs

@@ -101,6 +101,9 @@ where
             }
             // Bit 4: Atomic commands not supported
             // Bit 5: Test Domain Timer not supported
+            if dependencies.timer_available() {
+                caps.insert(Capabilities::TEST_DOMAIN_TIMER);
+            }
             // Bit 6: SWO Streaming Trace optional
             if swo.support().streaming {
                 caps.insert(Capabilities::SWO_STREAMING);
@@ -705,7 +708,8 @@ where
             let a = swd::DPRegister::try_from((transfer_req & (3 << 2)) >> 2).unwrap();
             let vmatch = (transfer_req & (1 << 4)) != 0;
             let mmask = (transfer_req & (1 << 5)) != 0;
-            let _ts = (transfer_req & (1 << 7)) != 0;
+            //  Bit 7 (Time Stamp) cannot be combined with Bit 4 (Value Match) or Bit 5 (Match Mask).
+            let timestamp = (transfer_req & (1 << 7)) != 0;
 
             if rnw == swd::RnW::R {
                 // Issue register read
@@ -720,11 +724,20 @@ where
                     if swd.read_ap(wait_retries, a).check(resp.mut_at(2)).is_none() {
                         break;
                     }
+                    if timestamp {
+                        // Store Timestamp of next AP read
+                        resp.write_u32(swd.timestamp());
+                    }
                     match swd.read_dp(wait_retries, rdbuff).check(resp.mut_at(2)) {
                         Some(v) => v,
                         None => break,
                     }
                 } else {
+                    if timestamp {
+                        // Store Timestamp
+                        resp.write_u32(swd.timestamp());
+                    }
+
                     // Reads from DP are not posted, so directly read the register.
                     match swd.read_dp(wait_retries, a).check(resp.mut_at(2)) {
                         Some(v) => v,
@@ -781,6 +794,11 @@ where
                 {
                     break;
                 }
+
+                if timestamp {
+                    // Store Timestamp
+                    resp.write_u32(swd.timestamp());
+                }
             }
         }
     }
@@ -848,7 +866,7 @@ where
                     }
 
                     if post_read && request_value.timestamp {
-                        resp.write_u32(0); // TODO real timestamp
+                        resp.write_u32(jtag.timestamp());
                     }
                 }
 
@@ -906,7 +924,7 @@ where
                         }
 
                         if request_value.timestamp {
-                            resp.write_u32(0); // TODO real timestamp
+                            resp.write_u32(jtag.timestamp());
                         }
                         post_read = true;
                     }
@@ -951,7 +969,7 @@ where
                     }
 
                     if request_value.timestamp {
-                        resp.write_u32(0); // TODO real timestamp
+                        resp.write_u32(jtag.timestamp());
                     }
                 }
             }

src/jtag.rs

@@ -186,6 +186,11 @@ pub trait Jtag<DEPS>: From<DEPS> {
     /// Returns whether JTAG is available or not.
     fn available(deps: &DEPS) -> bool;
 
+    /// Returns the current timestamp.
+    fn timestamp(&self) -> u32 {
+        0
+    }
+
     /// Returns a mutable reference to the JTAG interface configuration.
     fn config(&mut self) -> &mut Config;
 

src/mock_device.rs

@@ -2,6 +2,8 @@ use crate::{jtag, swd, swj};
 
 #[mockall::automock]
 pub trait SwdJtagDevice {
+    fn timer_available(&self) -> bool;
+
     // swj
     fn high_impedance_mode(&mut self);
     fn process_swj_clock(&mut self, max_frequency: u32) -> bool;
@@ -25,6 +27,10 @@ pub trait SwdJtagDevice {
 }
 
 impl swj::Dependencies<Self, Self> for MockSwdJtagDevice {
+    fn timer_available(&self) -> bool {
+        SwdJtagDevice::timer_available(self)
+    }
+
     fn high_impedance_mode(&mut self) {
         SwdJtagDevice::high_impedance_mode(self)
     }

src/swd.rs

@@ -114,6 +114,11 @@ pub trait Swd<DEPS>: From<DEPS> {
     /// Returns whether SWD is available or not.
     fn available(deps: &DEPS) -> bool;
 
+    /// Returns the current timestamp.
+    fn timestamp(&self) -> u32 {
+        0
+    }
+
     /// Returns a mutable reference to the SWD interface configuration.
     fn config(&mut self) -> &mut Config;
 

src/swj.rs

@@ -26,6 +26,11 @@ bitflags! {
 ///
 /// User has to provide implementations of SWJ_{Pins, Sequence, Clock} commands
 pub trait Dependencies<SWD, JTAG>: From<SWD> + From<JTAG> {
+    /// Returns true if the device can generate timestamps.
+    fn timer_available(&self) -> bool {
+        false
+    }
+
     /// Runner for SWJ_Pins commands.
     fn process_swj_pins(&mut self, output: Pins, mask: Pins, wait_us: u32) -> Pins;