From ee489a541a8a49de4e8ca6e486081149f57de99f Mon Sep 17 00:00:00 2001 From: Ali Saidi Date: Mon, 4 Apr 2011 11:42:23 -0500 Subject: [PATCH] IDE: Support x86, Alpha, and ARM use of the IDE controller. --- src/dev/ide_ctrl.cc | 4 ++-- 1 file 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]; } -- 2.30.2