diff options
| author | Tom Rini <trini@konsulko.com> | 2016-03-14 19:21:44 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-03-14 19:21:44 -0400 |
| commit | 88033d737d9f46e7eebda6a8f9770957eb9aae9c (patch) | |
| tree | 0b7c3bc6caa5ab4b7f8e88f05ce51ace87f25890 /cmd/usb.c | |
| parent | 9f0f432c0aea1e70959a0c06938459d3175a36b0 (diff) | |
| parent | 608e399fdef82e983db44c5cb8f5e772bba870e2 (diff) | |
| download | blackbird-obmc-uboot-88033d737d9f46e7eebda6a8f9770957eb9aae9c.tar.gz blackbird-obmc-uboot-88033d737d9f46e7eebda6a8f9770957eb9aae9c.zip | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'cmd/usb.c')
| -rw-r--r-- | cmd/usb.c | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -625,7 +625,7 @@ static int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int i; extern char usb_started; #ifdef CONFIG_USB_STORAGE - block_dev_desc_t *stor_dev; + struct blk_desc *stor_dev; #endif if (argc < 2) @@ -727,7 +727,7 @@ static int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (devno) printf("\n"); debug("print_part of %x\n", devno); - print_part(stor_dev); + part_print(stor_dev); } } } else { @@ -737,7 +737,7 @@ static int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) stor_dev->type != DEV_TYPE_UNKNOWN) { ok++; debug("print_part of %x\n", devno); - print_part(stor_dev); + part_print(stor_dev); } } if (!ok) { @@ -759,8 +759,7 @@ static int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) printf("\nUSB read: device %d block # %ld, count %ld" " ... ", usb_stor_curr_dev, blk, cnt); stor_dev = usb_stor_get_dev(usb_stor_curr_dev); - n = stor_dev->block_read(stor_dev, blk, cnt, - (ulong *)addr); + n = blk_dread(stor_dev, blk, cnt, (ulong *)addr); printf("%ld blocks read: %s\n", n, (n == cnt) ? "OK" : "ERROR"); if (n == cnt) @@ -781,8 +780,7 @@ static int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) printf("\nUSB write: device %d block # %ld, count %ld" " ... ", usb_stor_curr_dev, blk, cnt); stor_dev = usb_stor_get_dev(usb_stor_curr_dev); - n = stor_dev->block_write(stor_dev, blk, cnt, - (ulong *)addr); + n = blk_dwrite(stor_dev, blk, cnt, (ulong *)addr); printf("%ld blocks write: %s\n", n, (n == cnt) ? "OK" : "ERROR"); if (n == cnt) |
