1) Add type casting for argument "a" in EFI_ERROR(a), since if compare two constants...

2) Remove PcdDriverPcdLibNull.
3) Add more ASSERT() in BasePcdLibNull to detect the incorrect usage of Pcd Library.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3643 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Library/PcdDriverPcdLibNull/PcdLib.c b/MdeModulePkg/Library/PcdDriverPcdLibNull/PcdLib.c
deleted file mode 100644 (file)
index b7d4408..0000000
--- a/MdeModulePkg/Library/PcdDriverPcdLibNull/PcdLib.c
+++ /dev/null
@@ -1,836 +0,0 @@
-/** @file\r
-  A emptry template implementation of PCD Library.\r
-\r
-  Copyright (c) 2006, Intel Corporation\r
-  All rights reserved. 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
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-  Module Name:  PcdLib.c\r
-\r
-**/\r
-#include <PiDxe.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/PcdLib.h>\r
-#include <Library/BaseMemoryLib.h>\r
-\r
-\r
-/**\r
-  Sets the current SKU in the PCD database to the value specified by SkuId.  SkuId is returned.\r
-\r
-  @param[in]  SkuId The SKU value that will be used when the PCD service will retrieve and \r
-              set values associated with a PCD token.\r
-\r
-  @retval SKU_ID Return the SKU ID that just be set.\r
-\r
-**/\r
-UINTN           \r
-EFIAPI\r
-LibPcdSetSku (\r
-  IN UINTN  SkuId\r
-  )\r
-{\r
-  ASSERT (SkuId < 0x100);\r
-\r
-  return SkuId;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Returns the 8-bit value for the token specified by TokenNumber. \r
-\r
-  @param[in]  The PCD token number to retrieve a current value for.\r
-\r
-  @retval UINT8 Returns the 8-bit value for the token specified by TokenNumber. \r
-\r
-**/\r
-UINT8\r
-EFIAPI\r
-LibPcdGet8 (\r
-  IN UINTN             TokenNumber\r
-  )\r
-{\r
-  return 0;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Returns the 16-bit value for the token specified by TokenNumber. \r
-\r
-  @param[in]  The PCD token number to retrieve a current value for.\r
-\r
-  @retval UINT16 Returns the 16-bit value for the token specified by TokenNumber. \r
-\r
-**/\r
-UINT16\r
-EFIAPI\r
-LibPcdGet16 (\r
-  IN UINTN             TokenNumber\r
-  )\r
-{\r
-  return 0;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Returns the 32-bit value for the token specified by TokenNumber. \r
-\r
-  @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
-\r
-  @retval UINT32 Returns the 32-bit value for the token specified by TokenNumber.\r
-\r
-**/\r
-UINT32\r
-EFIAPI\r
-LibPcdGet32 (\r
-  IN UINTN             TokenNumber\r
-  )\r
-{\r
-  return 0;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Returns the 64-bit value for the token specified by TokenNumber.\r
-\r
-  @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
-\r
-  @retval UINT64 Returns the 64-bit value for the token specified by TokenNumber.\r
-\r
-**/\r
-UINT64\r
-EFIAPI\r
-LibPcdGet64 (\r
-  IN UINTN             TokenNumber\r
-  )\r
-{\r
-  return 0;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Returns the pointer to the buffer of the token specified by TokenNumber.\r
-\r
-  @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
-\r
-  @retval VOID* Returns the pointer to the token specified by TokenNumber.\r
-\r
-**/\r
-VOID *\r
-EFIAPI\r
-LibPcdGetPtr (\r
-  IN UINTN             TokenNumber\r
-  )\r
-{\r
-  return 0;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Returns the Boolean value of the token specified by TokenNumber. \r
-\r
-  @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
-\r
-  @retval BOOLEAN Returns the Boolean value of the token specified by TokenNumber. \r
-\r
-**/\r
-BOOLEAN \r
-EFIAPI\r
-LibPcdGetBool (\r
-  IN UINTN             TokenNumber\r
-  )\r
-{\r
-  return 0;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Returns the size of the token specified by TokenNumber. \r
-\r
-  @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
-\r
-  @retval UINTN Returns the size of the token specified by TokenNumber. \r
-\r
-**/\r
-UINTN\r
-EFIAPI\r
-LibPcdGetSize (\r
-  IN UINTN             TokenNumber\r
-  )\r
-{\r
-  return 0;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Returns the 8-bit value for the token specified by TokenNumber and Guid.\r
-  If Guid is NULL, then ASSERT(). \r
-\r
-  @param[in]  Guid Pointer to a 128-bit unique value that designates \r
-              which namespace to retrieve a value from.\r
-  @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
-\r
-  @retval UINT8 Return the UINT8.\r
-\r
-**/\r
-UINT8\r
-EFIAPI\r
-LibPcdGetEx8 (\r
-  IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
-  )\r
-{\r
-  ASSERT (Guid != NULL);\r
-\r
-  return 0;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Returns the 16-bit value for the token specified by TokenNumber and Guid.\r
-  If Guid is NULL, then ASSERT(). \r
-\r
-  @param[in]  Guid Pointer to a 128-bit unique value that designates \r
-              which namespace to retrieve a value from.\r
-  @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
-\r
-  @retval UINT16 Return the UINT16.\r
-\r
-**/\r
-UINT16\r
-EFIAPI\r
-LibPcdGetEx16 (\r
-  IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
-  )\r
-{\r
-  ASSERT (Guid != NULL);\r
-\r
-  return 0;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Returns the 32-bit value for the token specified by TokenNumber and Guid.\r
-  If Guid is NULL, then ASSERT(). \r
-\r
-  @param[in]  Guid Pointer to a 128-bit unique value that designates \r
-              which namespace to retrieve a value from.\r
-  @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
-\r
-  @retval UINT32 Return the UINT32.\r
-\r
-**/\r
-UINT32\r
-EFIAPI\r
-LibPcdGetEx32 (\r
-  IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
-  )\r
-{\r
-  ASSERT (Guid != NULL);\r
-\r
-  return 0;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Returns the 64-bit value for the token specified by TokenNumber and Guid.\r
-  If Guid is NULL, then ASSERT(). \r
-\r
-  @param[in]  Guid Pointer to a 128-bit unique value that designates \r
-              which namespace to retrieve a value from.\r
-  @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
-\r
-  @retval UINT64 Return the UINT64.\r
-\r
-**/\r
-UINT64\r
-EFIAPI\r
-LibPcdGetEx64 (\r
-  IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
-  )\r
-{\r
-  ASSERT (Guid != NULL);\r
-\r
-  return 0;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Returns the pointer to the buffer of the token specified by TokenNumber and Guid.\r
-  If Guid is NULL, then ASSERT(). \r
-\r
-  @param[in]  Guid Pointer to a 128-bit unique value that designates \r
-              which namespace to retrieve a value from.\r
-  @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
-\r
-  @retval VOID* Return the VOID* pointer.\r
-\r
-**/\r
-VOID *\r
-EFIAPI\r
-LibPcdGetExPtr (\r
-  IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
-  )\r
-{\r
-  ASSERT (Guid != NULL);\r
-\r
-  return 0;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Returns the Boolean value of the token specified by TokenNumber and Guid. \r
-  If Guid is NULL, then ASSERT(). \r
-\r
-  @param[in]  Guid Pointer to a 128-bit unique value that designates \r
-              which namespace to retrieve a value from.\r
-  @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
-\r
-  @retval BOOLEAN Return the BOOLEAN.\r
-\r
-**/\r
-BOOLEAN\r
-EFIAPI\r
-LibPcdGetExBool (\r
-  IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
-  )\r
-{\r
-  ASSERT (Guid != NULL);\r
-\r
-  return 0;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Returns the size of the token specified by TokenNumber and Guid. \r
-  If Guid is NULL, then ASSERT(). \r
-\r
-  @param[in]  Guid Pointer to a 128-bit unique value that designates \r
-              which namespace to retrieve a value from.\r
-  @param[in]  TokenNumber The PCD token number to retrieve a current value for.\r
-\r
-  @retval UINTN Return the size.\r
-\r
-**/\r
-UINTN\r
-EFIAPI\r
-LibPcdGetExSize (\r
-  IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber\r
-  )\r
-{\r
-  ASSERT (Guid != NULL);\r
-\r
-  return 0;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Sets the 8-bit value for the token specified by TokenNumber \r
-  to the value specified by Value.  Value is returned.\r
-  \r
-  @param[in]  TokenNumber The PCD token number to set a current value for.\r
-  @param[in]  Value The 8-bit value to set.\r
-\r
-  @retval UINT8 Return the value been set.\r
-\r
-**/\r
-UINT8\r
-EFIAPI\r
-LibPcdSet8 (\r
-  IN UINTN             TokenNumber,\r
-  IN UINT8             Value\r
-  )\r
-{\r
-  return Value;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Sets the 16-bit value for the token specified by TokenNumber \r
-  to the value specified by Value.  Value is returned.\r
-  \r
-  @param[in]  TokenNumber The PCD token number to set a current value for.\r
-  @param[in]  Value The 16-bit value to set.\r
-\r
-  @retval UINT16 Return the value been set.\r
-\r
-**/\r
-UINT16\r
-EFIAPI\r
-LibPcdSet16 (\r
-  IN UINTN             TokenNumber,\r
-  IN UINT16            Value\r
-  )\r
-{\r
-  return Value;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Sets the 32-bit value for the token specified by TokenNumber \r
-  to the value specified by Value.  Value is returned.\r
-  \r
-  @param[in]  TokenNumber The PCD token number to set a current value for.\r
-  @param[in]  Value The 32-bit value to set.\r
-\r
-  @retval UINT32 Return the value been set.\r
-\r
-**/\r
-UINT32\r
-EFIAPI\r
-LibPcdSet32 (\r
-  IN UINTN              TokenNumber,\r
-  IN UINT32             Value\r
-  )\r
-{\r
-  return Value;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Sets the 64-bit value for the token specified by TokenNumber \r
-  to the value specified by Value.  Value is returned.\r
-  \r
-  @param[in]  TokenNumber The PCD token number to set a current value for.\r
-  @param[in]  Value The 64-bit value to set.\r
-\r
-  @retval UINT64 Return the value been set.\r
-\r
-**/\r
-UINT64\r
-EFIAPI\r
-LibPcdSet64 (\r
-  IN UINTN              TokenNumber,\r
-  IN UINT64             Value\r
-  )\r
-{\r
-  return Value;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Sets a buffer for the token specified by TokenNumber to \r
-  the value specified by Buffer and SizeOfValue.  Buffer to\r
-  be set is returned. The content of the buffer could be \r
-  overwritten if a Callback on SET is registered with this\r
-  TokenNumber.\r
-  \r
-  If SizeOfValue is greater than the maximum \r
-  size support by TokenNumber, then set SizeOfValue to the \r
-  maximum size supported by TokenNumber and return NULL to \r
-  indicate that the set operation was not actually performed. \r
-  \r
-  If SizeOfValue > 0 and Buffer is NULL, then ASSERT().\r
-  \r
-  @param[in]  TokenNumber The PCD token number to set a current value for.\r
-  @param[in,out] SizeOfBuffer The size, in bytes, of Buffer.\r
-  @param[in]  Value A pointer to the buffer to set.\r
-\r
-  @retval VOID* Return the pointer for the buffer been set.\r
-\r
-**/\r
-VOID *\r
-EFIAPI\r
-LibPcdSetPtr (\r
-  IN      UINTN             TokenNumber,\r
-  IN OUT  UINTN             *SizeOfBuffer,\r
-  IN      VOID              *Buffer\r
-  )\r
-{\r
-  ASSERT (SizeOfBuffer != NULL);\r
-\r
-  if (*SizeOfBuffer > 0) {\r
-    ASSERT (Buffer != NULL);\r
-  }\r
-\r
-  return Buffer;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Sets the Boolean value for the token specified by TokenNumber \r
-  to the value specified by Value.  Value is returned.\r
-  \r
-  @param[in]  TokenNumber The PCD token number to set a current value for.\r
-  @param[in]  Value The boolean value to set.\r
-\r
-  @retval BOOLEAN Return the value been set.\r
-\r
-**/\r
-BOOLEAN\r
-EFIAPI\r
-LibPcdSetBool (\r
-  IN UINTN             TokenNumber,\r
-  IN BOOLEAN           Value\r
-  )\r
-{\r
-  return Value;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Sets the 8-bit value for the token specified by TokenNumber and \r
-  Guid to the value specified by Value. Value is returned.\r
-  If Guid is NULL, then ASSERT().\r
-  \r
-  @param[in]  Guid Pointer to a 128-bit unique value that \r
-              designates which namespace to set a value from.\r
-  @param[in]  TokenNumber The PCD token number to set a current value for.\r
-  @param[in]  Value The 8-bit value to set.\r
-\r
-  @retval UINT8 Return the value been set.\r
-\r
-**/\r
-UINT8\r
-EFIAPI\r
-LibPcdSetEx8 (\r
-  IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber,\r
-  IN UINT8             Value\r
-  )\r
-{\r
-  ASSERT (Guid != NULL);\r
-\r
-  return Value;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Sets the 16-bit value for the token specified by TokenNumber and \r
-  Guid to the value specified by Value. Value is returned.\r
-  If Guid is NULL, then ASSERT().\r
-  \r
-  @param[in]  Guid Pointer to a 128-bit unique value that \r
-              designates which namespace to set a value from.\r
-  @param[in]  TokenNumber The PCD token number to set a current value for.\r
-  @param[in]  Value The 16-bit value to set.\r
-\r
-  @retval UINT8 Return the value been set.\r
-\r
-**/\r
-UINT16\r
-EFIAPI\r
-LibPcdSetEx16 (\r
-  IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber,\r
-  IN UINT16            Value\r
-  )\r
-{\r
-  ASSERT (Guid != NULL);\r
-\r
-  return Value;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Sets the 32-bit value for the token specified by TokenNumber and \r
-  Guid to the value specified by Value. Value is returned.\r
-  If Guid is NULL, then ASSERT().\r
-  \r
-  @param[in]  Guid Pointer to a 128-bit unique value that \r
-              designates which namespace to set a value from.\r
-  @param[in]  TokenNumber The PCD token number to set a current value for.\r
-  @param[in]  Value The 32-bit value to set.\r
-\r
-  @retval UINT32 Return the value been set.\r
-\r
-**/\r
-UINT32\r
-EFIAPI\r
-LibPcdSetEx32 (\r
-  IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber,\r
-  IN UINT32            Value\r
-  )\r
-{\r
-  ASSERT (Guid != NULL);\r
-\r
-  return Value;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Sets the 64-bit value for the token specified by TokenNumber and \r
-  Guid to the value specified by Value. Value is returned.\r
-  If Guid is NULL, then ASSERT().\r
-  \r
-  @param[in]  Guid Pointer to a 128-bit unique value that \r
-              designates which namespace to set a value from.\r
-  @param[in]  TokenNumber The PCD token number to set a current value for.\r
-  @param[in]  Value The 64-bit value to set.\r
-\r
-  @retval UINT64 Return the value been set.\r
-\r
-**/\r
-UINT64\r
-EFIAPI\r
-LibPcdSetEx64 (\r
-  IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber,\r
-  IN UINT64            Value\r
-  )\r
-{\r
-  ASSERT (Guid != NULL);\r
-\r
-  return Value;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Sets a buffer for the token specified by TokenNumber to the value specified by \r
-  Buffer and SizeOfValue.  Buffer is returned.  If SizeOfValue is greater than \r
-  the maximum size support by TokenNumber, then set SizeOfValue to the maximum size \r
-  supported by TokenNumber and return NULL to indicate that the set operation \r
-  was not actually performed. \r
-  \r
-  If SizeOfValue > 0 and Buffer is NULL, then ASSERT().\r
-  \r
-  @param[in]  Guid Pointer to a 128-bit unique value that \r
-              designates which namespace to set a value from.\r
-  @param[in]  TokenNumber The PCD token number to set a current value for.\r
-  @param[in, out] SizeOfBuffer The size, in bytes, of Buffer.\r
-  @param[in]  Buffer A pointer to the buffer to set.\r
-\r
-  @retval VOID * Return the pinter to the buffer been set.\r
-\r
-**/\r
-VOID *\r
-EFIAPI\r
-LibPcdSetExPtr (\r
-  IN      CONST GUID        *Guid,\r
-  IN      UINTN             TokenNumber,\r
-  IN OUT  UINTN             *SizeOfBuffer,\r
-  IN      VOID              *Buffer\r
-  )\r
-{\r
-  ASSERT (Guid != NULL);\r
-\r
-  ASSERT (SizeOfBuffer != NULL);\r
-  \r
-  if (*SizeOfBuffer > 0) {\r
-    ASSERT (Buffer != NULL);\r
-  }\r
-\r
-  return Buffer;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Sets the Boolean value for the token specified by TokenNumber and \r
-  Guid to the value specified by Value. Value is returned.\r
-  If Guid is NULL, then ASSERT().\r
-  \r
-  @param[in]  Guid Pointer to a 128-bit unique value that \r
-              designates which namespace to set a value from.\r
-  @param[in]  TokenNumber The PCD token number to set a current value for.\r
-  @param[in]  Value The Boolean value to set.\r
-\r
-  @retval Boolean Return the value been set.\r
-\r
-**/\r
-BOOLEAN\r
-EFIAPI\r
-LibPcdSetExBool (\r
-  IN CONST GUID        *Guid,\r
-  IN UINTN             TokenNumber,\r
-  IN BOOLEAN           Value\r
-  )\r
-{\r
-  ASSERT (Guid != NULL);\r
-\r
-  return Value;\r
-}\r
-\r
-\r
-\r
-/**\r
-  When the token specified by TokenNumber and Guid is set, \r
-  then notification function specified by NotificationFunction is called.  \r
-  If Guid is NULL, then the default token space is used. \r
-  If NotificationFunction is NULL, then ASSERT().\r
-\r
-  @param[in]  Guid Pointer to a 128-bit unique value that designates which \r
-              namespace to set a value from.  If NULL, then the default \r
-              token space is used.\r
-  @param[in]  TokenNumber The PCD token number to monitor.\r
-  @param[in]  NotificationFunction The function to call when the token \r
-              specified by Guid and TokenNumber is set.\r
-\r
-  @retval VOID\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-LibPcdCallbackOnSet (\r
-  IN CONST GUID               *Guid,       OPTIONAL\r
-  IN UINTN                    TokenNumber,\r
-  IN PCD_CALLBACK             NotificationFunction\r
-  )\r
-{\r
-  ASSERT (NotificationFunction != NULL);\r
-}\r
-\r
-\r
-\r
-/**\r
-  Disable a notification function that was established with LibPcdCallbackonSet().\r
-  If NotificationFunction is NULL, then ASSERT().\r
-\r
-  @param[in]  Guid Specify the GUID token space.\r
-  @param[in]  TokenNumber Specify the token number.\r
-  @param[in]  NotificationFunction The callback function to be unregistered.\r
-\r
-  @retval VOID\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-LibPcdCancelCallback (\r
-  IN CONST GUID               *Guid,       OPTIONAL\r
-  IN UINTN                    TokenNumber,\r
-  IN PCD_CALLBACK             NotificationFunction\r
-  )\r
-{\r
-  ASSERT (NotificationFunction != NULL);\r
-}\r
-\r
-\r
-\r
-/**\r
-  Retrieves the next PCD token number from the token space specified by Guid.  \r
-  If Guid is NULL, then the default token space is used.  If TokenNumber is 0, \r
-  then the first token number is returned.  Otherwise, the token number that \r
-  follows TokenNumber in the token space is returned.  If TokenNumber is the last \r
-  token number in the token space, then 0 is returned.  If TokenNumber is not 0 and \r
-  is not in the token space specified by Guid, then ASSERT().\r
-\r
-  @param[in]  Pointer to a 128-bit unique value that designates which namespace \r
-              to set a value from.  If NULL, then the default token space is used.\r
-  @param[in]  The previous PCD token number.  If 0, then retrieves the first PCD \r
-              token number.\r
-\r
-  @retval UINTN            The next valid token number.\r
-\r
-**/\r
-UINTN           \r
-EFIAPI\r
-LibPcdGetNextToken (\r
-  IN CONST GUID               *Guid, OPTIONAL\r
-  IN       UINTN              TokenNumber\r
-  )\r
-{\r
-  return 0;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Retrieves the next PCD token space from a token space specified by Guid.\r
-  Guid of NULL is reserved to mark the default local token namespace on the current\r
-  platform. If Guid is NULL, then the GUID of the first non-local token space of the \r
-  current platform is returned. If Guid is the last non-local token space, \r
-  then NULL is returned. \r
-\r
-  If Guid is not NULL and is not a valid token space in the current platform, then ASSERT().\r
-\r
-\r
-  \r
-  @param[in]  Pointer to a 128-bit unique value that designates from which namespace \r
-              to start the search.\r
-\r
-  @retval CONST GUID *  The next valid token namespace.\r
-\r
-**/\r
-GUID *           \r
-EFIAPI\r
-LibPcdGetNextTokenSpace (\r
-  IN CONST GUID  *Guid\r
-  )\r
-{\r
-  return NULL;\r
-}\r
-\r
-\r
-\r
-/**\r
-  Sets the PCD entry specified by PatchVariable to the value specified by Buffer \r
-  and SizeOfValue.  Buffer is returned.  If SizeOfValue is greater than \r
-  MaximumDatumSize, then set SizeOfValue to MaximumDatumSize and return \r
-  NULL to indicate that the set operation was not actually performed.  \r
-  If SizeOfValue is set to MAX_ADDRESS, then SizeOfValue must be set to \r
-  MaximumDatumSize and NULL must be returned.\r
-  \r
-  If PatchVariable is NULL, then ASSERT().\r
-  If SizeOfValue is NULL, then ASSERT().\r
-  If SizeOfValue > 0 and Buffer is NULL, then ASSERT().\r
-\r
-  @param[in] PatchVariable      A pointer to the global variable in a module that is \r
-                                the target of the set operation.\r
-  @param[in] MaximumDatumSize   The maximum size allowed for the PCD entry specified by PatchVariable.\r
-  @param[in, out] SizeOfBuffer  A pointer to the size, in bytes, of Buffer.\r
-  @param[in] Buffer             A pointer to the buffer to used to set the target variable.\r
-\r
-**/\r
-VOID *\r
-EFIAPI\r
-LibPatchPcdSetPtr (\r
-  IN        VOID        *PatchVariable,\r
-  IN        UINTN       MaximumDatumSize,\r
-  IN OUT    UINTN       *SizeOfBuffer,\r
-  IN CONST  VOID        *Buffer\r
-  )\r
-{\r
-  ASSERT (PatchVariable != NULL);\r
-  ASSERT (SizeOfBuffer  != NULL);\r
-  \r
-  if (*SizeOfBuffer > 0) {\r
-    ASSERT (Buffer != NULL);\r
-  }\r
-\r
-  if ((*SizeOfBuffer > MaximumDatumSize) ||\r
-      (*SizeOfBuffer == MAX_ADDRESS)) {\r
-    *SizeOfBuffer = MaximumDatumSize;\r
-    return NULL;\r
-  }\r
-    \r
-  CopyMem (PatchVariable, Buffer, *SizeOfBuffer);\r
-  \r
-  return (VOID *) Buffer;\r
-}\r
-\r

diff --git a/MdeModulePkg/Library/PcdDriverPcdLibNull/PcdLib.inf b/MdeModulePkg/Library/PcdDriverPcdLibNull/PcdLib.inf
deleted file mode 100644 (file)
index 05c20df..0000000
--- a/MdeModulePkg/Library/PcdDriverPcdLibNull/PcdLib.inf
+++ /dev/null
@@ -1,51 +0,0 @@
-#/** @file\r
-# PCD Library instance implemented with PCD Protocol\r
-#\r
-# This library instance implement the APIs listed \r
-#  in PCD library class defined in MDE library specification.\r
-#  It is used by modules in DXE phase.\r
-# Copyright (c) 2007, Intel Corporation.\r
-#\r
-#  All rights reserved. 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
-#  http://opensource.org/licenses/bsd-license.php\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-#\r
-#\r
-#**/\r
-\r
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = PcdDriverPcdLib\r
-  FILE_GUID                      = 40096a3a-5c2a-4fbc-aef7-5475dd7ab334\r
-  MODULE_TYPE                    = DXE_DRIVER\r
-  VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = PcdLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER \r
-  EDK_RELEASE_VERSION            = 0x00020000\r
-  EFI_SPECIFICATION_VERSION      = 0x00020000\r
-\r
-#\r
-# The following information is for reference only and not required by the build tools.\r
-#\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
-#\r
-\r
-[Sources.common]\r
-  PcdLib.c\r
-\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  MdeModulePkg/MdeModulePkg.dec\r
-\r
-[LibraryClasses]\r
-  BaseMemoryLib\r
-  UefiBootServicesTableLib\r
-  DebugLib\r
-\r
-\r
-[Protocols]\r
-  gPcdProtocolGuid                              # PROTOCOL ALWAYS_CONSUMED\r
-\r

diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
index 15ee9ad89a962b644e74c8eedc14ad477d3fa3f9..c5cf6f38d5ed1ae75f441e6ecd169d4e38169498 100644 (file)
--- a/MdePkg/Include/Base.h
+++ b/MdePkg/Include/Base.h
@@ -261,7 +261,7 @@ typedef INTN RETURN_STATUS;
 #define ENCODE_ERROR(a)              (MAX_BIT | (a))\r
 \r
 #define ENCODE_WARNING(a)            (a)\r
-#define RETURN_ERROR(a)              ((a) < 0)\r
+#define RETURN_ERROR(a)              ((INTN) (a) < 0)\r
 \r
 #define RETURN_SUCCESS               0\r
 #define RETURN_LOAD_ERROR            ENCODE_ERROR (1)\r

diff --git a/MdePkg/Library/BasePcdLibNull/PcdLib.c b/MdePkg/Library/BasePcdLibNull/PcdLib.c
index aba7920baff488f4008bb512afe897889843b883..ec7101e6000ef1cb5eb53f725c222ca464e44fea 100644 (file)
--- a/MdePkg/Library/BasePcdLibNull/PcdLib.c
+++ b/MdePkg/Library/BasePcdLibNull/PcdLib.c
@@ -33,9 +33,9 @@ LibPcdSetSku (
   IN UINTN  SkuId\r
   )\r
 {\r
-  ASSERT (SkuId < 0x100);\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
 \r
-  return SkuId;\r
+  return 0;\r
 }\r
 \r
 \r
@@ -54,6 +54,8 @@ LibPcdGet8 (
   IN UINTN             TokenNumber\r
   )\r
 {\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
+\r
   return 0;\r
 }\r
 \r
@@ -73,6 +75,8 @@ LibPcdGet16 (
   IN UINTN             TokenNumber\r
   )\r
 {\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
+\r
   return 0;\r
 }\r
 \r
@@ -92,6 +96,8 @@ LibPcdGet32 (
   IN UINTN             TokenNumber\r
   )\r
 {\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
+\r
   return 0;\r
 }\r
 \r
@@ -111,6 +117,8 @@ LibPcdGet64 (
   IN UINTN             TokenNumber\r
   )\r
 {\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
+\r
   return 0;\r
 }\r
 \r
@@ -130,6 +138,8 @@ LibPcdGetPtr (
   IN UINTN             TokenNumber\r
   )\r
 {\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
+\r
   return 0;\r
 }\r
 \r
@@ -149,6 +159,8 @@ LibPcdGetBool (
   IN UINTN             TokenNumber\r
   )\r
 {\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
+\r
   return 0;\r
 }\r
 \r
@@ -168,6 +180,8 @@ LibPcdGetSize (
   IN UINTN             TokenNumber\r
   )\r
 {\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
+\r
   return 0;\r
 }\r
 \r
@@ -191,7 +205,7 @@ LibPcdGetEx8 (
   IN UINTN             TokenNumber\r
   )\r
 {\r
-  ASSERT (Guid != NULL);\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
 \r
   return 0;\r
 }\r
@@ -216,7 +230,7 @@ LibPcdGetEx16 (
   IN UINTN             TokenNumber\r
   )\r
 {\r
-  ASSERT (Guid != NULL);\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
 \r
   return 0;\r
 }\r
@@ -241,7 +255,7 @@ LibPcdGetEx32 (
   IN UINTN             TokenNumber\r
   )\r
 {\r
-  ASSERT (Guid != NULL);\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
 \r
   return 0;\r
 }\r
@@ -266,7 +280,7 @@ LibPcdGetEx64 (
   IN UINTN             TokenNumber\r
   )\r
 {\r
-  ASSERT (Guid != NULL);\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
 \r
   return 0;\r
 }\r
@@ -291,7 +305,7 @@ LibPcdGetExPtr (
   IN UINTN             TokenNumber\r
   )\r
 {\r
-  ASSERT (Guid != NULL);\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
 \r
   return 0;\r
 }\r
@@ -316,7 +330,7 @@ LibPcdGetExBool (
   IN UINTN             TokenNumber\r
   )\r
 {\r
-  ASSERT (Guid != NULL);\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
 \r
   return 0;\r
 }\r
@@ -341,7 +355,7 @@ LibPcdGetExSize (
   IN UINTN             TokenNumber\r
   )\r
 {\r
-  ASSERT (Guid != NULL);\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
 \r
   return 0;\r
 }\r
@@ -365,7 +379,9 @@ LibPcdSet8 (
   IN UINT8             Value\r
   )\r
 {\r
-  return Value;\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
+\r
+  return 0;\r
 }\r
 \r
 \r
@@ -387,7 +403,9 @@ LibPcdSet16 (
   IN UINT16            Value\r
   )\r
 {\r
-  return Value;\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
+\r
+  return 0;\r
 }\r
 \r
 \r
@@ -409,7 +427,9 @@ LibPcdSet32 (
   IN UINT32             Value\r
   )\r
 {\r
-  return Value;\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
+\r
+  return 0;\r
 }\r
 \r
 \r
@@ -431,7 +451,9 @@ LibPcdSet64 (
   IN UINT64             Value\r
   )\r
 {\r
-  return Value;\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
+\r
+  return 0;\r
 }\r
 \r
 \r
@@ -465,13 +487,9 @@ LibPcdSetPtr (
   IN      VOID              *Buffer\r
   )\r
 {\r
-  ASSERT (SizeOfBuffer != NULL);\r
-\r
-  if (*SizeOfBuffer > 0) {\r
-    ASSERT (Buffer != NULL);\r
-  }\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
 \r
-  return Buffer;\r
+  return NULL;\r
 }\r
 \r
 \r
@@ -493,7 +511,9 @@ LibPcdSetBool (
   IN BOOLEAN           Value\r
   )\r
 {\r
-  return Value;\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
+\r
+  return FALSE;\r
 }\r
 \r
 \r
@@ -519,9 +539,9 @@ LibPcdSetEx8 (
   IN UINT8             Value\r
   )\r
 {\r
-  ASSERT (Guid != NULL);\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
 \r
-  return Value;\r
+  return 0;\r
 }\r
 \r
 \r
@@ -547,9 +567,9 @@ LibPcdSetEx16 (
   IN UINT16            Value\r
   )\r
 {\r
-  ASSERT (Guid != NULL);\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
 \r
-  return Value;\r
+  return 0;\r
 }\r
 \r
 \r
@@ -575,9 +595,9 @@ LibPcdSetEx32 (
   IN UINT32            Value\r
   )\r
 {\r
-  ASSERT (Guid != NULL);\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
 \r
-  return Value;\r
+  return 0;\r
 }\r
 \r
 \r
@@ -603,9 +623,9 @@ LibPcdSetEx64 (
   IN UINT64            Value\r
   )\r
 {\r
-  ASSERT (Guid != NULL);\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
 \r
-  return Value;\r
+  return 0;\r
 }\r
 \r
 \r
@@ -637,15 +657,9 @@ LibPcdSetExPtr (
   IN      VOID              *Buffer\r
   )\r
 {\r
-  ASSERT (Guid != NULL);\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
 \r
-  ASSERT (SizeOfBuffer != NULL);\r
-  \r
-  if (*SizeOfBuffer > 0) {\r
-    ASSERT (Buffer != NULL);\r
-  }\r
-\r
-  return Buffer;\r
+  return NULL;\r
 }\r
 \r
 \r
@@ -671,9 +685,9 @@ LibPcdSetExBool (
   IN BOOLEAN           Value\r
   )\r
 {\r
-  ASSERT (Guid != NULL);\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
 \r
-  return Value;\r
+  return FALSE;\r
 }\r
 \r
 \r
@@ -702,7 +716,7 @@ LibPcdCallbackOnSet (
   IN PCD_CALLBACK             NotificationFunction\r
   )\r
 {\r
-  ASSERT (NotificationFunction != NULL);\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
 }\r
 \r
 \r
@@ -726,7 +740,7 @@ LibPcdCancelCallback (
   IN PCD_CALLBACK             NotificationFunction\r
   )\r
 {\r
-  ASSERT (NotificationFunction != NULL);\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
 }\r
 \r
 \r
@@ -754,6 +768,8 @@ LibPcdGetNextToken (
   IN       UINTN              TokenNumber\r
   )\r
 {\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
+\r
   return 0;\r
 }\r
 \r
@@ -782,6 +798,8 @@ LibPcdGetNextTokenSpace (
   IN CONST GUID  *Guid\r
   )\r
 {\r
+  ASSERT_EFI_ERROR (EFI_UNSUPPORTED);\r
+\r
   return NULL;\r
 }\r
 \r

diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index f3fbc031c2b4ee6f6d8f8c29f28de86a3725e6ba..2e5e3278cd77325ab97aff6b162b9eae7a46000c 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -385,7 +385,7 @@
   MdeModulePkg/Core/Dxe/DxeMain.inf\r
   MdeModulePkg/Universal/PCD/Dxe/Pcd.inf {\r
     <LibraryClass>\r
-      PcdLib|MdeModulePkg/Library/PcdDriverPcdLibNull/PcdLib.inf\r
+      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
   }\r
   Nt32Pkg/MetronomeDxe/MetronomeDxe.inf\r
   Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf  \r