index d7536066eb0c1f0ca78471bf66d684bb8ee590cf..42cbf52256eb43b3aab94c963b6675d779c0d9b4 100644 (file)
void __iomem *epio = musb->endpoints[epnum].regs;
struct dma_channel *dma;
- musb_ep_select(mbase, epnum);
+ musb_ep_select(musb, mbase, epnum);
req = next_request(musb_ep);
request = &req->request;
else
musb_ep = &hw_ep->ep_out;
- musb_ep_select(mbase, epnum);
+ musb_ep_select(musb, mbase, epnum);
req = next_request(musb_ep);
if (!req)
/* enable the interrupts for the endpoint, set the endpoint
* packet size (or fail), set the mode, clear the fifo
*/
- musb_ep_select(mbase, epnum);
+ musb_ep_select(musb, mbase, epnum);
if (usb_endpoint_dir_in(desc)) {
u16 int_txe = musb_readw(mbase, MUSB_INTRTXE);
epio = musb->endpoints[epnum].regs;
spin_lock_irqsave(&musb->lock, flags);
- musb_ep_select(musb->mregs, epnum);
+ musb_ep_select(musb, musb->mregs, epnum);
/* zero the endpoint sizes */
if (musb_ep->is_in) {
req->tx ? "TX/IN" : "RX/OUT",
&req->request, req->request.length, req->epnum);
- musb_ep_select(musb->mregs, req->epnum);
+ musb_ep_select(musb, musb->mregs, req->epnum);
if (req->tx)
txstate(musb, req);
else
@@ -1371,7 +1371,7 @@ static int musb_gadget_dequeue(struct usb_ep *ep, struct usb_request *request)
else if (is_dma_capable() && musb_ep->dma) {
struct dma_controller *c = musb->dma_controller;
- musb_ep_select(musb->mregs, musb_ep->current_epnum);
+ musb_ep_select(musb, musb->mregs, musb_ep->current_epnum);
if (c->channel_abort)
status = c->channel_abort(musb_ep->dma);
else
goto done;
}
- musb_ep_select(mbase, epnum);
+ musb_ep_select(musb, mbase, epnum);
request = next_request(musb_ep);
if (value) {
spin_lock_irqsave(&musb->lock, flags);
- musb_ep_select(mbase, epnum);
+ musb_ep_select(musb, mbase, epnum);
/* FIXME return zero unless RXPKTRDY is set */
retval = musb_readw(epio, MUSB_RXCOUNT);
mbase = musb->mregs;
spin_lock_irqsave(&musb->lock, flags);
- musb_ep_select(mbase, (u8) epnum);
+ musb_ep_select(musb, mbase, (u8) epnum);
/* disable interrupts */
int_txe = musb_readw(mbase, MUSB_INTRTXE);
@@ -1987,7 +1987,7 @@ static void stop_activity(struct musb *musb, struct usb_gadget_driver *driver)
for (i = 0, hw_ep = musb->endpoints;
i < musb->nr_endpoints;
i++, hw_ep++) {
- musb_ep_select(musb->mregs, i);
+ musb_ep_select(musb, musb->mregs, i);
if (hw_ep->is_shared_fifo /* || !epnum */) {
nuke(&hw_ep->ep_in, -ESHUTDOWN);
} else {