Make PcdPeim/PcdDxe driver also produce EFI_PCD_PPI/EFI_PCD_PROTOCOL defined in PI...

[mirror_edk2.git] / MdeModulePkg / Universal / PCD / Pei / Service.c

diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.c b/MdeModulePkg/Universal/PCD/Pei/Service.c
index 10cc2284335a20cb0b9e710eb1d955e442f3f50f..200c0d463957e9cc21f1ec61af12f3b349924a3f 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/Service.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Service.c
@@ -360,7 +360,7 @@ SetWorker (
   VOID                *InternalData;\r
   UINTN               MaxSize;\r
 \r
-  if (!FeaturePcdGet(PcdPeiPcdDatabaseSetEnabled)) {\r
+  if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
   \r
@@ -514,7 +514,7 @@ ExSetWorker (
 {\r
   UINTN                     TokenNumber;\r
 \r
-  if (!FeaturePcdGet(PcdPeiPcdDatabaseSetEnabled)) {\r
+  if (!FeaturePcdGet(PcdPeiFullPcdDatabaseEnable)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -542,12 +542,7 @@ ExGetWorker (
   IN UINTN            ExTokenNumber,\r
   IN UINTN            GetSize\r
   )\r
-{\r
-  if (!FeaturePcdGet (PcdPeiPcdDatabaseExEnabled)) {\r
-    ASSERT (FALSE);\r
-    return 0;\r
-  }\r
-  \r
+{ \r
   return GetWorker (GetExPcdTokenNumber (Guid, ExTokenNumber), GetSize);\r
 }\r
 \r
@@ -578,7 +573,7 @@ GetWorker (
   EFI_STATUS          Status;\r
   UINTN               DataSize;\r
   VOID                *Data;\r
-  UINT16              *StringTable;\r
+  UINT8               *StringTable;\r
   UINT16              StringTableIdx;\r
   PEI_PCD_DATABASE    *PeiPcdDb;\r
   UINT32              LocalTokenNumber;\r
@@ -627,7 +622,7 @@ GetWorker (
       VariableHead = (VARIABLE_HEAD *) ((UINT8 *)PeiPcdDb + Offset);\r
       \r
       Guid = &(PeiPcdDb->Init.GuidTable[VariableHead->GuidTableIndex]);\r
-      Name = &StringTable[VariableHead->StringIndex];\r
+      Name = (UINT16*)&StringTable[VariableHead->StringIndex];\r
 \r
       Status = GetHiiVariable (Guid, Name, &Data, &DataSize);\r
 \r
@@ -645,7 +640,7 @@ GetWorker (
       return (VOID *) ((UINT8 *)PeiPcdDb + Offset);\r
 \r
     case PCD_TYPE_STRING:\r
-      StringTableIdx = (UINT16) *((UINT8 *) PeiPcdDb + Offset);\r
+      StringTableIdx = * (UINT16*) ((UINT8 *) PeiPcdDb + Offset);\r
       return (VOID *) (&StringTable[StringTableIdx]);\r
 \r
     default:\r