Add in GetNextToken and Register Callback Function funtionality for DXE Driver.

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

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
index 5340ef5471bb222d9296b138d9fe7eab1fe65490..55633148bba1ad58cda1c91f085a61b74ce599b3 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -51,8 +51,8 @@ PCD_PROTOCOL mPcdInstance = {
   DxePcdSetPtrEx,\r
   DxePcdSetBoolEx,\r
 \r
   DxePcdSetPtrEx,\r
   DxePcdSetBoolEx,\r
 \r

-  PcdRegisterCallBackOnSet,\r
-  PcdUnRegisterCallBackOnSet,\r
+  DxeRegisterCallBackOnSet,\r
+  DxeUnRegisterCallBackOnSet,\r

   DxePcdGetNextToken\r
 };\r
 \r
   DxePcdGetNextToken\r
 };\r
 \r


@@ -103,7 +103,7 @@ DxePcdSetSku (
   IN  SKU_ID         SkuId\r
   )\r
 {\r
   IN  SKU_ID         SkuId\r
   )\r
 {\r

-  gPcdDatabase->PeiDb.Init.SystemSkuId = SkuId;\r
+  mPcdDatabase->PeiDb.Init.SystemSkuId = SkuId;\r

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


@@ -113,7 +113,7 @@ DxePcdSetSku (
 UINT8\r
 EFIAPI\r
 DxePcdGet8 (\r
 UINT8\r
 EFIAPI\r
 DxePcdGet8 (\r

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

   )\r
 {\r
   ASSERT (sizeof (UINT8) == DxePcdGetSize (TokenNumber));\r
   )\r
 {\r
   ASSERT (sizeof (UINT8) == DxePcdGetSize (TokenNumber));\r


@@ -126,7 +126,7 @@ DxePcdGet8 (
 UINT16\r
 EFIAPI\r
 DxePcdGet16 (\r
 UINT16\r
 EFIAPI\r
 DxePcdGet16 (\r

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

   )\r
 {\r
   ASSERT (sizeof (UINT16) == DxePcdGetSize (TokenNumber));\r
   )\r
 {\r
   ASSERT (sizeof (UINT16) == DxePcdGetSize (TokenNumber));\r


@@ -139,7 +139,7 @@ DxePcdGet16 (
 UINT32\r
 EFIAPI\r
 DxePcdGet32 (\r
 UINT32\r
 EFIAPI\r
 DxePcdGet32 (\r

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

   )\r
 {\r
   ASSERT (sizeof (UINT32) == DxePcdGetSize (TokenNumber));\r
   )\r
 {\r
   ASSERT (sizeof (UINT32) == DxePcdGetSize (TokenNumber));\r


@@ -152,7 +152,7 @@ DxePcdGet32 (
 UINT64\r
 EFIAPI\r
 DxePcdGet64 (\r
 UINT64\r
 EFIAPI\r
 DxePcdGet64 (\r

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

   )\r
 {\r
   ASSERT (sizeof (UINT64) == DxePcdGetSize (TokenNumber));\r
   )\r
 {\r
   ASSERT (sizeof (UINT64) == DxePcdGetSize (TokenNumber));\r


@@ -165,7 +165,7 @@ DxePcdGet64 (
 VOID *\r
 EFIAPI\r
 DxePcdGetPtr (\r
 VOID *\r
 EFIAPI\r
 DxePcdGetPtr (\r

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

   )\r
 {\r
   return GetWorker (TokenNumber);\r
   )\r
 {\r
   return GetWorker (TokenNumber);\r


@@ -176,7 +176,7 @@ DxePcdGetPtr (
 BOOLEAN\r
 EFIAPI\r
 DxePcdGetBool (\r
 BOOLEAN\r
 EFIAPI\r
 DxePcdGetBool (\r

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

   )\r
 {\r
   ASSERT (sizeof (BOOLEAN) == DxePcdGetSize (TokenNumber));\r
   )\r
 {\r
   ASSERT (sizeof (BOOLEAN) == DxePcdGetSize (TokenNumber));\r


@@ -189,13 +189,13 @@ DxePcdGetBool (
 UINTN\r
 EFIAPI\r
 DxePcdGetSize (\r
 UINTN\r
 EFIAPI\r
 DxePcdGetSize (\r

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

   )\r
 {\r
   UINT16 * SizeTable;\r
 \r
   )\r
 {\r
   UINT16 * SizeTable;\r
 \r

-  SizeTable = (TokenNumber < PEI_LOCAL_TOKEN_NUMBER) ? gPcdDatabase->PeiDb.Init.SizeTable :\r
-                                                    gPcdDatabase->DxeDb.Init.SizeTable;\r
+  SizeTable = (TokenNumber < PEI_LOCAL_TOKEN_NUMBER) ? mPcdDatabase->PeiDb.Init.SizeTable :\r
+                                                    mPcdDatabase->DxeDb.Init.SizeTable;\r

 \r
 \r
   TokenNumber = (TokenNumber < PEI_LOCAL_TOKEN_NUMBER) ? TokenNumber : (TokenNumber - PEI_LOCAL_TOKEN_NUMBER);\r
 \r
 \r
   TokenNumber = (TokenNumber < PEI_LOCAL_TOKEN_NUMBER) ? TokenNumber : (TokenNumber - PEI_LOCAL_TOKEN_NUMBER);\r


@@ -209,7 +209,7 @@ UINT8
 EFIAPI\r
 DxePcdGet8Ex (\r
   IN CONST EFI_GUID         *Guid,\r
 EFIAPI\r
 DxePcdGet8Ex (\r
   IN CONST EFI_GUID         *Guid,\r

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

   )\r
 {\r
   return *((UINT8 *) ExGetWorker (Guid, ExTokenNumber, sizeof(UINT8)));\r
   )\r
 {\r
   return *((UINT8 *) ExGetWorker (Guid, ExTokenNumber, sizeof(UINT8)));\r


@@ -221,7 +221,7 @@ UINT16
 EFIAPI\r
 DxePcdGet16Ex (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 DxePcdGet16Ex (\r
   IN CONST EFI_GUID        *Guid,\r

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

   )\r
 {\r
   return *((UINT16 *) ExGetWorker (Guid, ExTokenNumber, sizeof(UINT16)));\r
   )\r
 {\r
   return *((UINT16 *) ExGetWorker (Guid, ExTokenNumber, sizeof(UINT16)));\r


@@ -233,7 +233,7 @@ UINT32
 EFIAPI\r
 DxePcdGet32Ex (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 DxePcdGet32Ex (\r
   IN CONST EFI_GUID        *Guid,\r

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

   )\r
 {\r
   return *((UINT32 *) ExGetWorker (Guid, ExTokenNumber, sizeof(UINT32)));\r
   )\r
 {\r
   return *((UINT32 *) ExGetWorker (Guid, ExTokenNumber, sizeof(UINT32)));\r


@@ -245,7 +245,7 @@ UINT64
 EFIAPI\r
 DxePcdGet64Ex (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 DxePcdGet64Ex (\r
   IN CONST EFI_GUID        *Guid,\r

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

   )\r
 {\r
   //\r
   )\r
 {\r
   //\r


@@ -260,7 +260,7 @@ VOID *
 EFIAPI\r
 DxePcdGetPtrEx (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 DxePcdGetPtrEx (\r
   IN CONST EFI_GUID        *Guid,\r

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

   )\r
 {\r
   return ExGetWorker (Guid, ExTokenNumber, 0);\r
   )\r
 {\r
   return ExGetWorker (Guid, ExTokenNumber, 0);\r


@@ -272,7 +272,7 @@ BOOLEAN
 EFIAPI\r
 DxePcdGetBoolEx (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 DxePcdGetBoolEx (\r
   IN CONST EFI_GUID        *Guid,\r

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

   )\r
 {\r
   return *((BOOLEAN *) ExGetWorker (Guid, ExTokenNumber, sizeof(BOOLEAN)));\r
   )\r
 {\r
   return *((BOOLEAN *) ExGetWorker (Guid, ExTokenNumber, sizeof(BOOLEAN)));\r


@@ -284,7 +284,7 @@ UINTN
 EFIAPI\r
 DxePcdGetSizeEx (\r
   IN CONST EFI_GUID        *Guid,\r
 EFIAPI\r
 DxePcdGetSizeEx (\r
   IN CONST EFI_GUID        *Guid,\r

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

   )\r
 {\r
   EX_PCD_ENTRY_ATTRIBUTE    Attr;\r
   )\r
 {\r
   EX_PCD_ENTRY_ATTRIBUTE    Attr;\r


@@ -299,7 +299,7 @@ DxePcdGetSizeEx (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet8 (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet8 (\r

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

   IN UINT8              Value\r
   )\r
 {\r
   IN UINT8              Value\r
   )\r
 {\r


@@ -311,7 +311,7 @@ DxePcdSet8 (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet16 (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet16 (\r

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

   IN UINT16             Value\r
   )\r
 {\r
   IN UINT16             Value\r
   )\r
 {\r


@@ -323,7 +323,7 @@ DxePcdSet16 (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet32 (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet32 (\r

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

   IN UINT32             Value\r
   )\r
 {\r
   IN UINT32             Value\r
   )\r
 {\r


@@ -335,7 +335,7 @@ DxePcdSet32 (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet64 (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet64 (\r

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

   IN UINT64             Value\r
   )\r
 {\r
   IN UINT64             Value\r
   )\r
 {\r


@@ -347,7 +347,7 @@ DxePcdSet64 (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSetPtr (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSetPtr (\r

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

   IN UINTN              SizeOfBuffer,\r
   IN VOID               *Buffer\r
   )\r
   IN UINTN              SizeOfBuffer,\r
   IN VOID               *Buffer\r
   )\r


@@ -360,7 +360,7 @@ DxePcdSetPtr (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSetBool (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSetBool (\r

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

   IN BOOLEAN            Value\r
   )\r
 {\r
   IN BOOLEAN            Value\r
   )\r
 {\r


@@ -372,8 +372,8 @@ DxePcdSetBool (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet8Ex (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet8Ex (\r

-  IN CONST EFI_GUID        *Guid,\r
-  IN UINTN                  ExTokenNumber,\r
+  IN CONST EFI_GUID         *Guid,\r
+  IN PCD_TOKEN_NUMBER       ExTokenNumber,\r

   IN UINT8                  Value\r
   )\r
 {\r
   IN UINT8                  Value\r
   )\r
 {\r


@@ -391,8 +391,8 @@ DxePcdSet8Ex (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet16Ex (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet16Ex (\r

-  IN CONST EFI_GUID        *Guid,\r
-  IN UINTN  ExTokenNumber,\r
+  IN CONST EFI_GUID    *Guid,\r
+  IN PCD_TOKEN_NUMBER  ExTokenNumber,\r

   IN UINT16            Value\r
   )\r
 {\r
   IN UINT16            Value\r
   )\r
 {\r


@@ -410,8 +410,8 @@ DxePcdSet16Ex (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet32Ex (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet32Ex (\r

-  IN CONST EFI_GUID        *Guid,\r
-  IN UINTN  ExTokenNumber,\r
+  IN CONST EFI_GUID     *Guid,\r
+  IN PCD_TOKEN_NUMBER   ExTokenNumber,\r

   IN UINT32             Value\r
   )\r
 {\r
   IN UINT32             Value\r
   )\r
 {\r


@@ -429,8 +429,8 @@ DxePcdSet32Ex (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet64Ex (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet64Ex (\r

-  IN CONST EFI_GUID        *Guid,\r
-  IN UINTN  ExTokenNumber,\r
+  IN CONST EFI_GUID    *Guid,\r
+  IN PCD_TOKEN_NUMBER  ExTokenNumber,\r

   IN UINT64            Value\r
   )\r
 {\r
   IN UINT64            Value\r
   )\r
 {\r


@@ -449,7 +449,7 @@ EFI_STATUS
 EFIAPI\r
 DxePcdSetPtrEx (\r
   IN CONST EFI_GUID         *Guid,\r
 EFIAPI\r
 DxePcdSetPtrEx (\r
   IN CONST EFI_GUID         *Guid,\r

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

   IN UINTN                  SizeOfBuffer,\r
   IN VOID                   *Buffer\r
   )\r
   IN UINTN                  SizeOfBuffer,\r
   IN VOID                   *Buffer\r
   )\r


@@ -468,8 +468,8 @@ DxePcdSetPtrEx (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSetBoolEx (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSetBoolEx (\r

-  IN CONST EFI_GUID        *Guid,\r
-  IN UINTN  ExTokenNumber,\r
+  IN CONST EFI_GUID    *Guid,\r
+  IN PCD_TOKEN_NUMBER  ExTokenNumber,\r

   IN BOOLEAN           Value\r
   )\r
 {\r
   IN BOOLEAN           Value\r
   )\r
 {\r


@@ -487,26 +487,30 @@ DxePcdSetBoolEx (
 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r

-PcdRegisterCallBackOnSet (\r
-  IN  UINTN        TokenNumber,\r
-  IN  CONST EFI_GUID              *Guid, OPTIONAL\r
+DxeRegisterCallBackOnSet (\r
+  IN  PCD_TOKEN_NUMBER        TokenNumber,\r
+  IN  CONST EFI_GUID          *Guid, OPTIONAL\r

   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   )\r
 {\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   )\r
 {\r

-  return DxeRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction, TRUE);\r
+  ASSERT (CallBackFunction != NULL);\r
+  \r
+  return DxeRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction);\r

 }\r
 \r
 \r
 \r
 EFI_STATUS\r
 EFIAPI\r
 }\r
 \r
 \r
 \r
 EFI_STATUS\r
 EFIAPI\r

-PcdUnRegisterCallBackOnSet (\r
-  IN  UINTN        TokenNumber,\r
-  IN  CONST EFI_GUID              *Guid, OPTIONAL\r
+DxeUnRegisterCallBackOnSet (\r
+  IN  PCD_TOKEN_NUMBER        TokenNumber,\r
+  IN  CONST EFI_GUID          *Guid, OPTIONAL\r

   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   )\r
 {\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   )\r
 {\r

-  return DxeRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction, FALSE);\r
+  ASSERT (CallBackFunction != NULL);\r
+  \r
+  return DxeRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction);\r

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


@@ -514,10 +518,65 @@ PcdUnRegisterCallBackOnSet (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdGetNextToken (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdGetNextToken (\r

-  IN CONST EFI_GUID               *Guid, OPTIONAL\r
-  IN OUT  UINTN    *TokenNumber\r
+  IN CONST EFI_GUID         *Guid, OPTIONAL\r
+  IN OUT   PCD_TOKEN_NUMBER *TokenNumber\r

   )\r
 {\r
   )\r
 {\r

-  return DxeGetNextTokenWorker (TokenNumber, Guid);\r
+  PCD_TOKEN_NUMBER    ExTokenNumber;\r
+  \r
+  //\r
+  // Scan the local token space\r
+  //\r
+  if (Guid == NULL) {\r
+    *TokenNumber++;\r
+    if (*TokenNumber == PCD_INVALID_TOKEN_NUMBER) {\r
+      return EFI_SUCCESS;\r
+    } else {\r
+      if (*TokenNumber >= PEI_NEX_TOKEN_NUMBER &&\r
+          *TokenNumber < PEI_LOCAL_TOKEN_NUMBER) {\r
+        //\r
+        // The first Non-Ex type Token Number for DXE PCD \r
+        // database is PEI_LOCAL_TOKEN_NUMBER\r
+        //\r
+        *TokenNumber = PEI_LOCAL_TOKEN_NUMBER;\r
+        return EFI_SUCCESS;\r
+      } else if (*TokenNumber >= DXE_NEX_TOKEN_NUMBER + PEI_LOCAL_TOKEN_NUMBER) {\r
+        *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
+        return EFI_SUCCESS;\r
+      }\r
+    }\r
+  }\r
+\r
+  if (PEI_EXMAP_TABLE_EMPTY && PEI_EXMAP_TABLE_EMPTY) {\r
+    *TokenNumber = (UINTN) PCD_INVALID_TOKEN_NUMBER;\r
+    return EFI_NOT_FOUND;\r
+  }\r
+\r
+  ExTokenNumber = *TokenNumber;\r
+  if (!PEI_EXMAP_TABLE_EMPTY) {\r
+    ExTokenNumber = ExGetNextTokeNumber (\r
+                        Guid,\r
+                        ExTokenNumber,\r
+                        mPcdDatabase->PeiDb.Init.GuidTable,\r
+                        sizeof(mPcdDatabase->PeiDb.Init.GuidTable),\r
+                        mPcdDatabase->PeiDb.Init.ExMapTable,\r
+                        sizeof(mPcdDatabase->PeiDb.Init.ExMapTable)\r
+                        );\r
+  }\r
+\r
+  if (!DXE_EXMAP_TABLE_EMPTY) {\r
+    ExTokenNumber = ExGetNextTokeNumber (\r
+                        Guid,\r
+                        ExTokenNumber,\r
+                        mPcdDatabase->PeiDb.Init.GuidTable,\r
+                        sizeof(mPcdDatabase->PeiDb.Init.GuidTable),\r
+                        mPcdDatabase->PeiDb.Init.ExMapTable,\r
+                        sizeof(mPcdDatabase->PeiDb.Init.ExMapTable)\r
+                        );\r
+  }\r
+\r
+  *TokenNumber = ExTokenNumber;\r
+\r
+  return EFI_SUCCESS;\r

 }\r
 \r
 }\r
 \r

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.c b/EdkModulePkg/Universal/PCD/Dxe/Service.c
index 52097ade7e877d0baef83fd08a6c4362db1becee..ebef59590f0377ee928ec07126990b56b8e79f3a 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.c
@@ -22,13 +22,9 @@ Module Name: Service.c
 // Compression Algorithm will take care of the size optimization.\r
 //\r
 \r
 // Compression Algorithm will take care of the size optimization.\r
 //\r
 \r

-/*\r
-DXE_PCD_DATABASE_INIT gDXEPcdDbInit = {\r
-  DXE_PCD_DB_INIT_VALUE\r
-};\r
-*/\r
+PCD_DATABASE * mPcdDatabase;\r

 \r
 \r

-PCD_DATABASE * gPcdDatabase;\r
+LIST_ENTRY mCallbackFnTable[PCD_TOTAL_TOKEN_NUMBER];\r

 \r
 VOID *\r
 GetWorkerByLocalTokenNumber (\r
 \r
 VOID *\r
 GetWorkerByLocalTokenNumber (\r


@@ -54,9 +50,9 @@ GetWorkerByLocalTokenNumber (
     LocalTokenNumber = GetSkuEnabledTokenNumber (LocalTokenNumber & ~PCD_TYPE_SKU_ENABLED, Size, IsPeiDb);\r
   }\r
 \r
     LocalTokenNumber = GetSkuEnabledTokenNumber (LocalTokenNumber & ~PCD_TYPE_SKU_ENABLED, Size, IsPeiDb);\r
   }\r
 \r

-  PcdDb = IsPeiDb ? ((UINT8 *) &gPcdDatabase->PeiDb) : ((UINT8 *) &gPcdDatabase->DxeDb);\r
-  StringTable = IsPeiDb ? gPcdDatabase->PeiDb.Init.StringTable :\r
-                          gPcdDatabase->DxeDb.Init.StringTable;\r
+  PcdDb = IsPeiDb ? ((UINT8 *) &mPcdDatabase->PeiDb) : ((UINT8 *) &mPcdDatabase->DxeDb);\r
+  StringTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.StringTable :\r
+                          mPcdDatabase->DxeDb.Init.StringTable;\r

   \r
   Offset     = LocalTokenNumber & PCD_DATABASE_OFFSET_MASK;\r
   \r
   \r
   Offset     = LocalTokenNumber & PCD_DATABASE_OFFSET_MASK;\r
   \r


@@ -66,8 +62,8 @@ GetWorkerByLocalTokenNumber (
       return (VOID *) (FixedPcdGet32(PcdVpdBaseAddress) + VpdHead->Offset);\r
       \r
     case PCD_TYPE_HII:\r
       return (VOID *) (FixedPcdGet32(PcdVpdBaseAddress) + VpdHead->Offset);\r
       \r
     case PCD_TYPE_HII:\r

-      GuidTable   = IsPeiDb ? gPcdDatabase->PeiDb.Init.GuidTable :\r
-                              gPcdDatabase->DxeDb.Init.GuidTable;\r
+      GuidTable   = IsPeiDb ? mPcdDatabase->PeiDb.Init.GuidTable :\r
+                              mPcdDatabase->DxeDb.Init.GuidTable;\r

                               \r
       VariableHead = (VARIABLE_HEAD *) (PcdDb + Offset);\r
       \r
                               \r
       VariableHead = (VARIABLE_HEAD *) (PcdDb + Offset);\r
       \r


@@ -112,11 +108,11 @@ GetWorker (
   \r
   IsPeiDb = (TokenNumber <= PEI_LOCAL_TOKEN_NUMBER) ? TRUE : FALSE;\r
 \r
   \r
   IsPeiDb = (TokenNumber <= PEI_LOCAL_TOKEN_NUMBER) ? TRUE : FALSE;\r
 \r

-  LocalTokenNumberTable  = IsPeiDb ? gPcdDatabase->PeiDb.Init.LocalTokenNumberTable : \r
-                                     gPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r
+  LocalTokenNumberTable  = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : \r
+                                     mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r

 \r
 \r

-  SizeTable              = IsPeiDb ? gPcdDatabase->PeiDb.Init.SizeTable: \r
-                                     gPcdDatabase->DxeDb.Init.SizeTable;\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
   TokenNumber            = IsPeiDb ? TokenNumber :\r
                                      TokenNumber - PEI_LOCAL_TOKEN_NUMBER;\r


@@ -129,23 +125,150 @@ EFI_STATUS
 DxeRegisterCallBackWorker (\r
   IN  UINTN                   TokenNumber,\r
   IN  CONST GUID              *Guid, OPTIONAL\r
 DxeRegisterCallBackWorker (\r
   IN  UINTN                   TokenNumber,\r
   IN  CONST GUID              *Guid, OPTIONAL\r

-  IN  PCD_PROTOCOL_CALLBACK   CallBackFunction,\r
-  IN  BOOLEAN                 Register\r
+  IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r

 )\r
 {\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
+    GetExPcdTokenAttributes (Guid, TokenNumber, &ExAttr);\r
+    TokenNumber = ExAttr.LocalTokenNumberAlias;\r
+  }\r
+\r
+  ListHead = &mCallbackFnTable[TokenNumber];\r
+  ListNode = GetFirstNode (ListHead);\r
+\r
+  while (ListNode != ListHead) {\r
+    FnTableEntry = CR_FNENTRY_FROM_LISTNODE(ListNode, CALLBACK_FN_ENTRY, Node);\r
+\r
+    if (FnTableEntry->CallbackFn == CallBackFunction) {\r
+      //\r
+      // We only allow a Callback function to be register once\r
+      // for a TokenNumber. So just return EFI_SUCCESS\r
+      //\r
+      return EFI_SUCCESS;\r
+    }\r
+    ListNode = GetNextNode (ListHead, ListNode);\r
+  }\r
+\r
+  FnTableEntry = AllocatePool (sizeof(CALLBACK_FN_ENTRY));\r
+  ASSERT (FnTableEntry != NULL);\r
+\r
+  FnTableEntry->CallbackFn = CallBackFunction;\r
+  InsertTailList (ListHead, &FnTableEntry->Node);\r

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

+\r
+\r

 EFI_STATUS\r
 EFI_STATUS\r

-DxeGetNextTokenWorker (\r
-  IN OUT UINTN            *TokenNumber,\r
-  IN CONST GUID           *Guid     OPTIONAL\r
+DxeUnRegisterCallBackWorker (\r
+  IN  UINTN                   TokenNumber,\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
+    GetExPcdTokenAttributes (Guid, TokenNumber, &ExAttr);\r
+    TokenNumber = ExAttr.LocalTokenNumberAlias;\r
+  }\r
+\r
+  ListHead = &mCallbackFnTable[TokenNumber];\r
+  ListNode = GetFirstNode (ListHead);\r
+\r
+  while (ListNode != ListHead) {\r
+    FnTableEntry = CR_FNENTRY_FROM_LISTNODE(ListNode, CALLBACK_FN_ENTRY, Node);\r
+\r
+    if (FnTableEntry->CallbackFn == CallBackFunction) {\r
+      //\r
+      // We only allow a Callback function to be register once\r
+      // for a TokenNumber. So we can safely remove the Node from\r
+      // the Link List and return EFI_SUCCESS.\r
+      //\r
+      RemoveEntryList (ListNode);\r
+      FreePool (FnTableEntry);\r
+      \r
+      return EFI_SUCCESS;\r
+    }\r
+    ListNode = GetNextNode (ListHead, ListNode);\r
+  }\r
+\r
+  return EFI_INVALID_PARAMETER;\r
+}\r
+\r
+\r
+\r
+PCD_TOKEN_NUMBER\r
+ExGetNextTokeNumber (\r
+  IN CONST EFI_GUID         *Guid,\r
+  IN PCD_TOKEN_NUMBER       TokenNumber,\r
+  IN EFI_GUID               *GuidTable,\r
+  IN UINTN                  SizeOfGuidTable,\r
+  IN DYNAMICEX_MAPPING      *ExMapTable,\r
+  IN UINTN                  SizeOfExMapTable\r

   )\r
 {\r
   )\r
 {\r

-  return EFI_SUCCESS;\r
+  EFI_GUID         *MatchGuid;\r
+  UINTN            Idx;\r
+  UINTN            GuidTableIdx;\r
+  BOOLEAN          Found;\r
+\r
+  MatchGuid = ScanGuid (GuidTable, SizeOfGuidTable, Guid);\r
+  if (MatchGuid == NULL) {\r
+    return PCD_INVALID_TOKEN_NUMBER;\r
+  }\r
+\r
+  Found = FALSE;\r
+  GuidTableIdx = MatchGuid - GuidTable;\r
+  for (Idx = 0; Idx < SizeOfExMapTable; Idx++) {\r
+    if (ExMapTable[Idx].ExGuidIndex == GuidTableIdx) {\r
+      Found = TRUE;\r
+      break;\r
+    }\r
+  }\r
+\r
+  if (Found) {\r
+    if (TokenNumber == PCD_INVALID_TOKEN_NUMBER) {\r
+      return ExMapTable[Idx].ExTokenNumber;\r
+    }\r
+    \r
+    for ( ; Idx < SizeOfExMapTable; Idx++) {\r
+      if (ExMapTable[Idx].ExTokenNumber == TokenNumber) {\r
+        Idx++;\r
+        if (Idx == SizeOfExMapTable) {\r
+          //\r
+          // Exceed the length of ExMap Table\r
+          //\r
+          return PCD_INVALID_TOKEN_NUMBER;\r
+        } else if (ExMapTable[Idx].ExGuidIndex == GuidTableIdx) {\r
+          //\r
+          // Found the next match\r
+          //\r
+          return ExMapTable[Idx].ExTokenNumber;\r
+        } else {\r
+          //\r
+          // Guid has been changed. It is the next Token Space Guid.\r
+          // We should flag no more TokenNumber.\r
+          //\r
+          return PCD_INVALID_TOKEN_NUMBER;\r
+        }\r
+      }\r
+    }\r
+  }\r
+  \r
+  return PCD_INVALID_TOKEN_NUMBER;\r

 }\r
 }\r

+  \r

 \r
 \r
 \r
 \r
 \r
 \r


@@ -156,9 +279,10 @@ BuildPcdDxeDataBase (
 {\r
   PEI_PCD_DATABASE    *PeiDatabase;\r
   EFI_HOB_GUID_TYPE   *GuidHob;\r
 {\r
   PEI_PCD_DATABASE    *PeiDatabase;\r
   EFI_HOB_GUID_TYPE   *GuidHob;\r

+  UINTN               Idx;\r

 \r
 \r

-  gPcdDatabase = AllocateZeroPool (sizeof(PCD_DATABASE));\r
-  ASSERT (gPcdDatabase != NULL);\r
+  mPcdDatabase = AllocateZeroPool (sizeof(PCD_DATABASE));\r
+  ASSERT (mPcdDatabase != NULL);\r

 \r
   GuidHob = GetFirstGuidHob (&gPcdDataBaseHobGuid);\r
   ASSERT (GuidHob != NULL);\r
 \r
   GuidHob = GetFirstGuidHob (&gPcdDataBaseHobGuid);\r
   ASSERT (GuidHob != NULL);\r


@@ -167,12 +291,20 @@ BuildPcdDxeDataBase (
   //\r
   // Copy PCD Entries refereneced in PEI phase to PCD DATABASE\r
   //\r
   //\r
   // Copy PCD Entries refereneced in PEI phase to PCD DATABASE\r
   //\r

-  CopyMem (&gPcdDatabase->PeiDb, PeiDatabase, sizeof (PEI_PCD_DATABASE));\r
+  CopyMem (&mPcdDatabase->PeiDb, PeiDatabase, sizeof (PEI_PCD_DATABASE));\r

 \r
   //\r
   // Copy PCD Entries with default value to PCD DATABASE\r
   //\r
 \r
   //\r
   // Copy PCD Entries with default value to PCD DATABASE\r
   //\r

-  CopyMem (&gPcdDatabase->DxeDb.Init, &gDXEPcdDbInit, sizeof(DXE_PCD_DATABASE_INIT));\r
+  CopyMem (&mPcdDatabase->DxeDb.Init, &gDXEPcdDbInit, sizeof(DXE_PCD_DATABASE_INIT));\r
+\r
+\r
+  //\r
+  // Initialized the Callback Function Table\r
+  //\r
+  for (Idx = 0; Idx < PCD_TOTAL_TOKEN_NUMBER; Idx++) {\r
+    InitializeListHead (&mCallbackFnTable[Idx]);\r
+  }\r

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


@@ -233,18 +365,18 @@ GetSkuEnabledTokenNumber (
 \r
   ASSERT ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == 0);\r
 \r
 \r
   ASSERT ((LocalTokenNumber & PCD_TYPE_SKU_ENABLED) == 0);\r
 \r

-  PcdDb = IsPeiDb ? (UINT8 *) &gPcdDatabase->PeiDb : (UINT8 *) &gPcdDatabase->DxeDb;\r
+  PcdDb = IsPeiDb ? (UINT8 *) &mPcdDatabase->PeiDb : (UINT8 *) &mPcdDatabase->DxeDb;\r

 \r
   SkuHead     = (SKU_HEAD *) (PcdDb + (LocalTokenNumber & PCD_DATABASE_OFFSET_MASK));\r
   Value       = (UINT8 *) (PcdDb + SkuHead->SkuDataStartOffset); \r
 \r
 \r
   SkuHead     = (SKU_HEAD *) (PcdDb + (LocalTokenNumber & PCD_DATABASE_OFFSET_MASK));\r
   Value       = (UINT8 *) (PcdDb + SkuHead->SkuDataStartOffset); \r
 \r

-  PhaseSkuIdTable = IsPeiDb ? gPcdDatabase->PeiDb.Init.SkuIdTable :\r
-                              gPcdDatabase->DxeDb.Init.SkuIdTable;\r
+  PhaseSkuIdTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.SkuIdTable :\r
+                              mPcdDatabase->DxeDb.Init.SkuIdTable;\r

                               \r
   SkuIdTable  = &PhaseSkuIdTable[SkuHead->SkuIdTableOffset];\r
         \r
   for (i = 0; i < SkuIdTable[0]; i++) {\r
                               \r
   SkuIdTable  = &PhaseSkuIdTable[SkuHead->SkuIdTableOffset];\r
         \r
   for (i = 0; i < SkuIdTable[0]; i++) {\r

-    if (gPcdDatabase->PeiDb.Init.SystemSkuId == SkuIdTable[i + 1]) {\r
+    if (mPcdDatabase->PeiDb.Init.SystemSkuId == SkuIdTable[i + 1]) {\r

       break;\r
     }\r
   }\r
       break;\r
     }\r
   }\r


@@ -286,6 +418,24 @@ InvokeCallbackOnSet (
   UINTN             Size\r
   )\r
 {\r
   UINTN             Size\r
   )\r
 {\r

+  CALLBACK_FN_ENTRY       *FnTableEntry;\r
+  LIST_ENTRY              *ListHead;\r
+  LIST_ENTRY              *ListNode;\r
+\r
+  ListHead = &mCallbackFnTable[TokenNumber];\r
+  ListNode = GetFirstNode (ListHead);\r
+\r
+  while (ListNode != ListHead) {\r
+    FnTableEntry = CR_FNENTRY_FROM_LISTNODE(ListNode, CALLBACK_FN_ENTRY, Node);\r
+\r
+    FnTableEntry->CallbackFn(Guid, \r
+                    (Guid == NULL) ? TokenNumber : ExTokenNumber,\r
+                    Data,\r
+                    Size);\r
+    \r
+    ListNode = GetNextNode (ListHead, ListNode);\r
+  }\r
+  \r

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


@@ -314,8 +464,8 @@ SetWorker (
   \r
   IsPeiDb = (TokenNumber <= PEI_LOCAL_TOKEN_NUMBER) ? TRUE : FALSE;\r
 \r
   \r
   IsPeiDb = (TokenNumber <= PEI_LOCAL_TOKEN_NUMBER) ? TRUE : FALSE;\r
 \r

-  LocalTokenNumberTable  = IsPeiDb ? gPcdDatabase->PeiDb.Init.LocalTokenNumberTable : \r
-                                     gPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r
+  LocalTokenNumberTable  = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : \r
+                                     mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r

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


@@ -406,10 +556,10 @@ SetWorkerByLocalTokenNumber (
 \r
   Offset = LocalTokenNumber & PCD_DATABASE_OFFSET_MASK;\r
 \r
 \r
   Offset = LocalTokenNumber & PCD_DATABASE_OFFSET_MASK;\r
 \r

-  PcdDb = IsPeiDb ? ((UINT8 *) &gPcdDatabase->PeiDb) : ((UINT8 *) &gPcdDatabase->DxeDb);\r
+  PcdDb = IsPeiDb ? ((UINT8 *) &mPcdDatabase->PeiDb) : ((UINT8 *) &mPcdDatabase->DxeDb);\r

 \r
 \r

-  StringTable = IsPeiDb ? gPcdDatabase->PeiDb.Init.StringTable :\r
-                          gPcdDatabase->DxeDb.Init.StringTable;\r
+  StringTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.StringTable :\r
+                          mPcdDatabase->DxeDb.Init.StringTable;\r

   \r
   InternalData = PcdDb + Offset;\r
 \r
   \r
   InternalData = PcdDb + Offset;\r
 \r


@@ -426,8 +576,8 @@ SetWorkerByLocalTokenNumber (
       //\r
       // Bug Bug: Please implement this\r
       //\r
       //\r
       // Bug Bug: Please implement this\r
       //\r

-      GuidTable   = IsPeiDb ? gPcdDatabase->PeiDb.Init.GuidTable :\r
-                              gPcdDatabase->DxeDb.Init.GuidTable;\r
+      GuidTable   = IsPeiDb ? mPcdDatabase->PeiDb.Init.GuidTable :\r
+                              mPcdDatabase->DxeDb.Init.GuidTable;\r

                               \r
       VariableHead = (VARIABLE_HEAD *) (PcdDb + Offset);\r
       \r
                               \r
       VariableHead = (VARIABLE_HEAD *) (PcdDb + Offset);\r
       \r


@@ -542,9 +692,9 @@ GetExPcdTokenAttributes (
   EFI_GUID            *GuidTable;\r
   UINT16              *SizeTable;\r
 \r
   EFI_GUID            *GuidTable;\r
   UINT16              *SizeTable;\r
 \r

-  ExMap       = gPcdDatabase->PeiDb.Init.ExMapTable;\r
-  GuidTable   = gPcdDatabase->PeiDb.Init.GuidTable;\r
-  SizeTable   = gPcdDatabase->PeiDb.Init.SizeTable;\r
+  ExMap       = mPcdDatabase->PeiDb.Init.ExMapTable;\r
+  GuidTable   = mPcdDatabase->PeiDb.Init.GuidTable;\r
+  SizeTable   = mPcdDatabase->PeiDb.Init.SizeTable;\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


@@ -560,9 +710,9 @@ GetExPcdTokenAttributes (
     }\r
   }\r
   \r
     }\r
   }\r
   \r

-  ExMap       = gPcdDatabase->DxeDb.Init.ExMapTable;\r
-  GuidTable   = gPcdDatabase->DxeDb.Init.GuidTable;\r
-  SizeTable   = gPcdDatabase->DxeDb.Init.SizeTable;\r
+  ExMap       = mPcdDatabase->DxeDb.Init.ExMapTable;\r
+  GuidTable   = mPcdDatabase->DxeDb.Init.GuidTable;\r
+  SizeTable   = mPcdDatabase->DxeDb.Init.SizeTable;\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

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.h b/EdkModulePkg/Universal/PCD/Dxe/Service.h
index 54ab1b6551667dfc4511c4eba4bd6649872dc4a3..d33a891eba78375f71e52777383559f859a1cbc0 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.h
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.h
@@ -32,6 +32,14 @@ Module Name: Service.h
   #error "Please make sure the version of PCD Service DXE Driver and PCD DXE Database Generation Tool matches"\r
 #endif\r
 \r
   #error "Please make sure the version of PCD Service DXE Driver and PCD DXE Database Generation Tool matches"\r
 #endif\r
 \r

+\r
+typedef struct {\r
+  LIST_ENTRY              Node;\r
+  PCD_PROTOCOL_CALLBACK   CallbackFn;\r
+} CALLBACK_FN_ENTRY;\r
+\r
+#define CR_FNENTRY_FROM_LISTNODE(Record, Type, Field) _CR(Record, Type, Field)\r
+\r

 //\r
 // Internal Functions\r
 //\r
 //\r
 // Internal Functions\r
 //\r


@@ -89,17 +97,17 @@ GetHiiVariable (
 \r
 EFI_STATUS\r
 DxeRegisterCallBackWorker (\r
 \r
 EFI_STATUS\r
 DxeRegisterCallBackWorker (\r

-  IN  UINTN        TokenNumber,\r
-  IN  CONST EFI_GUID              *Guid, OPTIONAL\r
-  IN  PCD_PROTOCOL_CALLBACK   CallBackFunction,\r
-  IN  BOOLEAN                 Reigster\r
+  IN  UINTN                   TokenNumber,\r
+  IN  CONST EFI_GUID          *Guid, OPTIONAL\r
+  IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r

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

-DxeGetNextTokenWorker (\r
-  IN OUT UINTN *Token,\r
-  IN CONST EFI_GUID           *Guid     OPTIONAL\r
-  );\r
+DxeUnRegisterCallBackWorker (\r
+  IN  UINTN                   TokenNumber,\r
+  IN  CONST EFI_GUID          *Guid, OPTIONAL\r
+  IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
+);\r

 \r
 VOID\r
 BuildPcdDxeDataBase (\r
 \r
 VOID\r
 BuildPcdDxeDataBase (\r


@@ -363,7 +371,7 @@ DxePcdSetPtrEx (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSetBoolEx (\r
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSetBoolEx (\r

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

   IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN BOOLEAN           Value\r
   )\r
   IN PCD_TOKEN_NUMBER  TokenNumber,\r
   IN BOOLEAN           Value\r
   )\r


@@ -373,9 +381,9 @@ DxePcdSetBoolEx (
 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r

-PcdRegisterCallBackOnSet (\r
+DxeRegisterCallBackOnSet (\r

   IN  PCD_TOKEN_NUMBER        TokenNumber,\r
   IN  PCD_TOKEN_NUMBER        TokenNumber,\r

-  IN  CONST EFI_GUID              *Guid, OPTIONAL\r
+  IN  CONST EFI_GUID          *Guid, OPTIONAL\r

   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   )\r
 ;\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   )\r
 ;\r


@@ -383,7 +391,7 @@ PcdRegisterCallBackOnSet (
 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r

-PcdUnRegisterCallBackOnSet (\r
+DxeUnRegisterCallBackOnSet (\r

   IN  PCD_TOKEN_NUMBER        TokenNumber,\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   IN  PCD_TOKEN_NUMBER        TokenNumber,\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r


@@ -409,9 +417,20 @@ SetWorkerByLocalTokenNumber (
   )\r
 ;\r
 \r
   )\r
 ;\r
 \r

+PCD_TOKEN_NUMBER\r
+ExGetNextTokeNumber (\r
+  IN CONST EFI_GUID    *Guid,\r
+  IN PCD_TOKEN_NUMBER  TokenNumber,\r
+  IN EFI_GUID          *GuidTable,\r
+  IN UINTN             SizeOfGuidTable,\r
+  IN DYNAMICEX_MAPPING *ExMapTable,\r
+  IN UINTN             SizeOfExMapTable\r
+  )\r
+;\r
+\r

 extern EFI_GUID gPcdDataBaseHobGuid;\r
 \r
 extern EFI_GUID gPcdDataBaseHobGuid;\r
 \r

-extern PCD_DATABASE * gPcdDatabase;\r
+extern PCD_DATABASE * mPcdDatabase;\r

 \r
 extern DXE_PCD_DATABASE_INIT gDXEPcdDbInit;\r
 \r
 \r
 extern DXE_PCD_DATABASE_INIT gDXEPcdDbInit;\r
 \r

diff --git a/EdkModulePkg/Universal/PCD/Pei/Pcd.c b/EdkModulePkg/Universal/PCD/Pei/Pcd.c
index 1f6db7a0e7a73b045579f563bbbdded3ee0b5c23..031259b22a6e694ecf68a1319a7d88186c363187 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Pei/Pcd.c
+++ b/EdkModulePkg/Universal/PCD/Pei/Pcd.c
@@ -50,7 +50,7 @@ PCD_PPI mPcdPpiInstance = {
   PeiPcdSetPtrEx,         \r
   PeiPcdSetBoolEx,\r
 \r
   PeiPcdSetPtrEx,         \r
   PeiPcdSetBoolEx,\r
 \r

-  PcdRegisterCallBackOnSet,\r
+  PeiRegisterCallBackOnSet,\r

   PcdUnRegisterCallBackOnSet,\r
   PeiPcdGetNextToken\r
 };\r
   PcdUnRegisterCallBackOnSet,\r
   PeiPcdGetNextToken\r
 };\r


@@ -454,12 +454,14 @@ PeiPcdSetBoolEx (
 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r

-PcdRegisterCallBackOnSet (\r
+PeiRegisterCallBackOnSet (\r

   IN  PCD_TOKEN_NUMBER            ExTokenNumber,\r
   IN  CONST EFI_GUID              *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK            CallBackFunction\r
   )\r
 {\r
   IN  PCD_TOKEN_NUMBER            ExTokenNumber,\r
   IN  CONST EFI_GUID              *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK            CallBackFunction\r
   )\r
 {\r

+  ASSERT (CallBackFunction != NULL);\r
+  \r

   return PeiRegisterCallBackWorker (ExTokenNumber, Guid, CallBackFunction, TRUE);\r
 }\r
 \r
   return PeiRegisterCallBackWorker (ExTokenNumber, Guid, CallBackFunction, TRUE);\r
 }\r
 \r


@@ -473,6 +475,8 @@ PcdUnRegisterCallBackOnSet (
   IN  PCD_PPI_CALLBACK            CallBackFunction\r
   )\r
 {\r
   IN  PCD_PPI_CALLBACK            CallBackFunction\r
   )\r
 {\r

+  ASSERT (CallBackFunction != NULL);\r
+  \r

   return PeiRegisterCallBackWorker (ExTokenNumber, Guid, CallBackFunction, FALSE);\r
 }\r
 \r
   return PeiRegisterCallBackWorker (ExTokenNumber, Guid, CallBackFunction, FALSE);\r
 }\r
 \r


@@ -482,7 +486,7 @@ EFI_STATUS
 EFIAPI\r
 PeiPcdGetNextToken (\r
   IN CONST EFI_GUID               *Guid, OPTIONAL\r
 EFIAPI\r
 PeiPcdGetNextToken (\r
   IN CONST EFI_GUID               *Guid, OPTIONAL\r

-  IN OUT  PCD_TOKEN_NUMBER                   *TokenNumber\r
+  IN OUT  PCD_TOKEN_NUMBER        *TokenNumber\r

   )\r
 {\r
   UINTN               GuidTableIdx;\r
   )\r
 {\r
   UINTN               GuidTableIdx;\r

diff --git a/EdkModulePkg/Universal/PCD/Pei/Service.h b/EdkModulePkg/Universal/PCD/Pei/Service.h
index 5f334e141d0b3da030ac18372b7533fe38b31ff8..611427b578bd23f0f1aaabd19b0827ee240b3c9f 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Pei/Service.h
+++ b/EdkModulePkg/Universal/PCD/Pei/Service.h
@@ -358,7 +358,7 @@ PeiPcdSetBoolEx (
 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r

-PcdRegisterCallBackOnSet (\r
+PeiRegisterCallBackOnSet (\r

   IN  PCD_TOKEN_NUMBER        TokenNumber,\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK        CallBackFunction\r
   IN  PCD_TOKEN_NUMBER        TokenNumber,\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PPI_CALLBACK        CallBackFunction\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
index 7b86e6b88fc4e680bfa83c5828641315862218e6..e10f325ee6ebe8e4afda9f0fffefd4ff3082d57c 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
@@ -711,7 +711,7 @@ class PcdDatabase {
 \r
     private void getTwoGroupsOfTokens (ArrayList<Token> alTokens, List<Token> initTokens, List<Token> uninitTokens) {\r
         for (int i = 0; i < alTokens.size(); i++) {\r
 \r
     private void getTwoGroupsOfTokens (ArrayList<Token> alTokens, List<Token> initTokens, List<Token> uninitTokens) {\r
         for (int i = 0; i < alTokens.size(); i++) {\r

-            Token t = (Token)alTokens.get(i);\r
+            Token t = alTokens.get(i);\r

             if (t.hasDefaultValue()) {\r
                 initTokens.add(t);\r
             } else {\r
             if (t.hasDefaultValue()) {\r
                 initTokens.add(t);\r
             } else {\r


@@ -789,16 +789,14 @@ class PcdDatabase {
         // PEI_PCD_DATABASE_INIT\r
         //\r
         java.util.Comparator<Token> comparator = new AlignmentSizeComp();\r
         // PEI_PCD_DATABASE_INIT\r
         //\r
         java.util.Comparator<Token> comparator = new AlignmentSizeComp();\r

-        List<Token> list = initTokens;\r
-        java.util.Collections.sort(list, comparator);\r
+        java.util.Collections.sort(initTokens, comparator);\r

         initCode = processTokens(initTokens);\r
 \r
         //\r
         // Generate Structure Declaration for PcdTokens without Default Value\r
         // PEI_PCD_DATABASE_UNINIT\r
         //\r
         initCode = processTokens(initTokens);\r
 \r
         //\r
         // Generate Structure Declaration for PcdTokens without Default Value\r
         // PEI_PCD_DATABASE_UNINIT\r
         //\r

-        list = uninitTokens;\r
-        java.util.Collections.sort(list, comparator);\r
+        java.util.Collections.sort(uninitTokens, comparator);\r

         uninitCode = processTokens(uninitTokens);\r
 \r
         //\r
         uninitCode = processTokens(uninitTokens);\r
 \r
         //\r