Replace UNPACK_CB64 macro with inline

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

diff --git a/payloads/libpayload/include/coreboot_tables.h b/payloads/libpayload/include/coreboot_tables.h
index 1542157ca762c7d064b879e89a55ea2cb034ee26..3b3b7d2299b00146b1838cb3dc8edaf05d9d3420 100644 (file)
--- a/payloads/libpayload/include/coreboot_tables.h
+++ b/payloads/libpayload/include/coreboot_tables.h
@@ -27,28 +27,28 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _COREBOOT_TABLES_H_
-#define _COREBOOT_TABLES_H_
+#ifndef _COREBOOT_TABLES_H
+#define _COREBOOT_TABLES_H
 
 #include <arch/types.h>
 
 struct cbuint64 {
-       uint32_t lo;
-       uint32_t hi;
+       u32 lo;
+       u32 hi;
 };
 
 struct cb_header {
-       uint8_t signature[4];
-       uint32_t header_bytes;
-       uint32_t header_checksum;
-       uint32_t table_bytes;
-       uint32_t table_checksum;
-       uint32_t table_entries;
+       u8 signature[4];
+       u32 header_bytes;
+       u32 header_checksum;
+       u32 table_bytes;
+       u32 table_checksum;
+       u32 table_entries;
 };
 
 struct cb_record {
-       uint32_t tag;
-       uint32_t size;
+       u32 tag;
+       u32 size;
 };
 
 #define CB_TAG_UNUSED     0x0000
@@ -57,35 +57,39 @@ struct cb_record {
 struct cb_memory_range {
        struct cbuint64 start;
        struct cbuint64 size;
-       uint32_t type;
+       u32 type;
 };
 
-#define CB_MEM_RAM      1
-#define CB_MEM_RESERVED 2
-#define CB_MEM_TABLE    16
+#define CB_MEM_RAM          1
+#define CB_MEM_RESERVED     2
+#define CB_MEM_ACPI         3
+#define CB_MEM_NVS          4
+#define CB_MEM_UNUSABLE     5
+#define CB_MEM_VENDOR_RSVD  6
+#define CB_MEM_TABLE       16
 
 struct cb_memory {
-       uint32_t tag;
-       uint32_t size;
+       u32 tag;
+       u32 size;
        struct cb_memory_range map[0];
 };
 
 #define CB_TAG_HWRPB      0x0002
 
 struct cb_hwrpb {
-       uint32_t tag;
-       uint32_t size;
-       uint64_t hwrpb;
+       u32 tag;
+       u32 size;
+       u64 hwrpb;
 };
 
 #define CB_TAG_MAINBOARD  0x0003
 
 struct cb_mainboard {
-       uint32_t tag;
-       uint32_t size;
-       uint8_t vendor_idx;
-       uint8_t part_number_idx;
-       uint8_t strings[0];
+       u32 tag;
+       u32 size;
+       u8 vendor_idx;
+       u8 part_number_idx;
+       u8 strings[0];
 };
 
 #define CB_TAG_VERSION        0x0004
@@ -100,44 +104,133 @@ struct cb_mainboard {
 #define CB_TAG_ASSEMBLER      0x000d
 
 struct cb_string {
-       uint32_t tag;
-       uint32_t size;
-       uint8_t string[0];
+       u32 tag;
+       u32 size;
+       u8 string[0];
 };
 
 #define CB_TAG_SERIAL         0x000f
 
 struct cb_serial {
-       uint32_t tag;
-       uint32_t size;
-       uint16_t ioport;
+       u32 tag;
+       u32 size;
+#define CB_SERIAL_TYPE_IO_MAPPED     1
+#define CB_SERIAL_TYPE_MEMORY_MAPPED 2
+       u32 type;
+       u32 baseaddr;
+       u32 baud;
 };
 
 #define CB_TAG_CONSOLE       0x00010
 
 struct cb_console {
-       uint32_t tag;
-       uint32_t size;
-       uint16_t type;
+       u32 tag;
+       u32 size;
+       u16 type;
 };
 
 #define CB_TAG_CONSOLE_SERIAL8250 0
-#define CB_TAG_CONSOLE_VGA        1
-#define CB_TAG_CONSOLE_BTEXT      2 
+#define CB_TAG_CONSOLE_VGA        1 // OBSOLETE
+#define CB_TAG_CONSOLE_BTEXT      2 // OBSOLETE
 #define CB_TAG_CONSOLE_LOGBUF     3
-#define CB_TAG_CONSOLE_SROM       4
+#define CB_TAG_CONSOLE_SROM       4 // OBSOLETE
 #define CB_TAG_CONSOLE_EHCI       5
 
-/* Still to come: CMOS information */
+#define CB_TAG_FORWARD       0x00011
+
+struct cb_forward {
+       u32 tag;
+       u32 size;
+       u64 forward;
+};
+
+#define CB_TAG_FRAMEBUFFER      0x0012
+struct cb_framebuffer {
+       u32 tag;
+       u32 size;
+
+       u64 physical_address;
+       u32 x_resolution;
+       u32 y_resolution;
+       u32 bytes_per_line;
+       u8 bits_per_pixel;
+        u8 red_mask_pos;
+       u8 red_mask_size;
+       u8 green_mask_pos;
+       u8 green_mask_size;
+       u8 blue_mask_pos;
+       u8 blue_mask_size;
+       u8 reserved_mask_pos;
+       u8 reserved_mask_size;
+};
+
+#define CB_TAG_CMOS_OPTION_TABLE 0x00c8
+struct cb_cmos_option_table {
+       u32 tag;
+       u32 size;
+       u32 header_length;
+};
+
+#define CB_TAG_OPTION         0x00c9
+#define CMOS_MAX_NAME_LENGTH    32
+struct cb_cmos_entries {
+       u32 tag;
+       u32 size;
+       u32 bit;
+       u32 length;
+       u32 config;
+       u32 config_id;
+       u8 name[CMOS_MAX_NAME_LENGTH];
+};
+
+
+#define CB_TAG_OPTION_ENUM    0x00ca
+#define CMOS_MAX_TEXT_LENGTH 32
+struct cb_cmos_enums {
+       u32 tag;
+       u32 size;
+       u32 config_id;
+       u32 value;
+       u8 text[CMOS_MAX_TEXT_LENGTH];
+};
+
+#define CB_TAG_OPTION_DEFAULTS 0x00cb
+#define CMOS_IMAGE_BUFFER_SIZE 128
+struct cb_cmos_defaults {
+       u32 tag;
+       u32 size;
+       u32 name_length;
+       u8 name[CMOS_MAX_NAME_LENGTH];
+       u8 default_set[CMOS_IMAGE_BUFFER_SIZE];
+};
+
+#define CB_TAG_OPTION_CHECKSUM 0x00cc
+#define CHECKSUM_NONE  0
+#define CHECKSUM_PCBIOS        1
+struct cb_cmos_checksum {
+       u32 tag;
+       u32 size;
+       u32 range_start;
+       u32 range_end;
+       u32 location;
+       u32 type;
+};
+
+/* Helpful inlines */
+
+static inline u64 cb_unpack64(struct cbuint64 val)
+{
+       return (((u64) val.hi) << 32) | val.lo;
+}
 
 /* Helpful macros */
 
 #define MEM_RANGE_COUNT(_rec) \
-  (((_rec)->size - sizeof(*(_rec))) / sizeof((_rec)->map[0]))
+       (((_rec)->size - sizeof(*(_rec))) / sizeof((_rec)->map[0]))
 
 #define MEM_RANGE_PTR(_rec, _idx) \
-  (((uint8_t *) (_rec)) + sizeof(*(_rec)) \
-  + (sizeof((_rec)->map[0]) * (_idx)))
+       (((u8 *) (_rec)) + sizeof(*(_rec)) \
+       + (sizeof((_rec)->map[0]) * (_idx)))
 
 #define MB_VENDOR_STRING(_mb) \
        (((unsigned char *) ((_mb)->strings)) + (_mb)->vendor_idx)
@@ -145,7 +238,4 @@ struct cb_console {
 #define MB_PART_STRING(_mb) \
        (((unsigned char *) ((_mb)->strings)) + (_mb)->part_number_idx)
 
-#define UNPACK_CB64(_in) \
-       ( (((uint64_t) _in.hi) << 32) | _in.lo )
-
 #endif