From ccfe1f45af9d3ea0b45689a26f255b084764d331 Mon Sep 17 00:00:00 2001
From: Lukas Steiner <lsteiner@rhrk.uni-kl.de>
Date: Mon, 25 Nov 2019 23:44:54 +0100
Subject: [PATCH] Small bugfix in LPDDR4 checker, some method renaming.

---
 DRAMSys/library/src/controller/checker/CheckerLPDDR4.cpp      | 2 +-
 DRAMSys/library/src/controller/refresh/RefreshManager.cpp     | 4 ++--
 DRAMSys/library/src/controller/refresh/RefreshManager.h       | 4 ++--
 .../library/src/controller/refresh/RefreshManagerBankwise.h   | 4 ++--
 DRAMSys/library/src/controller/refresh/RefreshManagerDummy.h  | 4 ++--
 DRAMSys/library/src/controller/refresh/RefreshManagerIF.h     | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/DRAMSys/library/src/controller/checker/CheckerLPDDR4.cpp b/DRAMSys/library/src/controller/checker/CheckerLPDDR4.cpp
index 661a3129..ea2deb12 100644
--- a/DRAMSys/library/src/controller/checker/CheckerLPDDR4.cpp
+++ b/DRAMSys/library/src/controller/checker/CheckerLPDDR4.cpp
@@ -175,7 +175,7 @@ sc_time CheckerLPDDR4::delayToSatisfyConstraints(Command command, Rank rank, Ban
 
         lastCommandStart = lastScheduledByCommandAndRank[Command::RDA][rank.ID()];
         if (lastCommandStart != SC_ZERO_TIME)
-            earliestTimeToStart = std::max(earliestTimeToStart, lastCommandStart + memSpec->tRTP + 2 * memSpec->clk);
+            earliestTimeToStart = std::max(earliestTimeToStart, lastCommandStart + memSpec->tCCD + memSpec->tRTP - 6 * memSpec->clk);
 
         lastCommandStart = lastScheduledByCommandAndRank[Command::WR][rank.ID()];
         if (lastCommandStart != SC_ZERO_TIME)
diff --git a/DRAMSys/library/src/controller/refresh/RefreshManager.cpp b/DRAMSys/library/src/controller/refresh/RefreshManager.cpp
index ccc836d4..3035418e 100644
--- a/DRAMSys/library/src/controller/refresh/RefreshManager.cpp
+++ b/DRAMSys/library/src/controller/refresh/RefreshManager.cpp
@@ -52,12 +52,12 @@ RefreshManager::RefreshManager(std::vector<BankMachine *> &bankMachines,
         maxPulledin = -config.ControllerCoreRefMaxPulledIn;
 }
 
-void RefreshManager::messageActive()
+void RefreshManager::notifyActive()
 {
     controllerIdle = false;
 }
 
-void RefreshManager::messageIdle()
+void RefreshManager::notifyIdle()
 {
     controllerIdle = true;
 }
diff --git a/DRAMSys/library/src/controller/refresh/RefreshManager.h b/DRAMSys/library/src/controller/refresh/RefreshManager.h
index 44f85fe0..aa7acd03 100644
--- a/DRAMSys/library/src/controller/refresh/RefreshManager.h
+++ b/DRAMSys/library/src/controller/refresh/RefreshManager.h
@@ -52,8 +52,8 @@ public:
     virtual sc_time start() override;
     virtual void updateState(Command, tlm_generic_payload *) override;
 
-    virtual void messageActive() override;
-    virtual void messageIdle() override;
+    virtual void notifyActive() override;
+    virtual void notifyIdle() override;
 
 private:
     enum class RmState {Regular, Pulledin} state = RmState::Regular;
diff --git a/DRAMSys/library/src/controller/refresh/RefreshManagerBankwise.h b/DRAMSys/library/src/controller/refresh/RefreshManagerBankwise.h
index cdf457c1..4054c0e2 100644
--- a/DRAMSys/library/src/controller/refresh/RefreshManagerBankwise.h
+++ b/DRAMSys/library/src/controller/refresh/RefreshManagerBankwise.h
@@ -54,8 +54,8 @@ public:
     virtual sc_time start() override;
     virtual void updateState(Command, tlm_generic_payload *) override;
 
-    virtual void messageActive() override {}
-    virtual void messageIdle() override {}
+    virtual void notifyActive() override {}
+    virtual void notifyIdle() override {}
 
 private:
     enum class RmState {Regular, Precharged, Pulledin} state = RmState::Regular;
diff --git a/DRAMSys/library/src/controller/refresh/RefreshManagerDummy.h b/DRAMSys/library/src/controller/refresh/RefreshManagerDummy.h
index a59a5112..e9c2cabe 100644
--- a/DRAMSys/library/src/controller/refresh/RefreshManagerDummy.h
+++ b/DRAMSys/library/src/controller/refresh/RefreshManagerDummy.h
@@ -50,8 +50,8 @@ public:
     virtual sc_time start() override;
     virtual void updateState(Command, tlm_generic_payload *) override {}
 
-    virtual void messageActive() override {}
-    virtual void messageIdle() override {}
+    virtual void notifyActive() override {}
+    virtual void notifyIdle() override {}
 };
 
 #endif // REFRESHMANAGERDUMMY_H
diff --git a/DRAMSys/library/src/controller/refresh/RefreshManagerIF.h b/DRAMSys/library/src/controller/refresh/RefreshManagerIF.h
index fd428a37..cedf94c9 100644
--- a/DRAMSys/library/src/controller/refresh/RefreshManagerIF.h
+++ b/DRAMSys/library/src/controller/refresh/RefreshManagerIF.h
@@ -51,8 +51,8 @@ public:
     virtual sc_time start() = 0;
     virtual void updateState(Command, tlm_generic_payload *) = 0;
 
-    virtual void messageIdle() = 0;
-    virtual void messageActive() = 0;
+    virtual void notifyIdle() = 0;
+    virtual void notifyActive() = 0;
 };
 
 #endif // REFRESHMANAGERIF_H