merge

2014-04-11 12:26:43 +02:00
parent 53d37036bc 569949cfa6
commit d313afa84a
32 changed files with 513 additions and 240 deletions
--- a/dram/src/simulation/SimulationManager.cpp
+++ b/dram/src/simulation/SimulationManager.cpp
@@ -39,7 +39,7 @@ Simulation::Simulation(sc_module_name name, string pathToResources, string trace
 	for (auto& d : devices)
 	{
 		if (d.burstLength == 0)
-			d.burstLength = 8;
+			d.burstLength = Configuration::getInstance().BurstLength;
 	}

 	player1 = new TracePlayer<>("player1", pathToResources + string("traces/") + devices[0].trace,