Corrected a small bugs:

[mirror_edk2.git] / EdkModulePkg / Universal / PCD / Dxe / Service.h

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.h b/EdkModulePkg/Universal/PCD/Dxe/Service.h
index ff90fa5479db8df763e41f3bd324997bddf96842..8796affeb2ec73e22aa131c55b10652de4de45ea 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.h
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.h
@@ -1,7 +1,7 @@
 /** @file\r
 Private functions used by 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
@@ -22,13 +22,13 @@ Module Name: Service.h
 // Please make sure the PCD Serivce PEIM Version is consistent with\r
 // the version of PCD Database generation tool\r
 //\r
-#define PCD_DXE_SERVICE_DRIVER_VERSION      2\r
+#define PCD_SERVICE_DXE_DRIVER_VERSION      2\r
 \r
 //\r
 // PCD_DXE_DATABASE_GENTOOL_VERSION is defined in Autogen.h\r
 // and generated by PCD Database generation tool.\r
 //\r
-#if (PCD_DXE_SERVICE_PEIM_VERSION != PCD_DXE_DATABASE_GENTOOL_VERSION)\r
+#if (PCD_SERVICE_DXE_DRIVER_VERSION != PCD_DXE_SERVICE_DRIVER_AUTOGEN_VERSION)\r
   #error "Please make sure the version of PCD Service DXE Driver and PCD DXE Database Generation Tool matches"\r
 #endif\r
 \r
@@ -284,8 +284,8 @@ 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
@@ -294,8 +294,8 @@ 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
@@ -397,7 +397,7 @@ EFI_STATUS
 GetHiiVariable (\r
   IN  EFI_GUID      *VariableGuid,\r
   IN  UINT16        *VariableName,\r
-  OUT VOID          **VariableData,\r
+  OUT UINT8          **VariableData,\r
   OUT UINTN         *VariableSize\r
   )\r
 ;\r
@@ -441,14 +441,14 @@ GetExPcdTokenNumber (
 \r
 \r
 \r
-UINTN           \r
+EFI_STATUS           \r
 ExGetNextTokeNumber (\r
-  IN CONST EFI_GUID    *Guid,\r
-  IN UINTN             TokenNumber,\r
-  IN EFI_GUID          *GuidTable,\r
-  IN UINTN             SizeOfGuidTable,\r
-  IN DYNAMICEX_MAPPING *ExMapTable,\r
-  IN UINTN             SizeOfExMapTable\r
+  IN      CONST EFI_GUID    *Guid,\r
+  IN OUT  UINTN             *TokenNumber,\r
+  IN      EFI_GUID          *GuidTable,\r
+  IN      UINTN             SizeOfGuidTable,\r
+  IN      DYNAMICEX_MAPPING *ExMapTable,\r
+  IN      UINTN             SizeOfExMapTable\r
   )\r
 ;\r
 \r
@@ -475,4 +475,6 @@ extern PCD_DATABASE * mPcdDatabase;
 \r
 extern DXE_PCD_DATABASE_INIT gDXEPcdDbInit;\r
 \r
+extern EFI_LOCK mPcdDatabaseLock;\r
+\r
 #endif\r