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

[mirror_edk2.git] / EdkModulePkg / Universal / PCD / Dxe / Pcd.c

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