Added type cast (VOID *) to the third parameter of GetHiiVariable, to avoid compiling...

[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 26bb7d807e02cae2b53a92006bb7f45338441a09..b78752df293027cd11e6f868ac58e35b47001416 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -53,7 +53,8 @@ PCD_PROTOCOL mPcdInstance = {
 \r
   DxeRegisterCallBackOnSet,\r
   DxeUnRegisterCallBackOnSet,\r
-  DxePcdGetNextToken\r
+  DxePcdGetNextToken,\r
+  DxePcdGetNextTokenSpace\r
 };\r
 \r
 \r
@@ -182,21 +183,44 @@ DxePcdGetSize (
   IN UINTN                     TokenNumber\r
   )\r
 {\r
-  UINT16 * SizeTable;\r
+  UINTN   Size;\r
+  UINT32  *LocalTokenNumberTable;\r
+  BOOLEAN IsPeiDb;\r
+  UINTN   MaxSize;\r
+  UINTN   TmpTokenNumber;\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
+  //\r
+  // Backup the TokenNumber passed in as GetPtrTypeSize need the original TokenNumber\r
+  // \r
+  TmpTokenNumber = TokenNumber;\r
+\r
+  ASSERT (TokenNumber < PCD_TOTAL_TOKEN_NUMBER);\r
+\r
+  IsPeiDb = (BOOLEAN) (TokenNumber < PEI_LOCAL_TOKEN_NUMBER);\r
   \r
-  SizeTable = (TokenNumber < PEI_LOCAL_TOKEN_NUMBER) ? mPcdDatabase->PeiDb.Init.SizeTable :\r
-                                                    mPcdDatabase->DxeDb.Init.SizeTable;\r
+  TokenNumber = IsPeiDb ? TokenNumber : \r
+                          (TokenNumber - PEI_LOCAL_TOKEN_NUMBER);\r
 \r
+  LocalTokenNumberTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable \r
+                                  : mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r
 \r
-  TokenNumber = (TokenNumber < PEI_LOCAL_TOKEN_NUMBER) ? TokenNumber : (TokenNumber - PEI_LOCAL_TOKEN_NUMBER);\r
+  Size = (LocalTokenNumberTable[TokenNumber] & PCD_DATUM_TYPE_ALL_SET) >> PCD_DATUM_TYPE_SHIFT;\r
+\r
+  if (Size == 0) {\r
+    //\r
+    // For pointer type, we need to scan the SIZE_TABLE to get the current size.\r
+    //\r
+    return GetPtrTypeSize (TmpTokenNumber, &MaxSize);\r
+  } else {\r
+    return Size;\r
+  }\r
 \r
-  return SizeTable[TokenNumber];\r
 }\r
 \r
 \r
@@ -256,7 +280,7 @@ DxePcdGetPtrEx (
   IN UINTN                 ExTokenNumber\r
   )\r
 {\r
-  return ExGetWorker (Guid, ExTokenNumber, 0);\r
+  return  ExGetWorker (Guid, ExTokenNumber, 0);\r
 }\r
 \r
 \r
@@ -292,7 +316,7 @@ DxePcdSet8 (
   IN UINT8              Value\r
   )\r
 {\r
-  return SetWorker (TokenNumber, &Value, sizeof (Value), FALSE);\r
+  return SetValueWorker (TokenNumber, &Value, sizeof (Value));\r
 }\r
 \r
 \r
@@ -304,7 +328,7 @@ DxePcdSet16 (
   IN UINT16             Value\r
   )\r
 {\r
-  return SetWorker (TokenNumber, &Value, sizeof (Value), FALSE);\r
+  return SetValueWorker (TokenNumber, &Value, sizeof (Value));\r
 }\r
 \r
 \r
@@ -316,7 +340,7 @@ DxePcdSet32 (
   IN UINT32             Value\r
   )\r
 {\r
-  return SetWorker (TokenNumber, &Value, sizeof (Value), FALSE);\r
+  return SetValueWorker (TokenNumber, &Value, sizeof (Value));\r
 }\r
 \r
 \r
@@ -328,7 +352,7 @@ DxePcdSet64 (
   IN UINT64             Value\r
   )\r
 {\r
-  return SetWorker (TokenNumber, &Value, sizeof (Value), FALSE);\r
+  return SetValueWorker (TokenNumber, &Value, sizeof (Value));\r
 }\r
 \r
 \r
@@ -336,9 +360,9 @@ DxePcdSet64 (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSetPtr (\r
-  IN UINTN              TokenNumber,\r
-  IN UINTN              SizeOfBuffer,\r
-  IN VOID               *Buffer\r
+  IN          UINTN              TokenNumber,\r
+  IN OUT      UINTN              *SizeOfBuffer,\r
+  IN          VOID               *Buffer\r
   )\r
 {\r
   return SetWorker (TokenNumber, Buffer, SizeOfBuffer, TRUE);\r
@@ -353,7 +377,7 @@ DxePcdSetBool (
   IN BOOLEAN            Value\r
   )\r
 {\r
-  return SetWorker (TokenNumber, &Value, sizeof (Value), FALSE);\r
+  return SetValueWorker (TokenNumber, &Value, sizeof (Value));\r
 }\r
 \r
 \r
@@ -366,13 +390,7 @@ DxePcdSet8Ex (
   IN UINT8                  Value\r
   )\r
 {\r
-  return          ExSetWorker(\r
-                              ExTokenNumber, \r
-                              Guid,\r
-                              &Value, \r
-                              sizeof (Value), \r
-                              FALSE\r
-                              );\r
+  return  ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));\r
 }\r
 \r
 \r
@@ -385,13 +403,7 @@ DxePcdSet16Ex (
   IN UINT16            Value\r
   )\r
 {\r
-  return          ExSetWorker(\r
-                              ExTokenNumber, \r
-                              Guid,\r
-                              &Value, \r
-                              sizeof (Value), \r
-                              FALSE\r
-                              );\r
+  return  ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));\r
 }\r
 \r
 \r
@@ -404,13 +416,7 @@ DxePcdSet32Ex (
   IN UINT32             Value\r
   )\r
 {\r
-  return          ExSetWorker(\r
-                              ExTokenNumber, \r
-                              Guid,\r
-                              &Value, \r
-                              sizeof (Value), \r
-                              FALSE\r
-                              );\r
+  return  ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));\r
 }\r
 \r
 \r
@@ -423,13 +429,7 @@ DxePcdSet64Ex (
   IN UINT64            Value\r
   )\r
 {\r
-  return          ExSetWorker(\r
-                              ExTokenNumber, \r
-                              Guid,\r
-                              &Value, \r
-                              sizeof (Value), \r
-                              FALSE\r
-                              );\r
+  return  ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));\r
 }\r
 \r
 \r
@@ -437,19 +437,13 @@ DxePcdSet64Ex (
 EFI_STATUS\r
 EFIAPI\r
 DxePcdSetPtrEx (\r
-  IN CONST EFI_GUID         *Guid,\r
-  IN UINTN                  ExTokenNumber,\r
-  IN UINTN                  SizeOfBuffer,\r
-  IN VOID                   *Buffer\r
+  IN            CONST EFI_GUID         *Guid,\r
+  IN            UINTN                  ExTokenNumber,\r
+  IN OUT        UINTN                  *SizeOfBuffer,\r
+  IN            VOID                   *Buffer\r
   )\r
 {\r
-  return          ExSetWorker(\r
-                              ExTokenNumber, \r
-                              Guid,\r
-                              Buffer, \r
-                              SizeOfBuffer, \r
-                              TRUE\r
-                              );\r
+  return  ExSetWorker(ExTokenNumber, Guid, Buffer, SizeOfBuffer, TRUE);\r
 }\r
 \r
 \r
@@ -462,13 +456,7 @@ DxePcdSetBoolEx (
   IN BOOLEAN           Value\r
   )\r
 {\r
-  return          ExSetWorker(\r
-                              ExTokenNumber, \r
-                              Guid,\r
-                              &Value, \r
-                              sizeof (Value), \r
-                              TRUE\r
-                              );\r
+  return  ExSetValueWorker (ExTokenNumber, Guid, &Value, sizeof (Value));\r
 }\r
 \r
 \r
@@ -518,31 +506,26 @@ DxePcdGetNextToken (
   //\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
+    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
+    } else if (*TokenNumber > DXE_NEX_TOKEN_NUMBER + PEI_LOCAL_TOKEN_NUMBER) {\r
+      *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
     }\r
+    return EFI_SUCCESS;\r
   }\r
 \r
-  if (PEI_EXMAP_TABLE_EMPTY && PEI_EXMAP_TABLE_EMPTY) {\r
-    *TokenNumber = (UINTN) PCD_INVALID_TOKEN_NUMBER;\r
+  if (PEI_EXMAP_TABLE_EMPTY && DXE_EXMAP_TABLE_EMPTY) {\r
+    *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  ExTokenNumber = *TokenNumber;\r
   if (!PEI_EXMAP_TABLE_EMPTY) {\r
+    ExTokenNumber = *TokenNumber;\r
     ExTokenNumber = ExGetNextTokeNumber (\r
                         Guid,\r
                         ExTokenNumber,\r
@@ -556,13 +539,14 @@ DxePcdGetNextToken (
   if ((ExTokenNumber == PCD_INVALID_TOKEN_NUMBER) &&\r
       !DXE_EXMAP_TABLE_EMPTY\r
     ) {\r
+    ExTokenNumber = *TokenNumber;\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
+                        mPcdDatabase->DxeDb.Init.GuidTable,\r
+                        sizeof(mPcdDatabase->DxeDb.Init.GuidTable),\r
+                        mPcdDatabase->DxeDb.Init.ExMapTable,\r
+                        sizeof(mPcdDatabase->DxeDb.Init.ExMapTable)\r
                         );\r
   }\r
 \r
@@ -591,19 +575,28 @@ GetDistinctTokenSpace (
   TsIdx = 0;\r
   OldGuidIndex = ExMapTable[0].ExGuidIndex;\r
   DistinctTokenSpace[TsIdx] = &GuidTable[OldGuidIndex];\r
-  for (Idx = 1; Idx < PEI_EXMAPPING_TABLE_SIZE; Idx++) {\r
+  for (Idx = 1; Idx < *ExMapTableSize; Idx++) {\r
     if (ExMapTable[Idx].ExGuidIndex != OldGuidIndex) {\r
       OldGuidIndex = ExMapTable[Idx].ExGuidIndex;\r
       DistinctTokenSpace[++TsIdx] = &GuidTable[OldGuidIndex];\r
     }\r
   }\r
 \r
-  *ExMapTableSize = TsIdx;\r
+  //\r
+  // The total number of Distinct Token Space\r
+  // is TsIdx + 1 because we use TsIdx as a index\r
+  // to the DistinctTokenSpace[]\r
+  //\r
+  *ExMapTableSize = TsIdx + 1;\r
   return DistinctTokenSpace;\r
     \r
 }\r
   \r
-\r
+//\r
+// Just pre-allocate a memory buffer that is big enough to\r
+// host all distinct TokenSpace guid in both\r
+// PEI ExMap and DXE ExMap.\r
+//\r
 STATIC EFI_GUID *TmpTokenSpaceBuffer[PEI_EXMAPPING_TABLE_SIZE + DXE_EXMAPPING_TABLE_SIZE] = { 0 };\r
 \r
 EFI_STATUS\r
@@ -632,7 +625,7 @@ DxePcdGetNextTokenSpace (
   }\r
   \r
   \r
-  if (TmpTokenSpaceBuffer[0] != NULL) {\r
+  if (TmpTokenSpaceBuffer[0] == NULL) {\r
     PeiTokenSpaceTableSize = 0;\r
 \r
     if (!PEI_EXMAP_TABLE_EMPTY) {\r