← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/usb/musb/musb_gadget_ep0.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/usb/musb/musb_gadget_ep0.c
209
209
        void __iomem    *mbase = musb->mregs;
210
210
        u8              devctl;
211
211
 
212
 
        DBG(1, "HNP: Setting HR\n");
 
212
        dev_dbg(musb->controller, "HNP: Setting HR\n");
213
213
        devctl = musb_readb(mbase, MUSB_DEVCTL);
214
214
        musb_writeb(mbase, MUSB_DEVCTL, devctl | MUSB_DEVCTL_HR);
215
215
}
306
306
                                /* Maybe start the first request in the queue */
307
307
                                request = next_request(musb_ep);
308
308
                                if (!musb_ep->busy && request) {
309
 
                                        DBG(3, "restarting the request\n");
 
309
                                        dev_dbg(musb->controller, "restarting the request\n");
310
310
                                        musb_ep_restart(musb, request);
311
311
                                }
312
312
 
553
553
 
554
554
        if (!req) {
555
555
                /* WARN_ON(1); */
556
 
                DBG(2, "odd; csr0 %04x\n", musb_readw(regs, MUSB_CSR0));
 
556
                dev_dbg(musb->controller, "odd; csr0 %04x\n", musb_readw(regs, MUSB_CSR0));
557
557
                return;
558
558
        }
559
559
 
610
610
        /* NOTE:  earlier 2.6 versions changed setup packets to host
611
611
         * order, but now USB packets always stay in USB byte order.
612
612
         */
613
 
        DBG(3, "SETUP req%02x.%02x v%04x i%04x l%d\n",
 
613
        dev_dbg(musb->controller, "SETUP req%02x.%02x v%04x i%04x l%d\n",
614
614
                req->bRequestType,
615
615
                req->bRequest,
616
616
                le16_to_cpu(req->wValue),
678
678
        csr = musb_readw(regs, MUSB_CSR0);
679
679
        len = musb_readb(regs, MUSB_COUNT0);
680
680
 
681
 
        DBG(4, "csr %04x, count %d, myaddr %d, ep0stage %s\n",
 
681
        dev_dbg(musb->controller, "csr %04x, count %d, myaddr %d, ep0stage %s\n",
682
682
                        csr, len,
683
683
                        musb_readb(mbase, MUSB_FADDR),
684
684
                        decode_ep0stage(musb->ep0_state));
749
749
 
750
750
                /* enter test mode if needed (exit by reset) */
751
751
                else if (musb->test_mode) {
752
 
                        DBG(1, "entering TESTMODE\n");
 
752
                        dev_dbg(musb->controller, "entering TESTMODE\n");
753
753
 
754
754
                        if (MUSB_TEST_PACKET == musb->test_mode_nr)
755
755
                                musb_load_testpacket(musb);
861
861
                                break;
862
862
                        }
863
863
 
864
 
                        DBG(3, "handled %d, csr %04x, ep0stage %s\n",
 
864
                        dev_dbg(musb->controller, "handled %d, csr %04x, ep0stage %s\n",
865
865
                                handled, csr,
866
866
                                decode_ep0stage(musb->ep0_state));
867
867
 
878
878
                        if (handled < 0) {
879
879
                                musb_ep_select(mbase, 0);
880
880
stall:
881
 
                                DBG(3, "stall (%d)\n", handled);
 
881
                                dev_dbg(musb->controller, "stall (%d)\n", handled);
882
882
                                musb->ackpend |= MUSB_CSR0_P_SENDSTALL;
883
883
                                musb->ep0_state = MUSB_EP0_STAGE_IDLE;
884
884
finish:
958
958
                status = 0;
959
959
                break;
960
960
        default:
961
 
                DBG(1, "ep0 request queued in state %d\n",
 
961
                dev_dbg(musb->controller, "ep0 request queued in state %d\n",
962
962
                                musb->ep0_state);
963
963
                status = -EINVAL;
964
964
                goto cleanup;
967
967
        /* add request to the list */
968
968
        list_add_tail(&req->list, &ep->req_list);
969
969
 
970
 
        DBG(3, "queue to %s (%s), length=%d\n",
 
970
        dev_dbg(musb->controller, "queue to %s (%s), length=%d\n",
971
971
                        ep->name, ep->is_in ? "IN/TX" : "OUT/RX",
972
972
                        req->request.length);
973
973
 
1060
1060
                musb->ackpend = 0;
1061
1061
                break;
1062
1062
        default:
1063
 
                DBG(1, "ep0 can't halt in state %d\n", musb->ep0_state);
 
1063
                dev_dbg(musb->controller, "ep0 can't halt in state %d\n", musb->ep0_state);
1064
1064
                status = -EINVAL;
1065
1065
        }
1066
1066