\r
static UINT64 cb_unpack64(struct cbuint64 val)\r
{\r
- return (((UINT64) val.hi) << 32) | val.lo;\r
-}\r
-\r
-static const char *cb_mb_vendor_string(const struct cb_mainboard *cbm)\r
-{\r
- return (char *)(cbm->strings + cbm->vendor_idx);\r
-}\r
-\r
-static const char *cb_mb_part_string(const struct cb_mainboard *cbm)\r
-{\r
- return (char *)(cbm->strings + cbm->part_number_idx);\r
+ return LShiftU64 (val.hi, 32) | val.lo;\r
}\r
\r
UINT16\r
**/\r
RETURN_STATUS\r
CbParseAcpiTable (\r
- IN VOID** pMemTable,\r
+ IN VOID* pMemTable,\r
IN UINT32* pMemTableSize\r
)\r
{\r
- return CbParseCbMemTable (SIGNATURE_32 ('I', 'P', 'C', 'A'), pMemTable, pMemTableSize); \r
+ return CbParseCbMemTable (SIGNATURE_32 ('I', 'P', 'C', 'A'), (VOID **)pMemTable, pMemTableSize); \r
}\r
\r
/**\r