From owner-svn-src-all@FreeBSD.ORG  Tue Sep 15 16:59:53 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 118291065696;
	Tue, 15 Sep 2009 16:59:53 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 00A178FC1B;
	Tue, 15 Sep 2009 16:59:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8FGxqOL095253;
	Tue, 15 Sep 2009 16:59:52 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8FGxqGU095250;
	Tue, 15 Sep 2009 16:59:52 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <200909151659.n8FGxqGU095250@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Tue, 15 Sep 2009 16:59:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197224 - in head: lib/libdevinfo sys/sys
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Sep 2009 16:59:53 -0000

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;
 
 /**