From: Stephen Warren <swarren@nvidia.com>
Date: Fri, 13 Nov 2015 20:34:09 +0000 (-0700)
Subject: usb: kbd: don't use int xfers when polling via ctrl xfers
X-Git-Tag: v2016.01-rc3~18^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e4b70d80350c1238fa07872d71c19e3ddbf53b76;p=oweals%2Fu-boot.git

usb: kbd: don't use int xfers when polling via ctrl xfers

When CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP is enabled, use a
GET_REPORT control transfer to retrieve the initial state of the
keyboard. This matches the technique used to poll the keyboard state.
This is useful since it eliminates the remaining use of interrupt
transfers from the USB keyboard driver, which allows it to work with
USB HCD that don't support interrupt transfers.

Cc: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---

diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index 069fbd2de7..9617a4848a 100644
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -476,6 +476,9 @@ static int usb_kbd_probe_dev(struct usb_device *dev, unsigned int ifnum)
 				      USB_KBD_BOOT_REPORT_SIZE, data->new,
 				      data->intinterval);
 	if (!data->intq) {
+#elif defined(CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP)
+	if (usb_get_report(dev, iface->desc.bInterfaceNumber,
+			   1, 0, data->new, USB_KBD_BOOT_REPORT_SIZE) < 0) {
 #else
 	if (usb_submit_int_msg(dev, data->intpipe, data->new, data->intpktsize,
 			       data->intinterval) < 0) {