diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/ext4fs.h | 2 | ||||
| -rw-r--r-- | include/ext_common.h | 2 | ||||
| -rw-r--r-- | include/ide.h | 2 | ||||
| -rw-r--r-- | include/part.h | 4 |
4 files changed, 6 insertions, 4 deletions
diff --git a/include/ext4fs.h b/include/ext4fs.h index 379f7eb5e9..2429380396 100644 --- a/include/ext4fs.h +++ b/include/ext4fs.h @@ -135,7 +135,7 @@ int ext4fs_mount(unsigned part_length); void ext4fs_close(void); int ext4fs_ls(const char *dirname); void ext4fs_free_node(struct ext2fs_node *node, struct ext2fs_node *currroot); -int ext4fs_devread(int sector, int byte_offset, int byte_len, char *buf); +int ext4fs_devread(lbaint_t sector, int byte_offset, int byte_len, char *buf); void ext4fs_set_blk_dev(block_dev_desc_t *rbdd, disk_partition_t *info); long int read_allocated_block(struct ext2_inode *inode, int fileblock); int ext4fs_probe(block_dev_desc_t *fs_dev_desc, diff --git a/include/ext_common.h b/include/ext_common.h index 78a7808aa9..694e49fe13 100644 --- a/include/ext_common.h +++ b/include/ext_common.h @@ -180,7 +180,7 @@ struct ext2_data { struct ext2fs_node diropen; }; -extern unsigned long part_offset; +extern lbaint_t part_offset; int do_ext2ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); int do_ext2load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); diff --git a/include/ide.h b/include/ide.h index f691a74ab4..59ea9758a7 100644 --- a/include/ide.h +++ b/include/ide.h @@ -44,9 +44,11 @@ extern ulong ide_bus_offset[]; #ifdef CONFIG_SYS_64BIT_LBA typedef uint64_t lbaint_t; #define LBAF "%llx" +#define LBAFU "%llu" #else typedef ulong lbaint_t; #define LBAF "%lx" +#define LBAFU "%lu" #endif /* diff --git a/include/part.h b/include/part.h index 35c1c5b5f5..8e31e75a61 100644 --- a/include/part.h +++ b/include/part.h @@ -97,8 +97,8 @@ typedef struct block_dev_desc { #define DEV_TYPE_OPDISK 0x07 /* optical disk */ typedef struct disk_partition { - ulong start; /* # of first block in partition */ - ulong size; /* number of blocks in partition */ + lbaint_t start; /* # of first block in partition */ + lbaint_t size; /* number of blocks in partition */ ulong blksz; /* block size in bytes */ uchar name[32]; /* partition name */ uchar type[32]; /* string type description */ |