minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 12:13:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

cmd_fat: use common get_device_and_partition function

Browse Source 
Convert fatload, fatls, and fatinfo to use common device and partition
parsing function. With the common function "dev:part" can come from the
environment and a '-' can be used in that case.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
This commit is contained in:
Rob Herring 2012-08-23 11:31:47 +00:00 committed by Tom Rini
parent 81180819b8
commit cfda5aeab8
1 changed files with 34 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
common/cmd_fat.c
View File

@ -40,29 +40,20 @@ int do_fat_fsload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
unsigned long count; unsigned long count;
char buf [12]; char buf [12];
block_dev_desc_t *dev_desc=NULL; block_dev_desc_t *dev_desc=NULL;
int dev=0; disk_partition_t info;
int part=1; int part, dev;
char *ep;
if (argc < 5) { if (argc < 5) {
printf( "usage: fatload <interface> <dev[:part]> " printf("usage: fatload <interface> [<dev[:part]>] "
"<addr> <filename> [bytes]\n"); "<addr> <filename> [bytes]\n");
return 1; return 1;
} }
dev = (int)simple_strtoul(argv[2], &ep, 16); part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info);
dev_desc = get_dev(argv[1],dev); if (part < 0)
if (dev_desc == NULL) {
puts("\n** Invalid boot device **\n");
return 1; return 1;
}
if (*ep) { dev = dev_desc->dev;
if (*ep != ':') {
puts("\n** Invalid boot device, use `dev[:part]' **\n");
return 1;
}
part = (int)simple_strtoul(++ep, NULL, 16);
}
if (fat_register_device(dev_desc,part)!=0) { if (fat_register_device(dev_desc,part)!=0) {
printf("\n** Unable to use %s %d:%d for fatload **\n", printf("\n** Unable to use %s %d:%d for fatload **\n",
argv[1], dev, part); argv[1], dev, part);
@ -93,7 +84,7 @@ int do_fat_fsload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
U_BOOT_CMD( U_BOOT_CMD(
fatload, 6, 0, do_fat_fsload, fatload, 6, 0, do_fat_fsload,
"load binary file from a dos filesystem", "load binary file from a dos filesystem",
"<interface> <dev[:part]> <addr> <filename> [bytes]\n" "<interface> [<dev[:part]>] <addr> <filename> [bytes]\n"
" - load binary file 'filename' from 'dev' on 'interface'\n" " - load binary file 'filename' from 'dev' on 'interface'\n"
" to address 'addr' from dos filesystem" " to address 'addr' from dos filesystem"
); );
@ -101,29 +92,20 @@ U_BOOT_CMD(
int do_fat_ls (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int do_fat_ls (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
char *filename = "/"; char *filename = "/";
int ret; int ret, dev, part;
int dev=0;
int part=1;
char *ep;
block_dev_desc_t *dev_desc=NULL; block_dev_desc_t *dev_desc=NULL;
disk_partition_t info;
if (argc < 3) { if (argc < 2) {
printf("usage: fatls <interface> <dev[:part]> [directory]\n"); printf("usage: fatls <interface> [<dev[:part]>] [directory]\n");
return 0; return 0;
} }
dev = (int)simple_strtoul(argv[2], &ep, 16);
dev_desc = get_dev(argv[1],dev); part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info);
if (dev_desc == NULL) { if (part < 0)
puts("\n** Invalid boot device **\n");
return 1; return 1;
}
if (*ep) { dev = dev_desc->dev;
if (*ep != ':') {
puts("\n** Invalid boot device, use `dev[:part]' **\n");
return 1;
}
part = (int)simple_strtoul(++ep, NULL, 16);
}
if (fat_register_device(dev_desc,part)!=0) { if (fat_register_device(dev_desc,part)!=0) {
printf("\n** Unable to use %s %d:%d for fatls **\n", printf("\n** Unable to use %s %d:%d for fatls **\n",
argv[1], dev, part); argv[1], dev, part);
@ -142,34 +124,26 @@ int do_fat_ls (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
U_BOOT_CMD( U_BOOT_CMD(
fatls, 4, 1, do_fat_ls, fatls, 4, 1, do_fat_ls,
"list files in a directory (default /)", "list files in a directory (default /)",
"<interface> <dev[:part]> [directory]\n" "<interface> [<dev[:part]>] [directory]\n"
" - list files from 'dev' on 'interface' in a 'directory'" " - list files from 'dev' on 'interface' in a 'directory'"
); );
int do_fat_fsinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int do_fat_fsinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
int dev=0; int dev, part;
int part=1; block_dev_desc_t *dev_desc;
char *ep; disk_partition_t info;
block_dev_desc_t *dev_desc=NULL;
if (argc < 2) { if (argc < 2) {
printf("usage: fatinfo <interface> <dev[:part]>\n"); printf("usage: fatinfo <interface> [<dev[:part]>]\n");
return 0; return 0;
} }
dev = (int)simple_strtoul(argv[2], &ep, 16);
dev_desc = get_dev(argv[1],dev); part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info);
if (dev_desc == NULL) { if (part < 0)
puts("\n** Invalid boot device **\n");
return 1; return 1;
}
if (*ep) { dev = dev_desc->dev;
if (*ep != ':') {
puts("\n** Invalid boot device, use `dev[:part]' **\n");
return 1;
}
part = (int)simple_strtoul(++ep, NULL, 16);
}
if (fat_register_device(dev_desc,part)!=0) { if (fat_register_device(dev_desc,part)!=0) {
printf("\n** Unable to use %s %d:%d for fatinfo **\n", printf("\n** Unable to use %s %d:%d for fatinfo **\n",
argv[1], dev, part); argv[1], dev, part);
@ -181,7 +155,7 @@ int do_fat_fsinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
U_BOOT_CMD( U_BOOT_CMD(
fatinfo, 3, 1, do_fat_fsinfo, fatinfo, 3, 1, do_fat_fsinfo,
"print information about filesystem", "print information about filesystem",
"<interface> <dev[:part]>\n" "<interface> [<dev[:part]>]\n"
" - print information about filesystem from 'dev' on 'interface'" " - print information about filesystem from 'dev' on 'interface'"
); );
@ -193,6 +167,7 @@ static int do_fat_fswrite(cmd_tbl_t *cmdtp, int flag,
unsigned long addr; unsigned long addr;
unsigned long count; unsigned long count;
block_dev_desc_t *dev_desc = NULL; block_dev_desc_t *dev_desc = NULL;
disk_partition_t info;
int dev = 0; int dev = 0;
int part = 1; int part = 1;
char *ep; char *ep;
@ -200,19 +175,12 @@ static int do_fat_fswrite(cmd_tbl_t *cmdtp, int flag,
if (argc < 5) if (argc < 5)
return cmd_usage(cmdtp); return cmd_usage(cmdtp);
dev = (int)simple_strtoul(argv[2], &ep, 16); part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info);
dev_desc = get_dev(argv[1], dev); if (part < 0)
if (dev_desc == NULL) {
puts("\n** Invalid boot device **\n");
return 1; return 1;
}
if (*ep) { dev = dev_desc->dev;
if (*ep != ':') {
puts("\n** Invalid boot device, use `dev[:part]' **\n");
return 1;
}
part = (int)simple_strtoul(++ep, NULL, 16);
}
if (fat_register_device(dev_desc, part) != 0) { if (fat_register_device(dev_desc, part) != 0) {
printf("\n** Unable to use %s %d:%d for fatwrite **\n", printf("\n** Unable to use %s %d:%d for fatwrite **\n",
argv[1], dev, part); argv[1], dev, part);