svn commit: r197224 - in head: lib/libdevinfo sys/sys

[Attilio Rao]

Author: attilio
Date: Tue Sep 15 16:59:52 2009
New Revision: 197224
URL: http://svn.freebsd.org/changeset/base/197224

Log:
  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.
  
  Proposed by:	kib
  Approved by:	imp

Modified:
  head/lib/libdevinfo/devinfo.h
  head/sys/sys/bus.h

Modified: head/lib/libdevinfo/devinfo.h
==============================================================================
--- head/lib/libdevinfo/devinfo.h	Tue Sep 15 16:56:17 2009	(r197223)
+++ head/lib/libdevinfo/devinfo.h	Tue Sep 15 16:59:52 2009	(r197224)
@@ -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: head/sys/sys/bus.h
==============================================================================
--- head/sys/sys/bus.h	Tue Sep 15 16:56:17 2009	(r197223)
+++ head/sys/sys/bus.h	Tue Sep 15 16:59:52 2009	(r197224)
@@ -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;
 
 /**