actually attach patch.
On Mon, Aug 11, 2008 at 10:44 PM, Sean Nelson <[EMAIL PROTECTED]> wrote:
> remove coreboot_module.c's cbtables and use libpayload's cbtables.
>
> Signed-off-by: Sean Nelson <[EMAIL PROTECTED]>
>
> ---
>
> patch for coreinfo, associated with my previous patch
>
Index: coreboot_module.c
===================================================================
--- coreboot_module.c (revision 3501)
+++ coreboot_module.c (working copy)
@@ -22,25 +22,8 @@
#ifdef CONFIG_MODULE_COREBOOT
-#define MAX_MEMORY_COUNT 5
+static int cbtables_good;
-static struct {
- int mem_count;
- int mem_actual;
-
- struct cb_memory_range range[MAX_MEMORY_COUNT];
-
- char vendor[32];
- char part[32];
-
- char strings[10][64];
-
- struct cb_serial serial;
- struct cb_console console;
-} cb_info;
-
-static int tables_good = 0;
-
int coreboot_module_redraw(WINDOW *win)
{
int row = 2;
@@ -48,7 +31,7 @@
print_module_title(win, "Coreboot Tables");
- if (tables_good) {
+ if (cbtables_good) {
mvwprintw(win, row++, 1, "No Coreboot tables were found");
return 0;
}
@@ -120,133 +103,10 @@
return 0;
}
-static void parse_memory(unsigned char *ptr)
-{
- struct cb_memory *mem = (struct cb_memory *)ptr;
- int max = (MEM_RANGE_COUNT(mem) > MAX_MEMORY_COUNT)
- ? MAX_MEMORY_COUNT : MEM_RANGE_COUNT(mem);
- int i;
-
- for (i = 0; i < max; i++) {
- struct cb_memory_range *range =
- (struct cb_memory_range *)MEM_RANGE_PTR(mem, i);
-
- memcpy(&cb_info.range[i], range, sizeof(*range));
- }
-
- cb_info.mem_count = max;
- cb_info.mem_actual = MEM_RANGE_COUNT(mem);
-}
-
-static void parse_mainboard(unsigned char *ptr)
-{
- struct cb_mainboard *mb = (struct cb_mainboard *)ptr;
-
- strncpy(cb_info.vendor, (const char *)MB_VENDOR_STRING(mb), 31);
- strncpy(cb_info.part, (const char *)MB_PART_STRING(mb), 31);
-}
-
-static void parse_strings(unsigned char *ptr)
-{
- struct cb_string *string = (struct cb_string *)ptr;
- int index = string->tag - CB_TAG_VERSION;
-
- strncpy(cb_info.strings[index], (const char *)string->string, 63);
- cb_info.strings[index][63] = 0;
-}
-
-static void parse_serial(unsigned char *ptr)
-{
- memcpy(&cb_info.serial, (struct cb_serial *)ptr,
- sizeof(struct cb_serial));
-}
-
-static void parse_console(unsigned char *ptr)
-{
- memcpy(&cb_info.console, (struct cb_console *)ptr,
- sizeof(struct cb_console));
-}
-
-static int parse_header(void *addr, int len)
-{
- struct cb_header *header;
- unsigned char *ptr = (unsigned char *)addr;
- int i;
-
- for (i = 0; i < len; i += 16, ptr += 16) {
- header = (struct cb_header *)ptr;
-
- if (!strncmp((const char *)header->signature, "LBIO", 4))
- break;
- }
-
- /* We walked the entire space and didn't find anything. */
- if (i >= len)
- return -1;
-
- if (!header->table_bytes)
- return 0;
-
- /* FIXME: Check the checksum. */
-
- if (ipchksum((uint16_t *) header, sizeof(*header)))
- return -1;
-
- if (ipchksum((uint16_t *) (ptr + sizeof(*header)), header->table_bytes)
- != header->table_checksum)
- return -1;
-
- /* Now, walk the tables. */
- ptr += header->header_bytes;
-
- for (i = 0; i < header->table_entries; i++) {
- struct cb_record *rec = (struct cb_record *)ptr;
-
- switch (rec->tag) {
- case CB_TAG_MEMORY:
- parse_memory(ptr);
- break;
- case CB_TAG_MAINBOARD:
- parse_mainboard(ptr);
- break;
- case CB_TAG_VERSION:
- case CB_TAG_EXTRA_VERSION:
- case CB_TAG_BUILD:
- case CB_TAG_COMPILE_TIME:
- case CB_TAG_COMPILE_BY:
- case CB_TAG_COMPILE_HOST:
- case CB_TAG_COMPILE_DOMAIN:
- case CB_TAG_COMPILER:
- case CB_TAG_LINKER:
- case CB_TAG_ASSEMBLER:
- parse_strings(ptr);
- break;
- case CB_TAG_SERIAL:
- parse_serial(ptr);
- break;
- case CB_TAG_CONSOLE:
- parse_console(ptr);
- break;
- default:
- break;
- }
-
- ptr += rec->size;
- }
-
- return 1;
-}
-
static int coreboot_module_init(void)
{
- int ret = parse_header((void *)0x00000, 0x1000);
-
- if (ret != 1)
- ret = parse_header((void *)0xf0000, 0x1000);
-
- /* Return error if we couldn't find it at either address. */
- tables_good = (ret == 1) ? 0 : -1;
- return tables_good;
+ cbtables_good = coreboot_tables_init();
+ return cbtables_good;
}
struct coreinfo_module coreboot_module = {
--
coreboot mailing list
[email protected]
http://www.coreboot.org/mailman/listinfo/coreboot
