diff options
Diffstat (limited to 'ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/LibSmbiosView.c')
| -rw-r--r-- | ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/LibSmbiosView.c | 204 |
1 files changed, 67 insertions, 137 deletions
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/LibSmbiosView.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/LibSmbiosView.c index ed73a584bd..23a46d3fe1 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/LibSmbiosView.c +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/LibSmbiosView.c @@ -1,7 +1,7 @@ /** @file
API for SMBIOS table.
- Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -15,12 +15,11 @@ #include "../UefiShellDebug1CommandsLib.h"
#include <Guid/SmBios.h>
-#include "LibSmbios.h"
#include "LibSmbiosView.h"
#include "SmbiosView.h"
STATIC UINT8 mInit = 0;
-STATIC SMBIOS_STRUCTURE_TABLE *mSmbiosTable = NULL;
+STATIC SMBIOS_TABLE_ENTRY_POINT *mSmbiosTable = NULL;
STATIC SMBIOS_STRUCTURE_POINTER m_SmbiosStruct;
STATIC SMBIOS_STRUCTURE_POINTER *mSmbiosStruct = &m_SmbiosStruct;
@@ -90,7 +89,7 @@ LibSmbiosCleanup ( **/
VOID
LibSmbiosGetEPS (
- OUT SMBIOS_STRUCTURE_TABLE **EntryPointStructure
+ OUT SMBIOS_TABLE_ENTRY_POINT **EntryPointStructure
)
{
//
@@ -100,27 +99,77 @@ LibSmbiosGetEPS ( }
/**
- Get SMBIOS structure given the Handle,copy data to the Buffer,
+ Return SMBIOS string for the given string number.
+
+ @param[in] Smbios Pointer to SMBIOS structure.
+ @param[in] StringNumber String number to return. -1 is used to skip all strings and
+ point to the next SMBIOS structure.
+
+ @return Pointer to string, or pointer to next SMBIOS strcuture if StringNumber == -1
+**/
+CHAR8*
+LibGetSmbiosString (
+ IN SMBIOS_STRUCTURE_POINTER *Smbios,
+ IN UINT16 StringNumber
+ )
+{
+ UINT16 Index;
+ CHAR8 *String;
+
+ ASSERT (Smbios != NULL);
+
+ //
+ // 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.
+ // Return 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;
+}
+
+/**
+ Get SMBIOS structure for the given Handle,
Handle is changed to the next handle or 0xFFFF when the end is
reached or the handle is not found.
@param[in, out] Handle 0xFFFF: get the first structure
Others: get a structure according to this value.
- @param[in, out] Buffer The pointer to the caller's memory buffer.
- @param[out] Length Length of return buffer in bytes.
+ @param[out] Buffer The pointer to the pointer to the structure.
+ @param[out] Length Length of the structure.
- @retval DMI_SUCCESS Buffer contains the required structure data
- Handle is updated with next structure handle or
+ @retval DMI_SUCCESS Handle is updated with next structure handle or
0xFFFF(end-of-list).
- @retval DMI_INVALID_HANDLE Buffer not contain the requiring structure data.
- Handle is updated with next structure handle or
+ @retval DMI_INVALID_HANDLE Handle is updated with first structure handle or
0xFFFF(end-of-list).
**/
EFI_STATUS
LibGetSmbiosStructure (
IN OUT UINT16 *Handle,
- IN OUT UINT8 *Buffer,
+ OUT UINT8 **Buffer,
OUT UINT16 *Length
)
{
@@ -128,13 +177,13 @@ LibGetSmbiosStructure ( SMBIOS_STRUCTURE_POINTER SmbiosEnd;
UINT8 *Raw;
- if (*Handle == INVALIDE_HANDLE) {
+ if (*Handle == INVALID_HANDLE) {
*Handle = mSmbiosStruct->Hdr->Handle;
return DMI_INVALID_HANDLE;
}
- if (Buffer == NULL) {
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_LIBSMBIOSVIEW_NO_BUFF_SPEC), gShellDebug1HiiHandle);
+ if ((Buffer == NULL) || (Length == NULL)) {
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_LIBSMBIOSVIEW_NO_BUFF_LEN_SPEC), gShellDebug1HiiHandle);
return DMI_INVALID_HANDLE;
}
@@ -152,14 +201,14 @@ LibGetSmbiosStructure ( // Length = Next structure head - this structure head
//
*Length = (UINT16) (Smbios.Raw - Raw);
- CopyMem (Buffer, Raw, *Length);
+ *Buffer = Raw;
//
// update with the next structure handle.
//
if (Smbios.Raw < SmbiosEnd.Raw) {
*Handle = Smbios.Hdr->Handle;
} else {
- *Handle = INVALIDE_HANDLE;
+ *Handle = INVALID_HANDLE;
}
return DMI_SUCCESS;
}
@@ -169,126 +218,7 @@ LibGetSmbiosStructure ( LibGetSmbiosString (&Smbios, (UINT16) (-1));
}
- *Handle = INVALIDE_HANDLE;
+ *Handle = INVALID_HANDLE;
return DMI_INVALID_HANDLE;
}
-/**
- Check the structure to see if it is legal.
-
- @param[in] Smbios - Pointer to the structure that will be checked.
-
- @retval DMI_SUCCESS Structure data is legal.
- @retval DMI_BAD_PARAMETER Structure data contains bad parameter.
-**/
-EFI_STATUS
-SmbiosCheckStructure (
- IN SMBIOS_STRUCTURE_POINTER *Smbios
- )
-{
- //
- // If key != value, then error.
- //
-#define CHECK_VALUE(key, value) (((key) == (value)) ? EFI_SUCCESS : DMI_BAD_PARAMETER)
-
- EFI_STATUS Status;
- //
- // Assume staus is EFI_SUCCESS,
- // but if check is error, then EFI_ERROR.
- //
- Status = EFI_SUCCESS;
-
- switch (Smbios->Hdr->Type) {
- case 0:
- break;
-
- case 1:
- if (Smbios->Type1->Hdr.Length == 0x08 || Smbios->Type0->Hdr.Length == 0x19) {
- Status = EFI_SUCCESS;
- } else {
- Status = DMI_BAD_PARAMETER;
- }
- break;
-
- case 2:
- Status = CHECK_VALUE (Smbios->Type2->Hdr.Length, 0x08);
- break;
-
- case 6:
- Status = CHECK_VALUE (Smbios->Type6->Hdr.Length, 0x0C);
- break;
-
- case 11:
- Status = CHECK_VALUE (Smbios->Type11->Hdr.Length, 0x05);
- break;
-
- case 12:
- Status = CHECK_VALUE (Smbios->Type12->Hdr.Length, 0x05);
- break;
-
- case 13:
- Status = CHECK_VALUE (Smbios->Type13->Hdr.Length, 0x16);
- break;
-
- case 16:
- Status = CHECK_VALUE (Smbios->Type16->Hdr.Length, 0x0F);
- break;
-
- case 19:
- Status = CHECK_VALUE (Smbios->Type19->Hdr.Length, 0x0F);
- break;
-
- case 20:
- Status = CHECK_VALUE (Smbios->Type20->Hdr.Length, 0x13);
- break;
-
- case 32:
- //
- // Because EFI_SUCCESS == 0,
- // So errors added up is also error.
- //
- Status = CHECK_VALUE (Smbios->Type32->Reserved[0], 0x00) +
- CHECK_VALUE (Smbios->Type32->Reserved[1], 0x00) +
- CHECK_VALUE (Smbios->Type32->Reserved[2], 0x00) +
- CHECK_VALUE (Smbios->Type32->Reserved[3], 0x00) +
- CHECK_VALUE (Smbios->Type32->Reserved[4], 0x00) +
- CHECK_VALUE (Smbios->Type32->Reserved[5], 0x00);
- break;
-
- default:
- Status = DMI_BAD_PARAMETER;
- }
-
- return Status;
-}
-
-/**
- Get a string from the smbios information.
-
- @param[in] Smbios The pointer to the smbios information.
- @param[in] StringNumber The index to the string to get.
- @param[out] Buffer The buffer to fill with the string when retrieved.
-**/
-VOID
-SmbiosGetPendingString (
- IN SMBIOS_STRUCTURE_POINTER *Smbios,
- IN UINT16 StringNumber,
- OUT CHAR8 *Buffer
- )
-{
- CHAR8 *String;
- if (Buffer == NULL) {
- ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_LIBSMBIOSVIEW_NO_BUF_SPEC_WHEN_STRUCT), gShellDebug1HiiHandle);
- return ;
- }
- //
- // Get string and copy to buffer.
- // Caller should provide the buffer.
- //
- String = LibGetSmbiosString (Smbios, StringNumber);
- if (String != NULL) {
- CopyMem (Buffer, String, AsciiStrLen(String));
- } else {
- Buffer = NULL;
- }
-}
|