The main trunk of tip is broken by Scott's removing of PcdPeimTest driver, but forget...

[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 20fd4a15b56566ab818787dbb20eb8b5ead64eab..55040fe159386576feff909d34d5fae48c34cd6d 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
-  PcdRegisterCallBackOnSet,\r
-  PcdUnRegisterCallBackOnSet,\r
+  DxeRegisterCallBackOnSet,\r
+  DxeUnRegisterCallBackOnSet,\r
   DxePcdGetNextToken\r
 };\r
 \r
@@ -74,9 +74,9 @@ PcdDxeInit (
   //\r
   // Make sure the Pcd Protocol is not already installed in the system\r
   //\r
-  \r
+\r
   ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gPcdProtocolGuid);\r
-  \r
+\r
   BuildPcdDxeDataBase ();\r
 \r
   //\r
@@ -97,13 +97,15 @@ PcdDxeInit (
 }\r
 \r
 \r
-EFI_STATUS\r
+VOID\r
 EFIAPI\r
 DxePcdSetSku (\r
-  IN  UINTN        SkuId\r
+  IN  UINTN         SkuId\r
   )\r
 {\r
-  return gPcdDatabase->PeiDb.Init.SystemSkuId = (SKU_ID) SkuId;\r
+  mPcdDatabase->PeiDb.Init.SystemSkuId = (SKU_ID) SkuId;\r
+  \r
+  return;\r
 }\r
 \r
 \r
@@ -111,12 +113,10 @@ DxePcdSetSku (
 UINT8\r
 EFIAPI\r
 DxePcdGet8 (\r
-  IN UINTN         TokenNumber\r
+  IN UINTN                    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
@@ -124,12 +124,10 @@ DxePcdGet8 (
 UINT16\r
 EFIAPI\r
 DxePcdGet16 (\r
-  IN UINTN         TokenNumber\r
+  IN UINTN                    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
@@ -137,12 +135,10 @@ DxePcdGet16 (
 UINT32\r
 EFIAPI\r
 DxePcdGet32 (\r
-  IN UINTN         TokenNumber\r
+  IN UINTN                    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
@@ -150,12 +146,10 @@ DxePcdGet32 (
 UINT64\r
 EFIAPI\r
 DxePcdGet64 (\r
-  IN UINTN          TokenNumber\r
+  IN UINTN                     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
@@ -163,10 +157,10 @@ DxePcdGet64 (
 VOID *\r
 EFIAPI\r
 DxePcdGetPtr (\r
-  IN UINTN          TokenNumber\r
+  IN UINTN                     TokenNumber\r
   )\r
 {\r
-  return GetWorker (TokenNumber);\r
+  return GetWorker (TokenNumber, 0);\r
 }\r
 \r
 \r
@@ -174,12 +168,10 @@ DxePcdGetPtr (
 BOOLEAN\r
 EFIAPI\r
 DxePcdGetBool (\r
-  IN UINTN          TokenNumber\r
+  IN UINTN                     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
@@ -187,13 +179,19 @@ DxePcdGetBool (
 UINTN\r
 EFIAPI\r
 DxePcdGetSize (\r
-  IN UINTN          TokenNumber\r
+  IN UINTN                     TokenNumber\r
   )\r
 {\r
   UINT16 * SizeTable;\r
-\r
-  SizeTable = (TokenNumber < PEI_LOCAL_TOKEN_NUMBER) ? gPcdDatabase->PeiDb.Init.SizeTable :\r
-                                                    gPcdDatabase->DxeDb.Init.SizeTable;\r
+  //\r
+  // TokenNumber Zero is reserved as PCD_INVALID_TOKEN_NUMBER.\r
+  // We have to decrement TokenNumber by 1 to make it usable\r
+  // as the array index.\r
+  //\r
+  TokenNumber--;\r
+  \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
@@ -207,7 +205,7 @@ UINT8
 EFIAPI\r
 DxePcdGet8Ex (\r
   IN CONST EFI_GUID         *Guid,\r
-  IN UINTN                  ExTokenNumber\r
+  IN UINTN                 ExTokenNumber\r
   )\r
 {\r
   return *((UINT8 *) ExGetWorker (Guid, ExTokenNumber, sizeof(UINT8)));\r
@@ -219,10 +217,10 @@ UINT16
 EFIAPI\r
 DxePcdGet16Ex (\r
   IN CONST EFI_GUID        *Guid,\r
-  IN UINTN                 ExTokenNumber\r
+  IN UINTN                ExTokenNumber\r
   )\r
 {\r
-  return *((UINT16 *) ExGetWorker (Guid, ExTokenNumber, sizeof(UINT16)));\r
+  return ReadUnaligned16 (ExGetWorker (Guid, ExTokenNumber, sizeof(UINT16)));\r
 }\r
 \r
 \r
@@ -231,10 +229,10 @@ UINT32
 EFIAPI\r
 DxePcdGet32Ex (\r
   IN CONST EFI_GUID        *Guid,\r
-  IN UINTN                  ExTokenNumber\r
+  IN UINTN                 ExTokenNumber\r
   )\r
 {\r
-  return *((UINT32 *) ExGetWorker (Guid, ExTokenNumber, sizeof(UINT32)));\r
+  return ReadUnaligned32 (ExGetWorker (Guid, ExTokenNumber, sizeof(UINT32)));\r
 }\r
 \r
 \r
@@ -243,13 +241,10 @@ UINT64
 EFIAPI\r
 DxePcdGet64Ex (\r
   IN CONST EFI_GUID        *Guid,\r
-  IN UINTN                  ExTokenNumber\r
+  IN UINTN                 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
@@ -258,7 +253,7 @@ VOID *
 EFIAPI\r
 DxePcdGetPtrEx (\r
   IN CONST EFI_GUID        *Guid,\r
-  IN UINTN                  ExTokenNumber\r
+  IN UINTN                 ExTokenNumber\r
   )\r
 {\r
   return ExGetWorker (Guid, ExTokenNumber, 0);\r
@@ -270,7 +265,7 @@ BOOLEAN
 EFIAPI\r
 DxePcdGetBoolEx (\r
   IN CONST EFI_GUID        *Guid,\r
-  IN UINTN                  ExTokenNumber\r
+  IN UINTN                 ExTokenNumber\r
   )\r
 {\r
   return *((BOOLEAN *) ExGetWorker (Guid, ExTokenNumber, sizeof(BOOLEAN)));\r
@@ -282,14 +277,10 @@ UINTN
 EFIAPI\r
 DxePcdGetSizeEx (\r
   IN CONST EFI_GUID        *Guid,\r
-  IN UINTN                  ExTokenNumber\r
+  IN UINTN                 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, (UINT32) ExTokenNumber));\r
 }\r
 \r
 \r
@@ -346,15 +337,11 @@ EFI_STATUS
 EFIAPI\r
 DxePcdSetPtr (\r
   IN UINTN              TokenNumber,\r
-  IN CONST VOID         *Value\r
+  IN UINTN              SizeOfBuffer,\r
+  IN VOID               *Buffer\r
   )\r
 {\r
-  //\r
-  // BugBug, please change the Size to Input size when sync with spec\r
-  //\r
-  //ASSERT (sizeof (Value) == DxePcdGetSize (TokenNumber));\r
-\r
-  return SetWorker (TokenNumber, (VOID *)Value, DxePcdGetSize (TokenNumber), TRUE);\r
+  return SetWorker (TokenNumber, Buffer, SizeOfBuffer, TRUE);\r
 }\r
 \r
 \r
@@ -374,7 +361,7 @@ DxePcdSetBool (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet8Ex (\r
-  IN CONST EFI_GUID        *Guid,\r
+  IN CONST EFI_GUID         *Guid,\r
   IN UINTN                  ExTokenNumber,\r
   IN UINT8                  Value\r
   )\r
@@ -393,8 +380,8 @@ DxePcdSet8Ex (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet16Ex (\r
-  IN CONST EFI_GUID        *Guid,\r
-  IN UINTN  ExTokenNumber,\r
+  IN CONST EFI_GUID    *Guid,\r
+  IN UINTN             ExTokenNumber,\r
   IN UINT16            Value\r
   )\r
 {\r
@@ -412,8 +399,8 @@ DxePcdSet16Ex (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet32Ex (\r
-  IN CONST EFI_GUID        *Guid,\r
-  IN UINTN  ExTokenNumber,\r
+  IN CONST EFI_GUID     *Guid,\r
+  IN UINTN              ExTokenNumber,\r
   IN UINT32             Value\r
   )\r
 {\r
@@ -431,8 +418,8 @@ DxePcdSet32Ex (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSet64Ex (\r
-  IN CONST EFI_GUID        *Guid,\r
-  IN UINTN  ExTokenNumber,\r
+  IN CONST EFI_GUID    *Guid,\r
+  IN UINTN             ExTokenNumber,\r
   IN UINT64            Value\r
   )\r
 {\r
@@ -450,16 +437,17 @@ DxePcdSet64Ex (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSetPtrEx (\r
-  IN CONST EFI_GUID        *Guid,\r
-  IN UINTN  ExTokenNumber,\r
-  IN CONST VOID        *Value\r
+  IN CONST EFI_GUID         *Guid,\r
+  IN UINTN                  ExTokenNumber,\r
+  IN UINTN                  SizeOfBuffer,\r
+  IN VOID                   *Buffer\r
   )\r
 {\r
   return          ExSetWorker(\r
                               ExTokenNumber, \r
                               Guid,\r
-                              (VOID *) Value, \r
-                              sizeof (Value), \r
+                              Buffer, \r
+                              SizeOfBuffer, \r
                               TRUE\r
                               );\r
 }\r
@@ -469,8 +457,8 @@ DxePcdSetPtrEx (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSetBoolEx (\r
-  IN CONST EFI_GUID        *Guid,\r
-  IN UINTN  ExTokenNumber,\r
+  IN CONST EFI_GUID    *Guid,\r
+  IN UINTN             ExTokenNumber,\r
   IN BOOLEAN           Value\r
   )\r
 {\r
@@ -488,26 +476,30 @@ DxePcdSetBoolEx (
 \r
 EFI_STATUS\r
 EFIAPI\r
-PcdRegisterCallBackOnSet (\r
-  IN  UINTN        TokenNumber,\r
-  IN  CONST EFI_GUID              *Guid, OPTIONAL\r
+DxeRegisterCallBackOnSet (\r
+  IN  UINTN                   TokenNumber,\r
+  IN  CONST EFI_GUID          *Guid, OPTIONAL\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
-PcdUnRegisterCallBackOnSet (\r
-  IN  UINTN        TokenNumber,\r
-  IN  CONST EFI_GUID              *Guid, OPTIONAL\r
+DxeUnRegisterCallBackOnSet (\r
+  IN  UINTN                   TokenNumber,\r
+  IN  CONST EFI_GUID          *Guid, OPTIONAL\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   )\r
 {\r
-  return DxeRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction, FALSE);\r
+  ASSERT (CallBackFunction != NULL);\r
+  \r
+  return DxeUnRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction);\r
 }\r
 \r
 \r
@@ -515,10 +507,65 @@ PcdUnRegisterCallBackOnSet (
 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   UINTN            *TokenNumber\r
   )\r
 {\r
-  return DxeGetNextTokenWorker (TokenNumber, Guid);\r
+  UINTN               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