Add in support for GetNextTokenNumber API.

Use PCD_TOKEN_NUMBER as type for parameter of internal APIs.

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

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

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.h b/EdkModulePkg/Universal/PCD/Dxe/Service.h
index d33a891eba78375f71e52777383559f859a1cbc0..ec51ebbec8671e9c833f64387ce12d188f0a329b 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.h
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.h
@@ -46,16 +46,16 @@ typedef struct {
 \r
 EFI_STATUS\r
 SetWorker (\r
 \r
 EFI_STATUS\r
 SetWorker (\r

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

   )\r
 ;\r
 \r
 EFI_STATUS\r
 ExSetWorker (\r
   )\r
 ;\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                   Size,\r
   IN CONST EFI_GUID       *Guid,\r
   VOID                    *Data,\r
   UINTN                   Size,\r


@@ -66,14 +66,14 @@ ExSetWorker (
 \r
 VOID *\r
 GetWorker (\r
 \r
 VOID *\r
 GetWorker (\r

-  UINTN  TokenNumber\r
+  PCD_TOKEN_NUMBER  TokenNumber\r

   )\r
 ;\r
 \r
 VOID *\r
 ExGetWorker (\r
   IN CONST EFI_GUID         *Guid,\r
   )\r
 ;\r
 \r
 VOID *\r
 ExGetWorker (\r
   IN CONST EFI_GUID         *Guid,\r

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

   IN UINTN                  GetSize\r
   ) \r
 ;\r
   IN UINTN                  GetSize\r
   ) \r
 ;\r


@@ -90,21 +90,21 @@ EFI_STATUS
 GetHiiVariable (\r
   IN  EFI_GUID      *VariableGuid,\r
   IN  UINT16        *VariableName,\r
 GetHiiVariable (\r
   IN  EFI_GUID      *VariableGuid,\r
   IN  UINT16        *VariableName,\r

-  OUT VOID          ** VariableData,\r
+  OUT VOID          **VariableData,\r

   OUT UINTN         *VariableSize\r
   )\r
 ;\r
 \r
 EFI_STATUS\r
 DxeRegisterCallBackWorker (\r
   OUT UINTN         *VariableSize\r
   )\r
 ;\r
 \r
 EFI_STATUS\r
 DxeRegisterCallBackWorker (\r

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

   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
 );\r
 \r
 EFI_STATUS\r
 DxeUnRegisterCallBackWorker (\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
 );\r
 \r
 EFI_STATUS\r
 DxeUnRegisterCallBackWorker (\r

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

   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
 );\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
 );\r


@@ -125,7 +125,7 @@ typedef struct {
 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

diff --git a/EdkModulePkg/Universal/PCD/Pei/Pcd.c b/EdkModulePkg/Universal/PCD/Pei/Pcd.c
index 031259b22a6e694ecf68a1319a7d88186c363187..f084475335416276c7d9d6e19863310599731ec6 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Pei/Pcd.c
+++ b/EdkModulePkg/Universal/PCD/Pei/Pcd.c
@@ -500,13 +500,13 @@ PeiPcdGetNextToken (
     (*TokenNumber)++;\r
 \r
     if (*TokenNumber >= PEI_NEX_TOKEN_NUMBER) {\r
     (*TokenNumber)++;\r
 \r
     if (*TokenNumber >= PEI_NEX_TOKEN_NUMBER) {\r

-      *TokenNumber = 0;\r
+      *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r

     }\r
     \r
   } else {\r
 \r
     if (PEI_EXMAP_TABLE_EMPTY) {\r
     }\r
     \r
   } else {\r
 \r
     if (PEI_EXMAP_TABLE_EMPTY) {\r

-      *TokenNumber = (UINTN) PCD_INVALID_TOKEN_NUMBER;\r
+      *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r

       return EFI_NOT_FOUND;\r
     }\r
     \r
       return EFI_NOT_FOUND;\r
     }\r
     \r

diff --git a/EdkModulePkg/Universal/PCD/Pei/Service.c b/EdkModulePkg/Universal/PCD/Pei/Service.c
index 30595e1323a00ebf0c99f419396b9965bfa82d44..e280dd6715558a39b82c33175db5892bcd0145f2 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Pei/Service.c
+++ b/EdkModulePkg/Universal/PCD/Pei/Service.c
@@ -62,10 +62,12 @@ PeiRegisterCallBackWorker (
   ASSERT (GuidHob != NULL);\r
   \r
   CallbackTable = GET_GUID_HOB_DATA (GuidHob);\r
   ASSERT (GuidHob != NULL);\r
   \r
   CallbackTable = GET_GUID_HOB_DATA (GuidHob);\r

+  CallbackTable = CallbackTable + (TokenNumber * FixedPcdGet32(PcdMaxPeiPcdCallBackNumberPerPcdEntry));\r

 \r
   Compare = Register? NULL: CallBackFunction;\r
   Assign  = Register? CallBackFunction: NULL;\r
 \r
 \r
   Compare = Register? NULL: CallBackFunction;\r
   Assign  = Register? CallBackFunction: NULL;\r
 \r

+\r

   for (Idx = 0; Idx < FixedPcdGet32(PcdMaxPeiPcdCallBackNumberPerPcdEntry); Idx++) {\r
     if (CallbackTable[Idx] == Compare) {\r
       CallbackTable[Idx] = Assign;\r
   for (Idx = 0; Idx < FixedPcdGet32(PcdMaxPeiPcdCallBackNumberPerPcdEntry); Idx++) {\r
     if (CallbackTable[Idx] == Compare) {\r
       CallbackTable[Idx] = Assign;\r

diff --git a/EdkModulePkg/Universal/PCD/Pei/Service.h b/EdkModulePkg/Universal/PCD/Pei/Service.h
index 611427b578bd23f0f1aaabd19b0827ee240b3c9f..b0f066817ca0ea57e9868f8b77c953fb87863aa7 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Pei/Service.h
+++ b/EdkModulePkg/Universal/PCD/Pei/Service.h
@@ -42,43 +42,43 @@ GetPcdDatabase (
 \r
 EFI_STATUS\r
 SetWorker (\r
 \r
 EFI_STATUS\r
 SetWorker (\r

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

   )\r
 ;\r
 \r
 EFI_STATUS\r
 SetWorkerByLocalTokenNumber (\r
   )\r
 ;\r
 \r
 EFI_STATUS\r
 SetWorkerByLocalTokenNumber (\r

-  UINT32        LocalTokenNumber,\r
-  VOID          *Data,\r
-  UINTN         Size,\r
-  BOOLEAN       PtrType\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
   )\r
 ;\r
 \r
 EFI_STATUS\r
 ExSetWorker (\r

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

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

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

   )\r
 ;\r
 \r
 VOID *\r
 GetWorker (\r
   )\r
 ;\r
 \r
 VOID *\r
 GetWorker (\r

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

   )\r
 ;\r
 \r
 VOID *\r
 ExGetWorker (\r
   IN CONST EFI_GUID   *Guid,\r
   )\r
 ;\r
 \r
 VOID *\r
 ExGetWorker (\r
   IN CONST EFI_GUID   *Guid,\r

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

   IN UINTN            GetSize\r
   )\r
 ;\r
   IN UINTN            GetSize\r
   )\r
 ;\r


@@ -92,19 +92,25 @@ typedef struct {
 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
 \r
   OUT EX_PCD_ENTRY_ATTRIBUTE    *ExAttr\r
   )\r
 ;\r
 \r

+\r
+\r
+\r

 EFI_STATUS\r
 PeiRegisterCallBackWorker (\r
 EFI_STATUS\r
 PeiRegisterCallBackWorker (\r

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

   IN  CONST GUID         *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK   CallBackFunction,\r
   IN  BOOLEAN            Register\r
 );\r
 \r
   IN  CONST GUID         *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK   CallBackFunction,\r
   IN  BOOLEAN            Register\r
 );\r
 \r

+\r
+\r
+\r

 VOID\r
 BuildPcdDatabase (\r
   VOID\r
 VOID\r
 BuildPcdDatabase (\r
   VOID\r

diff --git a/EdkModulePkg/Universal/PCD/Test/PcdTest.c b/EdkModulePkg/Universal/PCD/Test/PcdTest.c
index 21fa67a6aa9789e1a9d9642cf251c37b400f9af7..6f2a5f1f1f4122a7566b3fdfeb8714879f6dfcc0 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Test/PcdTest.c
+++ b/EdkModulePkg/Universal/PCD/Test/PcdTest.c
@@ -23,9 +23,10 @@ CONST GUID Guid1  = GUID1;
 EFI_STATUS\r
 EFIAPI\r
 OnsetCallback1 (\r
 EFI_STATUS\r
 EFIAPI\r
 OnsetCallback1 (\r

-  IN  UINT32    CallBackToken,\r
-  IN  VOID      *TokenData,\r
-  IN  UINTN     TokenDataSize\r
+  IN  CONST EFI_GUID  *Guid,\r
+  IN  UINT32          CallBackToken,\r
+  IN  VOID            *TokenData,\r
+  IN  UINTN           TokenDataSize\r

   )\r
 {\r
   DebugPrint (0x80000000, "In CallbackOnSet %x %d\n", * ((UINT32 *)TokenData), TokenDataSize);    \r
   )\r
 {\r
   DebugPrint (0x80000000, "In CallbackOnSet %x %d\n", * ((UINT32 *)TokenData), TokenDataSize);    \r


@@ -42,6 +43,10 @@ DoTest(
   UINT16    u16;\r
   UINT32    u32;\r
   UINT64    u64;\r
   UINT16    u16;\r
   UINT32    u32;\r
   UINT64    u64;\r

+  PCD_TOKEN_NUMBER Token;\r
+  \r
+\r
+  LibPcdCallbackOnSet (NULL, PcdToken(PcdTestDynamicUint32), OnsetCallback1);\r

   \r
   u32 = 0xafafafaf;\r
   PcdSet32(PcdTestDynamicUint32, u32);\r
   \r
   u32 = 0xafafafaf;\r
   PcdSet32(PcdTestDynamicUint32, u32);\r


@@ -57,6 +62,15 @@ DoTest(
   ASSERT (u16 == 0x1234);\r
   ASSERT (u64 == PcdGet64(PcdTestDynamicUint64));\r
   ASSERT (u32 == PcdGet32(PcdTestDynamicUint32));\r
   ASSERT (u16 == 0x1234);\r
   ASSERT (u64 == PcdGet64(PcdTestDynamicUint64));\r
   ASSERT (u32 == PcdGet32(PcdTestDynamicUint32));\r

+\r
+\r
+  Token = PCD_INVALID_TOKEN_NUMBER;\r
+\r
+  do {\r
+    Token = LibPcdGetNextToken (NULL, Token);\r
+    DebugPrint (EFI_D_ERROR, "Next Token Number is %d\n", Token);\r
+  } while (Token != PCD_INVALID_TOKEN_NUMBER);\r
+  \r

   \r
   return;\r
 }\r
   \r
   return;\r
 }\r