mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-11-29 14:41:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

cbfs: Use void * for the position pointers

Browse Source 
It doesn't make sense to use u8 * as the pointer type for accessing the
CBFS since we do not access it as bytes, but via structures. Change it to
void *, which allows us to avoid a cast.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2020-05-24 17:38:19 -06:00 committed by Bin Meng
parent 9dc2355e51
commit e82ab51baf
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/cbfs/cbfs.c
View File

@ -83,7 +83,7 @@ static void swap_file_header(struct cbfs_fileheader *dest,
* @return 0 if a file is found, -ENOENT if one isn't, -EBADF if a bad header * @return 0 if a file is found, -ENOENT if one isn't, -EBADF if a bad header
* is found. * is found.
*/ */
static int file_cbfs_next_file(struct cbfs_priv *priv, u8 *start, int size, static int file_cbfs_next_file(struct cbfs_priv *priv, void *start, int size,
int align, struct cbfs_cachenode *new_node, int align, struct cbfs_cachenode *new_node,
int *used) int *used)
{ {
@ -92,8 +92,7 @@ static int file_cbfs_next_file(struct cbfs_priv *priv, u8 *start, int size,
*used = 0; *used = 0;
while (size >= align) { while (size >= align) {
const struct cbfs_fileheader *file_header = const struct cbfs_fileheader *file_header = start;
(const struct cbfs_fileheader *)start;
u32 name_len; u32 name_len;
u32 step; u32 step;
@ -133,7 +132,7 @@ static int file_cbfs_next_file(struct cbfs_priv *priv, u8 *start, int size,
} }
/* Look through a CBFS instance and copy file metadata into regular memory. */ /* Look through a CBFS instance and copy file metadata into regular memory. */
static int file_cbfs_fill_cache(struct cbfs_priv *priv, u8 *start, u32 size, static int file_cbfs_fill_cache(struct cbfs_priv *priv, void *start, u32 size,
u32 align) u32 align)
{ {
struct cbfs_cachenode *cache_node; struct cbfs_cachenode *cache_node;
@ -232,12 +231,12 @@ static int cbfs_load_header_ptr(struct cbfs_priv *priv, ulong base)
static void cbfs_init(struct cbfs_priv *priv, ulong end_of_rom) static void cbfs_init(struct cbfs_priv *priv, ulong end_of_rom)
{ {
u8 *start_of_rom; void *start_of_rom;
if (file_cbfs_load_header(priv, end_of_rom)) if (file_cbfs_load_header(priv, end_of_rom))
return; return;
start_of_rom = (u8 *)(end_of_rom + 1 - priv->header.rom_size); start_of_rom = (void *)(end_of_rom + 1 - priv->header.rom_size);
file_cbfs_fill_cache(priv, start_of_rom, priv->header.rom_size, file_cbfs_fill_cache(priv, start_of_rom, priv->header.rom_size,
priv->header.align); priv->header.align);
@ -263,7 +262,7 @@ int cbfs_init_mem(ulong base, ulong size, struct cbfs_priv **privp)
if (ret) if (ret)
return ret; return ret;
file_cbfs_fill_cache(priv, (u8 *)base, priv->header.rom_size, file_cbfs_fill_cache(priv, (void *)base, priv->header.rom_size,
priv->header.align); priv->header.align);
if (priv->result != CBFS_SUCCESS) if (priv->result != CBFS_SUCCESS)
return -EINVAL; return -EINVAL;
@ -351,7 +350,7 @@ const struct cbfs_cachenode *file_cbfs_find_uncached(ulong end_of_rom,
const char *name) const char *name)
{ {
struct cbfs_priv *priv = &cbfs_s; struct cbfs_priv *priv = &cbfs_s;
u8 *start; void *start;
u32 size; u32 size;
u32 align; u32 align;
static struct cbfs_cachenode node; static struct cbfs_cachenode node;
@ -359,7 +358,7 @@ const struct cbfs_cachenode *file_cbfs_find_uncached(ulong end_of_rom,
if (file_cbfs_load_header(priv, end_of_rom)) if (file_cbfs_load_header(priv, end_of_rom))
return NULL; return NULL;
start = (u8 *)(end_of_rom + 1 - priv->header.rom_size); start = (void *)(end_of_rom + 1 - priv->header.rom_size);
size = priv->header.rom_size; size = priv->header.rom_size;
align = priv->header.align; align = priv->header.align;