#define next_ep0_request(musb) next_in_request(&(musb)->endpoints[0])
/*
- * Locking note: we use only the controller lock, for simpler correctness.
+ * locking note: we use only the controller lock, for simpler correctness.
* It's always held with IRQs blocked.
*
* It protects the ep0 request queue as well as ep0_state, not just the
*/
static int service_tx_status_request(
struct musb *musb,
- const struct usb_ctrlrequest *pControlRequest)
+ const struct usb_ctrlrequest *ctrlrequest)
{
void __iomem *mbase = musb->mregs;
int handled = 1;
- u8 bResult[2], epnum = 0;
- const u8 bRecip = pControlRequest->bRequestType & USB_RECIP_MASK;
+ u8 result[2], epnum = 0;
+ const u8 recip = ctrlrequest->bRequestType & USB_RECIP_MASK;
- bResult[1] = 0;
+ result[1] = 0;
- switch (bRecip) {
+ switch (recip) {
case USB_RECIP_DEVICE:
- bResult[0] = musb->is_self_powered << USB_DEVICE_SELF_POWERED;
- bResult[0] |= musb->may_wakeup << USB_DEVICE_REMOTE_WAKEUP;
+ result[0] = musb->is_self_powered << USB_DEVICE_SELF_POWERED;
+ result[0] |= musb->may_wakeup << USB_DEVICE_REMOTE_WAKEUP;
#ifdef CONFIG_USB_MUSB_OTG
if (musb->g.is_otg) {
- bResult[0] |= musb->g.b_hnp_enable
+ result[0] |= musb->g.b_hnp_enable
<< USB_DEVICE_B_HNP_ENABLE;
- bResult[0] |= musb->g.a_alt_hnp_support
+ result[0] |= musb->g.a_alt_hnp_support
<< USB_DEVICE_A_ALT_HNP_SUPPORT;
- bResult[0] |= musb->g.a_hnp_support
+ result[0] |= musb->g.a_hnp_support
<< USB_DEVICE_A_HNP_SUPPORT;
}
#endif
break;
case USB_RECIP_INTERFACE:
- bResult[0] = 0;
+ result[0] = 0;
break;
case USB_RECIP_ENDPOINT: {
u16 tmp;
void __iomem *regs;
- epnum = (u8) pControlRequest->wIndex;
+ epnum = (u8) ctrlrequest->wIndex;
if (!epnum) {
- bResult[0] = 0;
+ result[0] = 0;
break;
}
break;
}
- MGC_SelectEnd(mbase, epnum);
+ musb_ep_select(mbase, epnum);
if (is_in)
tmp = musb_readw(regs, MGC_O_HDRC_TXCSR)
& MGC_M_TXCSR_P_SENDSTALL;
else
tmp = musb_readw(regs, MGC_O_HDRC_RXCSR)
& MGC_M_RXCSR_P_SENDSTALL;
- MGC_SelectEnd(mbase, 0);
+ musb_ep_select(mbase, 0);
- bResult[0] = tmp ? 1 : 0;
+ result[0] = tmp ? 1 : 0;
} break;
default:
/* fill up the fifo; caller updates csr0 */
if (handled > 0) {
- u16 len = le16_to_cpu(pControlRequest->wLength);
+ u16 len = le16_to_cpu(ctrlrequest->wLength);
if (len > 2)
len = 2;
- musb_write_fifo(&musb->endpoints[0], len, bResult);
+ musb_write_fifo(&musb->endpoints[0], len, result);
}
return handled;
*/
static int
service_in_request(struct musb *musb,
- const struct usb_ctrlrequest *pControlRequest)
+ const struct usb_ctrlrequest *ctrlrequest)
{
int handled = 0; /* not handled */
- if ((pControlRequest->bRequestType & USB_TYPE_MASK)
+ if ((ctrlrequest->bRequestType & USB_TYPE_MASK)
== USB_TYPE_STANDARD) {
- switch (pControlRequest->bRequest) {
+ switch (ctrlrequest->bRequest) {
case USB_REQ_GET_STATUS:
handled = service_tx_status_request(musb,
- pControlRequest);
+ ctrlrequest);
break;
/* case USB_REQ_SYNC_FRAME: */
*/
static int
service_zero_data_request(struct musb *musb,
- struct usb_ctrlrequest *pControlRequest)
-__releases(musb->Lock)
-__acquires(musb->Lock)
+ struct usb_ctrlrequest *ctrlrequest)
+__releases(musb->lock)
+__acquires(musb->lock)
{
int handled = -EINVAL;
void __iomem *mbase = musb->mregs;
- const u8 bRecip = pControlRequest->bRequestType & USB_RECIP_MASK;
+ const u8 recip = ctrlrequest->bRequestType & USB_RECIP_MASK;
/* the gadget driver handles everything except what we MUST handle */
- if ((pControlRequest->bRequestType & USB_TYPE_MASK)
+ if ((ctrlrequest->bRequestType & USB_TYPE_MASK)
== USB_TYPE_STANDARD) {
- switch (pControlRequest->bRequest) {
+ switch (ctrlrequest->bRequest) {
case USB_REQ_SET_ADDRESS:
/* change it after the status stage */
- musb->bSetAddress = TRUE;
- musb->bAddress = (u8) (pControlRequest->wValue & 0x7f);
+ musb->set_address = TRUE;
+ musb->address = (u8) (ctrlrequest->wValue & 0x7f);
handled = 1;
break;
case USB_REQ_CLEAR_FEATURE:
- switch (bRecip) {
+ switch (recip) {
case USB_RECIP_DEVICE:
- if (pControlRequest->wValue
+ if (ctrlrequest->wValue
!= USB_DEVICE_REMOTE_WAKEUP)
break;
musb->may_wakeup = 0;
case USB_RECIP_INTERFACE:
break;
case USB_RECIP_ENDPOINT:{
- const u8 epnum = pControlRequest->wIndex & 0x0f;
+ const u8 epnum = ctrlrequest->wIndex & 0x0f;
struct musb_ep *musb_ep;
if (epnum == 0
|| epnum >= MUSB_C_NUM_EPS
- || pControlRequest->wValue
+ || ctrlrequest->wValue
!= USB_ENDPOINT_HALT)
break;
- if (pControlRequest->wIndex & USB_DIR_IN)
+ if (ctrlrequest->wIndex & USB_DIR_IN)
musb_ep = &musb->endpoints[epnum].ep_in;
else
musb_ep = &musb->endpoints[epnum].ep_out;
break;
/* REVISIT do it directly, no locking games */
- spin_unlock(&musb->Lock);
+ spin_unlock(&musb->lock);
musb_gadget_set_halt(&musb_ep->end_point, 0);
- spin_lock(&musb->Lock);
+ spin_lock(&musb->lock);
/* select ep0 again */
- MGC_SelectEnd(mbase, 0);
+ musb_ep_select(mbase, 0);
handled = 1;
} break;
default:
break;
case USB_REQ_SET_FEATURE:
- switch (bRecip) {
+ switch (recip) {
case USB_RECIP_DEVICE:
handled = 1;
- switch (pControlRequest->wValue) {
+ switch (ctrlrequest->wValue) {
case USB_DEVICE_REMOTE_WAKEUP:
musb->may_wakeup = 1;
break;
case USB_DEVICE_TEST_MODE:
if (musb->g.speed != USB_SPEED_HIGH)
goto stall;
- if (pControlRequest->wIndex & 0xff)
+ if (ctrlrequest->wIndex & 0xff)
goto stall;
- switch (pControlRequest->wIndex >> 8) {
+ switch (ctrlrequest->wIndex >> 8) {
case 1:
pr_debug("TEST_J\n");
/* TEST_J */
- musb->bTestModeValue =
+ musb->test_mode_nr =
MGC_M_TEST_J;
break;
case 2:
/* TEST_K */
pr_debug("TEST_K\n");
- musb->bTestModeValue =
+ musb->test_mode_nr =
MGC_M_TEST_K;
break;
case 3:
/* TEST_SE0_NAK */
pr_debug("TEST_SE0_NAK\n");
- musb->bTestModeValue =
+ musb->test_mode_nr =
MGC_M_TEST_SE0_NAK;
break;
case 4:
/* TEST_PACKET */
pr_debug("TEST_PACKET\n");
- musb->bTestModeValue =
+ musb->test_mode_nr =
MGC_M_TEST_PACKET;
break;
default:
/* enter test mode after irq */
if (handled > 0)
- musb->bTestMode = TRUE;
+ musb->test_mode = TRUE;
break;
#ifdef CONFIG_USB_MUSB_OTG
case USB_DEVICE_B_HNP_ENABLE:
case USB_RECIP_ENDPOINT:{
const u8 epnum =
- pControlRequest->wIndex & 0x0f;
+ ctrlrequest->wIndex & 0x0f;
struct musb_ep *musb_ep;
struct musb_hw_ep *ep;
void __iomem *regs;
if (epnum == 0
|| epnum >= MUSB_C_NUM_EPS
- || pControlRequest->wValue
+ || ctrlrequest->wValue
!= USB_ENDPOINT_HALT)
break;
ep = musb->endpoints + epnum;
regs = ep->regs;
- is_in = pControlRequest->wIndex & USB_DIR_IN;
+ is_in = ctrlrequest->wIndex & USB_DIR_IN;
if (is_in)
musb_ep = &ep->ep_in;
else
if (!musb_ep->desc)
break;
- MGC_SelectEnd(mbase, epnum);
+ musb_ep_select(mbase, epnum);
if (is_in) {
csr = musb_readw(regs,
MGC_O_HDRC_TXCSR);
}
/* select ep0 again */
- MGC_SelectEnd(mbase, 0);
+ musb_ep_select(mbase, 0);
handled = 1;
} break;
* the TX FIFO right away, and give the controller a moment
* to switch modes...
*/
- musb->bSetAddress = FALSE;
+ musb->set_address = FALSE;
musb->ackpend = MGC_M_CSR0_P_SVDRXPKTRDY;
if (req->wLength == 0) {
if (req->bRequestType & USB_DIR_IN)
static int
forward_to_driver(struct musb *musb,
- const struct usb_ctrlrequest *pControlRequest)
-__releases(musb->Lock)
-__acquires(musb->Lock)
+ const struct usb_ctrlrequest *ctrlrequest)
+__releases(musb->lock)
+__acquires(musb->lock)
{
int retval;
- if (!musb->pGadgetDriver)
+ if (!musb->gadget_driver)
return -EOPNOTSUPP;
- spin_unlock(&musb->Lock);
- retval = musb->pGadgetDriver->setup(&musb->g, pControlRequest);
- spin_lock(&musb->Lock);
+ spin_unlock(&musb->lock);
+ retval = musb->gadget_driver->setup(&musb->g, ctrlrequest);
+ spin_lock(&musb->lock);
return retval;
}
void __iomem *regs = musb->endpoints[0].regs;
irqreturn_t retval = IRQ_NONE;
- MGC_SelectEnd(mbase, 0); /* select ep0 */
+ musb_ep_select(mbase, 0); /* select ep0 */
wCsrVal = musb_readw(regs, MGC_O_HDRC_CSR0);
len = musb_readb(regs, MGC_O_HDRC_COUNT0);
* we get 10 msec to receive this irq... until this
* is done we won't see the next packet.
*/
- if (musb->bSetAddress) {
- musb->bSetAddress = FALSE;
- musb_writeb(mbase, MGC_O_HDRC_FADDR, musb->bAddress);
+ if (musb->set_address) {
+ musb->set_address = FALSE;
+ musb_writeb(mbase, MGC_O_HDRC_FADDR, musb->address);
}
/* enter test mode if needed (exit by reset) */
- else if (musb->bTestMode) {
+ else if (musb->test_mode) {
DBG(1, "entering TESTMODE\n");
- if (MGC_M_TEST_PACKET == musb->bTestModeValue)
+ if (MGC_M_TEST_PACKET == musb->test_mode_nr)
musb_load_testpacket(musb);
musb_writeb(mbase, MGC_O_HDRC_TESTMODE,
- musb->bTestModeValue);
+ musb->test_mode_nr);
}
/* FALLTHROUGH */
handled = forward_to_driver(musb, &setup);
if (handled < 0) {
- MGC_SelectEnd(mbase, 0);
+ musb_ep_select(mbase, 0);
stall:
DBG(3, "stall (%d)\n", handled);
musb->ackpend |= MGC_M_CSR0_P_SENDSTALL;
req->request.status = -EINPROGRESS;
req->bTx = ep->is_in;
- spin_lock_irqsave(&musb->Lock, lockflags);
+ spin_lock_irqsave(&musb->lock, lockflags);
if (!list_empty(&ep->req_list)) {
status = -EBUSY;
ep->name, ep->is_in ? "IN/TX" : "OUT/RX",
req->request.length);
- MGC_SelectEnd(musb->mregs, 0);
+ musb_ep_select(musb->mregs, 0);
/* sequence #1, IN ... start writing the data */
if (musb->ep0_state == MGC_END0_STAGE_TX)
}
cleanup:
- spin_unlock_irqrestore(&musb->Lock, lockflags);
+ spin_unlock_irqrestore(&musb->lock, lockflags);
return status;
}
base = musb->mregs;
regs = musb->control_ep->regs;
- spin_lock_irqsave(&musb->Lock, flags);
+ spin_lock_irqsave(&musb->lock, flags);
if (!list_empty(&ep->req_list)) {
status = -EBUSY;
case MGC_END0_STAGE_RX: /* control-OUT data */
status = 0;
- MGC_SelectEnd(base, 0);
+ musb_ep_select(base, 0);
csr = musb_readw(regs, MGC_O_HDRC_CSR0);
csr |= MGC_M_CSR0_P_SENDSTALL;
musb_writew(regs, MGC_O_HDRC_CSR0, csr);
}
cleanup:
- spin_unlock_irqrestore(&musb->Lock, flags);
+ spin_unlock_irqrestore(&musb->lock, flags);
return status;
}