09027207f7
Date: Wed, 10 Dec 2014 21:08:34 +0000 Subject: [PATCH] fixes for MSVC compilation These fixes are needed to address the following error and warnings when compiling the library part using Visual Studio 2013 Community Edition (as in https://github.com/pbatard/uefi-simple): * "lib\x86_64\math.c(49): error C4235: nonstandard extension used : '_asm' keyword not supported on this architecture" * "lib\print.c(98): error C2059: syntax error : '('" due to placement of EFIAPI macro * "lib\cmdline.c(94): warning C4090: 'function' : different 'const' qualifiers" * "lib\smbios.c(25): warning C4068: unknown pragma" * Also update macro definitions in "inc\<arch>\efibind.h" for MSVC Signed-off-by: Pete Batard <pete@akeo.ie> Signed-off-by: Nigel Croxon <nigel.croxon@hp.com>
136 lines
3.5 KiB
C
136 lines
3.5 KiB
C
/*++
|
|
|
|
Copyright (c) 2000 Intel Corporation
|
|
|
|
Module Name:
|
|
|
|
Smbios.c
|
|
|
|
Abstract:
|
|
|
|
Lib fucntions for SMBIOS. Used to get system serial number and GUID
|
|
|
|
Revision History
|
|
|
|
--*/
|
|
|
|
#include "lib.h"
|
|
|
|
/*
|
|
* We convert 32 bit values to pointers. In 64 bit mode the compiler will issue a
|
|
* warning stating that the value is too small for the pointer:
|
|
* "warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]"
|
|
* we can safely ignore them here.
|
|
*/
|
|
#ifdef __GNUC__
|
|
#pragma GCC diagnostic ignored "-Wint-to-pointer-cast"
|
|
#endif
|
|
|
|
EFI_STATUS
|
|
LibGetSmbiosSystemGuidAndSerialNumber (
|
|
IN EFI_GUID *SystemGuid,
|
|
OUT CHAR8 **SystemSerialNumber
|
|
)
|
|
{
|
|
EFI_STATUS Status;
|
|
SMBIOS_STRUCTURE_TABLE *SmbiosTable;
|
|
SMBIOS_STRUCTURE_POINTER Smbios;
|
|
SMBIOS_STRUCTURE_POINTER SmbiosEnd;
|
|
UINT16 Index;
|
|
|
|
Status = LibGetSystemConfigurationTable(&SMBIOSTableGuid, (VOID**)&SmbiosTable);
|
|
if (EFI_ERROR(Status)) {
|
|
return EFI_NOT_FOUND;
|
|
}
|
|
|
|
Smbios.Hdr = (SMBIOS_HEADER *)SmbiosTable->TableAddress;
|
|
SmbiosEnd.Raw = (UINT8 *)(SmbiosTable->TableAddress + SmbiosTable->TableLength);
|
|
for (Index = 0; Index < SmbiosTable->TableLength ; Index++) {
|
|
if (Smbios.Hdr->Type == 1) {
|
|
if (Smbios.Hdr->Length < 0x19) {
|
|
//
|
|
// Older version did not support Guid and Serial number
|
|
//
|
|
continue;
|
|
}
|
|
|
|
//
|
|
// SMBIOS tables are byte packed so we need to do a byte copy to
|
|
// prevend alignment faults on IA-64.
|
|
|
|
CopyMem (SystemGuid, &Smbios.Type1->Uuid, sizeof(EFI_GUID));
|
|
*SystemSerialNumber = LibGetSmbiosString(&Smbios, Smbios.Type1->SerialNumber);
|
|
return EFI_SUCCESS;
|
|
}
|
|
|
|
//
|
|
// Make Smbios point to the next record
|
|
//
|
|
LibGetSmbiosString (&Smbios, -1);
|
|
|
|
if (Smbios.Raw >= SmbiosEnd.Raw) {
|
|
//
|
|
// SMBIOS 2.1 incorrectly stated the length of SmbiosTable as 0x1e.
|
|
// given this we must double check against the lenght of
|
|
/// the structure. My home PC has this bug.ruthard
|
|
//
|
|
return EFI_SUCCESS;
|
|
}
|
|
}
|
|
|
|
return EFI_SUCCESS;
|
|
}
|
|
|
|
CHAR8*
|
|
LibGetSmbiosString (
|
|
IN SMBIOS_STRUCTURE_POINTER *Smbios,
|
|
IN UINT16 StringNumber
|
|
)
|
|
/*++
|
|
|
|
Return SMBIOS string given the string number.
|
|
|
|
Arguments:
|
|
Smbios - Pointer to SMBIOS structure
|
|
StringNumber - String number to return. -1 is used to skip all strings and
|
|
point to the next SMBIOS structure.
|
|
|
|
Returns:
|
|
Pointer to string, or pointer to next SMBIOS strcuture if StringNumber == -1
|
|
--*/
|
|
{
|
|
UINT16 Index;
|
|
CHAR8 *String;
|
|
|
|
//
|
|
// Skip over formatted section
|
|
//
|
|
String = (CHAR8 *)(Smbios->Raw + Smbios->Hdr->Length);
|
|
|
|
//
|
|
// Look through unformated section
|
|
//
|
|
for (Index = 1; Index <= StringNumber; Index++) {
|
|
if (StringNumber == Index) {
|
|
return String;
|
|
}
|
|
|
|
//
|
|
// Skip string
|
|
//
|
|
for (; *String != 0; String++);
|
|
String++;
|
|
|
|
if (*String == 0) {
|
|
//
|
|
// If double NULL then we are done.
|
|
// Retrun pointer to next structure in Smbios.
|
|
// if you pass in a -1 you will always get here
|
|
//
|
|
Smbios->Raw = (UINT8 *)++String;
|
|
return NULL;
|
|
}
|
|
}
|
|
return NULL;
|
|
}
|