From ec731888a3516d6e0d6268f0aebad7e06438852e Mon Sep 17 00:00:00 2001
From: Lukas Steiner <lsteiner@rhrk.uni-kl.de>
Date: Mon, 12 Jun 2023 10:29:25 +0200
Subject: [PATCH] Remove check to issue first transaction at zero time.

---
 src/simulator/simulator/request/RequestIssuer.cpp | 12 ++----------
 src/simulator/simulator/request/RequestIssuer.h   |  3 ---
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/simulator/simulator/request/RequestIssuer.cpp b/src/simulator/simulator/request/RequestIssuer.cpp
index 8ae4417f..3a8bd7ba 100644
--- a/src/simulator/simulator/request/RequestIssuer.cpp
+++ b/src/simulator/simulator/request/RequestIssuer.cpp
@@ -79,14 +79,7 @@ void RequestIssuer::sendNextRequest()
     tlm::tlm_phase phase = tlm::BEGIN_REQ;
     sc_core::sc_time delay = request.delay;
 
-    if (request.address == 0x4000f000)
-        int x = 0;
-
-    if (transactionsSent == 0)
-        delay = sc_core::SC_ZERO_TIME;
-
     iSocket->nb_transport_fw(payload, phase, delay);
-    transactionInProgress = true;
 
     if (request.command == Request::Command::Read)
         pendingReadRequests++;
@@ -121,12 +114,11 @@ void RequestIssuer::peqCallback(tlm::tlm_generic_payload &payload, const tlm::tl
     }
     else if (phase == tlm::BEGIN_RESP)
     {
-        tlm::tlm_phase phase = tlm::END_RESP;
+        tlm::tlm_phase nextPhase = tlm::END_RESP;
         sc_core::sc_time delay = sc_core::SC_ZERO_TIME;
-        iSocket->nb_transport_fw(payload, phase, delay);
+        iSocket->nb_transport_fw(payload, nextPhase, delay);
 
         payload.release();
-        transactionInProgress = false;
 
         transactionFinished();
 
diff --git a/src/simulator/simulator/request/RequestIssuer.h b/src/simulator/simulator/request/RequestIssuer.h
index 831fb2b4..816f8138 100644
--- a/src/simulator/simulator/request/RequestIssuer.h
+++ b/src/simulator/simulator/request/RequestIssuer.h
@@ -63,7 +63,6 @@ private:
     tlm_utils::peq_with_cb_and_phase<RequestIssuer> payloadEventQueue;
     MemoryManager &memoryManager;
 
-    bool transactionInProgress = false;
     bool transactionPostponed = false;
     bool finished = false;
 
@@ -75,8 +74,6 @@ private:
     const std::optional<unsigned int> maxPendingReadRequests;
     const std::optional<unsigned int> maxPendingWriteRequests;
 
-    unsigned int activeProducers = 0;
-
     std::function<void()> transactionFinished;
     std::function<void()> terminate;
     std::function<Request()> nextRequest;