Author: oxygene Date: Thu Mar 10 08:52:02 2011 New Revision: 6440 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6440
Log: nvramtool: Move code so it has access to the right data structures Signed-off-by: Mathias Krause <[email protected]> Acked-by: Peter Stuge <[email protected]> Modified: trunk/util/nvramtool/accessors/layout-bin.c trunk/util/nvramtool/lbtable.c trunk/util/nvramtool/lbtable.h Modified: trunk/util/nvramtool/accessors/layout-bin.c ============================================================================== --- trunk/util/nvramtool/accessors/layout-bin.c Wed Mar 9 00:01:46 2011 (r6439) +++ trunk/util/nvramtool/accessors/layout-bin.c Thu Mar 10 08:52:02 2011 (r6440) @@ -84,6 +84,20 @@ } /**************************************************************************** + * get_layout_from_cmos_table + * + * Find the CMOS table which is stored within the coreboot table and set the + * global variable cmos_table to point to it. + ****************************************************************************/ +void get_layout_from_cmos_table(void) +{ + get_lbtable(); + cmos_table = (const struct cmos_option_table *) + find_lbrec(LB_TAG_CMOS_OPTION_TABLE); + process_layout(); +} + +/**************************************************************************** * process_cmos_table * * Extract layout information from the CMOS option table and store it in our Modified: trunk/util/nvramtool/lbtable.c ============================================================================== --- trunk/util/nvramtool/lbtable.c Wed Mar 9 00:01:46 2011 (r6439) +++ trunk/util/nvramtool/lbtable.c Thu Mar 10 08:52:02 2011 (r6440) @@ -63,7 +63,6 @@ unsigned long end, int *bad_header_count, int *bad_table_count); -static const struct lb_record *find_lbrec(uint32_t tag); static const char *lbrec_tag_to_str(uint32_t tag); static void memory_print_fn(const struct lb_record *rec); static void mainboard_print_fn(const struct lb_record *rec); @@ -215,11 +214,6 @@ /* Pointer to coreboot table. */ static const struct lb_header *lbtable = NULL; -/* The CMOS option table is located within the coreboot table. It tells us - * where the CMOS parameters are located in the nonvolatile RAM. - */ -static const struct cmos_option_table *cmos_table = NULL; - static const hexdump_format_t format = { 12, 4, " ", " | ", " ", " | ", '.' }; @@ -303,21 +297,6 @@ } /**************************************************************************** - * get_layout_from_cmos_table - * - * Find the CMOS table which is stored within the coreboot table and set the - * global variable cmos_table to point to it. - ****************************************************************************/ -void get_layout_from_cmos_table(void) -{ - - get_lbtable(); - cmos_table = (const struct cmos_option_table *) - find_lbrec(LB_TAG_CMOS_OPTION_TABLE); - process_layout(); -} - -/**************************************************************************** * dump_lbtable * * Do a low-level dump of the coreboot table. @@ -538,7 +517,7 @@ * Find the record in the coreboot table that matches 'tag'. Return pointer * to record on success or NULL if record not found. ****************************************************************************/ -static const struct lb_record *find_lbrec(uint32_t tag) +const struct lb_record *find_lbrec(uint32_t tag) { const char *p; uint32_t bytes_processed; Modified: trunk/util/nvramtool/lbtable.h ============================================================================== --- trunk/util/nvramtool/lbtable.h Wed Mar 9 00:01:46 2011 (r6439) +++ trunk/util/nvramtool/lbtable.h Thu Mar 10 08:52:02 2011 (r6440) @@ -39,6 +39,7 @@ void dump_lbtable(void); void list_lbtable_choices(void); void list_lbtable_item(const char item[]); +const struct lb_record *find_lbrec(uint32_t tag); void process_layout(void); #endif /* LBTABLE_H */ -- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
