Add in support for GetNextTokenNumber API.

[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 ebef59590f0377ee928ec07126990b56b8e79f3a..53d9621e8cd0809b5641f5d4d6579dd7ed72e19d 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.c
@@ -444,10 +444,10 @@ InvokeCallbackOnSet (
 \r
 EFI_STATUS\r
 SetWorker (\r
 \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              *LocalTokenNumberTable;\r
   )\r
 {\r
   UINT32              *LocalTokenNumberTable;\r


@@ -467,11 +467,11 @@ 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
+\r

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

-  InvokeCallbackOnSet (0, NULL, TokenNumber, Data, Size);\r
-\r

   return SetWorkerByLocalTokenNumber (LocalTokenNumberTable[TokenNumber], Data, Size, PtrType, IsPeiDb);\r
 \r
 }\r
   return SetWorkerByLocalTokenNumber (LocalTokenNumberTable[TokenNumber], Data, Size, PtrType, IsPeiDb);\r
 \r
 }\r


@@ -505,7 +505,7 @@ ExGetWorker (
 \r
 EFI_STATUS\r
 ExSetWorker (\r
 \r
 EFI_STATUS\r
 ExSetWorker (\r

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

   IN CONST EFI_GUID       *Guid,\r
   VOID                    *Data,\r
   UINTN                   SetSize,\r
   IN CONST EFI_GUID       *Guid,\r
   VOID                    *Data,\r
   UINTN                   SetSize,\r


@@ -683,7 +683,7 @@ SetHiiVariable (
 VOID\r
 GetExPcdTokenAttributes (\r
   IN CONST EFI_GUID             *Guid,\r
 VOID\r
 GetExPcdTokenAttributes (\r
   IN CONST EFI_GUID             *Guid,\r

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

   OUT EX_PCD_ENTRY_ATTRIBUTE    *ExAttr\r
   )\r
 {\r
   OUT EX_PCD_ENTRY_ATTRIBUTE    *ExAttr\r
   )\r
 {\r


@@ -721,7 +721,7 @@ GetExPcdTokenAttributes (
 \r
         ExAttr->IsPeiDb               = FALSE;\r
         ExAttr->Size                  = SizeTable[i + DXE_NEX_TOKEN_NUMBER];\r
 \r
         ExAttr->IsPeiDb               = FALSE;\r
         ExAttr->Size                  = SizeTable[i + DXE_NEX_TOKEN_NUMBER];\r

-        ExAttr->TokenNumber           = i + DXE_NEX_TOKEN_NUMBER;\r
+        ExAttr->TokenNumber           = i + PEI_LOCAL_TOKEN_NUMBER;\r

         ExAttr->LocalTokenNumberAlias = ExMap[i].LocalTokenNumber;\r
         return;\r
 \r
         ExAttr->LocalTokenNumberAlias = ExMap[i].LocalTokenNumber;\r
         return;\r
 \r