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 437006f05caa132c100abf23304f98399698d07b..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
@@ -471,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
@@ -486,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
-  return DxeUnRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction);\r
+  Status = DxeUnRegisterCallBackWorker (TokenNumber, Guid, CallBackFunction);\r
+\r
+  EfiReleaseLock (&mPcdDatabaseLock);\r
+  \r
+  return Status;\r
 }\r
 \r
 \r