f_thor: Dont perform reset at the end of thor

[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 c4c9909155a262e484970383d8a4355e17dcbc94..2596b2ee4ab4e3d9f969659ee9595dcd1bc23129 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:
@@ -142,7 +145,8 @@ static long long int download_head(unsigned long long total,
                                   int *cnt)
 {
        long long int rcv_cnt = 0, left_to_rcv, ret_rcv;
-       void *transfer_buffer = dfu_get_buf();
+       struct dfu_entity *dfu_entity = dfu_get_entity(alt_setting_num);
+       void *transfer_buffer = dfu_get_buf(dfu_entity);
        void *buf = transfer_buffer;
        int usb_pkt_cnt = 0, ret;
 
@@ -204,14 +208,26 @@ static long long int download_head(unsigned long long total,
 
 static int download_tail(long long int left, int cnt)
 {
-       void *transfer_buffer = dfu_get_buf();
+       struct dfu_entity *dfu_entity;
+       void *transfer_buffer;
        int ret;
 
        debug("%s: left: %llu cnt: %d\n", __func__, left, cnt);
 
+       dfu_entity = dfu_get_entity(alt_setting_num);
+       if (!dfu_entity) {
+               error("Alt setting: %d entity not found!\n", alt_setting_num);
+               return -ENOENT;
+       }
+
+       transfer_buffer = dfu_get_buf(dfu_entity);
+       if (!transfer_buffer) {
+               error("Transfer buffer not allocated!");
+               return -ENXIO;
+       }
+
        if (left) {
-               ret = dfu_write(dfu_get_entity(alt_setting_num),
-                               transfer_buffer, left, cnt++);
+               ret = dfu_write(dfu_entity, transfer_buffer, left, cnt++);
                if (ret) {
                        error("DFU write failed [%d]: left: %llu", ret, left);
                        return ret;
@@ -219,16 +235,15 @@ static int download_tail(long long int left, int cnt)
        }
 
        /*
-        * To store last "packet" DFU storage backend requires dfu_write with
-        * size parameter equal to 0
+        * To store last "packet" or write file from buffer to filesystem
+        * DFU storage backend requires dfu_flush
         *
         * This also frees memory malloc'ed by dfu_get_buf(), so no explicit
         * need fo call dfu_free_buf() is needed.
         */
-       ret = dfu_write(dfu_get_entity(alt_setting_num),
-                       transfer_buffer, 0, cnt);
+       ret = dfu_flush(dfu_entity, transfer_buffer, 0, cnt);
        if (ret)
-               error("DFU write failed [%d] cnt: %d", ret, cnt);
+               error("DFU flush failed!");
 
        return ret;
 }
@@ -307,7 +322,6 @@ static int process_data(void)
        ALLOC_CACHE_ALIGN_BUFFER(struct rqt_box, rqt, sizeof(struct rqt_box));
        int ret = -EINVAL;
 
-       memset(rqt, 0, sizeof(rqt));
        memcpy(rqt, thor_rx_data_buf, sizeof(struct rqt_box));
 
        debug("+RQT: %d, %d\n", rqt->rqt, rqt->rqt_data);
@@ -459,16 +473,6 @@ static struct usb_endpoint_descriptor hs_int_desc = {
        .bInterval = 0x9,
 };
 
-static struct usb_qualifier_descriptor dev_qualifier = {
-       .bLength =              sizeof(dev_qualifier),
-       .bDescriptorType =      USB_DT_DEVICE_QUALIFIER,
-
-       .bcdUSB =               __constant_cpu_to_le16(0x0200),
-       .bDeviceClass = USB_CLASS_VENDOR_SPEC,
-
-       .bNumConfigurations =   2,
-};
-
 /*
  * This attribute vendor descriptor is necessary for correct operation with
  * Windows version of THOR download program
@@ -542,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;
                }
@@ -576,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;
 }
@@ -614,7 +618,7 @@ static struct usb_request *thor_start_ep(struct usb_ep *ep)
 {
        struct usb_request *req;
 
-       req = alloc_ep_req(ep, ep->maxpacket);
+       req = alloc_ep_req(ep, THOR_PACKET_SIZE);
        debug("%s: ep:%p req:%p\n", __func__, ep, req);
 
        if (!req)
@@ -623,8 +627,6 @@ static struct usb_request *thor_start_ep(struct usb_ep *ep)
        memset(req->buf, 0, req->length);
        req->complete = thor_rx_tx_complete;
 
-       memset(req->buf, 0x55, req->length);
-
        return req;
 }
 
@@ -695,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 */
@@ -729,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 {
@@ -807,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) {
@@ -819,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) {
@@ -827,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 =
@@ -1001,3 +1010,5 @@ int thor_add(struct usb_configuration *c)
        debug("%s:\n", __func__);
        return thor_func_init(c);
 }
+
+DECLARE_GADGET_BIND_CALLBACK(usb_dnl_thor, thor_add);