From 6a00519e733733a4c20da768d9a07a458c8c0970 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 22 Nov 2010 02:33:47 -0500 Subject: [PATCH] IDE,X86: Fix IDE controller BAR configuration for x86. --- 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 4bbad883d..95b13bc7a 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) != 0){ + if ((BARAddrs[0] & ~BAR_IO_MASK) && !legacyIO[0]){ primary.cmdAddr = BARAddrs[0]; primary.cmdSize = BARSize[0]; primary.ctrlAddr = BARAddrs[1]; primary.ctrlSize = BARAddrs[1]; } - if ((BARAddrs[2] & ~BAR_IO_MASK) != 0){ + if ((BARAddrs[2] & ~BAR_IO_MASK) && !legacyIO[2]){ secondary.cmdAddr = BARAddrs[2]; secondary.cmdSize = BARSize[2]; secondary.ctrlAddr = BARAddrs[3]; secondary.ctrlSize = BARAddrs[3]; } -- 2.30.2