Clean up code.

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

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
index c8dab145af74238cdcdebb4931e74325419981d9..83cbcdc3b2ae1ed138f540b94177d8380c42ab15 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -28,10 +28,10 @@ EFI_GUID *TmpTokenSpaceBuffer[PEI_EXMAPPING_TABLE_SIZE + DXE_EXMAPPING_TABLE_SIZ
 ///\r
 EFI_LOCK mPcdDatabaseLock = EFI_INITIALIZE_LOCK_VARIABLE(TPL_NOTIFY);\r
 \r
-//\r
-// PCD_PROTOCOL the native implementation provided by MdePkg which support dynamic \r
-// type and dynamicEx type PCD.\r
-//\r
+///\r
+/// PCD_PROTOCOL the EDKII native implementation which support dynamic \r
+/// type and dynamicEx type PCDs.\r
+///\r
 PCD_PROTOCOL mPcdInstance = {\r
   DxePcdSetSku,\r
 \r
@@ -71,10 +71,10 @@ PCD_PROTOCOL mPcdInstance = {
   DxePcdGetNextTokenSpace\r
 };\r
 \r
-//\r
-// EFI_PCD_PROTOCOL is defined in PI 1.2 Vol 3 which only support dynamicEx type\r
-// PCD.\r
-//\r
+///\r
+/// EFI_PCD_PROTOCOL is defined in PI 1.2 Vol 3 which only support dynamicEx type\r
+/// PCD.\r
+///\r
 EFI_PCD_PROTOCOL mEfiPcdInstance = {\r
   DxePcdSetSku,\r
   DxePcdGet8Ex,\r
@@ -96,8 +96,7 @@ EFI_PCD_PROTOCOL mEfiPcdInstance = {
   DxePcdGetNextTokenSpace\r
 };\r
 \r
-\r
-\r
+EFI_HANDLE mPcdHandle = NULL;\r
 \r
 /**\r
   Main entry for PCD DXE driver.\r
@@ -118,7 +117,6 @@ PcdDxeInit (
   )\r
 {\r
   EFI_STATUS Status;\r
-  EFI_HANDLE mNewHandle;\r
   \r
   //\r
   // Make sure the Pcd Protocol is not already installed in the system\r
@@ -128,23 +126,20 @@ PcdDxeInit (
 \r
   BuildPcdDxeDataBase ();\r
 \r
-  mNewHandle = NULL;\r
-  \r
   //\r
   // Install PCD_PROTOCOL to handle dynamic type PCD\r
   // Install EFI_PCD_PROTOCOL to handle dynamicEx type PCD\r
   //\r
   Status = gBS->InstallMultipleProtocolInterfaces (\r
-                  &mNewHandle,\r
-                  &gPcdProtocolGuid,\r
-                  &mPcdInstance,\r
-                  &gEfiPcdProtocolGuid,\r
-                  &mEfiPcdInstance\r
+                  &mPcdHandle,\r
+                  &gPcdProtocolGuid,     &mPcdInstance,\r
+                  &gEfiPcdProtocolGuid,  &mEfiPcdInstance,\r
+                  NULL\r
                   );\r
                  \r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  return EFI_SUCCESS;\r
+  return Status;\r
 \r
 }\r
 \r

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.c b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
index 783dd2d7a72bd8472da2917dff9133b64df9fed8..b2d5aaf2d3c7035ffc52db8cd15af74a49851f53 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
@@ -14,10 +14,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include "Service.h"\r
 \r
-//\r
-// Instance of PCD_PPI protocol is native implementation by MdePkg.\r
-// This protocol instance support dynamic and dynamicEx type PCDs.\r
-//\r
+///\r
+/// Instance of PCD_PPI protocol is EDKII native implementation.\r
+/// This protocol instance support dynamic and dynamicEx type PCDs.\r
+///\r
 PCD_PPI mPcdPpiInstance = {\r
   PeiPcdSetSku,\r
 \r
@@ -57,10 +57,10 @@ PCD_PPI mPcdPpiInstance = {
   PeiPcdGetNextTokenSpace\r
 };\r
 \r
-//\r
-// Instance of EFI_PEI_PCD_PPI which is defined in PI 1.2 Vol 3.\r
-// This PPI instance only support dyanmicEx type PCD.\r
-//\r
+///\r
+/// Instance of EFI_PEI_PCD_PPI which is defined in PI 1.2 Vol 3.\r
+/// This PPI instance only support dyanmicEx type PCD.\r
+///\r
 EFI_PEI_PCD_PPI  mEfiPcdPpiInstance = {\r
   PeiPcdSetSku,\r
   \r
@@ -83,16 +83,17 @@ EFI_PEI_PCD_PPI  mEfiPcdPpiInstance = {
   PeiPcdGetNextTokenSpace\r
 };\r
 \r
-EFI_PEI_PPI_DESCRIPTOR  mPpiPCD = {\r
-  (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
-  &gPcdPpiGuid,\r
-  &mPcdPpiInstance\r
-};\r
-\r
-EFI_PEI_PPI_DESCRIPTOR  mEfiPpiPCD = {\r
-  (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
-  &gEfiPeiPcdPpiGuid,\r
-  &mEfiPcdPpiInstance\r
+EFI_PEI_PPI_DESCRIPTOR  mPpiList[] = {\r
+  {\r
+    EFI_PEI_PPI_DESCRIPTOR_PPI,\r
+    &gPcdPpiGuid,\r
+    &mPcdPpiInstance\r
+  },\r
+  {\r
+    (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
+    &gEfiPeiPcdPpiGuid,\r
+    &mEfiPcdPpiInstance\r
+  }\r
 };\r
 \r
 /**\r
@@ -118,16 +119,9 @@ PcdPeimInit (
   BuildPcdDatabase ();\r
 \r
   //\r
-  // Install PCD_PPI which produce support for dynamic and dynamicEx PCD\r
-  //\r
-  Status = PeiServicesInstallPpi (&mPpiPCD);\r
-  ASSERT_EFI_ERROR (Status);\r
-  \r
-  //\r
-  // Install EFI_PCD_PPI which produce support for dynamicEx PCD which is defined\r
-  // in PI 1.2 Vol 3 specification.\r
+  // Install PCD_PPI and EFI_PEI_PCD_PPI.\r
   //\r
-  Status = PeiServicesInstallPpi (&mEfiPpiPCD);\r
+  Status = PeiServicesInstallPpi (&mPpiList[0]);\r
   ASSERT_EFI_ERROR (Status);\r
   \r
   return Status;\r