usb: gadget: f_thor: Allocate request up to THOR_PACKET_SIZE

[karo-tx-uboot.git] / drivers / usb / gadget / f_thor.c

diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index 2d0410d795677c3925f739811cc671efa633e37f..06139ee04d2123f15d44a7613094e168962acb95 100644 (file)
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -123,6 +123,9 @@ static int process_rqt_cmd(const struct rqt_box *rqt)
                send_rsp(rsp);
                g_dnl_unregister();
                dfu_free_entities();
+#ifdef CONFIG_THOR_RESET_OFF
+               return RESET_DONE;
+#endif
                run_command("reset", 0);
                break;
        case RQT_CMD_POWEROFF:
@@ -543,7 +546,7 @@ static int thor_rx_data(void)
                }
 
                while (!dev->rxdata) {
-                       usb_gadget_handle_interrupts();
+                       usb_gadget_handle_interrupts(0);
                        if (ctrlc())
                                return -1;
                }
@@ -577,7 +580,7 @@ static void thor_tx_data(unsigned char *data, int len)
 
        /* Wait until tx interrupt received */
        while (!dev->txdata)
-               usb_gadget_handle_interrupts();
+               usb_gadget_handle_interrupts(0);
 
        dev->txdata = 0;
 }
@@ -694,7 +697,7 @@ int thor_init(void)
        /* Wait for a device enumeration and configuration settings */
        debug("THOR enumeration/configuration setting....\n");
        while (!dev->configuration_done)
-               usb_gadget_handle_interrupts();
+               usb_gadget_handle_interrupts(0);
 
        thor_set_dma(thor_rx_data_buf, strlen("THOR"));
        /* detect the download request from Host PC */
@@ -728,6 +731,10 @@ int thor_handle(void)
 
                if (ret > 0) {
                        ret = process_data();
+#ifdef CONFIG_THOR_RESET_OFF
+                       if (ret == RESET_DONE)
+                               break;
+#endif
                        if (ret < 0)
                                return ret;
                } else {
@@ -768,7 +775,7 @@ static int thor_func_bind(struct usb_configuration *c, struct usb_function *f)
                goto fail;
        }
        dev->req->buf = memalign(CONFIG_SYS_CACHELINE_SIZE,
-                                gadget->ep0->maxpacket);
+                                THOR_PACKET_SIZE);
        if (!dev->req->buf) {
                status = -ENOMEM;
                goto fail;
@@ -806,6 +813,7 @@ static int thor_func_bind(struct usb_configuration *c, struct usb_function *f)
        }
 
        dev->in_ep = ep; /* Store IN EP for enabling @ setup */
+       ep->driver_data = dev;
 
        ep = usb_ep_autoconfig(gadget, &fs_out_desc);
        if (!ep) {
@@ -818,6 +826,7 @@ static int thor_func_bind(struct usb_configuration *c, struct usb_function *f)
                                fs_out_desc.bEndpointAddress;
 
        dev->out_ep = ep; /* Store OUT EP for enabling @ setup */
+       ep->driver_data = dev;
 
        ep = usb_ep_autoconfig(gadget, &fs_int_desc);
        if (!ep) {
@@ -826,6 +835,7 @@ static int thor_func_bind(struct usb_configuration *c, struct usb_function *f)
        }
 
        dev->int_ep = ep;
+       ep->driver_data = dev;
 
        if (gadget_is_dualspeed(gadget)) {
                hs_int_desc.bEndpointAddress =