1) Use FeatureFlag PcdPciBusHotplugDeviceSupport to merge LightPciLib.c with PcdLib.c.

[mirror_edk2.git] / EdkModulePkg / Universal / PCD / Dxe / Service.c

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.c b/EdkModulePkg/Universal/PCD/Dxe/Service.c
index a2706d0bd3949c166845d50ead7f86bc16a1297e..a4b19878a59fd64bedac70ddb568549e21fad3c9 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.c
@@ -1,5 +1,5 @@
 /** @file\r
-Private functions used by PCD DXE driver.s\r
+Private functions used by PCD DXE driver.\r
 \r
 Copyright (c) 2006, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
@@ -17,11 +17,6 @@ Module Name: Service.c
 #include "Service.h"\r
 \r
 \r
-//\r
-// Build Tool will generate DXE_PCD_DB_INIT_VALUE in Autogen.h\r
-// Compression Algorithm will take care of the size optimization.\r
-//\r
-\r
 PCD_DATABASE * mPcdDatabase;\r
 \r
 LIST_ENTRY *mCallbackFnTable;\r
@@ -124,7 +119,7 @@ GetWorker (
           // It is a pointer type. So get the MaxSize reserved for\r
           // this PCD entry.\r
           //\r
-          GetPtrTypeSize (TokenNumber, &GetSize);\r
+          GetPtrTypeSize (TmpTokenNumber, &GetSize);\r
         }\r
         CopyMem (VaraiableDefaultBuffer, Data + VariableHead->Offset, GetSize);\r
         FreePool (Data);\r
@@ -341,7 +336,6 @@ BuildPcdDxeDataBase (
   ASSERT (mPcdDatabase != NULL);\r
 \r
   GuidHob = GetFirstGuidHob (&gPcdDataBaseHobGuid);\r
-\r
   if (GuidHob != NULL) {\r
 \r
     //\r
@@ -630,7 +624,7 @@ SetWorker (
       return EFI_INVALID_PARAMETER;\r
     \r
     case PCD_TYPE_STRING:\r
-      if (SetPtrTypeSize (TokenNumber, Size)) {\r
+      if (SetPtrTypeSize (TmpTokenNumber, Size)) {\r
         CopyMem (&StringTable[*((UINT16 *)InternalData)], Data, *Size);\r
         return EFI_SUCCESS;\r
       } else {\r
@@ -639,7 +633,7 @@ SetWorker (
 \r
     case PCD_TYPE_HII:\r
       if (PtrType) {\r
-        if (!SetPtrTypeSize (TokenNumber, Size)) {\r
+        if (!SetPtrTypeSize (TmpTokenNumber, Size)) {\r
           return EFI_INVALID_PARAMETER;\r
         }\r
       }\r
@@ -662,13 +656,9 @@ SetWorker (
         return Status;\r
       }\r
       \r
-      //\r
-      // Bug Bug: Please implement this\r
-      //\r
-\r
     case PCD_TYPE_DATA:\r
       if (PtrType) {\r
-        if (SetPtrTypeSize (TokenNumber, Size)) {\r
+        if (SetPtrTypeSize (TmpTokenNumber, Size)) {\r
           CopyMem (InternalData, Data, *Size);\r
           return EFI_SUCCESS;\r
         } else {\r
@@ -777,7 +767,7 @@ SetHiiVariable (
   Status = gRT->GetVariable (\r
     (UINT16 *)VariableName,\r
     VariableGuid,\r
-    &Attribute,\r
+    NULL,\r
     &Size,\r
     NULL\r
     );\r