Minor update for PlatOverMngr driver, VariableFormat.h and DxePcdLib.c.

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

diff --git a/MdeModulePkg/Include/VariableFormat.h b/MdeModulePkg/Include/VariableFormat.h
index 798bc411c3ee33d28131231ef8a4754fdece2902..ac25b0c1f6d2f653d0c7b88cd9c5ecabc9f0b821 100644 (file)
--- a/MdeModulePkg/Include/VariableFormat.h
+++ b/MdeModulePkg/Include/VariableFormat.h
@@ -17,12 +17,15 @@
 \r
 #define VARIABLE_STORE_SIGNATURE  EFI_SIGNATURE_32 ('$', 'V', 'S', 'S')\r
 \r
+#ifndef MAX_VARIABLE_SIZE\r
 #define MAX_VARIABLE_SIZE                 FixedPcdGet32(PcdMaxVariableSize)\r
-\r
+#endif\r
 //\r
 // Enlarges the hardware error record maximum variable size to 32K bytes\r
 //\r
+#ifndef MAX_HARDWARE_ERROR_VARIABLE_SIZE\r
 #define MAX_HARDWARE_ERROR_VARIABLE_SIZE  FixedPcdGet32(PcdMaxHardwareErrorVariableSize)\r
+#endif\r
 \r
 #define VARIABLE_DATA                     0x55AA\r
 \r

diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c
index 89f9cf60f769999775aafec7fb47c623c6db7bee..46db7c980ba9e8abf94ac6c4bd933cf3635e26df 100644 (file)
--- a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c
+++ b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c
@@ -175,24 +175,6 @@ PlatOverMngrInit (
   ZeroMem (mControllerToken, MAX_CHOICE_NUM * sizeof (EFI_STRING_ID));\r
   ZeroMem (mDriverImageProtocol, MAX_CHOICE_NUM * sizeof (EFI_LOADED_IMAGE_PROTOCOL *));\r
 \r
-  //\r
-  // Show the page\r
-  //\r
-  Status = FormBrowser2->SendForm (\r
-                           FormBrowser2,\r
-                           &CallbackInfo->RegisteredHandle,\r
-                           1,\r
-                           NULL,\r
-                           0,\r
-                           NULL,\r
-                           NULL\r
-                           );\r
-\r
-  Status = HiiDatabase->RemovePackageList (HiiDatabase, CallbackInfo->RegisteredHandle);\r
-  if (EFI_ERROR (Status)) {\r
-    return Status;\r
-  }\r
-\r
   return EFI_SUCCESS;\r
 }\r
 \r

diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.inf b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.inf
index 9fb499ae84a9cbd241b5c3afd853ad12380474ac..0aba22113a59291c9bdd2ca8e9cc0133c6e2f44e 100644 (file)
--- a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.inf
+++ b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.inf
@@ -19,7 +19,7 @@
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = PlatOverMngr\r
   FILE_GUID                      = 56D95BFE-F991-4898-B3BE-B8F37C927F48\r
-  MODULE_TYPE                    = UEFI_APPLICATION\r
+  MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
@@ -47,7 +47,7 @@
 [LibraryClasses]\r
   BaseLib\r
   UefiBootServicesTableLib\r
-  UefiApplicationEntryPoint\r
+  UefiDriverEntryPoint\r
   UefiLib\r
   DebugLib\r
   PlatDriOverLib\r

diff --git a/MdePkg/Library/DxePcdLib/DxePcdLib.c b/MdePkg/Library/DxePcdLib/DxePcdLib.c
index b76730f4256087a9bf0db82f54d731088f80e2c2..43dcf9079342d52153547b8698c4bb74a383eb07 100644 (file)
--- a/MdePkg/Library/DxePcdLib/DxePcdLib.c
+++ b/MdePkg/Library/DxePcdLib/DxePcdLib.c
@@ -514,7 +514,7 @@ LibPcdSet64 (
   maximum size supported by TokenNumber and return NULL to \r
   indicate that the set operation was not actually performed. \r
   \r
-  If SizeOfValue > 0 and Buffer is NULL, then ASSERT().\r
+  If SizeOfBuffer > 0 and Buffer is NULL, then ASSERT().\r
   \r
   @param[in]      TokenNumber   The PCD token number to set a current value for.\r
   @param[in, out] SizeOfBuffer  The size, in bytes, of Buffer.\r