From owner-svn-src-all@FreeBSD.ORG Sat Jun 6 17:04:38 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3995B3F1; Sat, 6 Jun 2015 17:04:38 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1B36D1E9C; Sat, 6 Jun 2015 17:04:38 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t56H4bIc051015; Sat, 6 Jun 2015 17:04:37 GMT (envelope-from marcel@FreeBSD.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t56H4a4E051007; Sat, 6 Jun 2015 17:04:36 GMT (envelope-from marcel@FreeBSD.org) Message-Id: <201506061704.t56H4a4E051007@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marcel set sender to marcel@FreeBSD.org using -f From: Marcel Moolenaar Date: Sat, 6 Jun 2015 17:04:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284086 - head/sys/dev/pci X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2015 17:04:38 -0000 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); }