From 997d11286ce50079879770490e118dc527427cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89der=20F=2E=20Zulian?= Date: Sun, 24 Apr 2016 17:26:42 +0200 Subject: [PATCH] Using the same function to convert clk freq. to period for all memories. --- .../controller/core/configuration/ConfigurationLoader.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.cpp b/DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.cpp index 60bf4a55..acb5c4f1 100644 --- a/DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.cpp +++ b/DRAMSys/simulator/src/controller/core/configuration/ConfigurationLoader.cpp @@ -324,9 +324,8 @@ void ConfigurationLoader::loadWideIO(Configuration& config, XMLElement* memspec) //MemTimings XMLElement* timings = memspec->FirstChildElement("memtimingspec"); double clkMhz = queryDoubleParameter(timings, "clkMhz"); - sc_time clk = sc_time(1 / clkMhz, SC_US); - config.memSpec.clk = clk; - + config.memSpec.clk = FrequencyToClk(clkMhz); + sc_time clk = config.memSpec.clk; config.memSpec.tRP = clk * queryUIntParameter(timings, "RP"); config.memSpec.tRAS = clk * queryUIntParameter(timings, "RAS"); config.memSpec.tRC = clk * queryUIntParameter(timings, "RC"); @@ -385,4 +384,3 @@ void ConfigurationLoader::loadWideIO(Configuration& config, XMLElement* memspec) config.memSpec.vDD = queryDoubleParameter(powers, "vdd"); config.memSpec.vDD2 = queryDoubleParameter(powers, "vdd2"); } -