Refine some internal functions of PCD Driver.

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

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
index 55633148bba1ad58cda1c91f085a61b74ce599b3..1bde2d8bd4e8fbf9a09311b9238e1ddcd4dc4c29 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -116,9 +116,7 @@ DxePcdGet8 (
   IN PCD_TOKEN_NUMBER         TokenNumber\r
   )\r
 {\r
   IN PCD_TOKEN_NUMBER         TokenNumber\r
   )\r
 {\r

-  ASSERT (sizeof (UINT8) == DxePcdGetSize (TokenNumber));\r
-  \r
-  return *((UINT8 *) GetWorker (TokenNumber));\r
+  return *((UINT8 *) GetWorker (TokenNumber, sizeof (UINT8)));\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -129,9 +127,7 @@ DxePcdGet16 (
   IN PCD_TOKEN_NUMBER         TokenNumber\r
   )\r
 {\r
   IN PCD_TOKEN_NUMBER         TokenNumber\r
   )\r
 {\r

-  ASSERT (sizeof (UINT16) == DxePcdGetSize (TokenNumber));\r
-  \r
-  return ReadUnaligned16 (GetWorker (TokenNumber));\r
+  return ReadUnaligned16 (GetWorker (TokenNumber, sizeof (UINT16)));\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -142,9 +138,7 @@ DxePcdGet32 (
   IN PCD_TOKEN_NUMBER         TokenNumber\r
   )\r
 {\r
   IN PCD_TOKEN_NUMBER         TokenNumber\r
   )\r
 {\r

-  ASSERT (sizeof (UINT32) == DxePcdGetSize (TokenNumber));\r
-  \r
-  return ReadUnaligned32 (GetWorker (TokenNumber));\r
+  return ReadUnaligned32 (GetWorker (TokenNumber, sizeof (UINT32)));\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -155,9 +149,7 @@ DxePcdGet64 (
   IN PCD_TOKEN_NUMBER          TokenNumber\r
   )\r
 {\r
   IN PCD_TOKEN_NUMBER          TokenNumber\r
   )\r
 {\r

-  ASSERT (sizeof (UINT64) == DxePcdGetSize (TokenNumber));\r
-  \r
-  return ReadUnaligned64(GetWorker (TokenNumber));\r
+  return ReadUnaligned64(GetWorker (TokenNumber, sizeof (UINT64)));\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -168,7 +160,7 @@ DxePcdGetPtr (
   IN PCD_TOKEN_NUMBER          TokenNumber\r
   )\r
 {\r
   IN PCD_TOKEN_NUMBER          TokenNumber\r
   )\r
 {\r

-  return GetWorker (TokenNumber);\r
+  return GetWorker (TokenNumber, 0);\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -179,9 +171,7 @@ DxePcdGetBool (
   IN PCD_TOKEN_NUMBER          TokenNumber\r
   )\r
 {\r
   IN PCD_TOKEN_NUMBER          TokenNumber\r
   )\r
 {\r

-  ASSERT (sizeof (BOOLEAN) == DxePcdGetSize (TokenNumber));\r
-  \r
-  return *((BOOLEAN *) GetWorker (TokenNumber));\r
+  return *((BOOLEAN *) GetWorker (TokenNumber, sizeof (BOOLEAN)));\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -224,7 +214,7 @@ DxePcdGet16Ex (
   IN PCD_TOKEN_NUMBER     ExTokenNumber\r
   )\r
 {\r
   IN PCD_TOKEN_NUMBER     ExTokenNumber\r
   )\r
 {\r

-  return *((UINT16 *) ExGetWorker (Guid, ExTokenNumber, sizeof(UINT16)));\r
+  return ReadUnaligned16 (ExGetWorker (Guid, ExTokenNumber, sizeof(UINT16)));\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -236,7 +226,7 @@ DxePcdGet32Ex (
   IN PCD_TOKEN_NUMBER      ExTokenNumber\r
   )\r
 {\r
   IN PCD_TOKEN_NUMBER      ExTokenNumber\r
   )\r
 {\r

-  return *((UINT32 *) ExGetWorker (Guid, ExTokenNumber, sizeof(UINT32)));\r
+  return ReadUnaligned32 (ExGetWorker (Guid, ExTokenNumber, sizeof(UINT32)));\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -248,10 +238,7 @@ DxePcdGet64Ex (
   IN PCD_TOKEN_NUMBER      ExTokenNumber\r
   )\r
 {\r
   IN PCD_TOKEN_NUMBER      ExTokenNumber\r
   )\r
 {\r

-  //\r
-  // BugBug: Must be changed to ReadUnaligned64\r
-  //\r
-  return *((UINT64 *) ExGetWorker (Guid, ExTokenNumber, sizeof(UINT64)));\r
+  return ReadUnaligned64 (ExGetWorker (Guid, ExTokenNumber, sizeof(UINT64)));\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -287,11 +274,7 @@ DxePcdGetSizeEx (
   IN PCD_TOKEN_NUMBER      ExTokenNumber\r
   )\r
 {\r
   IN PCD_TOKEN_NUMBER      ExTokenNumber\r
   )\r
 {\r

-  EX_PCD_ENTRY_ATTRIBUTE    Attr;\r
-  \r
-  GetExPcdTokenAttributes (Guid, ExTokenNumber, &Attr);\r
-\r
-  return Attr.Size;\r
+  return DxePcdGetSize(GetExPcdTokenNumber (Guid, ExTokenNumber));\r

 }\r
 \r
 \r
 }\r
 \r
 \r

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.c b/EdkModulePkg/Universal/PCD/Dxe/Service.c
index 53d9621e8cd0809b5641f5d4d6579dd7ed72e19d..e1aded74f99cbed9993d58152675f07fc07f062b 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.c
@@ -27,12 +27,15 @@ PCD_DATABASE * mPcdDatabase;
 LIST_ENTRY mCallbackFnTable[PCD_TOTAL_TOKEN_NUMBER];\r
 \r
 VOID *\r
 LIST_ENTRY mCallbackFnTable[PCD_TOTAL_TOKEN_NUMBER];\r
 \r
 VOID *\r

-GetWorkerByLocalTokenNumber (\r
-  UINT32      LocalTokenNumber,\r
-  BOOLEAN     IsPeiDb,\r
-  UINTN       Size\r
-  ) \r
+GetWorker (\r
+  PCD_TOKEN_NUMBER  TokenNumber,\r
+  UINTN             GetSize\r
+  )\r

 {\r
 {\r

+  UINT32              *LocalTokenNumberTable;\r
+  UINT16              *SizeTable;\r
+  BOOLEAN             IsPeiDb;\r
+  UINTN               Size;\r

   UINT32              Offset;\r
   EFI_GUID            *GuidTable;\r
   UINT16              *StringTable;\r
   UINT32              Offset;\r
   EFI_GUID            *GuidTable;\r
   UINT16              *StringTable;\r


@@ -45,7 +48,28 @@ GetWorkerByLocalTokenNumber (
   VPD_HEAD            *VpdHead;\r
   UINT8               *PcdDb;\r
   UINT16              StringTableIdx;      \r
   VPD_HEAD            *VpdHead;\r
   UINT8               *PcdDb;\r
   UINT16              StringTableIdx;      \r

+  UINT32              LocalTokenNumber;\r
+\r
+\r
+  ASSERT (TokenNumber < PCD_TOTAL_TOKEN_NUMBER);\r
+\r
+  Size = DxePcdGetSize (TokenNumber);\r
+  ASSERT (GetSize == Size || GetSize == 0);\r

 \r
 \r

+  \r
+  IsPeiDb = (TokenNumber <= PEI_LOCAL_TOKEN_NUMBER) ? TRUE : FALSE;\r
+\r
+  LocalTokenNumberTable  = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : \r
+                                     mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r
+\r
+  SizeTable              = IsPeiDb ? mPcdDatabase->PeiDb.Init.SizeTable: \r
+                                     mPcdDatabase->DxeDb.Init.SizeTable;\r
+\r
+  TokenNumber            = IsPeiDb ? TokenNumber :\r
+                                     TokenNumber - PEI_LOCAL_TOKEN_NUMBER;\r
+\r
+  LocalTokenNumber = LocalTokenNumberTable[TokenNumber];\r
+  \r

   if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == PCD_TYPE_SKU_ENABLED) {\r
     LocalTokenNumber = GetSkuEnabledTokenNumber (LocalTokenNumber & ~PCD_TYPE_SKU_ENABLED, Size, IsPeiDb);\r
   }\r
   if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == PCD_TYPE_SKU_ENABLED) {\r
     LocalTokenNumber = GetSkuEnabledTokenNumber (LocalTokenNumber & ~PCD_TYPE_SKU_ENABLED, Size, IsPeiDb);\r
   }\r


@@ -93,49 +117,24 @@ GetWorkerByLocalTokenNumber (
   ASSERT (FALSE);\r
       \r
   return NULL;\r
   ASSERT (FALSE);\r
       \r
   return NULL;\r

-}\r

   \r
   \r

-VOID *\r
-GetWorker (\r
-  UINTN  TokenNumber\r
-  )\r
-{\r
-  UINT32        *LocalTokenNumberTable;\r
-  UINT16        *SizeTable;\r
-  BOOLEAN       IsPeiDb;\r
-\r
-  ASSERT (TokenNumber < PCD_TOTAL_TOKEN_NUMBER);\r
-  \r
-  IsPeiDb = (TokenNumber <= PEI_LOCAL_TOKEN_NUMBER) ? TRUE : FALSE;\r
-\r
-  LocalTokenNumberTable  = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : \r
-                                     mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r
-\r
-  SizeTable              = IsPeiDb ? mPcdDatabase->PeiDb.Init.SizeTable: \r
-                                     mPcdDatabase->DxeDb.Init.SizeTable;\r
-\r
-  TokenNumber            = IsPeiDb ? TokenNumber :\r
-                                     TokenNumber - PEI_LOCAL_TOKEN_NUMBER;\r
-  return GetWorkerByLocalTokenNumber (LocalTokenNumberTable[TokenNumber], IsPeiDb, SizeTable[TokenNumber]);\r

 }\r
 \r
 \r
 \r
 EFI_STATUS\r
 DxeRegisterCallBackWorker (\r
 }\r
 \r
 \r
 \r
 EFI_STATUS\r
 DxeRegisterCallBackWorker (\r

-  IN  UINTN                   TokenNumber,\r
+  IN  PCD_TOKEN_NUMBER        TokenNumber,\r

   IN  CONST GUID              *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
 )\r
 {\r
   CALLBACK_FN_ENTRY       *FnTableEntry;\r
   IN  CONST GUID              *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
 )\r
 {\r
   CALLBACK_FN_ENTRY       *FnTableEntry;\r

-  EX_PCD_ENTRY_ATTRIBUTE  ExAttr;\r

   LIST_ENTRY              *ListHead;\r
   LIST_ENTRY              *ListNode;\r
 \r
   if (Guid != NULL) {\r
   LIST_ENTRY              *ListHead;\r
   LIST_ENTRY              *ListNode;\r
 \r
   if (Guid != NULL) {\r

-    GetExPcdTokenAttributes (Guid, TokenNumber, &ExAttr);\r
-    TokenNumber = ExAttr.LocalTokenNumberAlias;\r
+    TokenNumber = GetExPcdTokenNumber (Guid, TokenNumber);\r

   }\r
 \r
   ListHead = &mCallbackFnTable[TokenNumber];\r
   }\r
 \r
   ListHead = &mCallbackFnTable[TokenNumber];\r


@@ -168,19 +167,17 @@ DxeRegisterCallBackWorker (
 \r
 EFI_STATUS\r
 DxeUnRegisterCallBackWorker (\r
 \r
 EFI_STATUS\r
 DxeUnRegisterCallBackWorker (\r

-  IN  UINTN                   TokenNumber,\r
+  IN  PCD_TOKEN_NUMBER        TokenNumber,\r

   IN  CONST GUID              *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
 )\r
 {\r
   CALLBACK_FN_ENTRY       *FnTableEntry;\r
   IN  CONST GUID              *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
 )\r
 {\r
   CALLBACK_FN_ENTRY       *FnTableEntry;\r

-  EX_PCD_ENTRY_ATTRIBUTE  ExAttr;\r

   LIST_ENTRY              *ListHead;\r
   LIST_ENTRY              *ListNode;\r
 \r
   if (Guid != NULL) {\r
   LIST_ENTRY              *ListHead;\r
   LIST_ENTRY              *ListNode;\r
 \r
   if (Guid != NULL) {\r

-    GetExPcdTokenAttributes (Guid, TokenNumber, &ExAttr);\r
-    TokenNumber = ExAttr.LocalTokenNumberAlias;\r
+    TokenNumber = GetExPcdTokenNumber (Guid, TokenNumber);\r

   }\r
 \r
   ListHead = &mCallbackFnTable[TokenNumber];\r
   }\r
 \r
   ListHead = &mCallbackFnTable[TokenNumber];\r


@@ -452,6 +449,15 @@ SetWorker (
 {\r
   UINT32              *LocalTokenNumberTable;\r
   BOOLEAN             IsPeiDb;\r
 {\r
   UINT32              *LocalTokenNumberTable;\r
   BOOLEAN             IsPeiDb;\r

+  UINT32              LocalTokenNumber;\r
+  EFI_GUID            *GuidTable;\r
+  UINT16              *StringTable;\r
+  EFI_GUID            *Guid;\r
+  UINT16              *Name;\r
+  VOID                *InternalData;\r
+  VARIABLE_HEAD       *VariableHead;\r
+  UINTN               Offset;\r
+  UINT8               *PcdDb;\r

 \r
 \r
   ASSERT (TokenNumber < PCD_TOTAL_TOKEN_NUMBER);\r
 \r
 \r
   ASSERT (TokenNumber < PCD_TOTAL_TOKEN_NUMBER);\r


@@ -467,89 +473,16 @@ SetWorker (
   LocalTokenNumberTable  = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : \r
                                      mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r
 \r
   LocalTokenNumberTable  = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : \r
                                      mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r
 \r

-  InvokeCallbackOnSet (0, NULL, TokenNumber, Data, Size);\r
+  if ((TokenNumber < PEI_NEX_TOKEN_NUMBER) ||\r
+      (TokenNumber >= PEI_LOCAL_TOKEN_NUMBER || TokenNumber < (PEI_LOCAL_TOKEN_NUMBER + DXE_NEX_TOKEN_NUMBER))) {\r
+    InvokeCallbackOnSet (0, NULL, TokenNumber, Data, Size);\r
+  }\r

 \r
   TokenNumber = IsPeiDb ? TokenNumber\r
                         : TokenNumber - PEI_LOCAL_TOKEN_NUMBER;\r
 \r
   TokenNumber = IsPeiDb ? TokenNumber\r
                         : TokenNumber - PEI_LOCAL_TOKEN_NUMBER;\r

-  \r
-  return SetWorkerByLocalTokenNumber (LocalTokenNumberTable[TokenNumber], Data, Size, PtrType, IsPeiDb);\r
-\r
-}\r
-\r
-\r
-\r
-\r
-\r
-VOID *\r
-ExGetWorker (\r
-  IN CONST EFI_GUID         *Guid,\r
-  IN UINTN                  ExTokenNumber,\r
-  IN UINTN                  GetSize\r
-  ) \r
-{\r
-  EX_PCD_ENTRY_ATTRIBUTE Attr;\r
-\r
-  GetExPcdTokenAttributes (Guid, ExTokenNumber, &Attr);\r
-\r
-  ASSERT ((GetSize == Attr.Size) || (GetSize == 0));\r
-\r
-  return GetWorkerByLocalTokenNumber (Attr.LocalTokenNumberAlias,\r
-                                                Attr.IsPeiDb,\r
-                                                Attr.Size\r
-                                                );\r
-}\r
-\r
-\r
-\r
-\r
-\r
-EFI_STATUS\r
-ExSetWorker (\r
-  IN PCD_TOKEN_NUMBER     ExTokenNumber,\r
-  IN CONST EFI_GUID       *Guid,\r
-  VOID                    *Data,\r
-  UINTN                   SetSize,\r
-  BOOLEAN                 PtrType\r
-  )\r
-{\r
-  EX_PCD_ENTRY_ATTRIBUTE Attr;\r
-\r
-  GetExPcdTokenAttributes (Guid, ExTokenNumber, &Attr);\r
-\r
-  ASSERT (!PtrType && (SetSize == Attr.Size));\r
-\r
-  ASSERT (PtrType && (SetSize <= Attr.Size));\r
-\r
-  InvokeCallbackOnSet (ExTokenNumber, Guid, Attr.TokenNumber, Data, Attr.Size);\r

 \r
 \r

-  SetWorkerByLocalTokenNumber (Attr.LocalTokenNumberAlias, Data, Attr.Size, PtrType, Attr.IsPeiDb);\r
-\r
-  return EFI_SUCCESS;\r
+  LocalTokenNumber = LocalTokenNumberTable[TokenNumber];\r

   \r
   \r

-}\r
-\r
-\r
-\r
-\r
-EFI_STATUS\r
-SetWorkerByLocalTokenNumber (\r
-  UINT32        LocalTokenNumber,\r
-  VOID          *Data,\r
-  UINTN         Size,\r
-  BOOLEAN       PtrType,\r
-  BOOLEAN       IsPeiDb\r
-  )\r
-{\r
-  EFI_GUID            *GuidTable;\r
-  UINT16              *StringTable;\r
-  EFI_GUID            *Guid;\r
-  UINT16              *Name;\r
-  VOID                *InternalData;\r
-  VARIABLE_HEAD       *VariableHead;\r
-  UINTN               Offset;\r
-  UINT8               *PcdDb;\r
-\r
-\r

   if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == PCD_TYPE_SKU_ENABLED) {\r
     LocalTokenNumber = GetSkuEnabledTokenNumber (LocalTokenNumber & ~PCD_TYPE_SKU_ENABLED, Size, IsPeiDb);\r
   }\r
   if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == PCD_TYPE_SKU_ENABLED) {\r
     LocalTokenNumber = GetSkuEnabledTokenNumber (LocalTokenNumber & ~PCD_TYPE_SKU_ENABLED, Size, IsPeiDb);\r
   }\r


@@ -625,6 +558,46 @@ SetWorkerByLocalTokenNumber (
 \r
 \r
 \r
 \r
 \r
 \r

+\r
+\r
+VOID *\r
+ExGetWorker (\r
+  IN CONST EFI_GUID         *Guid,\r
+  IN UINTN                  ExTokenNumber,\r
+  IN UINTN                  GetSize\r
+  ) \r
+{\r
+  return GetWorker(GetExPcdTokenNumber (Guid, ExTokenNumber), GetSize);\r
+}\r
+\r
+\r
+\r
+\r
+\r
+EFI_STATUS\r
+ExSetWorker (\r
+  IN PCD_TOKEN_NUMBER     ExTokenNumber,\r
+  IN CONST EFI_GUID       *Guid,\r
+  VOID                    *Data,\r
+  UINTN                   SetSize,\r
+  BOOLEAN                 PtrType\r
+  )\r
+{\r
+  PCD_TOKEN_NUMBER        TokenNumber;\r
+  \r
+  TokenNumber = GetExPcdTokenNumber (Guid, ExTokenNumber);\r
+\r
+  InvokeCallbackOnSet (ExTokenNumber, Guid, TokenNumber, Data, SetSize);\r
+\r
+  SetWorker (TokenNumber, Data, SetSize, PtrType);\r
+\r
+  return EFI_SUCCESS;\r
+  \r
+}\r
+\r
+\r
+\r
+\r

 EFI_STATUS\r
 SetHiiVariable (\r
   IN  EFI_GUID     *VariableGuid,\r
 EFI_STATUS\r
 SetHiiVariable (\r
   IN  EFI_GUID     *VariableGuid,\r


@@ -680,56 +653,51 @@ SetHiiVariable (
 \r
 \r
 \r
 \r
 \r
 \r

-VOID\r
-GetExPcdTokenAttributes (\r
+PCD_TOKEN_NUMBER\r
+GetExPcdTokenNumber (\r

   IN CONST EFI_GUID             *Guid,\r
   IN CONST EFI_GUID             *Guid,\r

-  IN PCD_TOKEN_NUMBER           ExTokenNumber,\r
-  OUT EX_PCD_ENTRY_ATTRIBUTE    *ExAttr\r
+  IN PCD_TOKEN_NUMBER           ExTokenNumber\r

   )\r
 {\r
   UINT32              i;\r
   DYNAMICEX_MAPPING   *ExMap;\r
   EFI_GUID            *GuidTable;\r
   )\r
 {\r
   UINT32              i;\r
   DYNAMICEX_MAPPING   *ExMap;\r
   EFI_GUID            *GuidTable;\r

-  UINT16              *SizeTable;\r
+  EFI_GUID            *MatchGuid;\r
+  UINTN               MatchGuidIdx;\r

 \r
   ExMap       = mPcdDatabase->PeiDb.Init.ExMapTable;\r
   GuidTable   = mPcdDatabase->PeiDb.Init.GuidTable;\r
 \r
   ExMap       = mPcdDatabase->PeiDb.Init.ExMapTable;\r
   GuidTable   = mPcdDatabase->PeiDb.Init.GuidTable;\r

-  SizeTable   = mPcdDatabase->PeiDb.Init.SizeTable;\r
+  \r
+  MatchGuid   = ScanGuid (GuidTable, sizeof(mPcdDatabase->PeiDb.Init.GuidTable), Guid);\r
+  ASSERT (MatchGuid != NULL);\r
+\r
+  MatchGuidIdx = MatchGuid - GuidTable;\r

   \r
   for (i = 0; i < PEI_EXMAPPING_TABLE_SIZE; i++) {\r
     if ((ExTokenNumber == ExMap[i].ExTokenNumber) &&\r
   \r
   for (i = 0; i < PEI_EXMAPPING_TABLE_SIZE; i++) {\r
     if ((ExTokenNumber == ExMap[i].ExTokenNumber) &&\r

-        CompareGuid (Guid, (CONST EFI_GUID *) &GuidTable[ExMap[i].ExGuidIndex])\r
-      ) {\r
-\r
-        ExAttr->IsPeiDb               = TRUE;\r
-        ExAttr->Size                  = SizeTable[i + PEI_NEX_TOKEN_NUMBER];\r
-        ExAttr->TokenNumber           = i + PEI_NEX_TOKEN_NUMBER;\r
-        ExAttr->LocalTokenNumberAlias = ExMap[i].LocalTokenNumber;\r
-        return;\r
+        (MatchGuidIdx == ExMap[i].ExGuidIndex)) {\r
+        return ExMap[i].LocalTokenNumber;\r

 \r
     }\r
   }\r
   \r
   ExMap       = mPcdDatabase->DxeDb.Init.ExMapTable;\r
   GuidTable   = mPcdDatabase->DxeDb.Init.GuidTable;\r
 \r
     }\r
   }\r
   \r
   ExMap       = mPcdDatabase->DxeDb.Init.ExMapTable;\r
   GuidTable   = mPcdDatabase->DxeDb.Init.GuidTable;\r

-  SizeTable   = mPcdDatabase->DxeDb.Init.SizeTable;\r
+\r
+  MatchGuid   = ScanGuid (GuidTable, sizeof(mPcdDatabase->DxeDb.Init.GuidTable), Guid);\r
+  ASSERT (MatchGuid != NULL);\r
+\r
+  MatchGuidIdx = MatchGuid - GuidTable;\r

   \r
   for (i = 0; i < DXE_EXMAPPING_TABLE_SIZE; i++) {\r
     if ((ExTokenNumber == ExMap[i].ExTokenNumber) &&\r
   \r
   for (i = 0; i < DXE_EXMAPPING_TABLE_SIZE; i++) {\r
     if ((ExTokenNumber == ExMap[i].ExTokenNumber) &&\r

-         CompareGuid (Guid, (CONST EFI_GUID *) &GuidTable[ExMap[i].ExGuidIndex])\r
-      ) {\r
-\r
-        ExAttr->IsPeiDb               = FALSE;\r
-        ExAttr->Size                  = SizeTable[i + DXE_NEX_TOKEN_NUMBER];\r
-        ExAttr->TokenNumber           = i + PEI_LOCAL_TOKEN_NUMBER;\r
-        ExAttr->LocalTokenNumberAlias = ExMap[i].LocalTokenNumber;\r
-        return;\r
-\r
+         (MatchGuidIdx == ExMap[i].ExGuidIndex)) {\r
+        return ExMap[i].LocalTokenNumber + PEI_LOCAL_TOKEN_NUMBER;\r

     }\r
   }\r
 \r
   ASSERT (FALSE);\r
 \r
     }\r
   }\r
 \r
   ASSERT (FALSE);\r
 \r

-  return;\r
+  return 0;\r

 }\r
 \r
 }\r
 \r

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.h b/EdkModulePkg/Universal/PCD/Dxe/Service.h
index ec51ebbec8671e9c833f64387ce12d188f0a329b..af9fc420a3a09e74d2f8013ff2120d819fbb224e 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.h
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.h
@@ -66,7 +66,8 @@ ExSetWorker (
 \r
 VOID *\r
 GetWorker (\r
 \r
 VOID *\r
 GetWorker (\r

-  PCD_TOKEN_NUMBER  TokenNumber\r
+  PCD_TOKEN_NUMBER  TokenNumber,\r
+  UINTN             GetSize\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r


@@ -115,21 +116,12 @@ BuildPcdDxeDataBase (
 );\r
 \r
 \r
 );\r
 \r
 \r

-typedef struct {\r
-  UINTN   TokenNumber;\r
-  UINTN   Size;\r
-  UINT32  LocalTokenNumberAlias;\r
-  BOOLEAN IsPeiDb;\r
-} EX_PCD_ENTRY_ATTRIBUTE;\r
-\r
-VOID\r
-GetExPcdTokenAttributes (\r
+PCD_TOKEN_NUMBER\r
+GetExPcdTokenNumber (\r

   IN CONST EFI_GUID             *Guid,\r
   IN CONST EFI_GUID             *Guid,\r

-  IN PCD_TOKEN_NUMBER           ExTokenNumber,\r
-  OUT EX_PCD_ENTRY_ATTRIBUTE    *ExAttr\r
+  IN PCD_TOKEN_NUMBER           ExTokenNumber\r

   )\r
 ;\r
   )\r
 ;\r

-\r

 //\r
 // Protocol Interface function declaration.\r
 //\r
 //\r
 // Protocol Interface function declaration.\r
 //\r


@@ -407,16 +399,6 @@ DxePcdGetNextToken (
   )\r
 ;\r
 \r
   )\r
 ;\r
 \r

-EFI_STATUS\r
-SetWorkerByLocalTokenNumber (\r
-  UINT32        LocalTokenNumber,\r
-  VOID          *Data,\r
-  UINTN         Size,\r
-  BOOLEAN       PtrType,\r
-  BOOLEAN       IsPeiDb\r
-  )\r
-;\r
-\r

 PCD_TOKEN_NUMBER\r
 ExGetNextTokeNumber (\r
   IN CONST EFI_GUID    *Guid,\r
 PCD_TOKEN_NUMBER\r
 ExGetNextTokeNumber (\r
   IN CONST EFI_GUID    *Guid,\r

diff --git a/EdkModulePkg/Universal/PCD/Pei/Pcd.c b/EdkModulePkg/Universal/PCD/Pei/Pcd.c
index f084475335416276c7d9d6e19863310599731ec6..70b229e3a931c19a7fb168f981434f8f39a1f739 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Pei/Pcd.c
+++ b/EdkModulePkg/Universal/PCD/Pei/Pcd.c
@@ -255,11 +255,7 @@ PeiPcdGetSizeEx (
   IN PCD_TOKEN_NUMBER                  ExTokenNumber\r
   )\r
 {\r
   IN PCD_TOKEN_NUMBER                  ExTokenNumber\r
   )\r
 {\r

-  EX_PCD_ENTRY_ATTRIBUTE      Attr;\r
-\r
-  GetExPcdTokenAttributes (Guid, ExTokenNumber, &Attr);\r
-  \r
-  return Attr.Size;\r
+  return PeiPcdGetSize (GetExPcdTokenNumber (Guid, ExTokenNumber));\r

 }\r
 \r
 \r
 }\r
 \r
 \r

diff --git a/EdkModulePkg/Universal/PCD/Pei/Service.c b/EdkModulePkg/Universal/PCD/Pei/Service.c
index e280dd6715558a39b82c33175db5892bcd0145f2..62e2f9c1140b5ae039fe3ceb8a014aff177edd62 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Pei/Service.c
+++ b/EdkModulePkg/Universal/PCD/Pei/Service.c
@@ -30,7 +30,7 @@ Module Name: Service.c
 --*/\r
 EFI_STATUS\r
 PeiRegisterCallBackWorker (\r
 --*/\r
 EFI_STATUS\r
 PeiRegisterCallBackWorker (\r

-  IN  UINTN                       ExTokenNumber,\r
+  IN  PCD_TOKEN_NUMBER            ExTokenNumber,\r

   IN  CONST EFI_GUID              *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK            CallBackFunction,\r
   IN  BOOLEAN                     Register\r
   IN  CONST EFI_GUID              *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK            CallBackFunction,\r
   IN  BOOLEAN                     Register\r


@@ -41,20 +41,19 @@ PeiRegisterCallBackWorker (
   PCD_PPI_CALLBACK        Compare;\r
   PCD_PPI_CALLBACK        Assign;\r
   UINT32                  LocalTokenNumber;\r
   PCD_PPI_CALLBACK        Compare;\r
   PCD_PPI_CALLBACK        Assign;\r
   UINT32                  LocalTokenNumber;\r

-  UINTN                   TokenNumber;\r
+  PCD_TOKEN_NUMBER        TokenNumber;\r

   UINTN                   Idx;\r
   UINTN                   Idx;\r

-  EX_PCD_ENTRY_ATTRIBUTE  Attr;\r

 \r
   if (Guid == NULL) {\r
     TokenNumber = ExTokenNumber;\r
     ASSERT (TokenNumber < PEI_NEX_TOKEN_NUMBER);\r
 \r
   if (Guid == NULL) {\r
     TokenNumber = ExTokenNumber;\r
     ASSERT (TokenNumber < PEI_NEX_TOKEN_NUMBER);\r

-    LocalTokenNumber = GetPcdDatabase()->Init.LocalTokenNumberTable[TokenNumber];\r

   } else {\r
   } else {\r

-    GetExPcdTokenAttributes (Guid, ExTokenNumber, &Attr);\r
-    TokenNumber = Attr.TokenNumber;\r
-    LocalTokenNumber = Attr.LocalTokenNumberAlias;\r
+    TokenNumber = GetExPcdTokenNumber (Guid, ExTokenNumber);\r
+    ASSERT (TokenNumber < PEI_LOCAL_TOKEN_NUMBER);\r

   }\r
 \r
   }\r
 \r

+  LocalTokenNumber = GetPcdDatabase()->Init.LocalTokenNumberTable[TokenNumber];\r
+\r

   ASSERT ((LocalTokenNumber & PCD_TYPE_HII) == 0);\r
   ASSERT ((LocalTokenNumber & PCD_TYPE_VPD) == 0);\r
 \r
   ASSERT ((LocalTokenNumber & PCD_TYPE_HII) == 0);\r
   ASSERT ((LocalTokenNumber & PCD_TYPE_VPD) == 0);\r
 \r


@@ -267,16 +266,22 @@ InvokeCallbackOnSet (
   \r
 }\r
 \r
   \r
 }\r
 \r

+\r
+\r
+\r

 EFI_STATUS\r
 SetWorker (\r
 EFI_STATUS\r
 SetWorker (\r

-  UINTN         TokenNumber,\r
-  VOID          *Data,\r
-  UINTN         Size,\r
-  BOOLEAN       PtrType\r
+  PCD_TOKEN_NUMBER    TokenNumber,\r
+  VOID                *Data,\r
+  UINTN               Size,\r
+  BOOLEAN             PtrType\r

   )\r
 {\r
   UINT32              LocalTokenNumber;\r
   PEI_PCD_DATABASE    *PeiPcdDb;\r
   )\r
 {\r
   UINT32              LocalTokenNumber;\r
   PEI_PCD_DATABASE    *PeiPcdDb;\r

+  UINT16              StringTableIdx;\r
+  UINTN               Offset;\r
+  VOID                *InternalData;\r

 \r
   ASSERT (TokenNumber < PEI_LOCAL_TOKEN_NUMBER);\r
     \r
 \r
   ASSERT (TokenNumber < PEI_LOCAL_TOKEN_NUMBER);\r
     \r


@@ -290,71 +295,21 @@ SetWorker (
     ASSERT (PeiPcdDb->Init.SizeTable[TokenNumber] == Size);\r
   }\r
 \r
     ASSERT (PeiPcdDb->Init.SizeTable[TokenNumber] == Size);\r
   }\r
 \r

-  InvokeCallbackOnSet (0, NULL, TokenNumber, Data, Size);\r
-\r
-  return SetWorkerByLocalTokenNumber (LocalTokenNumber, Data, Size, PtrType);\r
-\r
-}\r
-\r
-\r
-\r
-\r
-EFI_STATUS\r
-ExSetWorker (\r
-  IN UINT32               ExTokenNumber,\r
-  IN CONST EFI_GUID       *Guid,\r
-  VOID                    *Data,\r
-  UINTN                   Size,\r
-  BOOLEAN                 PtrType\r
-  )\r
-{\r
-  PEI_PCD_DATABASE          *PeiPcdDb;\r
-  EX_PCD_ENTRY_ATTRIBUTE    Attr;\r
-\r
-\r
-  PeiPcdDb = GetPcdDatabase ();\r
-\r
-  GetExPcdTokenAttributes (Guid, ExTokenNumber, &Attr);\r
-\r
-  ASSERT (!PtrType && Attr.Size);\r
-\r
-  ASSERT (PtrType && Attr.Size >= Size);\r
-\r
-  InvokeCallbackOnSet (ExTokenNumber, Guid, Attr.TokenNumber, Data, Size);\r
-\r
-  SetWorkerByLocalTokenNumber (Attr.LocalTokenNumberAlias, Data, Size, PtrType);\r
-\r
-  return EFI_SUCCESS;\r
-  \r
-}\r
-\r
-\r
-\r
+  //\r
+  // We only invoke the callback function for Dynamic Type PCD Entry.\r
+  // For Dynamic EX PCD entry, we have invoked the callback function for Dynamic EX\r
+  // type PCD entry in ExSetWorker.\r
+  //\r
+  if (TokenNumber < PEI_NEX_TOKEN_NUMBER) {\r
+    InvokeCallbackOnSet (0, NULL, TokenNumber, Data, Size);\r
+  }\r

 \r
 \r

-EFI_STATUS\r
-SetWorkerByLocalTokenNumber (\r
-  UINT32        LocalTokenNumber,\r
-  VOID          *Data,\r
-  UINTN         Size,\r
-  BOOLEAN       PtrType\r
-  )\r
-{\r
-  PEI_PCD_DATABASE      *PeiPcdDb;\r
-  UINT8                 *PeiPcdDbRaw;\r
-  UINT16                StringTableIdx;\r
-  UINTN                 Offset;\r
-  VOID                  *InternalData;\r
- \r
-\r
-  PeiPcdDb    =    GetPcdDatabase ();\r
-  PeiPcdDbRaw =    (UINT8 *) PeiPcdDb;\r
-  \r

   if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == PCD_TYPE_SKU_ENABLED) {\r
     LocalTokenNumber = GetSkuEnabledTokenNumber (LocalTokenNumber & ~PCD_TYPE_SKU_ENABLED, Size);\r
   }\r
 \r
   Offset          = LocalTokenNumber & PCD_DATABASE_OFFSET_MASK;\r
   if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == PCD_TYPE_SKU_ENABLED) {\r
     LocalTokenNumber = GetSkuEnabledTokenNumber (LocalTokenNumber & ~PCD_TYPE_SKU_ENABLED, Size);\r
   }\r
 \r
   Offset          = LocalTokenNumber & PCD_DATABASE_OFFSET_MASK;\r

-  InternalData    = (VOID *) (PeiPcdDbRaw + Offset);\r
+  InternalData    = (VOID *) ((UINT8 *) PeiPcdDb + Offset);\r

   \r
   switch (LocalTokenNumber & ~PCD_DATABASE_OFFSET_MASK) {\r
     case PCD_TYPE_VPD:\r
   \r
   switch (LocalTokenNumber & ~PCD_DATABASE_OFFSET_MASK) {\r
     case PCD_TYPE_VPD:\r


@@ -404,14 +359,53 @@ SetWorkerByLocalTokenNumber (
 \r
   ASSERT (FALSE);\r
   return EFI_NOT_FOUND;\r
 \r
   ASSERT (FALSE);\r
   return EFI_NOT_FOUND;\r

+\r
+}\r
+\r
+\r
+\r
+\r
+EFI_STATUS\r
+ExSetWorker (\r
+  IN PCD_TOKEN_NUMBER     ExTokenNumber,\r
+  IN CONST EFI_GUID       *Guid,\r
+  VOID                    *Data,\r
+  UINTN                   Size,\r
+  BOOLEAN                 PtrType\r
+  )\r
+{\r
+  PCD_TOKEN_NUMBER          TokenNumber;\r
+\r
+  TokenNumber = GetExPcdTokenNumber (Guid, ExTokenNumber);\r
+\r
+  InvokeCallbackOnSet (ExTokenNumber, Guid, TokenNumber, Data, Size);\r
+\r
+  SetWorker (TokenNumber, Data, Size, PtrType);\r
+\r
+  return EFI_SUCCESS;\r
+  \r
+}\r
+\r
+\r
+\r
+\r
+VOID *\r
+ExGetWorker (\r
+  IN CONST  EFI_GUID  *Guid,\r
+  IN PCD_TOKEN_NUMBER ExTokenNumber,\r
+  IN UINTN            GetSize\r
+  )\r
+{\r
+  return GetWorker (GetExPcdTokenNumber (Guid, ExTokenNumber), GetSize);\r

 }\r
 \r
 \r
 }\r
 \r
 \r

+\r
+\r

 VOID *\r
 VOID *\r

-GetWorkerByLocalTokenNumber (\r
-  PEI_PCD_DATABASE    *PeiPcdDb,\r
-  UINT32              LocalTokenNumber,\r
-  UINTN               Size\r
+GetWorker (\r
+  PCD_TOKEN_NUMBER    TokenNumber,\r
+  UINTN               GetSize\r

   )\r
 {\r
   UINT32              Offset;\r
   )\r
 {\r
   UINT32              Offset;\r


@@ -423,9 +417,20 @@ GetWorkerByLocalTokenNumber (
   VOID                *Data;\r
   UINT16              *StringTable;\r
   UINT16              StringTableIdx;\r
   VOID                *Data;\r
   UINT16              *StringTable;\r
   UINT16              StringTableIdx;\r

-      \r
+  PEI_PCD_DATABASE    *PeiPcdDb;\r
+  UINT32              LocalTokenNumber;\r
+  UINTN               Size;\r
+\r
+  ASSERT (TokenNumber < PEI_LOCAL_TOKEN_NUMBER);\r
+\r
+  Size = PeiPcdGetSize(TokenNumber);\r
+  \r
+  ASSERT (GetSize == Size || GetSize == 0);\r
+\r

   PeiPcdDb        = GetPcdDatabase ();\r
 \r
   PeiPcdDb        = GetPcdDatabase ();\r
 \r

+  LocalTokenNumber = PeiPcdDb->Init.LocalTokenNumberTable[TokenNumber];\r
+\r

   if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == PCD_TYPE_SKU_ENABLED) {\r
     LocalTokenNumber = GetSkuEnabledTokenNumber (LocalTokenNumber & ~PCD_TYPE_SKU_ENABLED, Size);\r
   }\r
   if ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == PCD_TYPE_SKU_ENABLED) {\r
     LocalTokenNumber = GetSkuEnabledTokenNumber (LocalTokenNumber & ~PCD_TYPE_SKU_ENABLED, Size);\r
   }\r


@@ -476,72 +481,39 @@ GetWorkerByLocalTokenNumber (
 }\r
 \r
 \r
 }\r
 \r
 \r

-VOID *\r
-ExGetWorker (\r
-  IN CONST  EFI_GUID  *Guid,\r
-  IN UINT32           ExTokenNumber,\r
-  IN UINTN            GetSize\r
-  )\r
-{\r
-  EX_PCD_ENTRY_ATTRIBUTE      Attr;\r
-\r
-  GetExPcdTokenAttributes (Guid, ExTokenNumber, &Attr);\r
-  \r
-  ASSERT ((GetSize == Attr.Size) || (GetSize == 0));\r
-\r
-  return GetWorkerByLocalTokenNumber (GetPcdDatabase(),\r
-                                      Attr.LocalTokenNumberAlias,\r
-                                      Attr.Size\r
-                                      );\r
-}\r
-\r
-VOID *\r
-GetWorker (\r
-  UINTN  TokenNumber,\r
-  UINTN   GetSize\r
-  )\r
-{\r
-  PEI_PCD_DATABASE      *PeiPcdDb;\r
-\r
-  ASSERT (TokenNumber < PEI_LOCAL_TOKEN_NUMBER);\r
-\r
-  ASSERT (GetSize == PeiPcdGetSize (TokenNumber) || GetSize == 0);\r
-\r
-  PeiPcdDb = GetPcdDatabase ();\r
-  \r
-  return  GetWorkerByLocalTokenNumber (PeiPcdDb, PeiPcdDb->Init.LocalTokenNumberTable[TokenNumber], GetSize);\r
-}\r
-\r
-\r
-VOID\r
-GetExPcdTokenAttributes (\r
+PCD_TOKEN_NUMBER\r
+GetExPcdTokenNumber (\r

   IN CONST EFI_GUID             *Guid,\r
   IN CONST EFI_GUID             *Guid,\r

-  IN UINT32                     ExTokenNumber,\r
-  OUT EX_PCD_ENTRY_ATTRIBUTE    *ExAttr\r
+  IN UINT32                     ExTokenNumber\r

   )\r
 {\r
   UINT32              i;\r
   DYNAMICEX_MAPPING   *ExMap;\r
   EFI_GUID            *GuidTable;\r
   )\r
 {\r
   UINT32              i;\r
   DYNAMICEX_MAPPING   *ExMap;\r
   EFI_GUID            *GuidTable;\r

+  EFI_GUID            *MatchGuid;\r
+  UINTN               MatchGuidIdx;\r

   PEI_PCD_DATABASE    *PeiPcdDb;\r
 \r
   PeiPcdDb    = GetPcdDatabase();\r
   \r
   ExMap       = PeiPcdDb->Init.ExMapTable;\r
   GuidTable   = PeiPcdDb->Init.GuidTable;\r
   PEI_PCD_DATABASE    *PeiPcdDb;\r
 \r
   PeiPcdDb    = GetPcdDatabase();\r
   \r
   ExMap       = PeiPcdDb->Init.ExMapTable;\r
   GuidTable   = PeiPcdDb->Init.GuidTable;\r

+\r
+  MatchGuid = ScanGuid (GuidTable, sizeof(PeiPcdDb->Init.GuidTable), Guid);\r
+  ASSERT (MatchGuid != NULL);\r
+  \r
+  MatchGuidIdx = MatchGuid - GuidTable;\r

   \r
   for (i = 0; i < PEI_EXMAPPING_TABLE_SIZE; i++) {\r
     if ((ExTokenNumber == ExMap[i].ExTokenNumber) && \r
   \r
   for (i = 0; i < PEI_EXMAPPING_TABLE_SIZE; i++) {\r
     if ((ExTokenNumber == ExMap[i].ExTokenNumber) && \r

-        CompareGuid (Guid, (CONST EFI_GUID *) &GuidTable[ExMap[i].ExGuidIndex])) {\r
-      ExAttr->TokenNumber               = i + PEI_NEX_TOKEN_NUMBER;\r
-      ExAttr->Size                      = PeiPcdDb->Init.SizeTable[i + PEI_NEX_TOKEN_NUMBER];\r
-      ExAttr->LocalTokenNumberAlias     = ExMap[i].LocalTokenNumber;\r
+        (MatchGuidIdx == ExMap[i].ExGuidIndex)) {\r
+      return ExMap[i].LocalTokenNumber;\r

     }\r
   }\r
   \r
   ASSERT (FALSE);\r
   \r
     }\r
   }\r
   \r
   ASSERT (FALSE);\r
   \r

-  return;\r
+  return 0;\r

 }\r
 \r
 \r
 }\r
 \r
 \r

diff --git a/EdkModulePkg/Universal/PCD/Pei/Service.h b/EdkModulePkg/Universal/PCD/Pei/Service.h
index b0f066817ca0ea57e9868f8b77c953fb87863aa7..df774c9d39d8973980d70cf89949ae69a9813df9 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Pei/Service.h
+++ b/EdkModulePkg/Universal/PCD/Pei/Service.h
@@ -49,15 +49,6 @@ SetWorker (
   )\r
 ;\r
 \r
   )\r
 ;\r
 \r

-EFI_STATUS\r
-SetWorkerByLocalTokenNumber (\r
-  IN UINT32        LocalTokenNumber,\r
-  IN VOID          *Data,\r
-  IN UINTN         Size,\r
-  IN BOOLEAN       PtrType\r
-  )\r
-;\r
-\r

 EFI_STATUS\r
 ExSetWorker (\r
   IN PCD_TOKEN_NUMBER     ExTokenNumber,\r
 EFI_STATUS\r
 ExSetWorker (\r
   IN PCD_TOKEN_NUMBER     ExTokenNumber,\r


@@ -89,11 +80,11 @@ typedef struct {
   UINT32  LocalTokenNumberAlias;\r
 } EX_PCD_ENTRY_ATTRIBUTE;\r
 \r
   UINT32  LocalTokenNumberAlias;\r
 } EX_PCD_ENTRY_ATTRIBUTE;\r
 \r

-VOID\r
-GetExPcdTokenAttributes (\r
+\r
+PCD_TOKEN_NUMBER\r
+GetExPcdTokenNumber (\r

   IN CONST EFI_GUID             *Guid,\r
   IN CONST EFI_GUID             *Guid,\r

-  IN PCD_TOKEN_NUMBER           ExTokenNumber,\r
-  OUT EX_PCD_ENTRY_ATTRIBUTE    *ExAttr\r
+  IN PCD_TOKEN_NUMBER           ExTokenNumber\r

   )\r
 ;\r
 \r
   )\r
 ;\r
 \r