Commit 23c42126 authored by Tony Lindgren's avatar Tony Lindgren

musb_hdrc: Search and replace wFrame with frame

Search and replace wFrame with frame
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent e2c19314
...@@ -169,7 +169,7 @@ static inline void cppi_host_txdma_start(struct musb_hw_ep *ep) ...@@ -169,7 +169,7 @@ static inline void cppi_host_txdma_start(struct musb_hw_ep *ep)
static void static void
musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh) musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh)
{ {
u16 wFrame; u16 frame;
u32 len; u32 len;
void *buf; void *buf;
void __iomem *mbase = musb->mregs; void __iomem *mbase = musb->mregs;
...@@ -232,12 +232,12 @@ musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh) ...@@ -232,12 +232,12 @@ musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh)
case USB_ENDPOINT_XFER_INT: case USB_ENDPOINT_XFER_INT:
DBG(3, "check whether there's still time for periodic Tx\n"); DBG(3, "check whether there's still time for periodic Tx\n");
qh->iso_idx = 0; qh->iso_idx = 0;
wFrame = musb_readw(mbase, MUSB_FRAME); frame = musb_readw(mbase, MUSB_FRAME);
/* FIXME this doesn't implement that scheduling policy ... /* FIXME this doesn't implement that scheduling policy ...
* or handle framecounter wrapping * or handle framecounter wrapping
*/ */
if ((urb->transfer_flags & URB_ISO_ASAP) if ((urb->transfer_flags & URB_ISO_ASAP)
|| (wFrame >= urb->start_frame)) { || (frame >= urb->start_frame)) {
/* REVISIT the SOF irq handler shouldn't duplicate /* REVISIT the SOF irq handler shouldn't duplicate
* this code; and we don't init urb->start_frame... * this code; and we don't init urb->start_frame...
*/ */
......
...@@ -663,20 +663,20 @@ static irqreturn_t musb_stage2_irq(struct musb * musb, u8 int_usb, ...@@ -663,20 +663,20 @@ static irqreturn_t musb_stage2_irq(struct musb * musb, u8 int_usb,
void __iomem *mbase = musb->mregs; void __iomem *mbase = musb->mregs;
struct musb_hw_ep *ep; struct musb_hw_ep *ep;
u8 epnum; u8 epnum;
u16 wFrame; u16 frame;
DBG(6, "START_OF_FRAME\n"); DBG(6, "START_OF_FRAME\n");
handled = IRQ_HANDLED; handled = IRQ_HANDLED;
/* start any periodic Tx transfers waiting for current frame */ /* start any periodic Tx transfers waiting for current frame */
wFrame = musb_readw(mbase, MUSB_FRAME); frame = musb_readw(mbase, MUSB_FRAME);
ep = musb->endpoints; ep = musb->endpoints;
for (epnum = 1; (epnum < musb->nr_endpoints) for (epnum = 1; (epnum < musb->nr_endpoints)
&& (musb->epmask >= (1 << epnum)); && (musb->epmask >= (1 << epnum));
epnum++, ep++) { epnum++, ep++) {
// FIXME handle framecounter wraps (12 bits) // FIXME handle framecounter wraps (12 bits)
// eliminate duplicated StartUrb logic // eliminate duplicated StartUrb logic
if (ep->dwWaitFrame >= wFrame) { if (ep->dwWaitFrame >= frame) {
ep->dwWaitFrame = 0; ep->dwWaitFrame = 0;
printk("SOF --> periodic TX%s on %d\n", printk("SOF --> periodic TX%s on %d\n",
ep->tx_channel ? " DMA" : "", ep->tx_channel ? " DMA" : "",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment