Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-14 00:47:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

usb: ums - expose selected partition/s

Browse source 
By applying this patch, it will give us some flexibility to expose
a selected partition/s.

e.g:
1. To expose several partitions
ums 0 mmc 0:1,0:6

2. To expose the all partitions
ums 0 mmc 0:0

3. To expose multiple partititions on several devices
ums 0 mmc 0:1,1:6

4. It support legacy format
ums 0 mmc 0

Signed-off-by: John Tobias <john.tobias.ph@gmail.com>
This commit is contained in:
John Tobias 2016-04-13 12:06:51 -07:00 committed by Marek Vasut
parent 5b718407ed
commit a2e3a1d86c
1 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
cmd/usb_mass_storage.c
View file

@ -50,14 +50,16 @@ static void ums_fini(void)
#define UMS_NAME_LEN 16 #define UMS_NAME_LEN 16
static int ums_init(const char *devtype, const char *devnums) static int ums_init(const char *devtype, const char *devnums_part_str)
{ {
char *s, *t, *devnum, *name; char *s, *t, *devnum_part_str, *name;
struct blk_desc *block_dev; struct blk_desc *block_dev;
disk_partition_t info;
int partnum;
int ret; int ret;
struct ums *ums_new; struct ums *ums_new;
s = strdup(devnums); s = strdup(devnums_part_str);
if (!s) if (!s)
return -1; return -1;
@ -65,14 +67,23 @@ static int ums_init(const char *devtype, const char *devnums)
ums_count = 0; ums_count = 0;
for (;;) { for (;;) {
devnum = strsep(&t, ","); devnum_part_str = strsep(&t, ",");
if (!devnum) if (!devnum_part_str)
break; break;
ret = blk_get_device_by_str(devtype, devnum, &block_dev); partnum = blk_get_device_part_str(devtype, devnum_part_str,
if (ret < 0) &block_dev, &info, 1);
if (partnum < 0)
goto cleanup; goto cleanup;
/* Check if the argument is in legacy format. If yes,
* expose all partitions by setting the partnum = 0
* e.g. ums 0 mmc 0
*/
if (!strchr(devnum_part_str, ':'))
partnum = 0;
/* f_mass_storage.c assumes SECTOR_SIZE sectors */ /* f_mass_storage.c assumes SECTOR_SIZE sectors */
if (block_dev->blksz != SECTOR_SIZE) { if (block_dev->blksz != SECTOR_SIZE) {
ret = -1; ret = -1;
@ -86,10 +97,18 @@ static int ums_init(const char *devtype, const char *devnums)
} }
ums = ums_new; ums = ums_new;
ums[ums_count].read_sector = ums_read_sector; /* if partnum = 0, expose all partitions */
ums[ums_count].write_sector = ums_write_sector; if (partnum == 0) {
ums[ums_count].start_sector = 0; ums[ums_count].start_sector = 0;
ums[ums_count].num_sectors = block_dev->lba; ums[ums_count].num_sectors = block_dev->lba;
} else {
ums[ums_count].start_sector = info.start;
ums[ums_count].num_sectors = info.size;
}
ums[ums_count].read_sector = ums_read_sector;
ums[ums_count].write_sector = ums_write_sector;
name = malloc(UMS_NAME_LEN); name = malloc(UMS_NAME_LEN);
if (!name) { if (!name) {
ret = -1; ret = -1;
@ -230,6 +249,6 @@ cleanup_ums_init:
U_BOOT_CMD(ums, 4, 1, do_usb_mass_storage, U_BOOT_CMD(ums, 4, 1, do_usb_mass_storage,
"Use the UMS [USB Mass Storage]", "Use the UMS [USB Mass Storage]",
"<USB_controller> [<devtype>] <devnum> e.g. ums 0 mmc 0\n" "<USB_controller> [<devtype>] <dev[:part]> e.g. ums 0 mmc 0\n"
" devtype defaults to mmc" " devtype defaults to mmc"
); );