From d2a2d5ec41806b0444a74d0aedadf26555723f32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20E=C3=9Fer?= <se@FreeBSD.org>
Date: Fri, 30 Jun 1995 16:11:42 +0000
Subject: [PATCH] The PCI config mechanism 1 test failed for the Intel Aries.
 Make it less strict ...

Submitted by:	NIIMI Satoshi <sa2c@and.or.jp>
---
 sys/amd64/pci/pci_bus.c    | 4 ++--
 sys/amd64/pci/pci_cfgreg.c | 4 ++--
 sys/i386/isa/pcibus.c      | 4 ++--
 sys/i386/pci/pci_bus.c     | 4 ++--
 sys/i386/pci/pci_cfgreg.c  | 4 ++--
 sys/i386/pci/pci_pir.c     | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys/amd64/pci/pci_bus.c b/sys/amd64/pci/pci_bus.c
index d2a2ad92797e..d0621e99cac2 100644
--- a/sys/amd64/pci/pci_bus.c
+++ b/sys/amd64/pci/pci_bus.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.8 1995/03/22 21:35:39 se Exp $
+**  $Id: pcibus.c,v 1.9 1995/06/28 15:54:57 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -164,7 +164,7 @@ pcibus_setup (void)
 	result = inl (CONF1_ADDR_PORT);
 	outl (CONF1_ADDR_PORT, oldval);
 
-	if (result == CONF1_ENABLE) {
+	if (result & CONF1_ENABLE) {
 		pci_mechanism = 1;
 		pci_maxdevice = 32;
 		return;
diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c
index d2a2ad92797e..d0621e99cac2 100644
--- a/sys/amd64/pci/pci_cfgreg.c
+++ b/sys/amd64/pci/pci_cfgreg.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.8 1995/03/22 21:35:39 se Exp $
+**  $Id: pcibus.c,v 1.9 1995/06/28 15:54:57 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -164,7 +164,7 @@ pcibus_setup (void)
 	result = inl (CONF1_ADDR_PORT);
 	outl (CONF1_ADDR_PORT, oldval);
 
-	if (result == CONF1_ENABLE) {
+	if (result & CONF1_ENABLE) {
 		pci_mechanism = 1;
 		pci_maxdevice = 32;
 		return;
diff --git a/sys/i386/isa/pcibus.c b/sys/i386/isa/pcibus.c
index d2a2ad92797e..d0621e99cac2 100644
--- a/sys/i386/isa/pcibus.c
+++ b/sys/i386/isa/pcibus.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.8 1995/03/22 21:35:39 se Exp $
+**  $Id: pcibus.c,v 1.9 1995/06/28 15:54:57 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -164,7 +164,7 @@ pcibus_setup (void)
 	result = inl (CONF1_ADDR_PORT);
 	outl (CONF1_ADDR_PORT, oldval);
 
-	if (result == CONF1_ENABLE) {
+	if (result & CONF1_ENABLE) {
 		pci_mechanism = 1;
 		pci_maxdevice = 32;
 		return;
diff --git a/sys/i386/pci/pci_bus.c b/sys/i386/pci/pci_bus.c
index d2a2ad92797e..d0621e99cac2 100644
--- a/sys/i386/pci/pci_bus.c
+++ b/sys/i386/pci/pci_bus.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.8 1995/03/22 21:35:39 se Exp $
+**  $Id: pcibus.c,v 1.9 1995/06/28 15:54:57 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -164,7 +164,7 @@ pcibus_setup (void)
 	result = inl (CONF1_ADDR_PORT);
 	outl (CONF1_ADDR_PORT, oldval);
 
-	if (result == CONF1_ENABLE) {
+	if (result & CONF1_ENABLE) {
 		pci_mechanism = 1;
 		pci_maxdevice = 32;
 		return;
diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c
index d2a2ad92797e..d0621e99cac2 100644
--- a/sys/i386/pci/pci_cfgreg.c
+++ b/sys/i386/pci/pci_cfgreg.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.8 1995/03/22 21:35:39 se Exp $
+**  $Id: pcibus.c,v 1.9 1995/06/28 15:54:57 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -164,7 +164,7 @@ pcibus_setup (void)
 	result = inl (CONF1_ADDR_PORT);
 	outl (CONF1_ADDR_PORT, oldval);
 
-	if (result == CONF1_ENABLE) {
+	if (result & CONF1_ENABLE) {
 		pci_mechanism = 1;
 		pci_maxdevice = 32;
 		return;
diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c
index d2a2ad92797e..d0621e99cac2 100644
--- a/sys/i386/pci/pci_pir.c
+++ b/sys/i386/pci/pci_pir.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.8 1995/03/22 21:35:39 se Exp $
+**  $Id: pcibus.c,v 1.9 1995/06/28 15:54:57 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -164,7 +164,7 @@ pcibus_setup (void)
 	result = inl (CONF1_ADDR_PORT);
 	outl (CONF1_ADDR_PORT, oldval);
 
-	if (result == CONF1_ENABLE) {
+	if (result & CONF1_ENABLE) {
 		pci_mechanism = 1;
 		pci_maxdevice = 32;
 		return;