diff options
| author | Andreas Sandberg <andreas.sandberg@arm.com> | 2016-04-06 19:43:31 +0100 |
|---|---|---|
| committer | Andreas Sandberg <andreas.sandberg@arm.com> | 2016-04-06 19:43:31 +0100 |
| commit | be28d96510e0e722db83b26f1a12d3f5de979b32 (patch) | |
| tree | 6a7e1807397f002f51fddb34568b89250fca45c8 /src/sim/sub_system.hh | |
| parent | 8615b27174ae06db4665016c877b1e88031af203 (diff) | |
| download | gem5-be28d96510e0e722db83b26f1a12d3f5de979b32.tar.xz | |
Revert power patch sets with unexpected interactions
The following patches had unexpected interactions with the current
upstream code and have been reverted for now:
e07fd01651f3: power: Add support for power models
831c7f2f9e39: power: Low-power idle power state for idle CPUs
4f749e00b667: power: Add power states to ClockedObject
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
--HG--
extra : amend_source : 0b6fb073c6bbc24be533ec431eb51fbf1b269508
Diffstat (limited to 'src/sim/sub_system.hh')
| -rw-r--r-- | src/sim/sub_system.hh | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/sim/sub_system.hh b/src/sim/sub_system.hh index ec25d7056..6e35be676 100644 --- a/src/sim/sub_system.hh +++ b/src/sim/sub_system.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015 ARM Limited + * Copyright (c) 2014 ARM Limited * All rights reserved * * The license below extends only to copyright in the software and shall @@ -45,14 +45,10 @@ #ifndef __SIM_SUB_SYSTEM_HH__ #define __SIM_SUB_SYSTEM_HH__ -#include <vector> - #include "params/SubSystem.hh" #include "sim/power/thermal_domain.hh" #include "sim/sim_object.hh" -class PowerModel; - /** * The SubSystem simobject does nothing, it is just a container for * other simobjects used by the configuration system @@ -62,17 +58,6 @@ class SubSystem : public SimObject public: typedef SubSystemParams Params; SubSystem(const Params *p); - - double getDynamicPower() const; - - double getStaticPower() const; - - void registerPowerProducer(PowerModel *pm) { - powerProducers.push_back(pm); - } - - protected: - std::vector<PowerModel*> powerProducers; }; #endif |