Add some definitions for efi event in Uefi/UefiSpec.h to follow spec.

[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 bb17b88e196a87b9d840ae8f75acdfe73544c27a..01a26bb0bf5ed957ae4a064b3a0fb8b5d8c3b414 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(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
@@ -81,7 +82,7 @@ PcdDxeInit (
   BuildPcdDxeDataBase ();\r
 \r
   Status = gBS->InstallProtocolInterface (\r
-                  &NewHandle,\r
+                  &mNewHandle,\r
                   &gPcdProtocolGuid,\r
                   EFI_NATIVE_INTERFACE,\r
                   &mPcdInstance\r
@@ -472,9 +473,20 @@ DxeRegisterCallBackOnSet (
   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
@@ -487,9 +499,20 @@ DxeUnRegisterCallBackOnSet (
   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
@@ -502,12 +525,17 @@ DxePcdGetNextToken (
   )\r
 {\r
   EFI_STATUS          Status;\r
+  BOOLEAN             PeiExMapTableEmpty;\r
+  BOOLEAN             DxeExMapTableEmpty;\r
 \r
   if (!FeaturePcdGet (PcdDxePcdDatabaseTraverseEnabled)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
   Status = EFI_NOT_FOUND;\r
+  PeiExMapTableEmpty = PEI_EXMAP_TABLE_EMPTY;\r
+  DxeExMapTableEmpty = DXE_EXMAP_TABLE_EMPTY;\r
+\r
   //\r
   // Scan the local token space\r
   //\r
@@ -534,12 +562,12 @@ DxePcdGetNextToken (
     return EFI_SUCCESS;\r
   }\r
 \r
-  if (PEI_EXMAP_TABLE_EMPTY && DXE_EXMAP_TABLE_EMPTY) {\r
+  if (PeiExMapTableEmpty && DxeExMapTableEmpty) {\r
     *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  if (!PEI_EXMAP_TABLE_EMPTY) {\r
+  if (!PeiExMapTableEmpty) {\r
     Status = ExGetNextTokeNumber (\r
                         Guid,\r
                         TokenNumber,\r
@@ -554,7 +582,7 @@ DxePcdGetNextToken (
     return Status;\r
   }\r
 \r
-  if (!DXE_EXMAP_TABLE_EMPTY) {\r
+  if (!DxeExMapTableEmpty) {\r
     Status = ExGetNextTokeNumber (\r
                         Guid,\r
                         TokenNumber,\r
@@ -568,7 +596,7 @@ DxePcdGetNextToken (
   return Status;\r
 }\r
 \r
-\r
+STATIC\r
 EFI_GUID **\r
 GetDistinctTokenSpace (\r
   IN OUT    UINTN             *ExMapTableSize,\r
@@ -626,6 +654,8 @@ DxePcdGetNextTokenSpace (
   EFI_GUID            **PeiTokenSpaceTable;\r
   EFI_GUID            **DxeTokenSpaceTable;\r
   BOOLEAN             Match;\r
+  BOOLEAN             PeiExMapTableEmpty;\r
+  BOOLEAN             DxeExMapTableEmpty;\r
 \r
   if (!FeaturePcdGet (PcdDxePcdDatabaseTraverseEnabled)) {\r
     return EFI_UNSUPPORTED;\r
@@ -633,7 +663,10 @@ DxePcdGetNextTokenSpace (
 \r
   ASSERT (Guid != NULL);\r
   \r
-  if (PEI_EXMAP_TABLE_EMPTY && DXE_EXMAP_TABLE_EMPTY) {\r
+  PeiExMapTableEmpty = PEI_EXMAP_TABLE_EMPTY;\r
+  DxeExMapTableEmpty = DXE_EXMAP_TABLE_EMPTY;\r
+\r
+  if (PeiExMapTableEmpty && DxeExMapTableEmpty) {\r
     if (*Guid != NULL) {\r
       return EFI_NOT_FOUND;\r
     } else {\r
@@ -645,7 +678,7 @@ DxePcdGetNextTokenSpace (
   if (TmpTokenSpaceBuffer[0] == NULL) {\r
     PeiTokenSpaceTableSize = 0;\r
 \r
-    if (!PEI_EXMAP_TABLE_EMPTY) {\r
+    if (!PeiExMapTableEmpty) {\r
       PeiTokenSpaceTableSize = PEI_EXMAPPING_TABLE_SIZE;\r
       PeiTokenSpaceTable = GetDistinctTokenSpace (&PeiTokenSpaceTableSize,\r
                             mPcdDatabase->PeiDb.Init.ExMapTable,\r
@@ -654,7 +687,7 @@ DxePcdGetNextTokenSpace (
       CopyMem (TmpTokenSpaceBuffer, PeiTokenSpaceTable, sizeof (EFI_GUID*) * PeiTokenSpaceTableSize);\r
     }\r
 \r
-    if (!DXE_EXMAP_TABLE_EMPTY) {\r
+    if (!DxeExMapTableEmpty) {\r
       DxeTokenSpaceTableSize = DXE_EXMAPPING_TABLE_SIZE;\r
       DxeTokenSpaceTable = GetDistinctTokenSpace (&DxeTokenSpaceTableSize,\r
                             mPcdDatabase->DxeDb.Init.ExMapTable,\r