From owner-svn-src-head@FreeBSD.ORG Tue Aug 5 17:32:48 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7CE699B1 for ; Tue, 5 Aug 2014 17:32:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6D6D52CAB for ; Tue, 5 Aug 2014 17:32:48 +0000 (UTC) Received: from ian (uid 1311) (envelope-from ian@FreeBSD.org) id 53a1 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Tue, 05 Aug 2014 17:32:48 +0000 From: Ian Lepore Date: Tue, 5 Aug 2014 17:32:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r269597 - in head/sys/dev: fdt ofw X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e11540.53a1.5dab12e3@svn.freebsd.org> X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Aug 2014 17:32:48 -0000 Author: ian Date: Tue Aug 5 17:32:47 2014 New Revision: 269597 URL: http://svnweb.freebsd.org/changeset/base/269597 Log: Adjust ofwbus and simplebus to attach at BUS_PASS_ORDER_MIDDLE, so that a platform can attach some other bus first if necessary. Modified: head/sys/dev/fdt/simplebus.c head/sys/dev/ofw/ofwbus.c Modified: head/sys/dev/fdt/simplebus.c ============================================================================== --- head/sys/dev/fdt/simplebus.c Tue Aug 5 17:22:48 2014 (r269596) +++ head/sys/dev/fdt/simplebus.c Tue Aug 5 17:32:47 2014 (r269597) @@ -124,7 +124,7 @@ static devclass_t simplebus_devclass; EARLY_DRIVER_MODULE(simplebus, ofwbus, simplebus_driver, simplebus_devclass, 0, 0, BUS_PASS_BUS); EARLY_DRIVER_MODULE(simplebus, simplebus, simplebus_driver, simplebus_devclass, - 0, 0, BUS_PASS_BUS); + 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); static int simplebus_probe(device_t dev) Modified: head/sys/dev/ofw/ofwbus.c ============================================================================== --- head/sys/dev/ofw/ofwbus.c Tue Aug 5 17:22:48 2014 (r269596) +++ head/sys/dev/ofw/ofwbus.c Tue Aug 5 17:32:47 2014 (r269597) @@ -137,7 +137,7 @@ static driver_t ofwbus_driver = { }; static devclass_t ofwbus_devclass; EARLY_DRIVER_MODULE(ofwbus, nexus, ofwbus_driver, ofwbus_devclass, 0, 0, - BUS_PASS_BUS); + BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); MODULE_VERSION(ofwbus, 1); static const char *const ofwbus_excl_name[] = {