Add Pcd Protocol in [Depex] section and add back the constructor since PCD protocol...

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

diff --git a/MdePkg/Library/DxePcdLib/DxePcdLib.c b/MdePkg/Library/DxePcdLib/DxePcdLib.c
index cfde03a210869c06dadabf9a95d52f268f61c17d..e780bd32a24d0b3a4103388177767e3767599310 100644 (file)
--- a/MdePkg/Library/DxePcdLib/DxePcdLib.c
+++ b/MdePkg/Library/DxePcdLib/DxePcdLib.c
@@ -25,38 +25,34 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 PCD_PROTOCOL  *mPcd = NULL;\r
 \r
-/**\r
-  Retrieves PCD protocol interface.\r
 \r
-  This function retrieves PCD protocol interface. On the first invocation, it\r
-  retrieves protocol interface via UEFI boot services and cache it to accelarte\r
-  further access. A module invokes this function only when it needs to access a\r
-  dynamic PCD entry.\r
-  If UefiBootServicesTableLib has not been initialized, then ASSERT ().\r
-  If PCD protocol has not been installed, then ASSERT ().\r
+/**\r
+  The constructor function caches the PCD_PROTOCOL pointer.\r
 \r
-  @return mPcd  The PCD protocol protocol interface.\r
+  @param[in] ImageHandle The firmware allocated handle for the EFI image.  \r
+  @param[in] SystemTable A pointer to the EFI System Table.\r
+  \r
+  @retval EFI_SUCCESS The constructor always return EFI_SUCCESS.\r
 \r
 **/\r
-PCD_PROTOCOL*\r
-GetPcdProtocol (\r
-  VOID\r
+EFI_STATUS\r
+EFIAPI\r
+PcdLibConstructor (\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   EFI_STATUS  Status;\r
 \r
-  if (mPcd == NULL) {\r
-    ASSERT (gBS != NULL);\r
-    //\r
-    // PCD protocol has not been installed, but a module needs to access a\r
-    // dynamic PCD entry.\r
-    // \r
-    Status = gBS->LocateProtocol (&gPcdProtocolGuid, NULL, (VOID **)&mPcd);\r
-    ASSERT_EFI_ERROR (Status);\r
-    ASSERT (mPcd!= NULL);\r
-  }\r
+  //\r
+  // PCD protocol has not been installed, but a module needs to access a\r
+  // dynamic PCD entry.\r
+  // \r
+  Status = gBS->LocateProtocol (&gPcdProtocolGuid, NULL, (VOID **)&mPcd);\r
+  ASSERT_EFI_ERROR (Status);\r
+  ASSERT (mPcd!= NULL);\r
 \r
-  return mPcd;\r
+  return Status;\r
 }\r
 \r
 \r
@@ -78,7 +74,7 @@ LibPcdSetSku (
 {\r
   ASSERT (SkuId < PCD_MAX_SKU_ID);\r
 \r
-  (GetPcdProtocol ())->SetSku (SkuId);\r
+  mPcd->SetSku (SkuId);\r
 \r
   return SkuId;\r
 }\r
@@ -99,7 +95,7 @@ LibPcdGet8 (
   IN UINTN             TokenNumber\r
   )\r
 {\r
-  return (GetPcdProtocol ())->Get8 (TokenNumber);\r
+  return mPcd->Get8 (TokenNumber);\r
 }\r
 \r
 \r
@@ -118,7 +114,7 @@ LibPcdGet16 (
   IN UINTN             TokenNumber\r
   )\r
 {\r
-  return (GetPcdProtocol ())->Get16 (TokenNumber);\r
+  return mPcd->Get16 (TokenNumber);\r
 }\r
 \r
 \r
@@ -137,7 +133,7 @@ LibPcdGet32 (
   IN UINTN             TokenNumber\r
   )\r
 {\r
-  return (GetPcdProtocol ())->Get32 (TokenNumber);\r
+  return mPcd->Get32 (TokenNumber);\r
 }\r
 \r
 \r
@@ -156,7 +152,7 @@ LibPcdGet64 (
   IN UINTN             TokenNumber\r
   )\r
 {\r
-  return (GetPcdProtocol ())->Get64 (TokenNumber);\r
+  return mPcd->Get64 (TokenNumber);\r
 }\r
 \r
 \r
@@ -175,7 +171,7 @@ LibPcdGetPtr (
   IN UINTN             TokenNumber\r
   )\r
 {\r
-  return (GetPcdProtocol ())->GetPtr (TokenNumber);\r
+  return mPcd->GetPtr (TokenNumber);\r
 }\r
 \r
 \r
@@ -194,7 +190,7 @@ LibPcdGetBool (
   IN UINTN             TokenNumber\r
   )\r
 {\r
-  return (GetPcdProtocol ())->GetBool (TokenNumber);\r
+  return mPcd->GetBool (TokenNumber);\r
 }\r
 \r
 \r
@@ -213,7 +209,7 @@ LibPcdGetSize (
   IN UINTN             TokenNumber\r
   )\r
 {\r
-  return (GetPcdProtocol ())->GetSize (TokenNumber);\r
+  return mPcd->GetSize (TokenNumber);\r
 }\r
 \r
 \r
@@ -238,7 +234,7 @@ LibPcdGetEx8 (
 {\r
   ASSERT (Guid != NULL);\r
   \r
-  return (GetPcdProtocol ())->Get8Ex (Guid, TokenNumber);\r
+  return mPcd->Get8Ex (Guid, TokenNumber);\r
 }\r
 \r
 \r
@@ -262,7 +258,7 @@ LibPcdGetEx16 (
 {\r
   ASSERT (Guid != NULL);\r
 \r
-  return (GetPcdProtocol ())->Get16Ex (Guid, TokenNumber);\r
+  return mPcd->Get16Ex (Guid, TokenNumber);\r
 }\r
 \r
 \r
@@ -286,7 +282,7 @@ LibPcdGetEx32 (
 {\r
   ASSERT (Guid != NULL);\r
 \r
-  return (GetPcdProtocol ())->Get32Ex (Guid, TokenNumber);\r
+  return mPcd->Get32Ex (Guid, TokenNumber);\r
 }\r
 \r
 \r
@@ -311,7 +307,7 @@ LibPcdGetEx64 (
 {\r
   ASSERT (Guid != NULL);\r
   \r
-  return (GetPcdProtocol ())->Get64Ex (Guid, TokenNumber);\r
+  return mPcd->Get64Ex (Guid, TokenNumber);\r
 }\r
 \r
 \r
@@ -336,7 +332,7 @@ LibPcdGetExPtr (
 {\r
   ASSERT (Guid != NULL);\r
 \r
-  return (GetPcdProtocol ())->GetPtrEx (Guid, TokenNumber);\r
+  return mPcd->GetPtrEx (Guid, TokenNumber);\r
 }\r
 \r
 \r
@@ -361,7 +357,7 @@ LibPcdGetExBool (
 {\r
   ASSERT (Guid != NULL);\r
 \r
-  return (GetPcdProtocol ())->GetBoolEx (Guid, TokenNumber);\r
+  return mPcd->GetBoolEx (Guid, TokenNumber);\r
 }\r
 \r
 \r
@@ -386,7 +382,7 @@ LibPcdGetExSize (
 {\r
   ASSERT (Guid != NULL);\r
 \r
-  return (GetPcdProtocol ())->GetSizeEx (Guid, TokenNumber);\r
+  return mPcd->GetSizeEx (Guid, TokenNumber);\r
 }\r
 \r
 \r
@@ -411,7 +407,7 @@ LibPcdSet8 (
 {\r
   EFI_STATUS Status;\r
 \r
-  Status = (GetPcdProtocol ())->Set8 (TokenNumber, Value);\r
+  Status = mPcd->Set8 (TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
   \r
@@ -440,7 +436,7 @@ LibPcdSet16 (
 {\r
   EFI_STATUS Status;\r
 \r
-  Status = (GetPcdProtocol ())->Set16 (TokenNumber, Value);\r
+  Status = mPcd->Set16 (TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
   \r
@@ -468,7 +464,7 @@ LibPcdSet32 (
   )\r
 {\r
   EFI_STATUS Status;\r
-  Status = (GetPcdProtocol ())->Set32 (TokenNumber, Value);\r
+  Status = mPcd->Set32 (TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -497,7 +493,7 @@ LibPcdSet64 (
 {\r
   EFI_STATUS Status;\r
 \r
-  Status = (GetPcdProtocol ())->Set64 (TokenNumber, Value);\r
+  Status = mPcd->Set64 (TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -544,7 +540,7 @@ LibPcdSetPtr (
     ASSERT (Buffer != NULL);\r
   }\r
 \r
-  Status = (GetPcdProtocol ())->SetPtr (TokenNumber, SizeOfBuffer, Buffer);\r
+  Status = mPcd->SetPtr (TokenNumber, SizeOfBuffer, Buffer);\r
 \r
   if (EFI_ERROR (Status)) {\r
     return NULL;\r
@@ -575,7 +571,7 @@ LibPcdSetBool (
 {\r
   EFI_STATUS Status;\r
 \r
-  Status = (GetPcdProtocol ())->SetBool (TokenNumber, Value);\r
+  Status = mPcd->SetBool (TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -610,7 +606,7 @@ LibPcdSetEx8 (
 \r
   ASSERT (Guid != NULL);\r
 \r
-  Status = (GetPcdProtocol ())->Set8Ex (Guid, TokenNumber, Value);\r
+  Status = mPcd->Set8Ex (Guid, TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -645,7 +641,7 @@ LibPcdSetEx16 (
 \r
   ASSERT (Guid != NULL);\r
 \r
-  Status = (GetPcdProtocol ())->Set16Ex (Guid, TokenNumber, Value);\r
+  Status = mPcd->Set16Ex (Guid, TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -680,7 +676,7 @@ LibPcdSetEx32 (
 \r
   ASSERT (Guid != NULL);\r
 \r
-  Status = (GetPcdProtocol ())->Set32Ex (Guid, TokenNumber, Value);\r
+  Status = mPcd->Set32Ex (Guid, TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -714,7 +710,7 @@ LibPcdSetEx64 (
 \r
   ASSERT (Guid != NULL);\r
 \r
-  Status = (GetPcdProtocol ())->Set64Ex (Guid, TokenNumber, Value);\r
+  Status = mPcd->Set64Ex (Guid, TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -761,7 +757,7 @@ LibPcdSetExPtr (
     ASSERT (Buffer != NULL);\r
   }\r
 \r
-  Status = (GetPcdProtocol ())->SetPtrEx (Guid, TokenNumber, SizeOfBuffer, Buffer);\r
+  Status = mPcd->SetPtrEx (Guid, TokenNumber, SizeOfBuffer, Buffer);\r
 \r
   if (EFI_ERROR (Status)) {\r
     return NULL;\r
@@ -798,7 +794,7 @@ LibPcdSetExBool (
 \r
   ASSERT (Guid != NULL);\r
 \r
-  Status = (GetPcdProtocol ())->SetBoolEx (Guid, TokenNumber, Value);\r
+  Status = mPcd->SetBoolEx (Guid, TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -836,7 +832,7 @@ LibPcdCallbackOnSet (
 \r
   ASSERT (NotificationFunction != NULL);\r
 \r
-  Status = (GetPcdProtocol ())->CallbackOnSet (Guid, TokenNumber, NotificationFunction);\r
+  Status = mPcd->CallbackOnSet (Guid, TokenNumber, NotificationFunction);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -869,7 +865,7 @@ LibPcdCancelCallback (
 \r
   ASSERT (NotificationFunction != NULL);\r
     \r
-  Status = (GetPcdProtocol ())->CancelCallback (Guid, TokenNumber, NotificationFunction);\r
+  Status = mPcd->CancelCallback (Guid, TokenNumber, NotificationFunction);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -904,7 +900,7 @@ LibPcdGetNextToken (
 {\r
   EFI_STATUS Status;\r
 \r
-  Status = (GetPcdProtocol ())->GetNextToken (Guid, &TokenNumber);\r
+  Status = mPcd->GetNextToken (Guid, &TokenNumber);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -937,7 +933,7 @@ LibPcdGetNextTokenSpace (
 {\r
   EFI_STATUS Status;\r
 \r
-  Status = (GetPcdProtocol ())->GetNextTokenSpace (&Guid);\r
+  Status = mPcd->GetNextTokenSpace (&Guid);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r

diff --git a/MdePkg/Library/DxePcdLib/DxePcdLib.inf b/MdePkg/Library/DxePcdLib/DxePcdLib.inf
index d828ca109e2ef55bf59145f58989ce5faf483b81..de59815f97c65b2adad78d5d92075e0815ef5e09 100644 (file)
--- a/MdePkg/Library/DxePcdLib/DxePcdLib.inf
+++ b/MdePkg/Library/DxePcdLib/DxePcdLib.inf
@@ -25,6 +25,7 @@
   LIBRARY_CLASS                  = PcdLib|DXE_CORE 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
+  CONSTRUCTOR                    = PcdLibConstructor\r
 \r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
@@ -47,3 +48,6 @@
 [Protocols]\r
   gPcdProtocolGuid                              # PROTOCOL ALWAYS_CONSUMED\r
 \r
+[Depex]\r
+  gPcdProtocolGuid\r
+\r