Updated the copyright year.

[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 b78752df293027cd11e6f868ac58e35b47001416..641cb706eeb66279bf018226ff9b37d5eaa572c4 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -1,7 +1,7 @@
 /** @file\r
 PCD DXE driver\r
 \r
-Copyright (c) 2006, Intel Corporation\r
+Copyright (c) 2006 - 2007, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -17,6 +17,7 @@ Module Name: Pcd.c
 \r
 #include "Service.h"\r
 \r
+EFI_LOCK mPcdDatabaseLock = EFI_INITIALIZE_LOCK_VARIABLE(EFI_TPL_CALLBACK);\r
 \r
 PCD_PROTOCOL mPcdInstance = {\r
   DxePcdSetSku,\r
@@ -61,7 +62,7 @@ PCD_PROTOCOL mPcdInstance = {
 //\r
 // Static global to reduce the code size\r
 //\r
-static EFI_HANDLE NewHandle = NULL;\r
+static EFI_HANDLE mNewHandle = NULL;\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -80,12 +81,8 @@ PcdDxeInit (
 \r
   BuildPcdDxeDataBase ();\r
 \r
-  //\r
-  // BugBug Check if PcdDatabase is already installed.\r
-  //\r
-  \r
   Status = gBS->InstallProtocolInterface (\r
-                  &NewHandle,\r
+                  &mNewHandle,\r
                   &gPcdProtocolGuid,\r
                   EFI_NATIVE_INTERFACE,\r
                   &mPcdInstance\r
@@ -200,9 +197,15 @@ DxePcdGetSize (
   // \r
   TmpTokenNumber = TokenNumber;\r
 \r
-  ASSERT (TokenNumber < PCD_TOTAL_TOKEN_NUMBER);\r
+  // EBC compiler is very choosy. It may report warning about comparison\r
+  // between UINTN and 0 . So we add 1 in each size of the \r
+  // comparison.\r
+  ASSERT (TokenNumber + 1 < PCD_TOTAL_TOKEN_NUMBER + 1);\r
 \r
-  IsPeiDb = (BOOLEAN) (TokenNumber < PEI_LOCAL_TOKEN_NUMBER);\r
+  // EBC compiler is very choosy. It may report warning about comparison\r
+  // between UINTN and 0 . So we add 1 in each size of the \r
+  // comparison.\r
+  IsPeiDb = (BOOLEAN) (TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1);\r
   \r
   TokenNumber = IsPeiDb ? TokenNumber : \r
                           (TokenNumber - PEI_LOCAL_TOKEN_NUMBER);\r
@@ -465,14 +468,25 @@ DxePcdSetBoolEx (
 EFI_STATUS\r
 EFIAPI\r
 DxeRegisterCallBackOnSet (\r
-  IN  UINTN                   TokenNumber,\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
+  IN  UINTN                   TokenNumber,\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   )\r
 {\r
+  EFI_STATUS Status;\r
+  \r
   ASSERT (CallBackFunction != NULL);\r
   \r
-  return DxeRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction);\r
+  //\r
+  // Aquire lock to prevent reentrance from TPL_CALLBACK level\r
+  //\r
+  EfiAcquireLock (&mPcdDatabaseLock);\r
+\r
+  Status = DxeRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction);\r
+\r
+  EfiReleaseLock (&mPcdDatabaseLock);\r
+  \r
+  return Status;\r
 }\r
 \r
 \r
@@ -480,14 +494,25 @@ DxeRegisterCallBackOnSet (
 EFI_STATUS\r
 EFIAPI\r
 DxeUnRegisterCallBackOnSet (\r
-  IN  UINTN                   TokenNumber,\r
   IN  CONST EFI_GUID          *Guid, OPTIONAL\r
+  IN  UINTN                   TokenNumber,\r
   IN  PCD_PROTOCOL_CALLBACK   CallBackFunction\r
   )\r
 {\r
+  EFI_STATUS Status;\r
+  \r
   ASSERT (CallBackFunction != NULL);\r
+\r
+  //\r
+  // Aquire lock to prevent reentrance from TPL_CALLBACK level\r
+  //\r
+  EfiAcquireLock (&mPcdDatabaseLock);\r
+  \r
+  Status = DxeUnRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction);\r
+\r
+  EfiReleaseLock (&mPcdDatabaseLock);\r
   \r
-  return DxeUnRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction);\r
+  return Status;\r
 }\r
 \r
 \r
@@ -499,21 +524,34 @@ DxePcdGetNextToken (
   IN OUT   UINTN            *TokenNumber\r
   )\r
 {\r
-  UINTN               ExTokenNumber;\r
-  \r
+  EFI_STATUS          Status;\r
+\r
+  if (!FeaturePcdGet (PcdDxePcdDatabaseTraverseEnabled)) {\r
+    return EFI_UNSUPPORTED;\r
+  }\r
+\r
+  Status = EFI_NOT_FOUND;\r
   //\r
   // Scan the local token space\r
   //\r
   if (Guid == NULL) {\r
+    // EBC compiler is very choosy. It may report warning about comparison\r
+    // between UINTN and 0 . So we add 1 in each size of the \r
+    // comparison.\r
+    if (((*TokenNumber + 1 > PEI_NEX_TOKEN_NUMBER + 1) && (*TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1)) ||\r
+        ((*TokenNumber + 1 > (PEI_LOCAL_TOKEN_NUMBER + DXE_NEX_TOKEN_NUMBER + 1)))) {\r
+        return EFI_NOT_FOUND;\r
+    }\r
+    \r
     (*TokenNumber)++;\r
-    if (*TokenNumber > PEI_NEX_TOKEN_NUMBER &&\r
-        *TokenNumber <= PEI_LOCAL_TOKEN_NUMBER) {\r
+    if ((*TokenNumber + 1 > PEI_NEX_TOKEN_NUMBER + 1) &&\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
+    } else if (*TokenNumber + 1 > DXE_NEX_TOKEN_NUMBER + PEI_LOCAL_TOKEN_NUMBER + 1) {\r
       *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
     }\r
     return EFI_SUCCESS;\r
@@ -525,10 +563,9 @@ DxePcdGetNextToken (
   }\r
 \r
   if (!PEI_EXMAP_TABLE_EMPTY) {\r
-    ExTokenNumber = *TokenNumber;\r
-    ExTokenNumber = ExGetNextTokeNumber (\r
+    Status = ExGetNextTokeNumber (\r
                         Guid,\r
-                        ExTokenNumber,\r
+                        TokenNumber,\r
                         mPcdDatabase->PeiDb.Init.GuidTable,\r
                         sizeof(mPcdDatabase->PeiDb.Init.GuidTable),\r
                         mPcdDatabase->PeiDb.Init.ExMapTable,\r
@@ -536,13 +573,14 @@ DxePcdGetNextToken (
                         );\r
   }\r
 \r
-  if ((ExTokenNumber == PCD_INVALID_TOKEN_NUMBER) &&\r
-      !DXE_EXMAP_TABLE_EMPTY\r
-    ) {\r
-    ExTokenNumber = *TokenNumber;\r
-    ExTokenNumber = ExGetNextTokeNumber (\r
+  if (Status == EFI_SUCCESS) {\r
+    return Status;\r
+  }\r
+\r
+  if (!DXE_EXMAP_TABLE_EMPTY) {\r
+    Status = ExGetNextTokeNumber (\r
                         Guid,\r
-                        ExTokenNumber,\r
+                        TokenNumber,\r
                         mPcdDatabase->DxeDb.Init.GuidTable,\r
                         sizeof(mPcdDatabase->DxeDb.Init.GuidTable),\r
                         mPcdDatabase->DxeDb.Init.ExMapTable,\r
@@ -550,9 +588,7 @@ DxePcdGetNextToken (
                         );\r
   }\r
 \r
-  *TokenNumber = ExTokenNumber;\r
-\r
-  return EFI_SUCCESS;\r
+  return Status;\r
 }\r
 \r
 \r
@@ -614,6 +650,10 @@ DxePcdGetNextTokenSpace (
   EFI_GUID            **DxeTokenSpaceTable;\r
   BOOLEAN             Match;\r
 \r
+  if (!FeaturePcdGet (PcdDxePcdDatabaseTraverseEnabled)) {\r
+    return EFI_UNSUPPORTED;\r
+  }\r
+\r
   ASSERT (Guid != NULL);\r
   \r
   if (PEI_EXMAP_TABLE_EMPTY && DXE_EXMAP_TABLE_EMPTY) {\r