svn commit: r197228 - in stable/8: lib/libdevinfo sys/sys

[Attilio Rao]

Author: attilio
Date: Tue Sep 15 19:24:18 2009
New Revision: 197228
URL: http://svn.freebsd.org/changeset/base/197228

Log:
  MFC r197224:
  Use explicit int values for the device states in order to allow, if
  necessary, in the future, adds of new states without breaking ABI
  between revisions.
  
  Please note that this is a special condition as we want this fix in
  before RC1 as we assume it is critical and so it has been handled
  as an instant-merge.
  
  Approved by:	re (kib)

Modified:
  stable/8/lib/libdevinfo/devinfo.h
  stable/8/sys/sys/bus.h

Modified: stable/8/lib/libdevinfo/devinfo.h
==============================================================================
--- stable/8/lib/libdevinfo/devinfo.h	Tue Sep 15 19:18:34 2009	(r197227)
+++ stable/8/lib/libdevinfo/devinfo.h	Tue Sep 15 19:24:18 2009	(r197228)
@@ -41,10 +41,10 @@ typedef __uintptr_t	devinfo_handle_t;
  */
 /* XXX not sure if I want a copy here, or expose sys/bus.h */
 typedef enum devinfo_state {
-	DIS_NOTPRESENT,			/* not probed or probe failed */
-	DIS_ALIVE,			/* probe succeeded */
-	DIS_ATTACHED,			/* attach method called */
-	DIS_BUSY			/* device is open */
+	DIS_NOTPRESENT = 10,		/* not probed or probe failed */
+	DIS_ALIVE = 20,			/* probe succeeded */
+	DIS_ATTACHED = 30,		/* attach method called */
+	DIS_BUSY = 40			/* device is open */
 } devinfo_state_t;
 
 struct devinfo_dev {

Modified: stable/8/sys/sys/bus.h
==============================================================================
--- stable/8/sys/sys/bus.h	Tue Sep 15 19:18:34 2009	(r197227)
+++ stable/8/sys/sys/bus.h	Tue Sep 15 19:24:18 2009	(r197228)
@@ -50,10 +50,10 @@ struct u_businfo {
  * @brief State of the device.
  */
 typedef enum device_state {
-	DS_NOTPRESENT,			/**< @brief not probed or probe failed */
-	DS_ALIVE,			/**< @brief probe succeeded */
-	DS_ATTACHED,			/**< @brief attach method called */
-	DS_BUSY				/**< @brief device is open */
+	DS_NOTPRESENT = 10,		/**< @brief not probed or probe failed */
+	DS_ALIVE = 20,			/**< @brief probe succeeded */
+	DS_ATTACHED = 30,		/**< @brief attach method called */
+	DS_BUSY = 40			/**< @brief device is open */
 } device_state_t;
 
 /**