1) If DebugAssertEnabled is TRUE, we still need to provide the GET size

function as GetWorker and SetWoker need this function to do ASSERT.

2) 0 should be returned if GetSize is not supported.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1696 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qwang12 2006-10-10 02:17:53 +00:00
parent 0f769af196
commit 5f5f28c90d

View File

@ -101,7 +101,7 @@ PeiPcdSetSku (
UINT8 UINT8
EFIAPI EFIAPI
PeiPcdGet8 ( PeiPcdGet8 (
IN UINTN TokenNumber IN UINTN TokenNumber
) )
{ {
return *((UINT8 *) GetWorker (TokenNumber, sizeof (UINT8))); return *((UINT8 *) GetWorker (TokenNumber, sizeof (UINT8)));
@ -112,7 +112,7 @@ PeiPcdGet8 (
UINT16 UINT16
EFIAPI EFIAPI
PeiPcdGet16 ( PeiPcdGet16 (
IN UINTN TokenNumber IN UINTN TokenNumber
) )
{ {
return ReadUnaligned16 (GetWorker (TokenNumber, sizeof (UINT16))); return ReadUnaligned16 (GetWorker (TokenNumber, sizeof (UINT16)));
@ -123,7 +123,7 @@ PeiPcdGet16 (
UINT32 UINT32
EFIAPI EFIAPI
PeiPcdGet32 ( PeiPcdGet32 (
IN UINTN TokenNumber IN UINTN TokenNumber
) )
{ {
return ReadUnaligned32 (GetWorker (TokenNumber, sizeof (UINT32))); return ReadUnaligned32 (GetWorker (TokenNumber, sizeof (UINT32)));
@ -134,7 +134,7 @@ PeiPcdGet32 (
UINT64 UINT64
EFIAPI EFIAPI
PeiPcdGet64 ( PeiPcdGet64 (
IN UINTN TokenNumber IN UINTN TokenNumber
) )
{ {
return ReadUnaligned64 (GetWorker (TokenNumber, sizeof (UINT64))); return ReadUnaligned64 (GetWorker (TokenNumber, sizeof (UINT64)));
@ -145,7 +145,7 @@ PeiPcdGet64 (
VOID * VOID *
EFIAPI EFIAPI
PeiPcdGetPtr ( PeiPcdGetPtr (
IN UINTN TokenNumber IN UINTN TokenNumber
) )
{ {
return GetWorker (TokenNumber, 0); return GetWorker (TokenNumber, 0);
@ -156,7 +156,7 @@ PeiPcdGetPtr (
BOOLEAN BOOLEAN
EFIAPI EFIAPI
PeiPcdGetBool ( PeiPcdGetBool (
IN UINTN TokenNumber IN UINTN TokenNumber
) )
{ {
return *((BOOLEAN *) GetWorker (TokenNumber, sizeof (BOOLEAN))); return *((BOOLEAN *) GetWorker (TokenNumber, sizeof (BOOLEAN)));
@ -167,15 +167,20 @@ PeiPcdGetBool (
UINTN UINTN
EFIAPI EFIAPI
PeiPcdGetSize ( PeiPcdGetSize (
IN UINTN TokenNumber IN UINTN TokenNumber
) )
{ {
PEI_PCD_DATABASE *PeiPcdDb; PEI_PCD_DATABASE *PeiPcdDb;
UINTN Size; UINTN Size;
UINTN MaxSize; UINTN MaxSize;
if (!FeaturePcdGet(PcdPeiPcdDatabaseGetSizeEnabled)) { //
return EFI_UNSUPPORTED; // If DebugAssertEnabled is TRUE, we still need to provide the GET size
// function as GetWorker and SetWoker need this function to do ASSERT.
//
if ((!FeaturePcdGet(PcdPeiPcdDatabaseGetSizeEnabled)) &&
(!DebugAssertEnabled ())) {
return 0;
} }
PeiPcdDb = GetPcdDatabase (); PeiPcdDb = GetPcdDatabase ();
@ -209,8 +214,8 @@ PeiPcdGetSize (
UINT8 UINT8
EFIAPI EFIAPI
PeiPcdGet8Ex ( PeiPcdGet8Ex (
IN CONST EFI_GUID *Guid, IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber IN UINTN ExTokenNumber
) )
{ {
return *((UINT8 *) ExGetWorker (Guid, ExTokenNumber, sizeof (UINT8))); return *((UINT8 *) ExGetWorker (Guid, ExTokenNumber, sizeof (UINT8)));
@ -221,8 +226,8 @@ PeiPcdGet8Ex (
UINT16 UINT16
EFIAPI EFIAPI
PeiPcdGet16Ex ( PeiPcdGet16Ex (
IN CONST EFI_GUID *Guid, IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber IN UINTN ExTokenNumber
) )
{ {
return ReadUnaligned16 (ExGetWorker (Guid, ExTokenNumber, sizeof (UINT16))); return ReadUnaligned16 (ExGetWorker (Guid, ExTokenNumber, sizeof (UINT16)));
@ -233,8 +238,8 @@ PeiPcdGet16Ex (
UINT32 UINT32
EFIAPI EFIAPI
PeiPcdGet32Ex ( PeiPcdGet32Ex (
IN CONST EFI_GUID *Guid, IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber IN UINTN ExTokenNumber
) )
{ {
return ReadUnaligned32 (ExGetWorker (Guid, ExTokenNumber, sizeof (UINT32))); return ReadUnaligned32 (ExGetWorker (Guid, ExTokenNumber, sizeof (UINT32)));
@ -245,8 +250,8 @@ PeiPcdGet32Ex (
UINT64 UINT64
EFIAPI EFIAPI
PeiPcdGet64Ex ( PeiPcdGet64Ex (
IN CONST EFI_GUID *Guid, IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber IN UINTN ExTokenNumber
) )
{ {
return ReadUnaligned64 (ExGetWorker (Guid, ExTokenNumber, sizeof (UINT64))); return ReadUnaligned64 (ExGetWorker (Guid, ExTokenNumber, sizeof (UINT64)));
@ -257,8 +262,8 @@ PeiPcdGet64Ex (
VOID * VOID *
EFIAPI EFIAPI
PeiPcdGetPtrEx ( PeiPcdGetPtrEx (
IN CONST EFI_GUID *Guid, IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber IN UINTN ExTokenNumber
) )
{ {
return ExGetWorker (Guid, ExTokenNumber, 0); return ExGetWorker (Guid, ExTokenNumber, 0);
@ -269,8 +274,8 @@ PeiPcdGetPtrEx (
BOOLEAN BOOLEAN
EFIAPI EFIAPI
PeiPcdGetBoolEx ( PeiPcdGetBoolEx (
IN CONST EFI_GUID *Guid, IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber IN UINTN ExTokenNumber
) )
{ {
return *((BOOLEAN *) ExGetWorker (Guid, ExTokenNumber, sizeof (BOOLEAN))); return *((BOOLEAN *) ExGetWorker (Guid, ExTokenNumber, sizeof (BOOLEAN)));
@ -281,12 +286,12 @@ PeiPcdGetBoolEx (
UINTN UINTN
EFIAPI EFIAPI
PeiPcdGetSizeEx ( PeiPcdGetSizeEx (
IN CONST EFI_GUID *Guid, IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber IN UINTN ExTokenNumber
) )
{ {
if ((!FeaturePcdGet (PcdPeiPcdDatabaseGetSizeEnabled)) || !FeaturePcdGet (PcdPeiPcdDatabaseExEnabled)) { if ((!FeaturePcdGet (PcdPeiPcdDatabaseGetSizeEnabled)) || !FeaturePcdGet (PcdPeiPcdDatabaseExEnabled)) {
return EFI_UNSUPPORTED; return 0;
} }
return PeiPcdGetSize (GetExPcdTokenNumber (Guid, ExTokenNumber)); return PeiPcdGetSize (GetExPcdTokenNumber (Guid, ExTokenNumber));
@ -309,8 +314,8 @@ PeiPcdSet8 (
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
PeiPcdSet16 ( PeiPcdSet16 (
IN UINTN TokenNumber, IN UINTN TokenNumber,
IN UINT16 Value IN UINT16 Value
) )
{ {
return SetValueWorker (TokenNumber, &Value, sizeof (Value)); return SetValueWorker (TokenNumber, &Value, sizeof (Value));
@ -321,8 +326,8 @@ PeiPcdSet16 (
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
PeiPcdSet32 ( PeiPcdSet32 (
IN UINTN TokenNumber, IN UINTN TokenNumber,
IN UINT32 Value IN UINT32 Value
) )
{ {
return SetValueWorker (TokenNumber, &Value, sizeof (Value)); return SetValueWorker (TokenNumber, &Value, sizeof (Value));
@ -333,8 +338,8 @@ PeiPcdSet32 (
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
PeiPcdSet64 ( PeiPcdSet64 (
IN UINTN TokenNumber, IN UINTN TokenNumber,
IN UINT64 Value IN UINT64 Value
) )
{ {
return SetValueWorker (TokenNumber, &Value, sizeof (Value)); return SetValueWorker (TokenNumber, &Value, sizeof (Value));
@ -344,9 +349,9 @@ PeiPcdSet64 (
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
PeiPcdSetPtr ( PeiPcdSetPtr (
IN UINTN TokenNumber, IN UINTN TokenNumber,
IN OUT UINTN *SizeOfBuffer, IN OUT UINTN *SizeOfBuffer,
IN VOID *Buffer IN VOID *Buffer
) )
{ {
return SetWorker (TokenNumber, Buffer, SizeOfBuffer, TRUE); return SetWorker (TokenNumber, Buffer, SizeOfBuffer, TRUE);
@ -357,8 +362,8 @@ PeiPcdSetPtr (
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
PeiPcdSetBool ( PeiPcdSetBool (
IN UINTN TokenNumber, IN UINTN TokenNumber,
IN BOOLEAN Value IN BOOLEAN Value
) )
{ {
return SetValueWorker (TokenNumber, &Value, sizeof (Value)); return SetValueWorker (TokenNumber, &Value, sizeof (Value));
@ -369,9 +374,9 @@ PeiPcdSetBool (
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
PeiPcdSet8Ex ( PeiPcdSet8Ex (
IN CONST EFI_GUID *Guid, IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber, IN UINTN ExTokenNumber,
IN UINT8 Value IN UINT8 Value
) )
{ {
return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value)); return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));
@ -382,9 +387,9 @@ PeiPcdSet8Ex (
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
PeiPcdSet16Ex ( PeiPcdSet16Ex (
IN CONST EFI_GUID *Guid, IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber, IN UINTN ExTokenNumber,
IN UINT16 Value IN UINT16 Value
) )
{ {
return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value)); return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));
@ -395,9 +400,9 @@ PeiPcdSet16Ex (
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
PeiPcdSet32Ex ( PeiPcdSet32Ex (
IN CONST EFI_GUID *Guid, IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber, IN UINTN ExTokenNumber,
IN UINT32 Value IN UINT32 Value
) )
{ {
return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value)); return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));
@ -408,9 +413,9 @@ PeiPcdSet32Ex (
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
PeiPcdSet64Ex ( PeiPcdSet64Ex (
IN CONST EFI_GUID *Guid, IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber, IN UINTN ExTokenNumber,
IN UINT64 Value IN UINT64 Value
) )
{ {
return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value)); return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));
@ -421,10 +426,10 @@ PeiPcdSet64Ex (
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
PeiPcdSetPtrEx ( PeiPcdSetPtrEx (
IN CONST EFI_GUID *Guid, IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber, IN UINTN ExTokenNumber,
IN UINTN *SizeOfBuffer, IN UINTN *SizeOfBuffer,
IN VOID *Value IN VOID *Value
) )
{ {
return ExSetWorker (ExTokenNumber, Guid, Value, SizeOfBuffer, TRUE); return ExSetWorker (ExTokenNumber, Guid, Value, SizeOfBuffer, TRUE);
@ -435,9 +440,9 @@ PeiPcdSetPtrEx (
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
PeiPcdSetBoolEx ( PeiPcdSetBoolEx (
IN CONST EFI_GUID *Guid, IN CONST EFI_GUID *Guid,
IN UINTN ExTokenNumber, IN UINTN ExTokenNumber,
IN BOOLEAN Value IN BOOLEAN Value
) )
{ {
return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value)); return ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));
@ -583,7 +588,7 @@ PeiPcdGetNextToken (
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
PeiPcdGetNextTokenSpace ( PeiPcdGetNextTokenSpace (
IN OUT CONST EFI_GUID **Guid IN OUT CONST EFI_GUID **Guid
) )
{ {
UINTN GuidTableIdx; UINTN GuidTableIdx;