projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmd: zip: fix implicit declaration warning
[oweals/u-boot.git]
/
cmd
/
read.c
diff --git
a/cmd/read.c
b/cmd/read.c
index 8710288781747d9f0bc32a4d2ac18a9e61b893e4..34f53f9a292e58571cdd0efe3b2d9c93bdf5826e 100644
(file)
--- a/
cmd/read.c
+++ b/
cmd/read.c
@@
-12,13
+12,13
@@
#include <command.h>
#include <part.h>
#include <command.h>
#include <part.h>
-int do_read(
cmd_tbl_t *cmdtp, int flag, int argc, char *
const argv[])
+int do_read(
struct cmd_tbl *cmdtp, int flag, int argc, char *
const argv[])
{
char *ep;
{
char *ep;
-
block_dev_desc_t
*dev_desc = NULL;
+
struct blk_desc
*dev_desc = NULL;
int dev;
int part = 0;
int dev;
int part = 0;
-
disk_partition_t
part_info;
+
struct disk_partition
part_info;
ulong offset = 0u;
ulong limit = 0u;
void *addr;
ulong offset = 0u;
ulong limit = 0u;
void *addr;
@@
-39,7
+39,7
@@
int do_read(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
part = (int)simple_strtoul(++ep, NULL, 16);
}
part = (int)simple_strtoul(++ep, NULL, 16);
}
- dev_desc = get_dev(argv[1], dev);
+ dev_desc =
blk_
get_dev(argv[1], dev);
if (dev_desc == NULL) {
printf("Block device %s %d not supported\n", argv[1], dev);
return 1;
if (dev_desc == NULL) {
printf("Block device %s %d not supported\n", argv[1], dev);
return 1;
@@
-50,14
+50,14
@@
int do_read(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
cnt = simple_strtoul(argv[5], NULL, 16);
if (part != 0) {
cnt = simple_strtoul(argv[5], NULL, 16);
if (part != 0) {
- if (
get_partition
_info(dev_desc, part, &part_info)) {
+ if (
part_get
_info(dev_desc, part, &part_info)) {
printf("Cannot find partition %d\n", part);
return 1;
}
offset = part_info.start;
limit = part_info.size;
} else {
printf("Cannot find partition %d\n", part);
return 1;
}
offset = part_info.start;
limit = part_info.size;
} else {
- /* Largest address not available in
block_dev_desc_t
. */
+ /* Largest address not available in
struct blk_desc
. */
limit = ~0;
}
limit = ~0;
}
@@
-66,7
+66,7
@@
int do_read(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return 1;
}
return 1;
}
- if (
dev_desc->block_read(dev_desc, offset + blk, cnt, addr) < 0
) {
+ if (
blk_dread(dev_desc, offset + blk, cnt, addr) != cnt
) {
printf("Error reading blocks\n");
return 1;
}
printf("Error reading blocks\n");
return 1;
}