GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 06:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

usb: kbd: Cache pipe, interval and packetsize

Browse source 
Instead of looking them up every time we need them.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Hans de Goede 2014-09-24 14:06:10 +02:00 • committed by Marek Vasut
parent 88274b6c43
commit 8f8d7d2451
1 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
common/usb_kbd.c
View file

@ -99,6 +99,10 @@ static const unsigned char usb_kbd_arrow[] = {
#define USB_KBD_BOOT_REPORT_SIZE 8 #define USB_KBD_BOOT_REPORT_SIZE 8
struct usb_kbd_pdata { struct usb_kbd_pdata {
unsigned long intpipe;
int intpktsize;
int intinterval;
uint32_t repeat_delay; uint32_t repeat_delay;
uint32_t usb_in_pointer; uint32_t usb_in_pointer;
@ -305,23 +309,11 @@ static int usb_kbd_irq(struct usb_device *dev)
static inline void usb_kbd_poll_for_event(struct usb_device *dev) static inline void usb_kbd_poll_for_event(struct usb_device *dev)
{ {
#if defined(CONFIG_SYS_USB_EVENT_POLL) #if defined(CONFIG_SYS_USB_EVENT_POLL)
struct usb_interface *iface; struct usb_kbd_pdata *data = dev->privptr;
struct usb_endpoint_descriptor *ep;
struct usb_kbd_pdata *data;
int pipe;
int maxp;
/* Get the pointer to USB Keyboard device pointer */
data = dev->privptr;
iface = &dev->config.if_desc[0];
ep = &iface->ep_desc[0];
pipe = usb_rcvintpipe(dev, ep->bEndpointAddress);
/* Submit a interrupt transfer request */ /* Submit a interrupt transfer request */
maxp = usb_maxpacket(dev, pipe); usb_submit_int_msg(dev, data->intpipe, &data->new[0], data->intpktsize,
usb_submit_int_msg(dev, pipe, &data->new[0], data->intinterval);
min(maxp, USB_KBD_BOOT_REPORT_SIZE),
ep->bInterval);
usb_kbd_irq_worker(dev); usb_kbd_irq_worker(dev);
#elif defined(CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP) #elif defined(CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP)
@ -389,7 +381,6 @@ static int usb_kbd_probe(struct usb_device *dev, unsigned int ifnum)
struct usb_interface *iface; struct usb_interface *iface;
struct usb_endpoint_descriptor *ep; struct usb_endpoint_descriptor *ep;
struct usb_kbd_pdata *data; struct usb_kbd_pdata *data;
int pipe, maxp;
if (dev->descriptor.bNumConfigurations != 1) if (dev->descriptor.bNumConfigurations != 1)
return 0; return 0;
@ -438,8 +429,10 @@ static int usb_kbd_probe(struct usb_device *dev, unsigned int ifnum)
/* Set IRQ handler */ /* Set IRQ handler */
dev->irq_handle = usb_kbd_irq; dev->irq_handle = usb_kbd_irq;
pipe = usb_rcvintpipe(dev, ep->bEndpointAddress); data->intpipe = usb_rcvintpipe(dev, ep->bEndpointAddress);
maxp = usb_maxpacket(dev, pipe); data->intpktsize = min(usb_maxpacket(dev, data->intpipe),
USB_KBD_BOOT_REPORT_SIZE);
data->intinterval = ep->bInterval;
/* We found a USB Keyboard, install it. */ /* We found a USB Keyboard, install it. */
usb_set_protocol(dev, iface->desc.bInterfaceNumber, 0); usb_set_protocol(dev, iface->desc.bInterfaceNumber, 0);
@ -448,9 +441,8 @@ static int usb_kbd_probe(struct usb_device *dev, unsigned int ifnum)
usb_set_idle(dev, iface->desc.bInterfaceNumber, REPEAT_RATE, 0); usb_set_idle(dev, iface->desc.bInterfaceNumber, REPEAT_RATE, 0);
debug("USB KBD: enable interrupt pipe...\n"); debug("USB KBD: enable interrupt pipe...\n");
if (usb_submit_int_msg(dev, pipe, data->new, if (usb_submit_int_msg(dev, data->intpipe, data->new, data->intpktsize,
min(maxp, USB_KBD_BOOT_REPORT_SIZE), data->intinterval) < 0) {
ep->bInterval) < 0) {
printf("Failed to get keyboard state from device %04x:%04x\n", printf("Failed to get keyboard state from device %04x:%04x\n",
dev->descriptor.idVendor, dev->descriptor.idProduct); dev->descriptor.idVendor, dev->descriptor.idProduct);
/* Abort, we don't want to use that non-functional keyboard. */ /* Abort, we don't want to use that non-functional keyboard. */