Cleanup access to vendor/part # info

[coreboot.git] / payloads / libpayload / include / sysinfo.h

diff --git a/payloads/libpayload/include/sysinfo.h b/payloads/libpayload/include/sysinfo.h
index 50d331a043e6aabe8e8cbdec36dc0f4d6f007594..778dfe9414a96e47987541f045a9b91d1e7bf90c 100644 (file)
--- a/payloads/libpayload/include/sysinfo.h
+++ b/payloads/libpayload/include/sysinfo.h
@@ -27,8 +27,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef SYSINFO_H
-#define SYSINFO_H
+#ifndef _SYSINFO_H
+#define _SYSINFO_H
 
 /* Allow a maximum of 16 memory range definitions. */
 #define SYSINFO_MAX_MEM_RANGES 16
@@ -36,17 +36,32 @@
 struct sysinfo_t {
        unsigned int cpu_khz;
        unsigned short ser_ioport;
+       unsigned long ser_base; // for mmapped serial
 
        int n_memranges;
 
-       struct {
+       struct memrange {
                unsigned long long base;
                unsigned long long size;
+               unsigned int type;
        } memrange[SYSINFO_MAX_MEM_RANGES];
+
+       struct cb_cmos_option_table *option_table;
+       u32 cmos_range_start;
+       u32 cmos_range_end;
+       u32 cmos_checksum_location;
+
+       char *cb_version;
+
+       struct cb_framebuffer *framebuffer;
+
+       unsigned long *mbtable; /** Pointer to the multiboot table */
+
+       struct cb_header *header;
+       struct cb_mainboard *mainboard;
 };
 
 extern struct sysinfo_t lib_sysinfo;
-void lib_get_sysinfo(void);
 
 #endif