From dd4dc7bcd692e0046d18ceb42fc933b24d684edf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89der=20Ferreira=20Zulian?= <fzeder@rhrk.uni-kl.de>
Date: Thu, 28 May 2015 17:51:44 +0200
Subject: [PATCH] Revert "Cosmetic changes only."

This reverts commit 707ce4da8dc269f6087d9299c568cb9797adf642.
---
 dram/src/controller/Controller.h          | 9 +++++++++
 dram/src/controller/IController.h         | 5 +++--
 dram/src/controller/scheduler/Fr_Fcfs.h   | 4 ++--
 dram/src/simulation/Dram.h                | 1 -
 dram/src/simulation/SimulationManager.cpp | 5 ++---
 dram/src/simulation/main.cpp              | 4 +++-
 6 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/dram/src/controller/Controller.h b/dram/src/controller/Controller.h
index 02353e5b..29d06618 100644
--- a/dram/src/controller/Controller.h
+++ b/dram/src/controller/Controller.h
@@ -155,6 +155,15 @@ void Controller<BUSWIDTH>::buildScheduler()
     {
         scheduler = new FR_FCFS(*controllerCore);
     }
+//    else if (selectedScheduler == "PAR_BS")
+//    {
+//        scheduler = new PAR_BS(*controllerCore, Configuration::getInstance().RefreshAwareScheduling,
+//                               Configuration::getInstance().Capsize);
+//    }
+//    else if (selectedScheduler == "Grouper")
+//    {
+//        scheduler = new ReadWriteGrouper(*controllerCore);
+//    }
     else
         reportFatal(name(), "unsupported scheduler: " + selectedScheduler);
 }
diff --git a/dram/src/controller/IController.h b/dram/src/controller/IController.h
index 2ad32cbb..1b97345f 100644
--- a/dram/src/controller/IController.h
+++ b/dram/src/controller/IController.h
@@ -38,11 +38,12 @@
 #ifndef ICONTROLLER_H
 #define ICONTROLLER_H
 
-#include <systemc.h>
 
+#include <systemc.h>
 #include "core/scheduling/ScheduledCommand.h"
 #include "core/scheduling/Trigger.h"
 
+
 // Utiliy class to pass around the Controller class to the controller Core and various schedulers, without having to propagate the template defintions
 // throughout all classes
 class IController
@@ -55,5 +56,5 @@ public:
 
 };
 
-#endif // ICONTROLLER_H
 
+#endif // ICONTROLLER_H
diff --git a/dram/src/controller/scheduler/Fr_Fcfs.h b/dram/src/controller/scheduler/Fr_Fcfs.h
index ad919cb2..187b81ab 100644
--- a/dram/src/controller/scheduler/Fr_Fcfs.h
+++ b/dram/src/controller/scheduler/Fr_Fcfs.h
@@ -36,7 +36,7 @@
  */
 
 #ifndef FR_FCFS_H_
-#define FR_FCFS_H_
+#define  FR_FCFS_H_
 
 #include "IScheduler.h"
 #include "../core/ControllerCore.h"
@@ -60,5 +60,5 @@ private:
 
 };
 
-#endif /* FR_FCFS_H_ */
 
+#endif
diff --git a/dram/src/simulation/Dram.h b/dram/src/simulation/Dram.h
index eb928f0e..a29d6a5b 100644
--- a/dram/src/simulation/Dram.h
+++ b/dram/src/simulation/Dram.h
@@ -318,4 +318,3 @@ struct Dram: sc_module
 };
 
 #endif /* DRAM_H_ */
-
diff --git a/dram/src/simulation/SimulationManager.cpp b/dram/src/simulation/SimulationManager.cpp
index 17423f06..f463f23a 100644
--- a/dram/src/simulation/SimulationManager.cpp
+++ b/dram/src/simulation/SimulationManager.cpp
@@ -1,4 +1,4 @@
-/*
+    /*
  * Copyright (c) 2015, University of Kaiserslautern
  * All rights reserved.
  *
@@ -36,13 +36,12 @@
 
 #include <sys/wait.h>
 #include <boost/filesystem.hpp>
-
 #include "SimulationManager.h"
 #include "../common/Utils.h"
-
 using namespace std;
 using namespace tinyxml2;
 
+
 SimulationManager::SimulationManager(string resources) : resources(resources)
 {
 }
diff --git a/dram/src/simulation/main.cpp b/dram/src/simulation/main.cpp
index 0c160654..04f08f0b 100644
--- a/dram/src/simulation/main.cpp
+++ b/dram/src/simulation/main.cpp
@@ -36,11 +36,13 @@
 
 #include <iostream>
 #include <string>
+#include "SimulationManager.h"
+#include "../controller/core/configuration/Configuration.h"
+
 #include <systemc.h>
 #include <utility>
 #include <vector>
 
-#include "SimulationManager.h"
 
 using namespace std;