From owner-svn-src-all@FreeBSD.ORG Tue Jan 13 19:02:51 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 0217610657C5; Tue, 13 Jan 2009 19:02:51 +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 E3C528FC3E; Tue, 13 Jan 2009 19:02:50 +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 n0DJ2oLq012369; Tue, 13 Jan 2009 19:02:50 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0DJ2oMu012365; Tue, 13 Jan 2009 19:02:50 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <200901131902.n0DJ2oMu012365@svn.freebsd.org> From: Andrew Thompson Date: Tue, 13 Jan 2009 19:02:50 +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: r187171 - in head/sys/dev/usb2: core include 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: Tue, 13 Jan 2009 19:02:51 -0000 Author: thompsa Date: Tue Jan 13 19:02:50 2009 New Revision: 187171 URL: http://svn.freebsd.org/changeset/base/187171 Log: MFp4: //depot/projects/usb@155829 Code style changes requested by: M. Warner Losh Submitted by: Hans Petter Selasky Modified: head/sys/dev/usb2/core/usb2_core.h head/sys/dev/usb2/core/usb2_device.c head/sys/dev/usb2/core/usb2_hub.c head/sys/dev/usb2/include/usb2_defs.h Modified: head/sys/dev/usb2/core/usb2_core.h ============================================================================== --- head/sys/dev/usb2/core/usb2_core.h Tue Jan 13 19:02:40 2009 (r187170) +++ head/sys/dev/usb2/core/usb2_core.h Tue Jan 13 19:02:50 2009 (r187171) @@ -101,8 +101,6 @@ #define USB_HOST_ALIGN 8 /* bytes, must be power of two */ -#define USB_ROOT_HUB_ADDR 1 /* value */ - #define USB_ISOC_TIME_MAX 128 /* ms */ #define USB_FS_ISOC_UFRAME_MAX 4 /* exclusive unit */ Modified: head/sys/dev/usb2/core/usb2_device.c ============================================================================== --- head/sys/dev/usb2/core/usb2_device.c Tue Jan 13 19:02:40 2009 (r187170) +++ head/sys/dev/usb2/core/usb2_device.c Tue Jan 13 19:02:50 2009 (r187171) @@ -1293,18 +1293,15 @@ usb2_alloc_device(device_t parent_dev, s * Device index zero is not used and device index 1 should * always be the root hub. */ - for (device_index = USB_ROOT_HUB_ADDR;; device_index++) { -#if (USB_ROOT_HUB_ADDR > USB_MIN_DEVICES) -#error "Incorrect device limit." -#endif - if (device_index == bus->devices_max) { - device_printf(bus->bdev, - "No free USB device " - "index for new device!\n"); - return (NULL); - } - if (bus->devices[device_index] == NULL) - break; + for (device_index = USB_ROOT_HUB_ADDR; + (device_index != bus->devices_max) && + (bus->devices[device_index] != NULL); + device_index++) /* nop */; + + if (device_index == bus->devices_max) { + device_printf(bus->bdev, + "No free USB device index for new device!\n"); + return (NULL); } if (depth > 0x10) { Modified: head/sys/dev/usb2/core/usb2_hub.c ============================================================================== --- head/sys/dev/usb2/core/usb2_hub.c Tue Jan 13 19:02:40 2009 (r187170) +++ head/sys/dev/usb2/core/usb2_hub.c Tue Jan 13 19:02:50 2009 (r187171) @@ -1520,12 +1520,8 @@ usb2_bus_powerd(struct usb2_bus *bus) * The root HUB device is never suspended * and we simply skip it. */ - for (x = USB_ROOT_HUB_ADDR + 1;; x++) { -#if ((USB_ROOT_HUB_ADDR + 1) > USB_MIN_DEVICES) -#error "Incorrect device limit." -#endif - if (x == bus->devices_max) - break; + for (x = USB_ROOT_HUB_ADDR + 1; + x != bus->devices_max; x++) { udev = bus->devices[x]; if (udev == NULL) @@ -1568,12 +1564,8 @@ usb2_bus_powerd(struct usb2_bus *bus) /* Re-loop all the devices to get the actual state */ - for (x = USB_ROOT_HUB_ADDR + 1;; x++) { -#if ((USB_ROOT_HUB_ADDR + 1) > USB_MIN_DEVICES) -#error "Incorrect device limit." -#endif - if (x == bus->devices_max) - break; + for (x = USB_ROOT_HUB_ADDR + 1; + x != bus->devices_max; x++) { udev = bus->devices[x]; if (udev == NULL) Modified: head/sys/dev/usb2/include/usb2_defs.h ============================================================================== --- head/sys/dev/usb2/include/usb2_defs.h Tue Jan 13 19:02:40 2009 (r187170) +++ head/sys/dev/usb2/include/usb2_defs.h Tue Jan 13 19:02:50 2009 (r187171) @@ -35,6 +35,8 @@ #define USB_EP_MAX (2*16) /* hardcoded */ #define USB_FIFO_MAX (4 * USB_EP_MAX) +#define USB_ROOT_HUB_ADDR 1 /* index */ + #define USB_MIN_DEVICES 2 /* unused + root HUB */ #define USB_MAX_DEVICES USB_DEV_MAX /* including virtual root HUB and @@ -58,15 +60,18 @@ /* sanity checks */ #if (USB_FIFO_MAX < USB_EP_MAX) -#error "Misconfigured limits #1" +#error "There cannot be less FIFOs than USB endpoints." #endif #if (USB_FIFO_MAX & 1) -#error "Misconfigured limits #2" +#error "Number of FIFOs must be odd." #endif #if (USB_EP_MAX < (2*16)) -#error "Misconfigured limits #3" +#error "Number of hardware USB endpoints cannot be less than 32." #endif #if (USB_MAX_DEVICES < USB_MIN_DEVICES) -#error "Misconfigured limits #4" +#error "Minimum number of devices is greater than maximum number of devices." +#endif +#if (USB_ROOT_HUB_ADDR >= USB_MIN_DEVICES) +#error "The root hub address must be less than USB_MIN_DEVICES." #endif #endif /* _USB2_DEFS_H_ */