diff options
| author | Ron Dreslinski <rdreslin@umich.edu> | 2005-01-17 15:03:48 -0500 |
|---|---|---|
| committer | Ron Dreslinski <rdreslin@umich.edu> | 2005-01-17 15:03:48 -0500 |
| commit | ff9c4f109764e245f5bff5dffc9fec83224c9d4f (patch) | |
| tree | c6161e4de8773b0296e2b416195a562fd931a42b /dev/ide_ctrl.cc | |
| parent | 93146bc81a391fc298c2b49e2b3ecf969ae93b72 (diff) | |
| parent | c9fa82e25f2d86f2e26d357fac669c18899e39f8 (diff) | |
| download | gem5-ff9c4f109764e245f5bff5dffc9fec83224c9d4f.tar.xz | |
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision : da464558edb2a77dc02033464a88a59f2ae6355d
Diffstat (limited to 'dev/ide_ctrl.cc')
| -rw-r--r-- | dev/ide_ctrl.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/dev/ide_ctrl.cc b/dev/ide_ctrl.cc index 109908ead..037de1dea 100644 --- a/dev/ide_ctrl.cc +++ b/dev/ide_ctrl.cc @@ -664,6 +664,7 @@ IdeController::unserialize(Checkpoint *cp, const std::string §ion) BEGIN_DECLARE_SIM_OBJECT_PARAMS(IdeController) + Param<Addr> addr; SimObjectVectorParam<IdeDisk *> disks; SimObjectParam<MemoryController *> mmu; SimObjectParam<PciConfigAll *> configspace; @@ -680,6 +681,7 @@ END_DECLARE_SIM_OBJECT_PARAMS(IdeController) BEGIN_INIT_SIM_OBJECT_PARAMS(IdeController) + INIT_PARAM(addr, "Device Address"), INIT_PARAM(disks, "IDE disks attached to this controller"), INIT_PARAM(mmu, "Memory controller"), INIT_PARAM(configspace, "PCI Configspace"), |