diff --git a/dram/resources/configs/memconfigs/fifo.xml b/dram/resources/configs/memconfigs/fifo.xml index 2e23e330..50ee681f 100644 --- a/dram/resources/configs/memconfigs/fifo.xml +++ b/dram/resources/configs/memconfigs/fifo.xml @@ -1,15 +1,12 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/dram/resources/configs/memconfigs/fr_fcfs.xml b/dram/resources/configs/memconfigs/fr_fcfs.xml index cce963c7..f3c383f3 100644 --- a/dram/resources/configs/memconfigs/fr_fcfs.xml +++ b/dram/resources/configs/memconfigs/fr_fcfs.xml @@ -8,5 +8,11 @@ - + \ No newline at end of file diff --git a/dram/resources/configs/memconfigs/fr_fcfs_bankwise.xml b/dram/resources/configs/memconfigs/fr_fcfs_bankwise.xml deleted file mode 100644 index 1c2d4e9d..00000000 --- a/dram/resources/configs/memconfigs/fr_fcfs_bankwise.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/dram/resources/configs/memconfigs/fr_fcfs_unaware.xml b/dram/resources/configs/memconfigs/fr_fcfs_unaware.xml deleted file mode 100644 index 167af96e..00000000 --- a/dram/resources/configs/memconfigs/fr_fcfs_unaware.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/dram/resources/configs/memconfigs/grouper.xml b/dram/resources/configs/memconfigs/grouper.xml deleted file mode 100644 index 73116e13..00000000 --- a/dram/resources/configs/memconfigs/grouper.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/dram/resources/configs/memconfigs/memconfig.xml b/dram/resources/configs/memconfigs/memconfig.xml deleted file mode 100644 index 1c2d4e9d..00000000 --- a/dram/resources/configs/memconfigs/memconfig.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/dram/resources/configs/memconfigs/par_bs.xml b/dram/resources/configs/memconfigs/par_bs.xml deleted file mode 100644 index d2f77288..00000000 --- a/dram/resources/configs/memconfigs/par_bs.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/dram/resources/configs/memconfigs/par_bs_unaware.xml b/dram/resources/configs/memconfigs/par_bs_unaware.xml deleted file mode 100644 index aed501d7..00000000 --- a/dram/resources/configs/memconfigs/par_bs_unaware.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/dram/src/controller/core/ControllerCore.cpp b/dram/src/controller/core/ControllerCore.cpp index 6e73f2f3..81e1601a 100644 --- a/dram/src/controller/core/ControllerCore.cpp +++ b/dram/src/controller/core/ControllerCore.cpp @@ -58,7 +58,7 @@ ControllerCore::ControllerCore(IWrapperConnector& wrapperConnector, std::map= Configuration::getInstance().getPowerDownTimeout()) { PowerDownState newState; - if(Configuration::getInstance().powerDownMode == PowerDownMode::TimeoutPDN) + if(Configuration::getInstance().PowerDownMode == EPowerDownMode::TimeoutPDN) { newState = controller.state.rowBufferStates.allRowBuffersAreClosed() ? PowerDownState::PDNPrecharge : PowerDownState::PDNActive; } diff --git a/dram/src/simulation/Simulation.cpp b/dram/src/simulation/Simulation.cpp index db7a69a1..cee6ccdd 100644 --- a/dram/src/simulation/Simulation.cpp +++ b/dram/src/simulation/Simulation.cpp @@ -65,7 +65,7 @@ void Simulation::setupDebugManager(const string& traceName) void Simulation::setupTlmRecorder(const string &traceName, const string &pathToResources, const DramSetup &setup, const std::vector &devices) { - if(Configuration::getInstance().databaseRecordingEnabled) + if(Configuration::getInstance().DatabaseRecording) { TlmRecorder::recordingEnabled = true; TlmRecorder::dbName = traceName;