From cdebf6c68a11e3e41943825049d415c64e49555a Mon Sep 17 00:00:00 2001 From: yshang1 Date: Wed, 15 Aug 2007 06:17:29 +0000 Subject: [PATCH] 1) Add type casting for argument "a" in EFI_ERROR(a), since if compare two constants without specify data type, compiler maybe could not understand what is the actual data type of constant. The default would treat it as unsigned data. therefore, if the argument a of EFI_ERROR(a) is constant, for instance the EFI_LOAD_ERROR, the EFI_ERROR(a) would always be FALSE. 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 --- .../Library/PcdDriverPcdLibNull/PcdLib.c | 836 ------------------ .../Library/PcdDriverPcdLibNull/PcdLib.inf | 51 -- MdePkg/Include/Base.h | 2 +- MdePkg/Library/BasePcdLibNull/PcdLib.c | 98 +- Nt32Pkg/Nt32Pkg.dsc | 2 +- 5 files changed, 60 insertions(+), 929 deletions(-) delete mode 100644 MdeModulePkg/Library/PcdDriverPcdLibNull/PcdLib.c delete mode 100644 MdeModulePkg/Library/PcdDriverPcdLibNull/PcdLib.inf diff --git a/MdeModulePkg/Library/PcdDriverPcdLibNull/PcdLib.c b/MdeModulePkg/Library/PcdDriverPcdLibNull/PcdLib.c deleted file mode 100644 index b7d4408123..0000000000 --- a/MdeModulePkg/Library/PcdDriverPcdLibNull/PcdLib.c +++ /dev/null @@ -1,836 +0,0 @@ -/** @file - A emptry template implementation of PCD Library. - - Copyright (c) 2006, Intel Corporation - All rights reserved. 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 - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - - Module Name: PcdLib.c - -**/ -#include -#include -#include -#include - - -/** - Sets the current SKU in the PCD database to the value specified by SkuId. SkuId is returned. - - @param[in] SkuId The SKU value that will be used when the PCD service will retrieve and - set values associated with a PCD token. - - @retval SKU_ID Return the SKU ID that just be set. - -**/ -UINTN -EFIAPI -LibPcdSetSku ( - IN UINTN SkuId - ) -{ - ASSERT (SkuId < 0x100); - - return SkuId; -} - - - -/** - Returns the 8-bit value for the token specified by TokenNumber. - - @param[in] The PCD token number to retrieve a current value for. - - @retval UINT8 Returns the 8-bit value for the token specified by TokenNumber. - -**/ -UINT8 -EFIAPI -LibPcdGet8 ( - IN UINTN TokenNumber - ) -{ - return 0; -} - - - -/** - Returns the 16-bit value for the token specified by TokenNumber. - - @param[in] The PCD token number to retrieve a current value for. - - @retval UINT16 Returns the 16-bit value for the token specified by TokenNumber. - -**/ -UINT16 -EFIAPI -LibPcdGet16 ( - IN UINTN TokenNumber - ) -{ - return 0; -} - - - -/** - Returns the 32-bit value for the token specified by TokenNumber. - - @param[in] TokenNumber The PCD token number to retrieve a current value for. - - @retval UINT32 Returns the 32-bit value for the token specified by TokenNumber. - -**/ -UINT32 -EFIAPI -LibPcdGet32 ( - IN UINTN TokenNumber - ) -{ - return 0; -} - - - -/** - Returns the 64-bit value for the token specified by TokenNumber. - - @param[in] TokenNumber The PCD token number to retrieve a current value for. - - @retval UINT64 Returns the 64-bit value for the token specified by TokenNumber. - -**/ -UINT64 -EFIAPI -LibPcdGet64 ( - IN UINTN TokenNumber - ) -{ - return 0; -} - - - -/** - Returns the pointer to the buffer of the token specified by TokenNumber. - - @param[in] TokenNumber The PCD token number to retrieve a current value for. - - @retval VOID* Returns the pointer to the token specified by TokenNumber. - -**/ -VOID * -EFIAPI -LibPcdGetPtr ( - IN UINTN TokenNumber - ) -{ - return 0; -} - - - -/** - Returns the Boolean value of the token specified by TokenNumber. - - @param[in] TokenNumber The PCD token number to retrieve a current value for. - - @retval BOOLEAN Returns the Boolean value of the token specified by TokenNumber. - -**/ -BOOLEAN -EFIAPI -LibPcdGetBool ( - IN UINTN TokenNumber - ) -{ - return 0; -} - - - -/** - Returns the size of the token specified by TokenNumber. - - @param[in] TokenNumber The PCD token number to retrieve a current value for. - - @retval UINTN Returns the size of the token specified by TokenNumber. - -**/ -UINTN -EFIAPI -LibPcdGetSize ( - IN UINTN TokenNumber - ) -{ - return 0; -} - - - -/** - Returns the 8-bit value for the token specified by TokenNumber and Guid. - If Guid is NULL, then ASSERT(). - - @param[in] Guid Pointer to a 128-bit unique value that designates - which namespace to retrieve a value from. - @param[in] TokenNumber The PCD token number to retrieve a current value for. - - @retval UINT8 Return the UINT8. - -**/ -UINT8 -EFIAPI -LibPcdGetEx8 ( - IN CONST GUID *Guid, - IN UINTN TokenNumber - ) -{ - ASSERT (Guid != NULL); - - return 0; -} - - - -/** - Returns the 16-bit value for the token specified by TokenNumber and Guid. - If Guid is NULL, then ASSERT(). - - @param[in] Guid Pointer to a 128-bit unique value that designates - which namespace to retrieve a value from. - @param[in] TokenNumber The PCD token number to retrieve a current value for. - - @retval UINT16 Return the UINT16. - -**/ -UINT16 -EFIAPI -LibPcdGetEx16 ( - IN CONST GUID *Guid, - IN UINTN TokenNumber - ) -{ - ASSERT (Guid != NULL); - - return 0; -} - - - -/** - Returns the 32-bit value for the token specified by TokenNumber and Guid. - If Guid is NULL, then ASSERT(). - - @param[in] Guid Pointer to a 128-bit unique value that designates - which namespace to retrieve a value from. - @param[in] TokenNumber The PCD token number to retrieve a current value for. - - @retval UINT32 Return the UINT32. - -**/ -UINT32 -EFIAPI -LibPcdGetEx32 ( - IN CONST GUID *Guid, - IN UINTN TokenNumber - ) -{ - ASSERT (Guid != NULL); - - return 0; -} - - - -/** - Returns the 64-bit value for the token specified by TokenNumber and Guid. - If Guid is NULL, then ASSERT(). - - @param[in] Guid Pointer to a 128-bit unique value that designates - which namespace to retrieve a value from. - @param[in] TokenNumber The PCD token number to retrieve a current value for. - - @retval UINT64 Return the UINT64. - -**/ -UINT64 -EFIAPI -LibPcdGetEx64 ( - IN CONST GUID *Guid, - IN UINTN TokenNumber - ) -{ - ASSERT (Guid != NULL); - - return 0; -} - - - -/** - Returns the pointer to the buffer of the token specified by TokenNumber and Guid. - If Guid is NULL, then ASSERT(). - - @param[in] Guid Pointer to a 128-bit unique value that designates - which namespace to retrieve a value from. - @param[in] TokenNumber The PCD token number to retrieve a current value for. - - @retval VOID* Return the VOID* pointer. - -**/ -VOID * -EFIAPI -LibPcdGetExPtr ( - IN CONST GUID *Guid, - IN UINTN TokenNumber - ) -{ - ASSERT (Guid != NULL); - - return 0; -} - - - -/** - Returns the Boolean value of the token specified by TokenNumber and Guid. - If Guid is NULL, then ASSERT(). - - @param[in] Guid Pointer to a 128-bit unique value that designates - which namespace to retrieve a value from. - @param[in] TokenNumber The PCD token number to retrieve a current value for. - - @retval BOOLEAN Return the BOOLEAN. - -**/ -BOOLEAN -EFIAPI -LibPcdGetExBool ( - IN CONST GUID *Guid, - IN UINTN TokenNumber - ) -{ - ASSERT (Guid != NULL); - - return 0; -} - - - -/** - Returns the size of the token specified by TokenNumber and Guid. - If Guid is NULL, then ASSERT(). - - @param[in] Guid Pointer to a 128-bit unique value that designates - which namespace to retrieve a value from. - @param[in] TokenNumber The PCD token number to retrieve a current value for. - - @retval UINTN Return the size. - -**/ -UINTN -EFIAPI -LibPcdGetExSize ( - IN CONST GUID *Guid, - IN UINTN TokenNumber - ) -{ - ASSERT (Guid != NULL); - - return 0; -} - - - -/** - Sets the 8-bit value for the token specified by TokenNumber - to the value specified by Value. Value is returned. - - @param[in] TokenNumber The PCD token number to set a current value for. - @param[in] Value The 8-bit value to set. - - @retval UINT8 Return the value been set. - -**/ -UINT8 -EFIAPI -LibPcdSet8 ( - IN UINTN TokenNumber, - IN UINT8 Value - ) -{ - return Value; -} - - - -/** - Sets the 16-bit value for the token specified by TokenNumber - to the value specified by Value. Value is returned. - - @param[in] TokenNumber The PCD token number to set a current value for. - @param[in] Value The 16-bit value to set. - - @retval UINT16 Return the value been set. - -**/ -UINT16 -EFIAPI -LibPcdSet16 ( - IN UINTN TokenNumber, - IN UINT16 Value - ) -{ - return Value; -} - - - -/** - Sets the 32-bit value for the token specified by TokenNumber - to the value specified by Value. Value is returned. - - @param[in] TokenNumber The PCD token number to set a current value for. - @param[in] Value The 32-bit value to set. - - @retval UINT32 Return the value been set. - -**/ -UINT32 -EFIAPI -LibPcdSet32 ( - IN UINTN TokenNumber, - IN UINT32 Value - ) -{ - return Value; -} - - - -/** - Sets the 64-bit value for the token specified by TokenNumber - to the value specified by Value. Value is returned. - - @param[in] TokenNumber The PCD token number to set a current value for. - @param[in] Value The 64-bit value to set. - - @retval UINT64 Return the value been set. - -**/ -UINT64 -EFIAPI -LibPcdSet64 ( - IN UINTN TokenNumber, - IN UINT64 Value - ) -{ - return Value; -} - - - -/** - Sets a buffer for the token specified by TokenNumber to - the value specified by Buffer and SizeOfValue. Buffer to - be set is returned. The content of the buffer could be - overwritten if a Callback on SET is registered with this - TokenNumber. - - If SizeOfValue is greater than the maximum - size support by TokenNumber, then set SizeOfValue to the - maximum size supported by TokenNumber and return NULL to - indicate that the set operation was not actually performed. - - If SizeOfValue > 0 and Buffer is NULL, then ASSERT(). - - @param[in] TokenNumber The PCD token number to set a current value for. - @param[in,out] SizeOfBuffer The size, in bytes, of Buffer. - @param[in] Value A pointer to the buffer to set. - - @retval VOID* Return the pointer for the buffer been set. - -**/ -VOID * -EFIAPI -LibPcdSetPtr ( - IN UINTN TokenNumber, - IN OUT UINTN *SizeOfBuffer, - IN VOID *Buffer - ) -{ - ASSERT (SizeOfBuffer != NULL); - - if (*SizeOfBuffer > 0) { - ASSERT (Buffer != NULL); - } - - return Buffer; -} - - - -/** - Sets the Boolean value for the token specified by TokenNumber - to the value specified by Value. Value is returned. - - @param[in] TokenNumber The PCD token number to set a current value for. - @param[in] Value The boolean value to set. - - @retval BOOLEAN Return the value been set. - -**/ -BOOLEAN -EFIAPI -LibPcdSetBool ( - IN UINTN TokenNumber, - IN BOOLEAN Value - ) -{ - return Value; -} - - - -/** - Sets the 8-bit value for the token specified by TokenNumber and - Guid to the value specified by Value. Value is returned. - If Guid is NULL, then ASSERT(). - - @param[in] Guid Pointer to a 128-bit unique value that - designates which namespace to set a value from. - @param[in] TokenNumber The PCD token number to set a current value for. - @param[in] Value The 8-bit value to set. - - @retval UINT8 Return the value been set. - -**/ -UINT8 -EFIAPI -LibPcdSetEx8 ( - IN CONST GUID *Guid, - IN UINTN TokenNumber, - IN UINT8 Value - ) -{ - ASSERT (Guid != NULL); - - return Value; -} - - - -/** - Sets the 16-bit value for the token specified by TokenNumber and - Guid to the value specified by Value. Value is returned. - If Guid is NULL, then ASSERT(). - - @param[in] Guid Pointer to a 128-bit unique value that - designates which namespace to set a value from. - @param[in] TokenNumber The PCD token number to set a current value for. - @param[in] Value The 16-bit value to set. - - @retval UINT8 Return the value been set. - -**/ -UINT16 -EFIAPI -LibPcdSetEx16 ( - IN CONST GUID *Guid, - IN UINTN TokenNumber, - IN UINT16 Value - ) -{ - ASSERT (Guid != NULL); - - return Value; -} - - - -/** - Sets the 32-bit value for the token specified by TokenNumber and - Guid to the value specified by Value. Value is returned. - If Guid is NULL, then ASSERT(). - - @param[in] Guid Pointer to a 128-bit unique value that - designates which namespace to set a value from. - @param[in] TokenNumber The PCD token number to set a current value for. - @param[in] Value The 32-bit value to set. - - @retval UINT32 Return the value been set. - -**/ -UINT32 -EFIAPI -LibPcdSetEx32 ( - IN CONST GUID *Guid, - IN UINTN TokenNumber, - IN UINT32 Value - ) -{ - ASSERT (Guid != NULL); - - return Value; -} - - - -/** - Sets the 64-bit value for the token specified by TokenNumber and - Guid to the value specified by Value. Value is returned. - If Guid is NULL, then ASSERT(). - - @param[in] Guid Pointer to a 128-bit unique value that - designates which namespace to set a value from. - @param[in] TokenNumber The PCD token number to set a current value for. - @param[in] Value The 64-bit value to set. - - @retval UINT64 Return the value been set. - -**/ -UINT64 -EFIAPI -LibPcdSetEx64 ( - IN CONST GUID *Guid, - IN UINTN TokenNumber, - IN UINT64 Value - ) -{ - ASSERT (Guid != NULL); - - return Value; -} - - - -/** - Sets a buffer for the token specified by TokenNumber to the value specified by - Buffer and SizeOfValue. Buffer is returned. If SizeOfValue is greater than - the maximum size support by TokenNumber, then set SizeOfValue to the maximum size - supported by TokenNumber and return NULL to indicate that the set operation - was not actually performed. - - If SizeOfValue > 0 and Buffer is NULL, then ASSERT(). - - @param[in] Guid Pointer to a 128-bit unique value that - designates which namespace to set a value from. - @param[in] TokenNumber The PCD token number to set a current value for. - @param[in, out] SizeOfBuffer The size, in bytes, of Buffer. - @param[in] Buffer A pointer to the buffer to set. - - @retval VOID * Return the pinter to the buffer been set. - -**/ -VOID * -EFIAPI -LibPcdSetExPtr ( - IN CONST GUID *Guid, - IN UINTN TokenNumber, - IN OUT UINTN *SizeOfBuffer, - IN VOID *Buffer - ) -{ - ASSERT (Guid != NULL); - - ASSERT (SizeOfBuffer != NULL); - - if (*SizeOfBuffer > 0) { - ASSERT (Buffer != NULL); - } - - return Buffer; -} - - - -/** - Sets the Boolean value for the token specified by TokenNumber and - Guid to the value specified by Value. Value is returned. - If Guid is NULL, then ASSERT(). - - @param[in] Guid Pointer to a 128-bit unique value that - designates which namespace to set a value from. - @param[in] TokenNumber The PCD token number to set a current value for. - @param[in] Value The Boolean value to set. - - @retval Boolean Return the value been set. - -**/ -BOOLEAN -EFIAPI -LibPcdSetExBool ( - IN CONST GUID *Guid, - IN UINTN TokenNumber, - IN BOOLEAN Value - ) -{ - ASSERT (Guid != NULL); - - return Value; -} - - - -/** - When the token specified by TokenNumber and Guid is set, - then notification function specified by NotificationFunction is called. - If Guid is NULL, then the default token space is used. - If NotificationFunction is NULL, then ASSERT(). - - @param[in] Guid Pointer to a 128-bit unique value that designates which - namespace to set a value from. If NULL, then the default - token space is used. - @param[in] TokenNumber The PCD token number to monitor. - @param[in] NotificationFunction The function to call when the token - specified by Guid and TokenNumber is set. - - @retval VOID - -**/ -VOID -EFIAPI -LibPcdCallbackOnSet ( - IN CONST GUID *Guid, OPTIONAL - IN UINTN TokenNumber, - IN PCD_CALLBACK NotificationFunction - ) -{ - ASSERT (NotificationFunction != NULL); -} - - - -/** - Disable a notification function that was established with LibPcdCallbackonSet(). - If NotificationFunction is NULL, then ASSERT(). - - @param[in] Guid Specify the GUID token space. - @param[in] TokenNumber Specify the token number. - @param[in] NotificationFunction The callback function to be unregistered. - - @retval VOID - -**/ -VOID -EFIAPI -LibPcdCancelCallback ( - IN CONST GUID *Guid, OPTIONAL - IN UINTN TokenNumber, - IN PCD_CALLBACK NotificationFunction - ) -{ - ASSERT (NotificationFunction != NULL); -} - - - -/** - Retrieves the next PCD token number from the token space specified by Guid. - If Guid is NULL, then the default token space is used. If TokenNumber is 0, - then the first token number is returned. Otherwise, the token number that - follows TokenNumber in the token space is returned. If TokenNumber is the last - token number in the token space, then 0 is returned. If TokenNumber is not 0 and - is not in the token space specified by Guid, then ASSERT(). - - @param[in] Pointer to a 128-bit unique value that designates which namespace - to set a value from. If NULL, then the default token space is used. - @param[in] The previous PCD token number. If 0, then retrieves the first PCD - token number. - - @retval UINTN The next valid token number. - -**/ -UINTN -EFIAPI -LibPcdGetNextToken ( - IN CONST GUID *Guid, OPTIONAL - IN UINTN TokenNumber - ) -{ - return 0; -} - - - -/** - Retrieves the next PCD token space from a token space specified by Guid. - Guid of NULL is reserved to mark the default local token namespace on the current - platform. If Guid is NULL, then the GUID of the first non-local token space of the - current platform is returned. If Guid is the last non-local token space, - then NULL is returned. - - If Guid is not NULL and is not a valid token space in the current platform, then ASSERT(). - - - - @param[in] Pointer to a 128-bit unique value that designates from which namespace - to start the search. - - @retval CONST GUID * The next valid token namespace. - -**/ -GUID * -EFIAPI -LibPcdGetNextTokenSpace ( - IN CONST GUID *Guid - ) -{ - return NULL; -} - - - -/** - Sets the PCD entry specified by PatchVariable to the value specified by Buffer - and SizeOfValue. Buffer is returned. If SizeOfValue is greater than - MaximumDatumSize, then set SizeOfValue to MaximumDatumSize and return - NULL to indicate that the set operation was not actually performed. - If SizeOfValue is set to MAX_ADDRESS, then SizeOfValue must be set to - MaximumDatumSize and NULL must be returned. - - If PatchVariable is NULL, then ASSERT(). - If SizeOfValue is NULL, then ASSERT(). - If SizeOfValue > 0 and Buffer is NULL, then ASSERT(). - - @param[in] PatchVariable A pointer to the global variable in a module that is - the target of the set operation. - @param[in] MaximumDatumSize The maximum size allowed for the PCD entry specified by PatchVariable. - @param[in, out] SizeOfBuffer A pointer to the size, in bytes, of Buffer. - @param[in] Buffer A pointer to the buffer to used to set the target variable. - -**/ -VOID * -EFIAPI -LibPatchPcdSetPtr ( - IN VOID *PatchVariable, - IN UINTN MaximumDatumSize, - IN OUT UINTN *SizeOfBuffer, - IN CONST VOID *Buffer - ) -{ - ASSERT (PatchVariable != NULL); - ASSERT (SizeOfBuffer != NULL); - - if (*SizeOfBuffer > 0) { - ASSERT (Buffer != NULL); - } - - if ((*SizeOfBuffer > MaximumDatumSize) || - (*SizeOfBuffer == MAX_ADDRESS)) { - *SizeOfBuffer = MaximumDatumSize; - return NULL; - } - - CopyMem (PatchVariable, Buffer, *SizeOfBuffer); - - return (VOID *) Buffer; -} - diff --git a/MdeModulePkg/Library/PcdDriverPcdLibNull/PcdLib.inf b/MdeModulePkg/Library/PcdDriverPcdLibNull/PcdLib.inf deleted file mode 100644 index 05c20dfb6e..0000000000 --- a/MdeModulePkg/Library/PcdDriverPcdLibNull/PcdLib.inf +++ /dev/null @@ -1,51 +0,0 @@ -#/** @file -# PCD Library instance implemented with PCD Protocol -# -# This library instance implement the APIs listed -# in PCD library class defined in MDE library specification. -# It is used by modules in DXE phase. -# Copyright (c) 2007, Intel Corporation. -# -# All rights reserved. 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 -# http://opensource.org/licenses/bsd-license.php -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -# -# -#**/ - -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = PcdDriverPcdLib - FILE_GUID = 40096a3a-5c2a-4fbc-aef7-5475dd7ab334 - MODULE_TYPE = DXE_DRIVER - VERSION_STRING = 1.0 - LIBRARY_CLASS = PcdLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER - EDK_RELEASE_VERSION = 0x00020000 - EFI_SPECIFICATION_VERSION = 0x00020000 - -# -# The following information is for reference only and not required by the build tools. -# -# VALID_ARCHITECTURES = IA32 X64 IPF EBC -# - -[Sources.common] - PcdLib.c - - -[Packages] - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec - -[LibraryClasses] - BaseMemoryLib - UefiBootServicesTableLib - DebugLib - - -[Protocols] - gPcdProtocolGuid # PROTOCOL ALWAYS_CONSUMED - diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h index 15ee9ad89a..c5cf6f38d5 100644 --- 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)) #define ENCODE_WARNING(a) (a) -#define RETURN_ERROR(a) ((a) < 0) +#define RETURN_ERROR(a) ((INTN) (a) < 0) #define RETURN_SUCCESS 0 #define RETURN_LOAD_ERROR ENCODE_ERROR (1) diff --git a/MdePkg/Library/BasePcdLibNull/PcdLib.c b/MdePkg/Library/BasePcdLibNull/PcdLib.c index aba7920baf..ec7101e600 100644 --- a/MdePkg/Library/BasePcdLibNull/PcdLib.c +++ b/MdePkg/Library/BasePcdLibNull/PcdLib.c @@ -33,9 +33,9 @@ LibPcdSetSku ( IN UINTN SkuId ) { - ASSERT (SkuId < 0x100); + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); - return SkuId; + return 0; } @@ -54,6 +54,8 @@ LibPcdGet8 ( IN UINTN TokenNumber ) { + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); + return 0; } @@ -73,6 +75,8 @@ LibPcdGet16 ( IN UINTN TokenNumber ) { + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); + return 0; } @@ -92,6 +96,8 @@ LibPcdGet32 ( IN UINTN TokenNumber ) { + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); + return 0; } @@ -111,6 +117,8 @@ LibPcdGet64 ( IN UINTN TokenNumber ) { + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); + return 0; } @@ -130,6 +138,8 @@ LibPcdGetPtr ( IN UINTN TokenNumber ) { + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); + return 0; } @@ -149,6 +159,8 @@ LibPcdGetBool ( IN UINTN TokenNumber ) { + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); + return 0; } @@ -168,6 +180,8 @@ LibPcdGetSize ( IN UINTN TokenNumber ) { + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); + return 0; } @@ -191,7 +205,7 @@ LibPcdGetEx8 ( IN UINTN TokenNumber ) { - ASSERT (Guid != NULL); + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); return 0; } @@ -216,7 +230,7 @@ LibPcdGetEx16 ( IN UINTN TokenNumber ) { - ASSERT (Guid != NULL); + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); return 0; } @@ -241,7 +255,7 @@ LibPcdGetEx32 ( IN UINTN TokenNumber ) { - ASSERT (Guid != NULL); + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); return 0; } @@ -266,7 +280,7 @@ LibPcdGetEx64 ( IN UINTN TokenNumber ) { - ASSERT (Guid != NULL); + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); return 0; } @@ -291,7 +305,7 @@ LibPcdGetExPtr ( IN UINTN TokenNumber ) { - ASSERT (Guid != NULL); + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); return 0; } @@ -316,7 +330,7 @@ LibPcdGetExBool ( IN UINTN TokenNumber ) { - ASSERT (Guid != NULL); + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); return 0; } @@ -341,7 +355,7 @@ LibPcdGetExSize ( IN UINTN TokenNumber ) { - ASSERT (Guid != NULL); + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); return 0; } @@ -365,7 +379,9 @@ LibPcdSet8 ( IN UINT8 Value ) { - return Value; + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); + + return 0; } @@ -387,7 +403,9 @@ LibPcdSet16 ( IN UINT16 Value ) { - return Value; + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); + + return 0; } @@ -409,7 +427,9 @@ LibPcdSet32 ( IN UINT32 Value ) { - return Value; + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); + + return 0; } @@ -431,7 +451,9 @@ LibPcdSet64 ( IN UINT64 Value ) { - return Value; + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); + + return 0; } @@ -465,13 +487,9 @@ LibPcdSetPtr ( IN VOID *Buffer ) { - ASSERT (SizeOfBuffer != NULL); - - if (*SizeOfBuffer > 0) { - ASSERT (Buffer != NULL); - } + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); - return Buffer; + return NULL; } @@ -493,7 +511,9 @@ LibPcdSetBool ( IN BOOLEAN Value ) { - return Value; + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); + + return FALSE; } @@ -519,9 +539,9 @@ LibPcdSetEx8 ( IN UINT8 Value ) { - ASSERT (Guid != NULL); + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); - return Value; + return 0; } @@ -547,9 +567,9 @@ LibPcdSetEx16 ( IN UINT16 Value ) { - ASSERT (Guid != NULL); + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); - return Value; + return 0; } @@ -575,9 +595,9 @@ LibPcdSetEx32 ( IN UINT32 Value ) { - ASSERT (Guid != NULL); + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); - return Value; + return 0; } @@ -603,9 +623,9 @@ LibPcdSetEx64 ( IN UINT64 Value ) { - ASSERT (Guid != NULL); + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); - return Value; + return 0; } @@ -637,15 +657,9 @@ LibPcdSetExPtr ( IN VOID *Buffer ) { - ASSERT (Guid != NULL); + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); - ASSERT (SizeOfBuffer != NULL); - - if (*SizeOfBuffer > 0) { - ASSERT (Buffer != NULL); - } - - return Buffer; + return NULL; } @@ -671,9 +685,9 @@ LibPcdSetExBool ( IN BOOLEAN Value ) { - ASSERT (Guid != NULL); + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); - return Value; + return FALSE; } @@ -702,7 +716,7 @@ LibPcdCallbackOnSet ( IN PCD_CALLBACK NotificationFunction ) { - ASSERT (NotificationFunction != NULL); + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); } @@ -726,7 +740,7 @@ LibPcdCancelCallback ( IN PCD_CALLBACK NotificationFunction ) { - ASSERT (NotificationFunction != NULL); + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); } @@ -754,6 +768,8 @@ LibPcdGetNextToken ( IN UINTN TokenNumber ) { + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); + return 0; } @@ -782,6 +798,8 @@ LibPcdGetNextTokenSpace ( IN CONST GUID *Guid ) { + ASSERT_EFI_ERROR (EFI_UNSUPPORTED); + return NULL; } diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc index f3fbc031c2..2e5e3278cd 100644 --- a/Nt32Pkg/Nt32Pkg.dsc +++ b/Nt32Pkg/Nt32Pkg.dsc @@ -385,7 +385,7 @@ MdeModulePkg/Core/Dxe/DxeMain.inf MdeModulePkg/Universal/PCD/Dxe/Pcd.inf { - PcdLib|MdeModulePkg/Library/PcdDriverPcdLibNull/PcdLib.inf + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf } Nt32Pkg/MetronomeDxe/MetronomeDxe.inf Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf -- 2.39.2