Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 Sep 2010 11:09:31 +0000 (UTC)
From:      Andriy Gapon <avg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r212893 - in stable/7/sys: amd64/amd64 arm/arm arm/xscale/ixp425 dev/acpica dev/atkbdc dev/firewire dev/iicbus dev/ppbus dev/spibus i386/i386 ia64/ia64 isa kern pc98/pc98 sparc64/sparc6...
Message-ID:  <201009201109.o8KB9Vj8049546@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: avg
Date: Mon Sep 20 11:09:31 2010
New Revision: 212893
URL: http://svn.freebsd.org/changeset/base/212893

Log:
  MFC r212413: bus_add_child: change type of order parameter to u_int

Modified:
  stable/7/sys/amd64/amd64/legacy.c
  stable/7/sys/amd64/amd64/nexus.c
  stable/7/sys/arm/arm/nexus.c
  stable/7/sys/arm/xscale/ixp425/ixp425.c
  stable/7/sys/dev/acpica/acpi.c
  stable/7/sys/dev/acpica/acpi_cpu.c
  stable/7/sys/dev/atkbdc/atkbdc_isa.c
  stable/7/sys/dev/firewire/firewire.c
  stable/7/sys/dev/firewire/fwohci_pci.c
  stable/7/sys/dev/iicbus/iicbus.c
  stable/7/sys/dev/ppbus/ppbconf.c
  stable/7/sys/dev/spibus/spibus.c
  stable/7/sys/i386/i386/legacy.c
  stable/7/sys/i386/i386/nexus.c
  stable/7/sys/ia64/ia64/nexus.c
  stable/7/sys/isa/isa_common.c
  stable/7/sys/kern/bus_if.m
  stable/7/sys/kern/subr_bus.c
  stable/7/sys/pc98/pc98/canbus.c
  stable/7/sys/sparc64/sparc64/nexus.c
  stable/7/sys/sun4v/sun4v/nexus.c
  stable/7/sys/sun4v/sun4v/vnex.c
  stable/7/sys/sys/bus.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/amd64/amd64/legacy.c
==============================================================================
--- stable/7/sys/amd64/amd64/legacy.c	Mon Sep 20 07:31:08 2010	(r212892)
+++ stable/7/sys/amd64/amd64/legacy.c	Mon Sep 20 11:09:31 2010	(r212893)
@@ -61,7 +61,7 @@ static void legacy_identify(driver_t *dr
 static	int legacy_probe(device_t);
 static	int legacy_attach(device_t);
 static	int legacy_print_child(device_t, device_t);
-static device_t legacy_add_child(device_t bus, int order, const char *name,
+static device_t legacy_add_child(device_t bus, u_int order, const char *name,
 				int unit);
 static	int legacy_read_ivar(device_t, device_t, int, uintptr_t *);
 static	int legacy_write_ivar(device_t, device_t, int, uintptr_t);
@@ -170,7 +170,7 @@ legacy_print_child(device_t bus, device_
 }
 
 static device_t
-legacy_add_child(device_t bus, int order, const char *name, int unit)
+legacy_add_child(device_t bus, u_int order, const char *name, int unit)
 {
 	device_t child;
 	struct legacy_device *atdev;
@@ -234,7 +234,7 @@ legacy_write_ivar(device_t dev, device_t
 static void	cpu_identify(driver_t *driver, device_t parent);
 static int	cpu_read_ivar(device_t dev, device_t child, int index,
 		    uintptr_t *result);
-static device_t cpu_add_child(device_t bus, int order, const char *name,
+static device_t cpu_add_child(device_t bus, u_int order, const char *name,
 		    int unit);
 static struct resource_list *cpu_get_rlist(device_t dev, device_t child);
 
@@ -299,7 +299,7 @@ cpu_identify(driver_t *driver, device_t 
 }
 
 static device_t
-cpu_add_child(device_t bus, int order, const char *name, int unit)
+cpu_add_child(device_t bus, u_int order, const char *name, int unit)
 {
 	struct cpu_device *cd;
 	device_t child;

Modified: stable/7/sys/amd64/amd64/nexus.c
==============================================================================
--- stable/7/sys/amd64/amd64/nexus.c	Mon Sep 20 07:31:08 2010	(r212892)
+++ stable/7/sys/amd64/amd64/nexus.c	Mon Sep 20 11:09:31 2010	(r212893)
@@ -85,7 +85,7 @@ static	int nexus_probe(device_t);
 static	int nexus_attach(device_t);
 static	int nexus_print_all_resources(device_t dev);
 static	int nexus_print_child(device_t, device_t);
-static device_t nexus_add_child(device_t bus, int order, const char *name,
+static device_t nexus_add_child(device_t bus, u_int order, const char *name,
 				int unit);
 static	struct resource *nexus_alloc_resource(device_t, device_t, int, int *,
 					      u_long, u_long, u_long, u_int);
@@ -286,7 +286,7 @@ nexus_print_child(device_t bus, device_t
 }
 
 static device_t
-nexus_add_child(device_t bus, int order, const char *name, int unit)
+nexus_add_child(device_t bus, u_int order, const char *name, int unit)
 {
 	device_t		child;
 	struct nexus_device	*ndev;

Modified: stable/7/sys/arm/arm/nexus.c
==============================================================================
--- stable/7/sys/arm/arm/nexus.c	Mon Sep 20 07:31:08 2010	(r212892)
+++ stable/7/sys/arm/arm/nexus.c	Mon Sep 20 11:09:31 2010	(r212893)
@@ -74,7 +74,7 @@ static struct rman mem_rman;
 static	int nexus_probe(device_t);
 static	int nexus_attach(device_t);
 static	int nexus_print_child(device_t, device_t);
-static	device_t nexus_add_child(device_t, int, const char *, int);
+static	device_t nexus_add_child(device_t, u_int, const char *, int);
 static	struct resource *nexus_alloc_resource(device_t, device_t, int, int *,
 	u_long, u_long, u_long, u_int);
 static	int nexus_activate_resource(device_t, device_t, int, int,
@@ -176,7 +176,7 @@ nexus_print_child(device_t bus, device_t
 
 
 static device_t
-nexus_add_child(device_t bus, int order, const char *name, int unit)
+nexus_add_child(device_t bus, u_int order, const char *name, int unit)
 {
 	device_t	child;
 	struct nexus_device *ndev;

Modified: stable/7/sys/arm/xscale/ixp425/ixp425.c
==============================================================================
--- stable/7/sys/arm/xscale/ixp425/ixp425.c	Mon Sep 20 07:31:08 2010	(r212892)
+++ stable/7/sys/arm/xscale/ixp425/ixp425.c	Mon Sep 20 11:09:31 2010	(r212893)
@@ -271,7 +271,7 @@ ixp425_hinted_child(device_t bus, const 
 }
 
 static device_t
-ixp425_add_child(device_t dev, int order, const char *name, int unit)
+ixp425_add_child(device_t dev, u_int order, const char *name, int unit)
 {
 	device_t child;
 	struct ixp425_ivar *ivar;

Modified: stable/7/sys/dev/acpica/acpi.c
==============================================================================
--- stable/7/sys/dev/acpica/acpi.c	Mon Sep 20 07:31:08 2010	(r212892)
+++ stable/7/sys/dev/acpica/acpi.c	Mon Sep 20 11:09:31 2010	(r212893)
@@ -100,7 +100,7 @@ static int	acpi_attach(device_t dev);
 static int	acpi_suspend(device_t dev);
 static int	acpi_resume(device_t dev);
 static int	acpi_shutdown(device_t dev);
-static device_t	acpi_add_child(device_t bus, int order, const char *name,
+static device_t	acpi_add_child(device_t bus, u_int order, const char *name,
 			int unit);
 static int	acpi_print_child(device_t bus, device_t child);
 static void	acpi_probe_nomatch(device_t bus, device_t child);
@@ -744,7 +744,7 @@ acpi_shutdown(device_t dev)
  * Handle a new device being added
  */
 static device_t
-acpi_add_child(device_t bus, int order, const char *name, int unit)
+acpi_add_child(device_t bus, u_int order, const char *name, int unit)
 {
     struct acpi_device	*ad;
     device_t		child;

Modified: stable/7/sys/dev/acpica/acpi_cpu.c
==============================================================================
--- stable/7/sys/dev/acpica/acpi_cpu.c	Mon Sep 20 07:31:08 2010	(r212892)
+++ stable/7/sys/dev/acpica/acpi_cpu.c	Mon Sep 20 11:09:31 2010	(r212893)
@@ -146,7 +146,7 @@ static int	acpi_cpu_resume(device_t dev)
 static int	acpi_pcpu_get_id(uint32_t idx, uint32_t *acpi_id,
 		    uint32_t *cpu_id);
 static struct resource_list *acpi_cpu_get_rlist(device_t dev, device_t child);
-static device_t	acpi_cpu_add_child(device_t dev, int order, const char *name,
+static device_t	acpi_cpu_add_child(device_t dev, u_int order, const char *name,
 		    int unit);
 static int	acpi_cpu_read_ivar(device_t dev, device_t child, int index,
 		    uintptr_t *result);
@@ -460,7 +460,7 @@ acpi_cpu_get_rlist(device_t dev, device_
 }
 
 static device_t
-acpi_cpu_add_child(device_t dev, int order, const char *name, int unit)
+acpi_cpu_add_child(device_t dev, u_int order, const char *name, int unit)
 {
     struct acpi_cpu_device *ad;
     device_t child;

Modified: stable/7/sys/dev/atkbdc/atkbdc_isa.c
==============================================================================
--- stable/7/sys/dev/atkbdc/atkbdc_isa.c	Mon Sep 20 07:31:08 2010	(r212892)
+++ stable/7/sys/dev/atkbdc/atkbdc_isa.c	Mon Sep 20 11:09:31 2010	(r212893)
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
 
 static int	atkbdc_isa_probe(device_t dev);
 static int	atkbdc_isa_attach(device_t dev);
-static device_t	atkbdc_isa_add_child(device_t bus, int order, char *name,
+static device_t	atkbdc_isa_add_child(device_t bus, u_int order, char *name,
 				 int unit);
 
 static device_method_t atkbdc_isa_methods[] = {
@@ -227,7 +227,7 @@ atkbdc_isa_attach(device_t dev)
 }
 
 static device_t
-atkbdc_isa_add_child(device_t bus, int order, char *name, int unit)
+atkbdc_isa_add_child(device_t bus, u_int order, char *name, int unit)
 {
 	atkbdc_device_t	*ivar;
 	device_t	child;

Modified: stable/7/sys/dev/firewire/firewire.c
==============================================================================
--- stable/7/sys/dev/firewire/firewire.c	Mon Sep 20 07:31:08 2010	(r212892)
+++ stable/7/sys/dev/firewire/firewire.c	Mon Sep 20 11:09:31 2010	(r212893)
@@ -101,7 +101,7 @@ static void firewire_xfer_timeout(void *
 #if 0
 static int firewire_shutdown    (device_t);
 #endif
-static device_t firewire_add_child   (device_t, int, const char *, int);
+static device_t firewire_add_child(device_t, u_int, const char *, int);
 static void fw_try_bmr (void *);
 static void fw_try_bmr_callback (struct fw_xfer *);
 static void fw_asystart (struct fw_xfer *);
@@ -460,7 +460,7 @@ firewire_attach(device_t dev)
  * Attach it as child.
  */
 static device_t
-firewire_add_child(device_t dev, int order, const char *name, int unit)
+firewire_add_child(device_t dev, u_int order, const char *name, int unit)
 {
         device_t child;
 	struct firewire_softc *sc;

Modified: stable/7/sys/dev/firewire/fwohci_pci.c
==============================================================================
--- stable/7/sys/dev/firewire/fwohci_pci.c	Mon Sep 20 07:31:08 2010	(r212892)
+++ stable/7/sys/dev/firewire/fwohci_pci.c	Mon Sep 20 11:09:31 2010	(r212893)
@@ -490,7 +490,7 @@ fwohci_pci_shutdown(device_t dev)
 }
 
 static device_t
-fwohci_pci_add_child(device_t dev, int order, const char *name, int unit)
+fwohci_pci_add_child(device_t dev, u_int order, const char *name, int unit)
 {
 	struct fwohci_softc *sc;
 	device_t child;

Modified: stable/7/sys/dev/iicbus/iicbus.c
==============================================================================
--- stable/7/sys/dev/iicbus/iicbus.c	Mon Sep 20 07:31:08 2010	(r212892)
+++ stable/7/sys/dev/iicbus/iicbus.c	Mon Sep 20 11:09:31 2010	(r212893)
@@ -186,7 +186,7 @@ iicbus_read_ivar(device_t bus, device_t 
 }
 
 static device_t
-iicbus_add_child(device_t dev, int order, const char *name, int unit)
+iicbus_add_child(device_t dev, u_int order, const char *name, int unit)
 {
 	device_t child;
 	struct iicbus_ivar *devi;

Modified: stable/7/sys/dev/ppbus/ppbconf.c
==============================================================================
--- stable/7/sys/dev/ppbus/ppbconf.c	Mon Sep 20 07:31:08 2010	(r212892)
+++ stable/7/sys/dev/ppbus/ppbconf.c	Mon Sep 20 11:09:31 2010	(r212893)
@@ -85,7 +85,7 @@ ppbus_probe(device_t dev)
  * Add a ppbus device, allocate/initialize the ivars
  */
 static device_t
-ppbus_add_child(device_t dev, int order, const char *name, int unit)
+ppbus_add_child(device_t dev, u_int order, const char *name, int unit)
 {
 	struct ppb_device *ppbdev;
 	device_t child;

Modified: stable/7/sys/dev/spibus/spibus.c
==============================================================================
--- stable/7/sys/dev/spibus/spibus.c	Mon Sep 20 07:31:08 2010	(r212892)
+++ stable/7/sys/dev/spibus/spibus.c	Mon Sep 20 11:09:31 2010	(r212893)
@@ -127,7 +127,7 @@ spibus_read_ivar(device_t bus, device_t 
 }
 
 static device_t
-spibus_add_child(device_t dev, int order, const char *name, int unit)
+spibus_add_child(device_t dev, u_int order, const char *name, int unit)
 {
 	device_t child;
 	struct spibus_ivar *devi;

Modified: stable/7/sys/i386/i386/legacy.c
==============================================================================
--- stable/7/sys/i386/i386/legacy.c	Mon Sep 20 07:31:08 2010	(r212892)
+++ stable/7/sys/i386/i386/legacy.c	Mon Sep 20 11:09:31 2010	(r212893)
@@ -66,7 +66,7 @@ static void legacy_identify(driver_t *dr
 static	int legacy_probe(device_t);
 static	int legacy_attach(device_t);
 static	int legacy_print_child(device_t, device_t);
-static device_t legacy_add_child(device_t bus, int order, const char *name,
+static device_t legacy_add_child(device_t bus, u_int order, const char *name,
 				int unit);
 static	int legacy_read_ivar(device_t, device_t, int, uintptr_t *);
 static	int legacy_write_ivar(device_t, device_t, int, uintptr_t);
@@ -191,7 +191,7 @@ legacy_print_child(device_t bus, device_
 }
 
 static device_t
-legacy_add_child(device_t bus, int order, const char *name, int unit)
+legacy_add_child(device_t bus, u_int order, const char *name, int unit)
 {
 	device_t child;
 	struct legacy_device *atdev;
@@ -255,7 +255,7 @@ legacy_write_ivar(device_t dev, device_t
 static void	cpu_identify(driver_t *driver, device_t parent);
 static int	cpu_read_ivar(device_t dev, device_t child, int index,
 		    uintptr_t *result);
-static device_t cpu_add_child(device_t bus, int order, const char *name,
+static device_t cpu_add_child(device_t bus, u_int order, const char *name,
 		    int unit);
 static struct resource_list *cpu_get_rlist(device_t dev, device_t child);
 
@@ -320,7 +320,7 @@ cpu_identify(driver_t *driver, device_t 
 }
 
 static device_t
-cpu_add_child(device_t bus, int order, const char *name, int unit)
+cpu_add_child(device_t bus, u_int order, const char *name, int unit)
 {
 	struct cpu_device *cd;
 	device_t child;

Modified: stable/7/sys/i386/i386/nexus.c
==============================================================================
--- stable/7/sys/i386/i386/nexus.c	Mon Sep 20 07:31:08 2010	(r212892)
+++ stable/7/sys/i386/i386/nexus.c	Mon Sep 20 11:09:31 2010	(r212893)
@@ -89,7 +89,7 @@ static	int nexus_probe(device_t);
 static	int nexus_attach(device_t);
 static	int nexus_print_all_resources(device_t dev);
 static	int nexus_print_child(device_t, device_t);
-static device_t nexus_add_child(device_t bus, int order, const char *name,
+static device_t nexus_add_child(device_t bus, u_int order, const char *name,
 				int unit);
 static	struct resource *nexus_alloc_resource(device_t, device_t, int, int *,
 					      u_long, u_long, u_long, u_int);
@@ -298,7 +298,7 @@ nexus_print_child(device_t bus, device_t
 }
 
 static device_t
-nexus_add_child(device_t bus, int order, const char *name, int unit)
+nexus_add_child(device_t bus, u_int order, const char *name, int unit)
 {
 	device_t		child;
 	struct nexus_device	*ndev;

Modified: stable/7/sys/ia64/ia64/nexus.c
==============================================================================
--- stable/7/sys/ia64/ia64/nexus.c	Mon Sep 20 07:31:08 2010	(r212892)
+++ stable/7/sys/ia64/ia64/nexus.c	Mon Sep 20 11:09:31 2010	(r212893)
@@ -76,7 +76,7 @@ static struct rman irq_rman, drq_rman, p
 static	int nexus_probe(device_t);
 static	int nexus_attach(device_t);
 static	int nexus_print_child(device_t, device_t);
-static device_t nexus_add_child(device_t bus, int order, const char *name,
+static device_t nexus_add_child(device_t bus, u_int order, const char *name,
 				int unit);
 static	struct resource *nexus_alloc_resource(device_t, device_t, int, int *,
 					      u_long, u_long, u_long, u_int);
@@ -248,7 +248,7 @@ nexus_print_child(device_t bus, device_t
 }
 
 static device_t
-nexus_add_child(device_t bus, int order, const char *name, int unit)
+nexus_add_child(device_t bus, u_int order, const char *name, int unit)
 {
 	device_t		child;
 	struct nexus_device	*ndev;

Modified: stable/7/sys/isa/isa_common.c
==============================================================================
--- stable/7/sys/isa/isa_common.c	Mon Sep 20 07:31:08 2010	(r212892)
+++ stable/7/sys/isa/isa_common.c	Mon Sep 20 11:09:31 2010	(r212893)
@@ -617,7 +617,7 @@ isa_probe_children(device_t dev)
  * Add a new child with default ivars.
  */
 static device_t
-isa_add_child(device_t dev, int order, const char *name, int unit)
+isa_add_child(device_t dev, u_int order, const char *name, int unit)
 {
 	device_t child;
 	struct	isa_device *idev;

Modified: stable/7/sys/kern/bus_if.m
==============================================================================
--- stable/7/sys/kern/bus_if.m	Mon Sep 20 07:31:08 2010	(r212892)
+++ stable/7/sys/kern/bus_if.m	Mon Sep 20 11:09:31 2010	(r212893)
@@ -191,7 +191,7 @@ METHOD void driver_added {
  */
 METHOD device_t add_child {
 	device_t _dev;
-	int _order;
+	u_int _order;
 	const char *_name;
 	int _unit;
 };

Modified: stable/7/sys/kern/subr_bus.c
==============================================================================
--- stable/7/sys/kern/subr_bus.c	Mon Sep 20 07:31:08 2010	(r212892)
+++ stable/7/sys/kern/subr_bus.c	Mon Sep 20 11:09:31 2010	(r212893)
@@ -2879,7 +2879,7 @@ resource_list_purge(struct resource_list
 }
 
 device_t
-bus_generic_add_child(device_t dev, int order, const char *name, int unit)
+bus_generic_add_child(device_t dev, u_int order, const char *name, int unit)
 {
 
 	return (device_add_child_ordered(dev, order, name, unit));

Modified: stable/7/sys/pc98/pc98/canbus.c
==============================================================================
--- stable/7/sys/pc98/pc98/canbus.c	Mon Sep 20 07:31:08 2010	(r212892)
+++ stable/7/sys/pc98/pc98/canbus.c	Mon Sep 20 11:09:31 2010	(r212893)
@@ -82,7 +82,7 @@ static int	canbus_detach(device_t);
 
 /* Bus interface methods */
 static int	canbus_print_child(device_t, device_t);
-static device_t	canbus_add_child(device_t, int, const char *, int);
+static device_t	canbus_add_child(device_t, u_int, const char *, int);
 static struct resource *	canbus_alloc_resource(
     device_t, device_t, int, int *, u_long, u_long, u_long, u_int);
 static int	canbus_activate_resource(
@@ -235,7 +235,7 @@ canbus_print_child(device_t dev, device_
 }
 
 static device_t
-canbus_add_child(device_t bus, int order, const char *name, int unit)
+canbus_add_child(device_t bus, u_int order, const char *name, int unit)
 {
 	device_t child;
 	struct canbus_device *cbdev;

Modified: stable/7/sys/sparc64/sparc64/nexus.c
==============================================================================
--- stable/7/sys/sparc64/sparc64/nexus.c	Mon Sep 20 07:31:08 2010	(r212892)
+++ stable/7/sys/sparc64/sparc64/nexus.c	Mon Sep 20 11:09:31 2010	(r212893)
@@ -257,7 +257,7 @@ nexus_attach(device_t dev)
 }
 
 static device_t
-nexus_add_child(device_t dev, int order, const char *name, int unit)
+nexus_add_child(device_t dev, u_int order, const char *name, int unit)
 {
 	device_t cdev;
 	struct nexus_devinfo *ndi;

Modified: stable/7/sys/sun4v/sun4v/nexus.c
==============================================================================
--- stable/7/sys/sun4v/sun4v/nexus.c	Mon Sep 20 07:31:08 2010	(r212892)
+++ stable/7/sys/sun4v/sun4v/nexus.c	Mon Sep 20 11:09:31 2010	(r212893)
@@ -234,7 +234,7 @@ nexus_attach(device_t dev)
 }
 
 static device_t
-nexus_add_child(device_t dev, int order, const char *name, int unit)
+nexus_add_child(device_t dev, u_int order, const char *name, int unit)
 {
 	device_t cdev;
 	struct nexus_devinfo *ndi;

Modified: stable/7/sys/sun4v/sun4v/vnex.c
==============================================================================
--- stable/7/sys/sun4v/sun4v/vnex.c	Mon Sep 20 07:31:08 2010	(r212892)
+++ stable/7/sys/sun4v/sun4v/vnex.c	Mon Sep 20 11:09:31 2010	(r212893)
@@ -204,7 +204,7 @@ vnex_attach(device_t dev)
 }
 
 static device_t
-vnex_add_child(device_t dev, int order, const char *name, int unit)
+vnex_add_child(device_t dev, u_int order, const char *name, int unit)
 {
 	device_t cdev;
 	struct vnex_devinfo *vndi;

Modified: stable/7/sys/sys/bus.h
==============================================================================
--- stable/7/sys/sys/bus.h	Mon Sep 20 07:31:08 2010	(r212892)
+++ stable/7/sys/sys/bus.h	Mon Sep 20 11:09:31 2010	(r212893)
@@ -279,7 +279,7 @@ void	root_bus_configure(void);
 int	bus_generic_activate_resource(device_t dev, device_t child, int type,
 				      int rid, struct resource *r);
 device_t
-	bus_generic_add_child(device_t dev, int order, const char *name,
+	bus_generic_add_child(device_t dev, u_int order, const char *name,
 			      int unit);
 struct resource *
 	bus_generic_alloc_resource(device_t bus, device_t child, int type,



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009201109.o8KB9Vj8049546>