From owner-svn-src-stable-8@FreeBSD.ORG Tue Nov 13 17:16:04 2012 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6AE624DC; Tue, 13 Nov 2012 17:16:04 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4FB538FC13; Tue, 13 Nov 2012 17:16:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qADHG4X0086223; Tue, 13 Nov 2012 17:16:04 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qADHG4IT086219; Tue, 13 Nov 2012 17:16:04 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201211131716.qADHG4IT086219@svn.freebsd.org> From: Hans Petter Selasky Date: Tue, 13 Nov 2012 17:16:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r242987 - stable/8/sys/dev/usb/template X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Nov 2012 17:16:04 -0000 Author: hselasky Date: Tue Nov 13 17:16:03 2012 New Revision: 242987 URL: http://svnweb.freebsd.org/changeset/base/242987 Log: MFC 228304: Correct some bInterval USB template descriptor values. Modified: stable/8/sys/dev/usb/template/usb_template.c stable/8/sys/dev/usb/template/usb_template_kbd.c stable/8/sys/dev/usb/template/usb_template_modem.c stable/8/sys/dev/usb/template/usb_template_mouse.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/usb/ (props changed) Modified: stable/8/sys/dev/usb/template/usb_template.c ============================================================================== --- stable/8/sys/dev/usb/template/usb_template.c Tue Nov 13 17:11:36 2012 (r242986) +++ stable/8/sys/dev/usb/template/usb_template.c Tue Nov 13 17:16:03 2012 (r242987) @@ -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/8/sys/dev/usb/template/usb_template_kbd.c ============================================================================== --- stable/8/sys/dev/usb/template/usb_template_kbd.c Tue Nov 13 17:11:36 2012 (r242986) +++ stable/8/sys/dev/usb/template/usb_template_kbd.c Tue Nov 13 17:16:03 2012 (r242987) @@ -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/8/sys/dev/usb/template/usb_template_modem.c ============================================================================== --- stable/8/sys/dev/usb/template/usb_template_modem.c Tue Nov 13 17:11:36 2012 (r242986) +++ stable/8/sys/dev/usb/template/usb_template_modem.c Tue Nov 13 17:16:03 2012 (r242987) @@ -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/8/sys/dev/usb/template/usb_template_mouse.c ============================================================================== --- stable/8/sys/dev/usb/template/usb_template_mouse.c Tue Nov 13 17:11:36 2012 (r242986) +++ stable/8/sys/dev/usb/template/usb_template_mouse.c Tue Nov 13 17:16:03 2012 (r242987) @@ -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 = {