V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

dm: usb: Prefix ehci interrupt-queue functions with _ehci_ 

This is a preparation patch for adding interrupt-queue support to the
ehci dm code.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Hans de Goede 2015-05-11 20:43:52 +02:00 committed by Simon Glass
parent 45b9ea1da2
commit 029fd8ea1f
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/usb/host/ehci-hcd.c
View File

@ -1263,9 +1263,9 @@ disable_periodic(struct ehci_ctrl *ctrl)
return 0; return 0;
} }
struct int_queue * static struct int_queue *_ehci_create_int_queue(struct usb_device *dev,
create_int_queue(struct usb_device *dev, unsigned long pipe, int queuesize, unsigned long pipe, int queuesize, int elementsize,
int elementsize, void *buffer, int interval) void *buffer, int interval)
{ {
struct ehci_ctrl *ctrl = ehci_get_ctrl(dev); struct ehci_ctrl *ctrl = ehci_get_ctrl(dev);
struct int_queue *result = NULL; struct int_queue *result = NULL;
@ -1421,7 +1421,8 @@ fail1:
return NULL; return NULL;
} }
void *poll_int_queue(struct usb_device *dev, struct int_queue *queue) static void *_ehci_poll_int_queue(struct usb_device *dev,
struct int_queue *queue)
{ {
struct QH *cur = queue->current; struct QH *cur = queue->current;
struct qTD *cur_td; struct qTD *cur_td;
@ -1456,8 +1457,8 @@ void *poll_int_queue(struct usb_device *dev, struct int_queue *queue)
} }
/* Do not free buffers associated with QHs, they're owned by someone else */ /* Do not free buffers associated with QHs, they're owned by someone else */
int static int _ehci_destroy_int_queue(struct usb_device *dev,
destroy_int_queue(struct usb_device *dev, struct int_queue *queue) struct int_queue *queue)
{ {
struct ehci_ctrl *ctrl = ehci_get_ctrl(dev); struct ehci_ctrl *ctrl = ehci_get_ctrl(dev);
int result = -1; int result = -1;
@ -1514,12 +1515,12 @@ static int _ehci_submit_int_msg(struct usb_device *dev, unsigned long pipe,
debug("dev=%p, pipe=%lu, buffer=%p, length=%d, interval=%d", debug("dev=%p, pipe=%lu, buffer=%p, length=%d, interval=%d",
dev, pipe, buffer, length, interval); dev, pipe, buffer, length, interval);
queue = create_int_queue(dev, pipe, 1, length, buffer, interval); queue = _ehci_create_int_queue(dev, pipe, 1, length, buffer, interval);
if (!queue) if (!queue)
return -1; return -1;
timeout = get_timer(0) + USB_TIMEOUT_MS(pipe); timeout = get_timer(0) + USB_TIMEOUT_MS(pipe);
while ((backbuffer = poll_int_queue(dev, queue)) == NULL) while ((backbuffer = _ehci_poll_int_queue(dev, queue)) == NULL)
if (get_timer(0) > timeout) { if (get_timer(0) > timeout) {
printf("Timeout poll on interrupt endpoint\n"); printf("Timeout poll on interrupt endpoint\n");
result = -ETIMEDOUT; result = -ETIMEDOUT;
@ -1532,7 +1533,7 @@ static int _ehci_submit_int_msg(struct usb_device *dev, unsigned long pipe,
return -EINVAL; return -EINVAL;
} }
ret = destroy_int_queue(dev, queue); ret = _ehci_destroy_int_queue(dev, queue);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -1558,6 +1559,24 @@ int submit_int_msg(struct usb_device *dev, unsigned long pipe,
{ {
return _ehci_submit_int_msg(dev, pipe, buffer, length, interval); return _ehci_submit_int_msg(dev, pipe, buffer, length, interval);
} }
struct int_queue *create_int_queue(struct usb_device *dev,
unsigned long pipe, int queuesize, int elementsize,
void *buffer, int interval)
{
return _ehci_create_int_queue(dev, pipe, queuesize, elementsize,
buffer, interval);
}
void *poll_int_queue(struct usb_device *dev, struct int_queue *queue)
{
return _ehci_poll_int_queue(dev, queue);
}
int destroy_int_queue(struct usb_device *dev, struct int_queue *queue)
{
return _ehci_destroy_int_queue(dev, queue);
}
#endif #endif
#ifdef CONFIG_DM_USB #ifdef CONFIG_DM_USB