Author: avg
Date: Mon Sep 20 05:56:09 2010
New Revision: 212889
URL: http://svn.freebsd.org/changeset/base/212889
Log:
MFC r212213: struct device: widen type of flags and order fields to u_int
Modified:
stable/8/sys/kern/subr_bus.c
stable/8/sys/sys/bus.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/kern/subr_bus.c
==============================================================================
--- stable/8/sys/kern/subr_bus.c Mon Sep 20 05:46:15 2010
(r212888)
+++ stable/8/sys/kern/subr_bus.c Mon Sep 20 05:56:09 2010
(r212889)
@@ -121,7 +121,7 @@ struct device {
int busy; /**< count of calls to device_busy() */
device_state_t state; /**< current device state */
u_int32_t devflags; /**< api level flags for
device_get_flags() */
- u_short flags; /**< internal device flags */
+ u_int flags; /**< internal device flags */
#define DF_ENABLED 1 /* device should be
probed/attached */
#define DF_FIXEDCLASS 2 /* devclass specified at create
time */
#define DF_WILDCARD 4 /* unit was originally wildcard
*/
@@ -130,8 +130,7 @@ struct device {
#define DF_DONENOMATCH 32 /* don't execute DEVICE_NOMATCH
again */
#define DF_EXTERNALSOFTC 64 /* softc not allocated by us */
#define DF_REBID 128 /* Can rebid after attach */
- u_char order; /**< order from
device_add_child_ordered() */
- u_char pad;
+ u_int order; /**< order from
device_add_child_ordered() */
void *ivars; /**< instance variables */
void *softc; /**< current driver's variables */
@@ -1787,12 +1786,12 @@ device_add_child(device_t dev, const cha
* @returns the new device
*/
device_t
-device_add_child_ordered(device_t dev, int order, const char *name, int unit)
+device_add_child_ordered(device_t dev, u_int order, const char *name, int unit)
{
device_t child;
device_t place;
- PDEBUG(("%s at %s with order %d as unit %d",
+ PDEBUG(("%s at %s with order %u as unit %d",
name, DEVICENAME(dev), order, unit));
child = make_device(dev, name, unit);
Modified: stable/8/sys/sys/bus.h
==============================================================================
--- stable/8/sys/sys/bus.h Mon Sep 20 05:46:15 2010 (r212888)
+++ stable/8/sys/sys/bus.h Mon Sep 20 05:56:09 2010 (r212889)
@@ -393,7 +393,7 @@ bus_alloc_resource_any(device_t dev, int
* Access functions for device.
*/
device_t device_add_child(device_t dev, const char *name, int unit);
-device_t device_add_child_ordered(device_t dev, int order,
+device_t device_add_child_ordered(device_t dev, u_int order,
const char *name, int unit);
void device_busy(device_t dev);
int device_delete_child(device_t dev, device_t child);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
