Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 4 Sep 2010 17:28:29 +0000 (UTC)
From:      Andriy Gapon <avg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r212213 - in head/sys: kern sys
Message-ID:  <201009041728.o84HST37025546@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: avg
Date: Sat Sep  4 17:28:29 2010
New Revision: 212213
URL: http://svn.freebsd.org/changeset/base/212213

Log:
  struct device: widen type of flags and order fields to u_int
  
  Also change int -> u_int for order parameter in device_add_child_ordered.
  There should not be any ABI change as struct device is private to subr_bus.c
  and the API change should be compatible.
  
  To do: change int -> u_int for order parameter of bus_add_child method
  and its implementations.  The change should also be API compatible, but
  is a bit more churn.
  
  Suggested by:	imp, jhb
  MFC after:	1 week

Modified:
  head/sys/kern/subr_bus.c
  head/sys/sys/bus.h

Modified: head/sys/kern/subr_bus.c
==============================================================================
--- head/sys/kern/subr_bus.c	Sat Sep  4 17:27:48 2010	(r212212)
+++ head/sys/kern/subr_bus.c	Sat Sep  4 17:28:29 2010	(r212213)
@@ -121,7 +121,7 @@ struct device {
 	int		busy;		/**< count of calls to device_busy() */
 	device_state_t	state;		/**< current device state  */
 	uint32_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  */
 
@@ -1790,12 +1789,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: head/sys/sys/bus.h
==============================================================================
--- head/sys/sys/bus.h	Sat Sep  4 17:27:48 2010	(r212212)
+++ head/sys/sys/bus.h	Sat Sep  4 17:28:29 2010	(r212213)
@@ -410,7 +410,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);



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