cbfstool: Hide cbfstool_offset from the global namespace
This is part of a larger effort to reduce global variable usage in cbfstool. cbfstool_offset is particularly easy to hide since it's only used in common.c . Change-Id: Ic45349b5148d4407f31e12682ea0ad4b68136711 Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Reviewed-on: http://review.coreboot.org/5102 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
parent
f592c08b68
commit
c677c7d6e4
|
@ -150,9 +150,19 @@ void *loadfile(const char *filename, uint32_t * romsize_p, void *content,
|
|||
static struct cbfs_header *cbfstool_master_header;
|
||||
static uint32_t phys_start, phys_end, align;
|
||||
uint32_t romsize;
|
||||
void *cbfstool_offset;
|
||||
static void *cbfstool_offset;
|
||||
uint32_t arch = CBFS_ARCHITECTURE_UNKNOWN;
|
||||
|
||||
static inline void *phys_to_virt(uint32_t addr)
|
||||
{
|
||||
return cbfstool_offset + addr;
|
||||
}
|
||||
|
||||
static inline uint32_t virt_to_phys(void *addr)
|
||||
{
|
||||
return (unsigned long)(addr - cbfstool_offset) & 0xffffffff;
|
||||
}
|
||||
|
||||
static struct {
|
||||
uint32_t arch;
|
||||
const char *name;
|
||||
|
|
|
@ -62,7 +62,6 @@ int buffer_write_file(struct buffer *buffer, const char *filename);
|
|||
/* Destroys a memory buffer. */
|
||||
void buffer_delete(struct buffer *buffer);
|
||||
|
||||
extern void *cbfstool_offset;
|
||||
extern uint32_t romsize;
|
||||
extern int host_bigendian;
|
||||
extern uint32_t arch;
|
||||
|
@ -70,16 +69,6 @@ extern uint32_t arch;
|
|||
const char *arch_to_string(uint32_t a);
|
||||
uint32_t string_to_arch(const char *arch_string);
|
||||
|
||||
static inline void *phys_to_virt(uint32_t addr)
|
||||
{
|
||||
return cbfstool_offset + addr;
|
||||
}
|
||||
|
||||
static inline uint32_t virt_to_phys(void *addr)
|
||||
{
|
||||
return (unsigned long)(addr - cbfstool_offset) & 0xffffffff;
|
||||
}
|
||||
|
||||
#define ALIGN(val, by) (((val) + (by)-1)&~((by)-1))
|
||||
|
||||
size_t getfilesize(const char *filename);
|
||||
|
|
Loading…
Reference in New Issue