From a783c063eef72ce11fdb8bce351171f997041bc9 Mon Sep 17 00:00:00 2001
From: se <se@FreeBSD.org>
Date: Wed, 9 Apr 1997 09:15:03 +0000
Subject: Fix consistency test to not fail on pre PCI 2.0 motherboards

---
 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 6af7ffd..a626d6c 100644
--- a/sys/amd64/pci/pci_bus.c
+++ b/sys/amd64/pci/pci_bus.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.31 1997/02/22 09:36:58 peter Exp $
+**  $Id: pcibus.c,v 1.32 1997/03/05 20:52:00 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -177,7 +177,7 @@ pcibus_check (void)
 		class = pcibus_read (pcibus_tag (0,device,0), 8);
 		if (bootverbose)
 			printf ("[class=%x] ", class >> 8);
-		if ((class & 0xfff0ff00) != 0x06000000)
+		if (!class || (class & 0xf8f0ff00) != 0)
 			continue;
 
 		header = pcibus_read (pcibus_tag (0,device,0), 12);
diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c
index 6af7ffd..a626d6c 100644
--- a/sys/amd64/pci/pci_cfgreg.c
+++ b/sys/amd64/pci/pci_cfgreg.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.31 1997/02/22 09:36:58 peter Exp $
+**  $Id: pcibus.c,v 1.32 1997/03/05 20:52:00 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -177,7 +177,7 @@ pcibus_check (void)
 		class = pcibus_read (pcibus_tag (0,device,0), 8);
 		if (bootverbose)
 			printf ("[class=%x] ", class >> 8);
-		if ((class & 0xfff0ff00) != 0x06000000)
+		if (!class || (class & 0xf8f0ff00) != 0)
 			continue;
 
 		header = pcibus_read (pcibus_tag (0,device,0), 12);
diff --git a/sys/i386/isa/pcibus.c b/sys/i386/isa/pcibus.c
index 6af7ffd..a626d6c 100644
--- a/sys/i386/isa/pcibus.c
+++ b/sys/i386/isa/pcibus.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.31 1997/02/22 09:36:58 peter Exp $
+**  $Id: pcibus.c,v 1.32 1997/03/05 20:52:00 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -177,7 +177,7 @@ pcibus_check (void)
 		class = pcibus_read (pcibus_tag (0,device,0), 8);
 		if (bootverbose)
 			printf ("[class=%x] ", class >> 8);
-		if ((class & 0xfff0ff00) != 0x06000000)
+		if (!class || (class & 0xf8f0ff00) != 0)
 			continue;
 
 		header = pcibus_read (pcibus_tag (0,device,0), 12);
diff --git a/sys/i386/pci/pci_bus.c b/sys/i386/pci/pci_bus.c
index 6af7ffd..a626d6c 100644
--- a/sys/i386/pci/pci_bus.c
+++ b/sys/i386/pci/pci_bus.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.31 1997/02/22 09:36:58 peter Exp $
+**  $Id: pcibus.c,v 1.32 1997/03/05 20:52:00 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -177,7 +177,7 @@ pcibus_check (void)
 		class = pcibus_read (pcibus_tag (0,device,0), 8);
 		if (bootverbose)
 			printf ("[class=%x] ", class >> 8);
-		if ((class & 0xfff0ff00) != 0x06000000)
+		if (!class || (class & 0xf8f0ff00) != 0)
 			continue;
 
 		header = pcibus_read (pcibus_tag (0,device,0), 12);
diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c
index 6af7ffd..a626d6c 100644
--- a/sys/i386/pci/pci_cfgreg.c
+++ b/sys/i386/pci/pci_cfgreg.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.31 1997/02/22 09:36:58 peter Exp $
+**  $Id: pcibus.c,v 1.32 1997/03/05 20:52:00 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -177,7 +177,7 @@ pcibus_check (void)
 		class = pcibus_read (pcibus_tag (0,device,0), 8);
 		if (bootverbose)
 			printf ("[class=%x] ", class >> 8);
-		if ((class & 0xfff0ff00) != 0x06000000)
+		if (!class || (class & 0xf8f0ff00) != 0)
 			continue;
 
 		header = pcibus_read (pcibus_tag (0,device,0), 12);
diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c
index 6af7ffd..a626d6c 100644
--- a/sys/i386/pci/pci_pir.c
+++ b/sys/i386/pci/pci_pir.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.31 1997/02/22 09:36:58 peter Exp $
+**  $Id: pcibus.c,v 1.32 1997/03/05 20:52:00 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -177,7 +177,7 @@ pcibus_check (void)
 		class = pcibus_read (pcibus_tag (0,device,0), 8);
 		if (bootverbose)
 			printf ("[class=%x] ", class >> 8);
-		if ((class & 0xfff0ff00) != 0x06000000)
+		if (!class || (class & 0xf8f0ff00) != 0)
 			continue;
 
 		header = pcibus_read (pcibus_tag (0,device,0), 12);
-- 
cgit v1.1