diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2004-06-11 01:55:20 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2004-06-11 01:55:20 -0400 |
| commit | ca0dcd048c02ac1857d487e4f027bf8bf18e4266 (patch) | |
| tree | b9790cc5b9453e52c4eb74921ecb4d5a7790c02f | |
| parent | 7902e0bec78aa12066baf8f8e62bf316dad5cd6a (diff) | |
| download | gem5-ca0dcd048c02ac1857d487e4f027bf8bf18e4266.tar.xz | |
after unserialization in the ide driver we need to reprogram the
busbridges. Also small fix for gcc 3.3.3.
dev/etherpkt.hh:
Gcc 3.3.3 wants assert.h to be include in this file.
dev/ide_ctrl.cc:
after unserialization we need to tell the busbridges what addresses to
respond to.
--HG--
extra : convert_revision : a421197a5be07761bdef571d0a9406d77788e270
| -rw-r--r-- | dev/etherpkt.hh | 1 | ||||
| -rw-r--r-- | dev/ide_ctrl.cc | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/dev/etherpkt.hh b/dev/etherpkt.hh index 8d0022363..76b4a9156 100644 --- a/dev/etherpkt.hh +++ b/dev/etherpkt.hh @@ -35,6 +35,7 @@ #include <iosfwd> #include <memory> +#include <assert.h> #include "sim/host.hh" #include "base/refcnt.hh" diff --git a/dev/ide_ctrl.cc b/dev/ide_ctrl.cc index b25f83723..67da63a9b 100644 --- a/dev/ide_ctrl.cc +++ b/dev/ide_ctrl.cc @@ -653,6 +653,17 @@ IdeController::unserialize(Checkpoint *cp, const std::string §ion) UNSERIALIZE_SCALAR(io_enabled); UNSERIALIZE_SCALAR(bm_enabled); UNSERIALIZE_ARRAY(cmd_in_progress, 4); + if (pioInterface) { + pioInterface->addAddrRange(pri_cmd_addr, pri_cmd_addr + + pri_cmd_size - 1); + pioInterface->addAddrRange(pri_ctrl_addr, pri_ctrl_addr + + pri_ctrl_size - 1); + pioInterface->addAddrRange(sec_cmd_addr, sec_cmd_addr + + sec_cmd_size - 1); + pioInterface->addAddrRange(sec_ctrl_addr, sec_ctrl_addr + + sec_ctrl_size - 1); + pioInterface->addAddrRange(bmi_addr, bmi_addr + bmi_size - 1); + } } #ifndef DOXYGEN_SHOULD_SKIP_THIS |