Update PcdLib instances:

1. Remove the [depex] section for both PeiPcdLib and DxePcdLib
2. Remove the constructor of DxePcdLib.

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

diff --git a/MdePkg/Library/DxePcdLib/DxePcdLib.c b/MdePkg/Library/DxePcdLib/DxePcdLib.c
index 707bebdf9386134bdb26063d23c19a6ecf1d6876..98882d41664c27ff084c4c8fd8369b2b2fc0c671 100644 (file)
--- a/MdePkg/Library/DxePcdLib/DxePcdLib.c
+++ b/MdePkg/Library/DxePcdLib/DxePcdLib.c
@@ -25,30 +25,40 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include "DxePcdLibInternal.h"\r
 \r
-static PCD_PROTOCOL  *mPcd;\r
+STATIC PCD_PROTOCOL  *mPcd = NULL;\r
 \r
 /**\r
-  The constructor function caches the PCD_PROTOCOL pointer.\r
+  Retrieves PCD protocol interface.\r
 \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
+  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
+  @return mPcd  The PCD protocol protocol interface.\r
 \r
 **/\r
-EFI_STATUS\r
-EFIAPI\r
-PcdLibConstructor (\r
-  IN EFI_HANDLE        ImageHandle,\r
-  IN EFI_SYSTEM_TABLE  *SystemTable\r
+PCD_PROTOCOL*\r
+GetPcdProtocol (\r
+  VOID\r
   )\r
 {\r
   EFI_STATUS  Status;\r
 \r
-  Status = gBS->LocateProtocol (&gPcdProtocolGuid, NULL, (VOID **)&mPcd);\r
-  ASSERT_EFI_ERROR (Status);\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
-  return EFI_SUCCESS;\r
+  return mPcd;\r
 }\r
 \r
 \r
@@ -69,7 +79,7 @@ LibPcdSetSku (
 {\r
   ASSERT (SkuId < 0x100);\r
 \r
-  mPcd->SetSku (SkuId);\r
+  (GetPcdProtocol ())->SetSku (SkuId);\r
 \r
   return SkuId;\r
 }\r
@@ -90,7 +100,7 @@ LibPcdGet8 (
   IN UINTN             TokenNumber\r
   )\r
 {\r
-  return mPcd->Get8 (TokenNumber);\r
+  return (GetPcdProtocol ())->Get8 (TokenNumber);\r
 }\r
 \r
 \r
@@ -109,7 +119,7 @@ LibPcdGet16 (
   IN UINTN             TokenNumber\r
   )\r
 {\r
-  return mPcd->Get16 (TokenNumber);\r
+  return (GetPcdProtocol ())->Get16 (TokenNumber);\r
 }\r
 \r
 \r
@@ -128,7 +138,7 @@ LibPcdGet32 (
   IN UINTN             TokenNumber\r
   )\r
 {\r
-  return mPcd->Get32 (TokenNumber);\r
+  return (GetPcdProtocol ())->Get32 (TokenNumber);\r
 }\r
 \r
 \r
@@ -147,7 +157,7 @@ LibPcdGet64 (
   IN UINTN             TokenNumber\r
   )\r
 {\r
-  return mPcd->Get64 (TokenNumber);\r
+  return (GetPcdProtocol ())->Get64 (TokenNumber);\r
 }\r
 \r
 \r
@@ -166,7 +176,7 @@ LibPcdGetPtr (
   IN UINTN             TokenNumber\r
   )\r
 {\r
-  return mPcd->GetPtr (TokenNumber);\r
+  return (GetPcdProtocol ())->GetPtr (TokenNumber);\r
 }\r
 \r
 \r
@@ -185,7 +195,7 @@ LibPcdGetBool (
   IN UINTN             TokenNumber\r
   )\r
 {\r
-  return mPcd->GetBool (TokenNumber);\r
+  return (GetPcdProtocol ())->GetBool (TokenNumber);\r
 }\r
 \r
 \r
@@ -204,7 +214,7 @@ LibPcdGetSize (
   IN UINTN             TokenNumber\r
   )\r
 {\r
-  return mPcd->GetSize (TokenNumber);\r
+  return (GetPcdProtocol ())->GetSize (TokenNumber);\r
 }\r
 \r
 \r
@@ -229,7 +239,7 @@ LibPcdGetEx8 (
 {\r
   ASSERT (Guid != NULL);\r
   \r
-  return mPcd->Get8Ex (Guid, TokenNumber);\r
+  return (GetPcdProtocol ())->Get8Ex (Guid, TokenNumber);\r
 }\r
 \r
 \r
@@ -253,7 +263,7 @@ LibPcdGetEx16 (
 {\r
   ASSERT (Guid != NULL);\r
 \r
-  return mPcd->Get16Ex (Guid, TokenNumber);\r
+  return (GetPcdProtocol ())->Get16Ex (Guid, TokenNumber);\r
 }\r
 \r
 \r
@@ -277,7 +287,7 @@ LibPcdGetEx32 (
 {\r
   ASSERT (Guid != NULL);\r
 \r
-  return mPcd->Get32Ex (Guid, TokenNumber);\r
+  return (GetPcdProtocol ())->Get32Ex (Guid, TokenNumber);\r
 }\r
 \r
 \r
@@ -302,7 +312,7 @@ LibPcdGetEx64 (
 {\r
   ASSERT (Guid != NULL);\r
   \r
-  return mPcd->Get64Ex (Guid, TokenNumber);\r
+  return (GetPcdProtocol ())->Get64Ex (Guid, TokenNumber);\r
 }\r
 \r
 \r
@@ -327,7 +337,7 @@ LibPcdGetExPtr (
 {\r
   ASSERT (Guid != NULL);\r
 \r
-  return mPcd->GetPtrEx (Guid, TokenNumber);\r
+  return (GetPcdProtocol ())->GetPtrEx (Guid, TokenNumber);\r
 }\r
 \r
 \r
@@ -352,7 +362,7 @@ LibPcdGetExBool (
 {\r
   ASSERT (Guid != NULL);\r
 \r
-  return mPcd->GetBoolEx (Guid, TokenNumber);\r
+  return (GetPcdProtocol ())->GetBoolEx (Guid, TokenNumber);\r
 }\r
 \r
 \r
@@ -377,7 +387,7 @@ LibPcdGetExSize (
 {\r
   ASSERT (Guid != NULL);\r
 \r
-  return mPcd->GetSizeEx (Guid, TokenNumber);\r
+  return (GetPcdProtocol ())->GetSizeEx (Guid, TokenNumber);\r
 }\r
 \r
 \r
@@ -401,7 +411,7 @@ LibPcdSet8 (
 {\r
   EFI_STATUS Status;\r
 \r
-  Status = mPcd->Set8 (TokenNumber, Value);\r
+  Status = (GetPcdProtocol ())->Set8 (TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
   \r
@@ -429,7 +439,7 @@ LibPcdSet16 (
 {\r
   EFI_STATUS Status;\r
 \r
-  Status = mPcd->Set16 (TokenNumber, Value);\r
+  Status = (GetPcdProtocol ())->Set16 (TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
   \r
@@ -456,7 +466,7 @@ LibPcdSet32 (
   )\r
 {\r
   EFI_STATUS Status;\r
-  Status = mPcd->Set32 (TokenNumber, Value);\r
+  Status = (GetPcdProtocol ())->Set32 (TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -484,7 +494,7 @@ LibPcdSet64 (
 {\r
   EFI_STATUS Status;\r
 \r
-  Status = mPcd->Set64 (TokenNumber, Value);\r
+  Status = (GetPcdProtocol ())->Set64 (TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -531,7 +541,7 @@ LibPcdSetPtr (
     ASSERT (Buffer != NULL);\r
   }\r
 \r
-  Status = mPcd->SetPtr (TokenNumber, SizeOfBuffer, Buffer);\r
+  Status = (GetPcdProtocol ())->SetPtr (TokenNumber, SizeOfBuffer, Buffer);\r
 \r
   if (EFI_ERROR (Status)) {\r
     return NULL;\r
@@ -561,7 +571,7 @@ LibPcdSetBool (
 {\r
   EFI_STATUS Status;\r
 \r
-  Status = mPcd->SetBool (TokenNumber, Value);\r
+  Status = (GetPcdProtocol ())->SetBool (TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -595,7 +605,7 @@ LibPcdSetEx8 (
 \r
   ASSERT (Guid != NULL);\r
 \r
-  Status = mPcd->Set8Ex (Guid, TokenNumber, Value);\r
+  Status = (GetPcdProtocol ())->Set8Ex (Guid, TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -629,7 +639,7 @@ LibPcdSetEx16 (
 \r
   ASSERT (Guid != NULL);\r
 \r
-  Status = mPcd->Set16Ex (Guid, TokenNumber, Value);\r
+  Status = (GetPcdProtocol ())->Set16Ex (Guid, TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -663,7 +673,7 @@ LibPcdSetEx32 (
 \r
   ASSERT (Guid != NULL);\r
 \r
-  Status = mPcd->Set32Ex (Guid, TokenNumber, Value);\r
+  Status = (GetPcdProtocol ())->Set32Ex (Guid, TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -697,7 +707,7 @@ LibPcdSetEx64 (
 \r
   ASSERT (Guid != NULL);\r
 \r
-  Status = mPcd->Set64Ex (Guid, TokenNumber, Value);\r
+  Status = (GetPcdProtocol ())->Set64Ex (Guid, TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -743,7 +753,7 @@ LibPcdSetExPtr (
     ASSERT (Buffer != NULL);\r
   }\r
 \r
-  Status = mPcd->SetPtrEx (Guid, TokenNumber, SizeOfBuffer, Buffer);\r
+  Status = (GetPcdProtocol ())->SetPtrEx (Guid, TokenNumber, SizeOfBuffer, Buffer);\r
 \r
   if (EFI_ERROR (Status)) {\r
     return NULL;\r
@@ -779,7 +789,7 @@ LibPcdSetExBool (
 \r
   ASSERT (Guid != NULL);\r
 \r
-  Status = mPcd->SetBoolEx (Guid, TokenNumber, Value);\r
+  Status = (GetPcdProtocol ())->SetBoolEx (Guid, TokenNumber, Value);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -816,7 +826,7 @@ LibPcdCallbackOnSet (
 \r
   ASSERT (NotificationFunction != NULL);\r
 \r
-  Status = mPcd->CallbackOnSet (Guid, TokenNumber, NotificationFunction);\r
+  Status = (GetPcdProtocol ())->CallbackOnSet (Guid, TokenNumber, NotificationFunction);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -848,7 +858,7 @@ LibPcdCancelCallback (
 \r
   ASSERT (NotificationFunction != NULL);\r
     \r
-  Status = mPcd->CancelCallback (Guid, TokenNumber, NotificationFunction);\r
+  Status = (GetPcdProtocol ())->CancelCallback (Guid, TokenNumber, NotificationFunction);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -882,7 +892,7 @@ LibPcdGetNextToken (
 {\r
   EFI_STATUS Status;\r
 \r
-  Status = mPcd->GetNextToken (Guid, &TokenNumber);\r
+  Status = (GetPcdProtocol ())->GetNextToken (Guid, &TokenNumber);\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -916,7 +926,7 @@ LibPcdGetNextTokenSpace (
 {\r
   EFI_STATUS Status;\r
 \r
-  Status = mPcd->GetNextTokenSpace (&Guid);\r
+  Status = (GetPcdProtocol ())->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 04c2b6e6e5e8d45033ffbcccb130f37359b2ae7f..f155cc3f79e43a4918c7238881bfa8a641bb24ee 100644 (file)
--- a/MdePkg/Library/DxePcdLib/DxePcdLib.inf
+++ b/MdePkg/Library/DxePcdLib/DxePcdLib.inf
@@ -26,8 +26,6 @@
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
 \r
-  CONSTRUCTOR                    = PcdLibConstructor\r
-\r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
@@ -49,6 +47,3 @@
 [Protocols]\r
   gPcdProtocolGuid                              # PROTOCOL ALWAYS_CONSUMED\r
 \r
-\r
-[Depex]\r
-  gPcdProtocolGuid
\ No newline at end of file

diff --git a/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf b/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
index b8df5ea37a1ece0feb9728e4704b5ccbdfe135bf..d533af947f77ce40a4d2cc2cfb1a6b48a542ed5d 100644 (file)
--- a/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
+++ b/MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
@@ -48,6 +48,3 @@
 \r
 [Ppis]\r
   gPcdPpiGuid                                   # PPI ALWAYS_CONSUMED\r
-\r
-[Depex]\r
-  gPcdPpiGuid
\ No newline at end of file