From e254ef1a60370a2d7fd2a416a3b526077668d1c0 Mon Sep 17 00:00:00 2001
From: Filip Leonarski <filip.leonarski@psi.ch>
Date: Thu, 23 Nov 2023 14:52:53 +0100
Subject: [PATCH] FPGA: No "trailing" address message in AXI-Stream

---
 fpga/hls/data_collection_fsm.cpp | 5 +----
 fpga/hls/save_to_hbm.cpp         | 4 +---
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/fpga/hls/data_collection_fsm.cpp b/fpga/hls/data_collection_fsm.cpp
index 6efb8ab8..b5439287 100644
--- a/fpga/hls/data_collection_fsm.cpp
+++ b/fpga/hls/data_collection_fsm.cpp
@@ -84,10 +84,7 @@ void data_collection_fsm(AXI_STREAM &eth_in,
             packet_out.dest = 0;
             packet_out.id   = 1;
             data_out << packet_out;
-
-            addr.last = 0;
-            addr_out << addr;
-
+            
             rcv_state = RCV_INIT;
             break;
         case RCV_INIT:
diff --git a/fpga/hls/save_to_hbm.cpp b/fpga/hls/save_to_hbm.cpp
index 83244cac..ff3ba96f 100644
--- a/fpga/hls/save_to_hbm.cpp
+++ b/fpga/hls/save_to_hbm.cpp
@@ -33,9 +33,6 @@ void save_to_hbm(STREAM_512 &data_in,
         cmpl[i].last = 0;
     }
 
-    axis_addr addr;
-    addr_in >> addr;
-
     packet_512_t packet_in;
     data_in >> packet_in;
     data_out << packet_in;
@@ -43,6 +40,7 @@ void save_to_hbm(STREAM_512 &data_in,
     ap_uint<32> offset_hbm_0 = 12 * hbm_size_bytes / 32;
     ap_uint<32> offset_hbm_1 = 14 * hbm_size_bytes / 32;
 
+    axis_addr addr;
     addr_in >> addr;
 
     Loop_good_packet: