From d0cc456dc3561d473926e60fb10ab643790a9ac7 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Mon, 5 May 2014 10:40:16 -0600 Subject: [PATCH] ums: use get_device() not find_mmc_device(); get_device() is a generic routine that will support any type of block device. Use this instead of the type-specific find_mmc_device(), for future flexibility. Cc: Lukasz Majewski Signed-off-by: Stephen Warren Acked-by: Przemyslaw Marczak --- common/cmd_usb_mass_storage.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/common/cmd_usb_mass_storage.c b/common/cmd_usb_mass_storage.c index 9888ed4f17..b5954fc5c6 100644 --- a/common/cmd_usb_mass_storage.c +++ b/common/cmd_usb_mass_storage.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include @@ -40,17 +39,22 @@ static struct ums ums_dev = { .name = "UMS disk", }; -struct ums *ums_init(unsigned int dev_num) +struct ums *ums_init(const char *devtype, const char *devnum) { - struct mmc *mmc = NULL; + block_dev_desc_t *block_dev; + int ret; - mmc = find_mmc_device(dev_num); - if (!mmc || mmc_init(mmc)) + ret = get_device(devtype, devnum, &block_dev); + if (ret < 0) return NULL; - ums_dev.block_dev = &mmc->block_dev; + /* f_mass_storage.c assumes SECTOR_SIZE sectors */ + if (block_dev->blksz != SECTOR_SIZE) + return NULL; + + ums_dev.block_dev = block_dev; ums_dev.start_sector = 0; - ums_dev.num_sectors = mmc->capacity / SECTOR_SIZE; + ums_dev.num_sectors = block_dev->lba; printf("UMS: disk start sector: %#x, count: %#x\n", ums_dev.start_sector, ums_dev.num_sectors); @@ -65,11 +69,10 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag, return CMD_RET_USAGE; const char *usb_controller = argv[1]; - const char *mmc_devstring = argv[2]; - - unsigned int dev_num = simple_strtoul(mmc_devstring, NULL, 0); + const char *devtype = "mmc"; + const char *devnum = argv[2]; - struct ums *ums = ums_init(dev_num); + struct ums *ums = ums_init(devtype, devnum); if (!ums) return CMD_RET_FAILURE; -- 2.25.1