From: Gabe Black <gblack@eecs.umich.edu>
Date: Mon, 22 Nov 2010 07:33:47 +0000 (-0500)
Subject: IDE,X86: Fix IDE controller BAR configuration for x86.
X-Git-Tag: stable_2012_02_02~723
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6a00519e733733a4c20da768d9a07a458c8c0970;p=gem5.git

IDE,X86: Fix IDE controller BAR configuration for x86.
---

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];
     }