summaryrefslogtreecommitdiff
path: root/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
diff options
context:
space:
mode:
authorBrad Beckmann <Brad.Beckmann@amd.com>2010-01-29 20:29:33 -0800
committerBrad Beckmann <Brad.Beckmann@amd.com>2010-01-29 20:29:33 -0800
commite4218dd08f13a2f4f5f688f5fb03083658bb7705 (patch)
tree42f9635ff8c3859e2c2d5e7062cec24e27f2e49e /src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
parent26cce73e97d721545c8a2805183192c775c37004 (diff)
downloadgem5-e4218dd08f13a2f4f5f688f5fb03083658bb7705.tar.xz
ruby: Re-enabled orion power models
Removed the dummy power function implementations so that Orion can implement them correctly. Since Orion lacks modular design, this patch simply enables scons to compile it. There are no python configuration changes in this patch.
Diffstat (limited to 'src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh')
-rw-r--r--src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
index 505353089..498a6cae1 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
@@ -74,11 +74,8 @@ public:
void swarb_req();
void power_router_initialize(power_router *router, power_router_info *info);
- double calculate_power() { return 0.0; }
- double calculate_offline_power(power_router*, power_router_info*)
- {
- return 0.0;
- }
+ double calculate_power();
+ double calculate_offline_power(power_router*, power_router_info*);
void calculate_performance_numbers();
private: