From owner-svn-src-stable@FreeBSD.ORG Sat Dec 31 14:37:52 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8D256106566B; Sat, 31 Dec 2011 14:37:52 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6CA438FC14; Sat, 31 Dec 2011 14:37:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBVEbqVL068419; Sat, 31 Dec 2011 14:37:52 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBVEbqcl068414; Sat, 31 Dec 2011 14:37:52 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201112311437.pBVEbqcl068414@svn.freebsd.org> From: Hans Petter Selasky Date: Sat, 31 Dec 2011 14:37:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r229103 - stable/9/sys/dev/usb/template X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Dec 2011 14:37:52 -0000 Author: hselasky Date: Sat Dec 31 14:37:51 2011 New Revision: 229103 URL: http://svn.freebsd.org/changeset/base/229103 Log: MFC 228304: Correct some bInterval USB template descriptor values. Modified: stable/9/sys/dev/usb/template/usb_template.c stable/9/sys/dev/usb/template/usb_template_kbd.c stable/9/sys/dev/usb/template/usb_template_modem.c stable/9/sys/dev/usb/template/usb_template_mouse.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) Modified: stable/9/sys/dev/usb/template/usb_template.c ============================================================================== --- stable/9/sys/dev/usb/template/usb_template.c Sat Dec 31 14:36:51 2011 (r229102) +++ stable/9/sys/dev/usb/template/usb_template.c Sat Dec 31 14:37:51 2011 (r229103) @@ -260,7 +260,7 @@ usb_make_endpoint_desc(struct usb_temp_s ed->bInterval = 1; /* 1 ms */ break; default: - ed->bInterval = 8; /* 8*125 us */ + ed->bInterval = 4; /* 1 ms */ break; } break; Modified: stable/9/sys/dev/usb/template/usb_template_kbd.c ============================================================================== --- stable/9/sys/dev/usb/template/usb_template_kbd.c Sat Dec 31 14:36:51 2011 (r229102) +++ stable/9/sys/dev/usb/template/usb_template_kbd.c Sat Dec 31 14:37:51 2011 (r229103) @@ -89,9 +89,9 @@ static const struct usb_temp_packet_size }; static const struct usb_temp_interval keyboard_intr_interval = { - .bInterval[USB_SPEED_LOW] = 2, /* ms */ - .bInterval[USB_SPEED_FULL] = 2, - .bInterval[USB_SPEED_HIGH] = 2 * 8, + .bInterval[USB_SPEED_LOW] = 2, /* 2 ms */ + .bInterval[USB_SPEED_FULL] = 2, /* 2 ms */ + .bInterval[USB_SPEED_HIGH] = 5, /* 2 ms */ }; /* The following HID descriptor was dumped from a HP keyboard. */ Modified: stable/9/sys/dev/usb/template/usb_template_modem.c ============================================================================== --- stable/9/sys/dev/usb/template/usb_template_modem.c Sat Dec 31 14:36:51 2011 (r229102) +++ stable/9/sys/dev/usb/template/usb_template_modem.c Sat Dec 31 14:37:51 2011 (r229103) @@ -98,9 +98,9 @@ static const struct usb_temp_packet_size }; static const struct usb_temp_interval modem_intr_interval = { - .bInterval[USB_SPEED_LOW] = 10, - .bInterval[USB_SPEED_FULL] = 10, - .bInterval[USB_SPEED_HIGH] = 10 * 8, + .bInterval[USB_SPEED_LOW] = 8, /* 8ms */ + .bInterval[USB_SPEED_FULL] = 8, /* 8ms */ + .bInterval[USB_SPEED_HIGH] = 7, /* 8ms */ }; static const struct usb_temp_endpoint_desc modem_ep_0 = { Modified: stable/9/sys/dev/usb/template/usb_template_mouse.c ============================================================================== --- stable/9/sys/dev/usb/template/usb_template_mouse.c Sat Dec 31 14:36:51 2011 (r229102) +++ stable/9/sys/dev/usb/template/usb_template_mouse.c Sat Dec 31 14:37:51 2011 (r229103) @@ -101,9 +101,9 @@ static const struct usb_temp_packet_size }; static const struct usb_temp_interval mouse_intr_interval = { - .bInterval[USB_SPEED_LOW] = 2, - .bInterval[USB_SPEED_FULL] = 2, - .bInterval[USB_SPEED_HIGH] = 2 * 8, + .bInterval[USB_SPEED_LOW] = 2, /* 2ms */ + .bInterval[USB_SPEED_FULL] = 2, /* 2ms */ + .bInterval[USB_SPEED_HIGH] = 5, /* 2ms */ }; static const struct usb_temp_endpoint_desc mouse_ep_0 = {