summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Saidi <Ali.Saidi@ARM.com>2011-04-04 11:42:23 -0500
committerAli Saidi <Ali.Saidi@ARM.com>2011-04-04 11:42:23 -0500
commitee489a541a8a49de4e8ca6e486081149f57de99f (patch)
tree48f706597c8ac301df037894b05e416665001a61
parentc56eb8fb3c8974ebd63a760c54c1012c4357ebe5 (diff)
downloadgem5-ee489a541a8a49de4e8ca6e486081149f57de99f.tar.xz
IDE: Support x86, Alpha, and ARM use of the IDE controller.
-rw-r--r--src/dev/ide_ctrl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dev/ide_ctrl.cc b/src/dev/ide_ctrl.cc
index 95b13bc7a..8e9b673ac 100644
--- a/src/dev/ide_ctrl.cc
+++ b/src/dev/ide_ctrl.cc
@@ -107,11 +107,11 @@ IdeController::IdeController(Params *p)
primary.select(false);
secondary.select(false);
- if ((BARAddrs[0] & ~BAR_IO_MASK) && !legacyIO[0]){
+ if ((BARAddrs[0] & ~BAR_IO_MASK) && (!legacyIO[0] || ioShift)) {
primary.cmdAddr = BARAddrs[0]; primary.cmdSize = BARSize[0];
primary.ctrlAddr = BARAddrs[1]; primary.ctrlSize = BARAddrs[1];
}
- if ((BARAddrs[2] & ~BAR_IO_MASK) && !legacyIO[2]){
+ if ((BARAddrs[2] & ~BAR_IO_MASK) && (!legacyIO[2] || ioShift)) {
secondary.cmdAddr = BARAddrs[2]; secondary.cmdSize = BARSize[2];
secondary.ctrlAddr = BARAddrs[3]; secondary.ctrlSize = BARAddrs[3];
}