CorebootModulePkgPkg: Expose FindCbTag API from CbParseLib

CbPlatformSupportLib might use FindCbTag() API to parse
platform specific information. So expose this API.
And add EFIAPI to all functions in CbParseLib.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Guo Dong <guo.dong@intel.com>
Reviewed-by: Maurice Ma <maurice.ma@intel.com>

diff --git a/CorebootModulePkg/Include/Library/CbParseLib.h b/CorebootModulePkg/Include/Library/CbParseLib.h
index 064baf3d0c6d36aec21a11f7eeba06ec070bc918..12dd4fa979aa495094977b8917abc00043c8b0b5 100644 (file)
--- a/CorebootModulePkg/Include/Library/CbParseLib.h
+++ b/CorebootModulePkg/Include/Library/CbParseLib.h
@@ -2,7 +2,7 @@
   This library will parse the coreboot table in memory and extract those required\r
   information.\r
 \r
   This library will parse the coreboot table in memory and extract those required\r
   information.\r
 \r

-  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -17,6 +17,24 @@
 typedef RETURN_STATUS \\r
         (*CB_MEM_INFO_CALLBACK) (UINT64 Base, UINT64 Size, UINT32 Type, VOID *Param);\r
 \r
 typedef RETURN_STATUS \\r
         (*CB_MEM_INFO_CALLBACK) (UINT64 Base, UINT64 Size, UINT32 Type, VOID *Param);\r
 \r

+/**\r
+  Find coreboot record with given Tag from the memory Start in 4096\r
+  bytes range.\r
+\r
+  @param  Start              The start memory to be searched in\r
+  @param  Tag                The tag id to be found\r
+\r
+  @retval NULL              The Tag is not found.\r
+  @retval Others            The poiter to the record found.\r
+\r
+**/\r
+VOID *\r
+EFIAPI\r
+FindCbTag (\r
+  IN  VOID     *Start,\r
+  IN  UINT32   Tag\r
+  );\r
+\r

 /**\r
   Acquire the memory information from the coreboot table in memory.\r
 \r
 /**\r
   Acquire the memory information from the coreboot table in memory.\r
 \r


@@ -28,6 +46,7 @@ typedef RETURN_STATUS \
 \r
 **/\r
 RETURN_STATUS\r
 \r
 **/\r
 RETURN_STATUS\r

+EFIAPI\r

 CbParseMemoryInfo (\r
   IN  CB_MEM_INFO_CALLBACK  MemInfoCallback,\r
   IN  VOID                  *pParam\r
 CbParseMemoryInfo (\r
   IN  CB_MEM_INFO_CALLBACK  MemInfoCallback,\r
   IN  VOID                  *pParam\r


@@ -46,6 +65,7 @@ CbParseMemoryInfo (
 \r
 **/\r
 RETURN_STATUS\r
 \r
 **/\r
 RETURN_STATUS\r

+EFIAPI\r

 CbParseCbMemTable (\r
   IN UINT32     TableId,
   IN VOID**     pMemTable,\r
 CbParseCbMemTable (\r
   IN UINT32     TableId,
   IN VOID**     pMemTable,\r


@@ -64,6 +84,7 @@ CbParseCbMemTable (
 \r
 **/\r
 RETURN_STATUS\r
 \r
 **/\r
 RETURN_STATUS\r

+EFIAPI\r

 CbParseAcpiTable (\r
   IN VOID**     pMemTable,\r
   IN UINT32*    pMemTableSize\r
 CbParseAcpiTable (\r
   IN VOID**     pMemTable,\r
   IN UINT32*    pMemTableSize\r


@@ -81,6 +102,7 @@ CbParseAcpiTable (
 \r
 **/\r
 RETURN_STATUS\r
 \r
 **/\r
 RETURN_STATUS\r

+EFIAPI\r

 CbParseSmbiosTable (\r
   IN VOID**     pMemTable,\r
   IN UINT32*    pMemTableSize\r
 CbParseSmbiosTable (\r
   IN VOID**     pMemTable,\r
   IN UINT32*    pMemTableSize\r


@@ -101,6 +123,7 @@ CbParseSmbiosTable (
 \r
 **/\r
 RETURN_STATUS\r
 \r
 **/\r
 RETURN_STATUS\r

+EFIAPI\r

 CbParseFadtInfo (\r
   IN UINTN*     pPmCtrlReg,\r
   IN UINTN*     pPmTimerReg,\r
 CbParseFadtInfo (\r
   IN UINTN*     pPmCtrlReg,\r
   IN UINTN*     pPmTimerReg,\r


@@ -125,6 +148,7 @@ CbParseFadtInfo (
 \r
 **/\r
 RETURN_STATUS\r
 \r
 **/\r
 RETURN_STATUS\r

+EFIAPI\r

 CbParseSerialInfo (\r
   OUT UINT32     *pRegBase,
   OUT UINT32     *pRegAccessType,
 CbParseSerialInfo (\r
   OUT UINT32     *pRegBase,
   OUT UINT32     *pRegAccessType,


@@ -145,6 +169,7 @@ CbParseSerialInfo (
 \r
 **/\r
 RETURN_STATUS\r
 \r
 **/\r
 RETURN_STATUS\r

+EFIAPI\r

 CbParseGetCbHeader (\r
   IN UINTN  Level,\r
   IN VOID** HeaderPtr\r
 CbParseGetCbHeader (\r
   IN UINTN  Level,\r
   IN VOID** HeaderPtr\r


@@ -160,6 +185,7 @@ CbParseGetCbHeader (
 \r
 **/\r
 RETURN_STATUS\r
 \r
 **/\r
 RETURN_STATUS\r

+EFIAPI\r

 CbParseFbInfo (\r
   IN FRAME_BUFFER_INFO*     pFbInfo\r
   );\r
 CbParseFbInfo (\r
   IN FRAME_BUFFER_INFO*     pFbInfo\r
   );\r

diff --git a/CorebootModulePkg/Library/CbParseLib/CbParseLib.c b/CorebootModulePkg/Library/CbParseLib/CbParseLib.c
index 305e38fa47473028be96692a7de1d1ba2f322629..0909b0f492023b3a029065906006db6bafdcaf6e 100644 (file)
--- a/CorebootModulePkg/Library/CbParseLib/CbParseLib.c
+++ b/CorebootModulePkg/Library/CbParseLib/CbParseLib.c
@@ -94,6 +94,7 @@ CbCheckSum16 (
 \r
 **/\r
 VOID *\r
 \r
 **/\r
 VOID *\r

+EFIAPI\r

 FindCbTag (\r
   IN  VOID     *Start,\r
   IN  UINT32   Tag\r
 FindCbTag (\r
   IN  VOID     *Start,\r
   IN  UINT32   Tag\r


@@ -175,6 +176,7 @@ FindCbTag (
 \r
 **/\r
 RETURN_STATUS\r
 \r
 **/\r
 RETURN_STATUS\r

+EFIAPI\r

 FindCbMemTable (\r
   IN  struct cbmem_root  *Root,\r
   IN  UINT32             TableId,\r
 FindCbMemTable (\r
   IN  struct cbmem_root  *Root,\r
   IN  UINT32             TableId,\r


@@ -237,6 +239,7 @@ FindCbMemTable (
 \r
 **/\r
 RETURN_STATUS\r
 \r
 **/\r
 RETURN_STATUS\r

+EFIAPI\r

 CbParseMemoryInfo (\r
   IN  CB_MEM_INFO_CALLBACK  MemInfoCallback,\r
   IN  VOID                  *pParam\r
 CbParseMemoryInfo (\r
   IN  CB_MEM_INFO_CALLBACK  MemInfoCallback,\r
   IN  VOID                  *pParam\r


@@ -287,6 +290,7 @@ CbParseMemoryInfo (
 \r
 **/\r
 RETURN_STATUS\r
 \r
 **/\r
 RETURN_STATUS\r

+EFIAPI\r

 CbParseCbMemTable (\r
   IN  UINT32     TableId,\r
   OUT VOID       **pMemTable,\r
 CbParseCbMemTable (\r
   IN  UINT32     TableId,\r
   OUT VOID       **pMemTable,\r


@@ -343,6 +347,7 @@ CbParseCbMemTable (
 \r
 **/\r
 RETURN_STATUS\r
 \r
 **/\r
 RETURN_STATUS\r

+EFIAPI\r

 CbParseAcpiTable (\r
   OUT VOID       **pMemTable,\r
   OUT UINT32     *pMemTableSize\r
 CbParseAcpiTable (\r
   OUT VOID       **pMemTable,\r
   OUT UINT32     *pMemTableSize\r


@@ -363,6 +368,7 @@ CbParseAcpiTable (
 \r
 **/\r
 RETURN_STATUS\r
 \r
 **/\r
 RETURN_STATUS\r

+EFIAPI\r

 CbParseSmbiosTable (\r
   OUT VOID       **pMemTable,\r
   OUT UINT32     *pMemTableSize\r
 CbParseSmbiosTable (\r
   OUT VOID       **pMemTable,\r
   OUT UINT32     *pMemTableSize\r


@@ -386,6 +392,7 @@ CbParseSmbiosTable (
 \r
 **/\r
 RETURN_STATUS\r
 \r
 **/\r
 RETURN_STATUS\r

+EFIAPI\r

 CbParseFadtInfo (\r
   OUT UINTN      *pPmCtrlReg,\r
   OUT UINTN      *pPmTimerReg,\r
 CbParseFadtInfo (\r
   OUT UINTN      *pPmCtrlReg,\r
   OUT UINTN      *pPmTimerReg,\r


@@ -533,6 +540,7 @@ CbParseFadtInfo (
 \r
 **/\r
 RETURN_STATUS\r
 \r
 **/\r
 RETURN_STATUS\r

+EFIAPI\r

 CbParseSerialInfo (\r
   OUT UINT32      *pRegBase,\r
   OUT UINT32      *pRegAccessType,\r
 CbParseSerialInfo (\r
   OUT UINT32      *pRegBase,\r
   OUT UINT32      *pRegAccessType,\r


@@ -591,6 +599,7 @@ CbParseSerialInfo (
 \r
 **/\r
 RETURN_STATUS\r
 \r
 **/\r
 RETURN_STATUS\r

+EFIAPI\r

 CbParseGetCbHeader (\r
   IN  UINTN  Level,\r
   OUT VOID   **HeaderPtr\r
 CbParseGetCbHeader (\r
   IN  UINTN  Level,\r
   OUT VOID   **HeaderPtr\r


@@ -629,6 +638,7 @@ CbParseGetCbHeader (
 \r
 **/\r
 RETURN_STATUS\r
 \r
 **/\r
 RETURN_STATUS\r

+EFIAPI\r

 CbParseFbInfo (\r
   OUT FRAME_BUFFER_INFO       *pFbInfo\r
   )\r
 CbParseFbInfo (\r
   OUT FRAME_BUFFER_INFO       *pFbInfo\r
   )\r