Merge branch 'master' of git://git.denx.de/u-boot-usb

[u-boot] / drivers / usb / gadget / f_mass_storage.c

diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index e045957d07238862f23c80cd7e90845ae14e8447..1ecb92ac6b81ed3db82a08b6e1a7d554003c0aec 100644 (file)
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -243,6 +243,7 @@
 #include <config.h>
 #include <malloc.h>
 #include <common.h>
+#include <console.h>
 #include <g_dnl.h>
 
 #include <linux/err.h>
@@ -443,8 +444,9 @@ static void set_bulk_out_req_length(struct fsg_common *common,
 
 /*-------------------------------------------------------------------------*/
 
-struct ums *ums;
-struct fsg_common *the_fsg_common;
+static struct ums *ums;
+static int ums_count;
+static struct fsg_common *the_fsg_common;
 
 static int fsg_set_halt(struct fsg_dev *fsg, struct usb_ep *ep)
 {
@@ -671,7 +673,7 @@ static int sleep_thread(struct fsg_common *common)
                if (common->thread_wakeup_needed)
                        break;
 
-               if (++i == 50000) {
+               if (++i == 20000) {
                        busy_indicator();
                        i = 0;
                        k++;
@@ -689,7 +691,7 @@ static int sleep_thread(struct fsg_common *common)
                        k = 0;
                }
 
-               usb_gadget_handle_interrupts();
+               usb_gadget_handle_interrupts(0);
        }
        common->thread_wakeup_needed = 0;
        return rc;
@@ -771,7 +773,7 @@ static int do_read(struct fsg_common *common)
                }
 
                /* Perform the read */
-               rc = ums->read_sector(ums,
+               rc = ums[common->lun].read_sector(&ums[common->lun],
                                      file_offset / SECTOR_SIZE,
                                      amount / SECTOR_SIZE,
                                      (char __user *)bh->buf);
@@ -945,7 +947,7 @@ static int do_write(struct fsg_common *common)
                        amount = bh->outreq->actual;
 
                        /* Perform the write */
-                       rc = ums->write_sector(ums,
+                       rc = ums[common->lun].write_sector(&ums[common->lun],
                                               file_offset / SECTOR_SIZE,
                                               amount / SECTOR_SIZE,
                                               (char __user *)bh->buf);
@@ -973,7 +975,7 @@ static int do_write(struct fsg_common *common)
 
                        /* If an error occurred, report it and its position */
                        if (nwritten < amount) {
-                               printf("nwritten:%d amount:%d\n", nwritten,
+                               printf("nwritten:%zd amount:%u\n", nwritten,
                                       amount);
                                curlun->sense_data = SS_WRITE_ERROR;
                                curlun->info_valid = 1;
@@ -1061,7 +1063,7 @@ static int do_verify(struct fsg_common *common)
                }
 
                /* Perform the read */
-               rc = ums->read_sector(ums,
+               rc = ums[common->lun].read_sector(&ums[common->lun],
                                      file_offset / SECTOR_SIZE,
                                      amount / SECTOR_SIZE,
                                      (char __user *)bh->buf);
@@ -1116,7 +1118,7 @@ static int do_inquiry(struct fsg_common *common, struct fsg_buffhd *bh)
        buf[4] = 31;            /* Additional length */
                                /* No special options */
        sprintf((char *) (buf + 8), "%-8s%-16s%04x", (char*) vendor_id ,
-                       ums->name, (u16) 0xffff);
+                       ums[common->lun].name, (u16) 0xffff);
 
        return 36;
 }
@@ -2455,7 +2457,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common,
        int nluns, i, rc;
 
        /* Find out how many LUNs there should be */
-       nluns = 1;
+       nluns = ums_count;
        if (nluns < 1 || nluns > FSG_MAX_LUNS) {
                printf("invalid number of LUNs: %u\n", nluns);
                return ERR_PTR(-EINVAL);
@@ -2500,7 +2502,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common,
        for (i = 0; i < nluns; i++) {
                common->luns[i].removable = 1;
 
-               rc = fsg_lun_open(&common->luns[i], "");
+               rc = fsg_lun_open(&common->luns[i], ums[i].num_sectors, "");
                if (rc)
                        goto error_luns;
        }
@@ -2774,9 +2776,10 @@ int fsg_add(struct usb_configuration *c)
        return fsg_bind_config(c->cdev, c, fsg_common);
 }
 
-int fsg_init(struct ums *ums_dev)
+int fsg_init(struct ums *ums_devs, int count)
 {
-       ums = ums_dev;
+       ums = ums_devs;
+       ums_count = count;
 
        return 0;
 }