block: pass block dev not num to read/write/erase()

[u-boot] / common / cmd_usb_mass_storage.c

diff --git a/common/cmd_usb_mass_storage.c b/common/cmd_usb_mass_storage.c
index 51c3fffb46ce2914ecf14e44a65723e1cd487216..f4bafecd0d45c5eae13703abce6151eff4b417b1 100644 (file)
--- a/common/cmd_usb_mass_storage.c
+++ b/common/cmd_usb_mass_storage.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <common.h>
 #include <command.h>
+#include <console.h>
 #include <g_dnl.h>
 #include <part.h>
 #include <usb.h>
@@ -18,9 +19,8 @@ static int ums_read_sector(struct ums *ums_dev,
 {
        block_dev_desc_t *block_dev = ums_dev->block_dev;
        lbaint_t blkstart = start + ums_dev->start_sector;
-       int dev_num = block_dev->dev;
 
-       return block_dev->block_read(dev_num, blkstart, blkcnt, buf);
+       return block_dev->block_read(block_dev, blkstart, blkcnt, buf);
 }
 
 static int ums_write_sector(struct ums *ums_dev,
@@ -28,9 +28,8 @@ static int ums_write_sector(struct ums *ums_dev,
 {
        block_dev_desc_t *block_dev = ums_dev->block_dev;
        lbaint_t blkstart = start + ums_dev->start_sector;
-       int dev_num = block_dev->dev;
 
-       return block_dev->block_write(dev_num, blkstart, blkcnt, buf);
+       return block_dev->block_write(block_dev, blkstart, blkcnt, buf);
 }
 
 static struct ums ums_dev = {
@@ -137,7 +136,7 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
        }
 
        while (1) {
-               usb_gadget_handle_interrupts();
+               usb_gadget_handle_interrupts(controller_index);
 
                rc = fsg_main_thread(NULL);
                if (rc) {
@@ -154,11 +153,12 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
        }
 exit:
        g_dnl_unregister();
+       board_usb_cleanup(controller_index, USB_INIT_DEVICE);
        return CMD_RET_SUCCESS;
 }
 
 U_BOOT_CMD(ums, 4, 1, do_usb_mass_storage,
-       "Use the UMS [User Mass Storage]",
+       "Use the UMS [USB Mass Storage]",
        "<USB_controller> [<devtype>] <devnum>  e.g. ums 0 mmc 0\n"
        "    devtype defaults to mmc"
 );