From owner-svn-src-all@FreeBSD.ORG Sat Apr 25 21:25:52 2009 Return-Path: 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 E71BA106566C; Sat, 25 Apr 2009 21:25:52 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BB40C8FC1B; Sat, 25 Apr 2009 21:25:52 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3PLPqpd063560; Sat, 25 Apr 2009 21:25:52 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3PLPqvZ063558; Sat, 25 Apr 2009 21:25:52 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <200904252125.n3PLPqvZ063558@svn.freebsd.org> From: Andrew Thompson Date: Sat, 25 Apr 2009 21:25: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: r191498 - head/sys/dev/usb 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Apr 2009 21:25:53 -0000 Author: thompsa Date: Sat Apr 25 21:25:52 2009 New Revision: 191498 URL: http://svn.freebsd.org/changeset/base/191498 Log: Make the state string descriptions public. Modified: head/sys/dev/usb/usb_core.h head/sys/dev/usb/usb_device.c Modified: head/sys/dev/usb/usb_core.h ============================================================================== --- head/sys/dev/usb/usb_core.h Sat Apr 25 21:16:06 2009 (r191497) +++ head/sys/dev/usb/usb_core.h Sat Apr 25 21:25:52 2009 (r191498) @@ -515,6 +515,7 @@ typedef struct malloc_type *usb2_malloc_ /* prototypes */ const char *usb2_errstr(usb2_error_t error); +const char *usb2_statestr(enum usb_dev_state state); struct usb2_config_descriptor *usb2_get_config_descriptor( struct usb2_device *udev); struct usb2_device_descriptor *usb2_get_device_descriptor( Modified: head/sys/dev/usb/usb_device.c ============================================================================== --- head/sys/dev/usb/usb_device.c Sat Apr 25 21:16:06 2009 (r191497) +++ head/sys/dev/usb/usb_device.c Sat Apr 25 21:25:52 2009 (r191498) @@ -90,6 +90,22 @@ int usb2_template = 0; SYSCTL_INT(_hw_usb2, OID_AUTO, template, CTLFLAG_RW, &usb2_template, 0, "Selected USB device side template"); +static const char* statestr[USB_STATE_MAX] = { + [USB_STATE_DETACHED] = "DETACHED", + [USB_STATE_ATTACHED] = "ATTACHED", + [USB_STATE_POWERED] = "POWERED", + [USB_STATE_ADDRESSED] = "ADDRESSED", + [USB_STATE_CONFIGURED] = "CONFIGURED", + [USB_STATE_SUSPENDED] = "SUSPENDED" +}; + +const char * +usb2_statestr(enum usb_dev_state state) +{ + KASSERT(state < USB_STATE_MAX, ("invalid udev state")); + + return (statestr[state]); +} /*------------------------------------------------------------------------* * usb2_get_pipe_by_addr @@ -2448,19 +2464,11 @@ usb2_peer_can_wakeup(struct usb2_device void usb2_set_device_state(struct usb2_device *udev, enum usb_dev_state state) { - static const char* statestr[USB_STATE_MAX] = { - [USB_STATE_DETACHED] = "DETACHED", - [USB_STATE_ATTACHED] = "ATTACHED", - [USB_STATE_POWERED] = "POWERED", - [USB_STATE_ADDRESSED] = "ADDRESSED", - [USB_STATE_CONFIGURED] = "CONFIGURED", - [USB_STATE_SUSPENDED] = "SUSPENDED" - }; KASSERT(state < USB_STATE_MAX, ("invalid udev state")); DPRINTF("udev %p state %s -> %s\n", udev, - statestr[udev->state], statestr[state]); + usb2_statestr(udev->state), usb2_statestr(state)); udev->state = state; }