Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usb: mv_udc: Move endpoint array into driver data

Browse Source 
The endpoints are operated on a per-controller basis, move the
endpoint array into controller's private data. Also shuffle the
struct mv_ep structure definition just above the definition of
the struct mv_drv so they're well grouped together.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Lei Wen <leiwen@marvell.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Stefano Babic <sbabic@denx.de>
master
Marek Vasut 12 years ago
parent 6368c91945
commit 532d846f89
2 changed files with 33 additions and 32 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 48
      drivers/usb/gadget/mv_udc.c
  2. 17
      include/usb/mv_udc.h

48
drivers/usb/gadget/mv_udc.c
Unescape View File

@ -83,10 +83,8 @@ static struct usb_ep_ops mv_ep_ops = {
.free_request = mv_ep_free_request, .free_request = mv_ep_free_request,
}; };
static struct mv_ep ep[2 * NUM_ENDPOINTS];
static struct mv_drv controller = { static struct mv_drv controller = {
.gadget = { .gadget = {
.ep0 = &ep[0].ep,
.name = "mv_udc", .name = "mv_udc",
}, },
}; };
@ -207,7 +205,7 @@ static void handle_ep_complete(struct mv_ep *ep)
static void handle_setup(void) static void handle_setup(void)
{ {
struct usb_request *req = &ep[0].req; struct usb_request *req = &controller.ep[0].req;
struct mv_udc *udc = controller.udc; struct mv_udc *udc = controller.udc;
struct ept_queue_head *head; struct ept_queue_head *head;
struct usb_ctrlrequest r; struct usb_ctrlrequest r;
@ -230,11 +228,11 @@ static void handle_setup(void)
if ((r.wValue == 0) && (r.wLength == 0)) { if ((r.wValue == 0) && (r.wLength == 0)) {
req->length = 0; req->length = 0;
for (i = 0; i < NUM_ENDPOINTS; i++) { for (i = 0; i < NUM_ENDPOINTS; i++) {
if (!ep[i].desc) if (!controller.ep[i].desc)
continue; continue;
num = ep[i].desc->bEndpointAddress num = controller.ep[i].desc->bEndpointAddress
& USB_ENDPOINT_NUMBER_MASK; & USB_ENDPOINT_NUMBER_MASK;
in = (ep[i].desc->bEndpointAddress in = (controller.ep[i].desc->bEndpointAddress
& USB_DIR_IN) != 0; & USB_DIR_IN) != 0;
if ((num == _num) && (in == _in)) { if ((num == _num) && (in == _in)) {
ep_enable(num, in); ep_enable(num, in);
@ -290,10 +288,11 @@ static void stop_activity(void)
for (i = 0; i < NUM_ENDPOINTS; i++) { for (i = 0; i < NUM_ENDPOINTS; i++) {
if (i != 0) if (i != 0)
writel(0, &udc->epctrl[i]); writel(0, &udc->epctrl[i]);
if (ep[i].desc) { if (controller.ep[i].desc) {
num = ep[i].desc->bEndpointAddress num = controller.ep[i].desc->bEndpointAddress
& USB_ENDPOINT_NUMBER_MASK; & USB_ENDPOINT_NUMBER_MASK;
in = (ep[i].desc->bEndpointAddress & USB_DIR_IN) != 0; in = (controller.ep[i].desc->bEndpointAddress
& USB_DIR_IN) != 0;
head = epts + (num * 2) + (in); head = epts + (num * 2) + (in);
head->info = INFO_ACTIVE; head->info = INFO_ACTIVE;
} }
@ -324,8 +323,8 @@ void udc_irq(void)
if (bit == 2) { if (bit == 2) {
controller.gadget.speed = USB_SPEED_HIGH; controller.gadget.speed = USB_SPEED_HIGH;
for (i = 1; i < NUM_ENDPOINTS && n; i++) for (i = 1; i < NUM_ENDPOINTS && n; i++)
if (ep[i].desc) if (controller.ep[i].desc)
ep[i].ep.maxpacket = 512; controller.ep[i].ep.maxpacket = 512;
} else { } else {
controller.gadget.speed = USB_SPEED_FULL; controller.gadget.speed = USB_SPEED_FULL;
} }
@ -344,14 +343,14 @@ void udc_irq(void)
writel(n, &udc->epcomp); writel(n, &udc->epcomp);
for (i = 0; i < NUM_ENDPOINTS && n; i++) { for (i = 0; i < NUM_ENDPOINTS && n; i++) {
if (ep[i].desc) { if (controller.ep[i].desc) {
num = ep[i].desc->bEndpointAddress num = controller.ep[i].desc->bEndpointAddress
& USB_ENDPOINT_NUMBER_MASK; & USB_ENDPOINT_NUMBER_MASK;
in = (ep[i].desc->bEndpointAddress in = (controller.ep[i].desc->bEndpointAddress
& USB_DIR_IN) != 0; & USB_DIR_IN) != 0;
bit = (in) ? EPT_TX(num) : EPT_RX(num); bit = (in) ? EPT_TX(num) : EPT_RX(num);
if (n & bit) if (n & bit)
handle_ep_complete(&ep[i]); handle_ep_complete(&controller.ep[i]);
} }
} }
} }
@ -436,19 +435,20 @@ static int mvudc_probe(void)
} }
INIT_LIST_HEAD(&controller.gadget.ep_list); INIT_LIST_HEAD(&controller.gadget.ep_list);
ep[0].ep.maxpacket = 64; controller.gadget.ep0 = &controller.ep[0].ep;
ep[0].ep.name = "ep0"; controller.ep[0].ep.maxpacket = 64;
ep[0].desc = &ep0_in_desc; controller.ep[0].ep.name = "ep0";
controller.ep[0].desc = &ep0_in_desc;
INIT_LIST_HEAD(&controller.gadget.ep0->ep_list); INIT_LIST_HEAD(&controller.gadget.ep0->ep_list);
for (i = 0; i < 2 * NUM_ENDPOINTS; i++) { for (i = 0; i < 2 * NUM_ENDPOINTS; i++) {
if (i != 0) { if (i != 0) {
ep[i].ep.maxpacket = 512; controller.ep[i].ep.maxpacket = 512;
ep[i].ep.name = "ep-"; controller.ep[i].ep.name = "ep-";
list_add_tail(&ep[i].ep.ep_list, list_add_tail(&controller.ep[i].ep.ep_list,
&controller.gadget.ep_list); &controller.gadget.ep_list);
ep[i].desc = NULL; controller.ep[i].desc = NULL;
} }
ep[i].ep.ops = &mv_ep_ops; controller.ep[i].ep.ops = &mv_ep_ops;
} }
return 0; return 0;
} }

17
include/usb/mv_udc.h
Unescape View File

@ -22,13 +22,6 @@
#define EP_MAX_PACKET_SIZE 0x200 #define EP_MAX_PACKET_SIZE 0x200
#define EP0_MAX_PACKET_SIZE 64 #define EP0_MAX_PACKET_SIZE 64
struct mv_ep {
struct usb_ep ep;
struct usb_request req;
struct list_head queue;
const struct usb_endpoint_descriptor *desc;
};
struct mv_udc { struct mv_udc {
u32 pad0[80]; u32 pad0[80];
#define MICRO_8FRAME 0x8 #define MICRO_8FRAME 0x8
@ -70,10 +63,18 @@ struct mv_udc {
u32 epctrl[16]; /* 0x1c0 */ u32 epctrl[16]; /* 0x1c0 */
}; };
struct mv_ep {
struct usb_ep ep;
struct usb_request req;
struct list_head queue;
const struct usb_endpoint_descriptor *desc;
};
struct mv_drv { struct mv_drv {
struct usb_gadget gadget; struct usb_gadget gadget;
struct usb_gadget_driver *driver; struct usb_gadget_driver *driver;
struct mv_udc *udc; struct mv_udc *udc;
struct mv_ep ep[2 * NUM_ENDPOINTS];
}; };
struct ept_queue_head { struct ept_queue_head {

Write Preview
Loading…
Cancel
Save