diff options
| author | Kevin Lim <ktlim@umich.edu> | 2005-04-14 16:06:34 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2005-04-14 16:06:34 -0400 |
| commit | 26d6d97f5d46bfe2cc5734eb632bec0bc67aed19 (patch) | |
| tree | ed8a33f234ee4d85bc79f6179ea8907976ee3e70 /dev/tsunami.cc | |
| parent | dcedd7866e35adc1e0fbc081188b259ffc7bbdf5 (diff) | |
| parent | 5e67b78af7f74d7223ced5b54978ca9fa29606c5 (diff) | |
| download | gem5-26d6d97f5d46bfe2cc5734eb632bec0bc67aed19.tar.xz | |
Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5
--HG--
extra : convert_revision : 0baadd8d68bfa6f8e96307eb2d4426b0d9e0b8b4
Diffstat (limited to 'dev/tsunami.cc')
| -rw-r--r-- | dev/tsunami.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/dev/tsunami.cc b/dev/tsunami.cc index c84dde9bc..55a2c5ea6 100644 --- a/dev/tsunami.cc +++ b/dev/tsunami.cc @@ -45,9 +45,9 @@ using namespace std; -Tsunami::Tsunami(const string &name, System *s, - IntrControl *ic, PciConfigAll *pci, int intr_freq) - : Platform(name, ic, pci, intr_freq), system(s) +Tsunami::Tsunami(const string &name, System *s, IntrControl *ic, + PciConfigAll *pci) + : Platform(name, ic, pci), system(s) { // set the back pointer from the system to myself system->platform = this; @@ -109,7 +109,6 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(Tsunami) SimObjectParam<System *> system; SimObjectParam<IntrControl *> intrctrl; SimObjectParam<PciConfigAll *> pciconfig; - Param<int> interrupt_frequency; END_DECLARE_SIM_OBJECT_PARAMS(Tsunami) @@ -117,15 +116,13 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(Tsunami) INIT_PARAM(system, "system"), INIT_PARAM(intrctrl, "interrupt controller"), - INIT_PARAM(pciconfig, "PCI configuration"), - INIT_PARAM_DFLT(interrupt_frequency, "frequency of interrupts", 1024) + INIT_PARAM(pciconfig, "PCI configuration") END_INIT_SIM_OBJECT_PARAMS(Tsunami) CREATE_SIM_OBJECT(Tsunami) { - return new Tsunami(getInstanceName(), system, intrctrl, pciconfig, - interrupt_frequency); + return new Tsunami(getInstanceName(), system, intrctrl, pciconfig); } REGISTER_SIM_OBJECT("Tsunami", Tsunami) |