GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace UNPACK_CB64 macro with inline 

Having submitted a module based on coreboot to LKML for acceptance,
it was requested that fewer macros and more inlines be used (because
of their superior type-checking when performing pointer casts, etc).

This is the first of several changes to make the relevant parts of
coreboot comply to linux code standards.

Change-Id: Iffe7061fa62fa639e0cb6ccb9125eb3403d06b1a
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Reviewed-on: http://review.coreboot.org/495
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
This commit is contained in:
Philip Prindeville 2011-12-23 17:09:02 -07:00 committed by Patrick Georgi
parent d3cf0c811e
commit 46404d75e4
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
payloads/coreinfo/coreboot_module.c
View File

@ -112,9 +112,9 @@ int coreboot_module_redraw(WINDOW *win)
} }
wprintw(win, "%16.16llx - %16.16llx", wprintw(win, "%16.16llx - %16.16llx",
UNPACK_CB64(cb_info.range[i].start), cb_unpack64(cb_info.range[i].start),
UNPACK_CB64(cb_info.range[i].start) + cb_unpack64(cb_info.range[i].start) +
UNPACK_CB64(cb_info.range[i].size) - 1); cb_unpack64(cb_info.range[i].size) - 1);
} }
return 0; return 0;

4
payloads/libpayload/arch/i386/coreboot.c
View File

@ -63,10 +63,10 @@ static void cb_parse_memory(unsigned char *ptr, struct sysinfo_t *info)
#endif #endif
info->memrange[info->n_memranges].base = info->memrange[info->n_memranges].base =
UNPACK_CB64(range->start); cb_unpack64(range->start);
info->memrange[info->n_memranges].size = info->memrange[info->n_memranges].size =
UNPACK_CB64(range->size); cb_unpack64(range->size);
info->memrange[info->n_memranges].type = range->type; info->memrange[info->n_memranges].type = range->type;

10
payloads/libpayload/include/coreboot_tables.h
View File

@ -216,6 +216,13 @@ struct cb_cmos_checksum {
u32 type; u32 type;
}; };
/* Helpful inlines */
static inline u64 cb_unpack64(struct cbuint64 val)
{
return (((u64) val.hi) << 32) | val.lo;
}
/* Helpful macros */ /* Helpful macros */
#define MEM_RANGE_COUNT(_rec) \ #define MEM_RANGE_COUNT(_rec) \
@ -231,7 +238,4 @@ struct cb_cmos_checksum {
#define MB_PART_STRING(_mb) \ #define MB_PART_STRING(_mb) \
(((unsigned char *) ((_mb)->strings)) + (_mb)->part_number_idx) (((unsigned char *) ((_mb)->strings)) + (_mb)->part_number_idx)
#define UNPACK_CB64(_in) \
( (((u64) _in.hi) << 32) | _in.lo )
#endif #endif