diff options
| author | Andrew Schultz <alschult@umich.edu> | 2004-02-05 02:25:45 -0500 |
|---|---|---|
| committer | Andrew Schultz <alschult@umich.edu> | 2004-02-05 02:25:45 -0500 |
| commit | daa579fc0f3aca4e042068862b022095734b41d9 (patch) | |
| tree | 744e2c54646847ea6474aa338700e7f03e6da785 /dev/tsunami.cc | |
| parent | 69e1e10f5d940ee06d2c38f3a1b21c9992587f13 (diff) | |
| download | gem5-daa579fc0f3aca4e042068862b022095734b41d9.tar.xz | |
Fix PCI code so it builds properly now
dev/pciconfigall.cc:
dev/pciconfigall.hh:
dev/pcidev.cc:
dev/pcidev.hh:
dev/tsunami.cc:
dev/tsunami.hh:
A bunch of changes to clean up new PCI code and to fix build
--HG--
extra : convert_revision : 71063bcc565c50fc293b323ddce2c8e701f544ff
Diffstat (limited to 'dev/tsunami.cc')
| -rw-r--r-- | dev/tsunami.cc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/dev/tsunami.cc b/dev/tsunami.cc index c6823ffa4..5fe1d0f23 100644 --- a/dev/tsunami.cc +++ b/dev/tsunami.cc @@ -43,9 +43,9 @@ using namespace std; -Tsunami::Tsunami(const string &name, AdaptecController *s, EtherDev *e, - SimConsole *con, IntrControl *ic, int intr_freq) - : SimObject(name), intrctrl(ic), cons(con), scsi(s), ethernet(e), +Tsunami::Tsunami(const string &name, EtherDev *e, SimConsole *con, + IntrControl *ic, int intr_freq) + : SimObject(name), intrctrl(ic), cons(con), ethernet(e), interrupt_frequency(intr_freq) { for (int i = 0; i < Tsunami::Max_CPUs; i++) @@ -66,7 +66,6 @@ Tsunami::unserialize(Checkpoint *cp, const std::string §ion) BEGIN_DECLARE_SIM_OBJECT_PARAMS(Tsunami) - SimObjectParam<AdaptecController *> scsi; SimObjectParam<EtherDev *> ethernet; SimObjectParam<SimConsole *> cons; SimObjectParam<IntrControl *> intrctrl; @@ -76,7 +75,6 @@ END_DECLARE_SIM_OBJECT_PARAMS(Tsunami) BEGIN_INIT_SIM_OBJECT_PARAMS(Tsunami) - INIT_PARAM(scsi, "scsi controller"), INIT_PARAM(ethernet, "ethernet controller"), INIT_PARAM(cons, "system console"), INIT_PARAM(intrctrl, "interrupt controller"), @@ -84,12 +82,10 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(Tsunami) END_INIT_SIM_OBJECT_PARAMS(Tsunami) - CREATE_SIM_OBJECT(Tsunami) { - return new Tsunami(getInstanceName(), scsi, ethernet, - cons, intrctrl, interrupt_frequency); + return new Tsunami(getInstanceName(), ethernet, cons, intrctrl, + interrupt_frequency); } REGISTER_SIM_OBJECT("Tsunami", Tsunami) - |