svn commit: r284086 - head/sys/dev/pci

[Marcel Moolenaar]

Author: marcel
Date: Sat Jun  6 17:04:36 2015
New Revision: 284086
URL: https://svnweb.freebsd.org/changeset/base/284086

Log:
  Revert previous change. The magical constants can't be changed
  (easily) without having to go to other drivers to change the
  magical return values. This wouldn't be so bad if there were
  proper defines for these constants.
  
  In particular dev/acpica/acpi_pcib_pci.c returns -1000 as the
  probe priority and it's expected that this driver gets to
  attach over the common PCI bus drivers.

Modified:
  head/sys/dev/pci/eisa_pci.c
  head/sys/dev/pci/hostb_pci.c
  head/sys/dev/pci/ignore_pci.c
  head/sys/dev/pci/isa_pci.c
  head/sys/dev/pci/pci_pci.c

Modified: head/sys/dev/pci/eisa_pci.c
==============================================================================
--- head/sys/dev/pci/eisa_pci.c	Sat Jun  6 16:47:45 2015	(r284085)
+++ head/sys/dev/pci/eisa_pci.c	Sat Jun  6 17:04:36 2015	(r284086)
@@ -100,7 +100,7 @@ eisab_probe(device_t dev)
     
     if (matched) {
 	device_set_desc(dev, "PCI-EISA bridge");
-	return (BUS_PROBE_GENERIC);
+	return(-10000);
     }
     return(ENXIO);
 }

Modified: head/sys/dev/pci/hostb_pci.c
==============================================================================
--- head/sys/dev/pci/hostb_pci.c	Sat Jun  6 16:47:45 2015	(r284085)
+++ head/sys/dev/pci/hostb_pci.c	Sat Jun  6 17:04:36 2015	(r284086)
@@ -63,7 +63,7 @@ pci_hostb_probe(device_t dev)
 	    pci_get_subclass(dev) == PCIS_BRIDGE_HOST) {
 		device_set_desc(dev, "Host to PCI bridge");
 		device_quiet(dev);
-		return (BUS_PROBE_GENERIC);
+		return (-10000);
 	}
 	return (ENXIO);
 }

Modified: head/sys/dev/pci/ignore_pci.c
==============================================================================
--- head/sys/dev/pci/ignore_pci.c	Sat Jun  6 16:47:45 2015	(r284085)
+++ head/sys/dev/pci/ignore_pci.c	Sat Jun  6 17:04:36 2015	(r284086)
@@ -66,7 +66,7 @@ ignore_pci_probe(device_t dev)
     case 0x10001042ul:	/* SMC 37C665 */
 	device_set_desc(dev, "ignored");
 	device_quiet(dev);
-	return (BUS_PROBE_GENERIC);
+	return(-10000);
     }
     return(ENXIO);
 }

Modified: head/sys/dev/pci/isa_pci.c
==============================================================================
--- head/sys/dev/pci/isa_pci.c	Sat Jun  6 16:47:45 2015	(r284085)
+++ head/sys/dev/pci/isa_pci.c	Sat Jun  6 17:04:36 2015	(r284086)
@@ -154,7 +154,7 @@ isab_pci_probe(device_t dev)
 
     if (matched) {
 	device_set_desc(dev, "PCI-ISA bridge");
-	return (BUS_PROBE_GENERIC);
+	return(-10000);
     }
     return(ENXIO);
 }

Modified: head/sys/dev/pci/pci_pci.c
==============================================================================
--- head/sys/dev/pci/pci_pci.c	Sat Jun  6 16:47:45 2015	(r284085)
+++ head/sys/dev/pci/pci_pci.c	Sat Jun  6 17:04:36 2015	(r284086)
@@ -890,7 +890,7 @@ pcib_probe(device_t dev)
     if ((pci_get_class(dev) == PCIC_BRIDGE) &&
 	(pci_get_subclass(dev) == PCIS_BRIDGE_PCI)) {
 	device_set_desc(dev, "PCI-PCI bridge");
-	return (BUS_PROBE_GENERIC);
+	return(-10000);
     }
     return(ENXIO);
 }