From c536a708906e9c5651859d97dffbf676d75ee53b Mon Sep 17 00:00:00 2001
From: mwojcik <mw@m-labs.hk>
Date: Fri, 19 May 2023 12:58:32 +0800
Subject: [PATCH] satellite gateware: add rtio analyzer

---
 src/gateware/kasli_soc.py | 4 ++++
 src/gateware/zc706.py     | 4 ++++
 src/satman/src/main.rs    | 3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/gateware/kasli_soc.py b/src/gateware/kasli_soc.py
index 17e8820e..477cb718 100755
--- a/src/gateware/kasli_soc.py
+++ b/src/gateware/kasli_soc.py
@@ -438,6 +438,10 @@ class GenericSatellite(SoCCore):
         self.submodules.rtio_moninj = rtio.MonInj(self.rtio_channels)
         self.csr_devices.append("rtio_moninj")
 
+        self.submodules.rtio_analyzer = analyzer.Analyzer(self.rtio_tsc, self.local_io.cri,
+                                                          self.ps7.s_axi_hp1)
+        self.csr_devices.append("rtio_analyzer")
+
         rtio_clk_period = 1e9/clk_freq
         self.rustc_cfg["rtio_frequency"] = str(clk_freq/1e6)
 
diff --git a/src/gateware/zc706.py b/src/gateware/zc706.py
index 8805c400..4ffd1e3f 100755
--- a/src/gateware/zc706.py
+++ b/src/gateware/zc706.py
@@ -486,6 +486,10 @@ class _SatelliteBase(SoCCore):
             enable_routing=True)
         self.csr_devices.append("cri_con")
 
+        self.submodules.rtio_analyzer = analyzer.Analyzer(self.rtio_tsc, self.rtio_core.cri,
+                                                          self.ps7.s_axi_hp1)
+        self.csr_devices.append("rtio_analyzer")
+
         self.submodules.routing_table = rtio.RoutingTableAccess(self.cri_con)
         self.csr_devices.append("routing_table")
 
diff --git a/src/satman/src/main.rs b/src/satman/src/main.rs
index 6eb33cd3..9cf8406b 100644
--- a/src/satman/src/main.rs
+++ b/src/satman/src/main.rs
@@ -28,6 +28,7 @@ use libboard_artiq::io_expander;
 #[cfg(has_si5324)]
 use libboard_artiq::si5324;
 use libboard_artiq::{drtio_routing, drtioaux, identifier_read, logger, pl::csr};
+use libboard_artiq::{drtioaux_proto::ANALYZER_MAX_SIZE};
 #[cfg(feature = "target_kasli_soc")]
 use libboard_zynq::error_led::ErrorLED;
 use libboard_zynq::{gic, i2c::I2c, mpcore, print, println, stdio, time::Milliseconds, timer::GlobalTimer};
@@ -421,7 +422,7 @@ fn process_aux_packet(
             drtioaux::send(0, &drtioaux::Packet::AnalyzerHeader {
                 total_byte_count: header.total_byte_count,
                 sent_bytes: header.sent_bytes,
-                overflow_occurred: header.overflow,
+                overflow_occurred: header.error,
             })
         }
         drtioaux::Packet::AnalyzerDataRequest { destination: _destination } => {