From 8031cd93b53cd3fe17a5a5f21e8e8bd833398e97 Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Wed, 1 Jun 2005 21:44:00 -0400
Subject: Standardize clock parameter names to 'clock'. Fix description for Bus
 clock_ratio (no longer a ratio). Add Clock param type (generic Frequency or
 Latency).

cpu/base_cpu.cc:
cpu/base_cpu.hh:
cpu/beta_cpu/alpha_full_cpu_builder.cc:
cpu/simple_cpu/simple_cpu.cc:
dev/ide_ctrl.cc:
dev/ns_gige.cc:
dev/ns_gige.hh:
dev/pciconfigall.cc:
dev/sinic.cc:
dev/tsunami_cchip.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
dev/uart.cc:
python/m5/objects/BaseCPU.py:
python/m5/objects/BaseCache.py:
python/m5/objects/BaseSystem.py:
python/m5/objects/Bus.py:
python/m5/objects/Ethernet.py:
python/m5/objects/Root.py:
sim/universe.cc:
    Standardize clock parameter names to 'clock'.
    Fix description for Bus clock_ratio (no longer a ratio).
python/m5/config.py:
    Minor tweaks on Frequency/Latency:
    - added new Clock param type to avoid ambiguities
    - factored out init code into getLatency()
    - made RootFrequency *not* a subclass of Frequency so it
    can't be directly assigned to a Frequency paremeter

--HG--
extra : convert_revision : fc4bb8562df171b454bbf696314cda57e1ec8506
---
 sim/universe.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sim')

diff --git a/sim/universe.cc b/sim/universe.cc
index ecf54c2e7..981a8ebae 100644
--- a/sim/universe.cc
+++ b/sim/universe.cc
@@ -85,14 +85,14 @@ class Root : public SimObject
 
 BEGIN_DECLARE_SIM_OBJECT_PARAMS(Root)
 
-    Param<Tick> frequency;
+    Param<Tick> clock;
     Param<string> output_file;
 
 END_DECLARE_SIM_OBJECT_PARAMS(Root)
 
 BEGIN_INIT_SIM_OBJECT_PARAMS(Root)
 
-    INIT_PARAM(frequency, "tick frequency"),
+    INIT_PARAM(clock, "tick frequency"),
     INIT_PARAM(output_file, "file to dump simulator output to")
 
 END_INIT_SIM_OBJECT_PARAMS(Root)
@@ -109,7 +109,7 @@ CREATE_SIM_OBJECT(Root)
     Root *root = new Root(getInstanceName());
 
     using namespace Clock;
-    Frequency = frequency;
+    Frequency = clock;
     Float::s = static_cast<double>(Frequency);
     Float::ms = Float::s / 1.0e3;
     Float::us = Float::s / 1.0e6;
-- 
cgit v1.2.3