1. Fixed tools_def.template to meet ICC build for IA32

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

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.h b/MdeModulePkg/Universal/PCD/Dxe/Service.h
index da38053e13b6679614a04ec954eb5ff99fbb57fa..3d6e3ed0349c3ffe5020bf1e4ee2167011a0c420 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.h
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.h
@@ -1,14 +1,14 @@
 /** @file\r
 Private functions used by PCD DXE driver.\r
 \r
 /** @file\r
 Private functions used by PCD DXE driver.\r
 \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
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \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
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 \r
 Module Name: Service.h\r
 \r
 \r
 Module Name: Service.h\r


@@ -18,10 +18,18 @@ Module Name: Service.h
 #ifndef _SERVICE_H\r
 #define _SERVICE_H\r
 \r
 #ifndef _SERVICE_H\r
 #define _SERVICE_H\r
 \r

-//\r
-// Include common header file for this module.\r
-//\r
-#include "CommonHeader.h"\r
+#include <PiDxe.h>\r
+#include <Protocol/Pcd.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/UefiLib.h>\r
+#include <Library/UefiDriverEntryPoint.h>\r
+#include <Library/PcdLib.h>\r
+#include <Library/HobLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/UefiRuntimeServicesTableLib.h>\r

 \r
 //\r
 // Please make sure the PCD Serivce PEIM Version is consistent with\r
 \r
 //\r
 // Please make sure the PCD Serivce PEIM Version is consistent with\r


@@ -33,9 +41,9 @@ Module Name: Service.h
 // PCD_DXE_DATABASE_GENTOOL_VERSION is defined in Autogen.h\r
 // and generated by PCD Database generation tool.\r
 //\r
 // PCD_DXE_DATABASE_GENTOOL_VERSION is defined in Autogen.h\r
 // and generated by PCD Database generation tool.\r
 //\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
+//#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
 //\r
 // Protocol Interface function declaration.\r
 \r
 //\r
 // Protocol Interface function declaration.\r


@@ -387,7 +395,7 @@ ExGetWorker (
   IN CONST EFI_GUID         *Guid,\r
   IN UINTN                  ExTokenNumber,\r
   IN UINTN                  GetSize\r
   IN CONST EFI_GUID         *Guid,\r
   IN UINTN                  ExTokenNumber,\r
   IN UINTN                  GetSize\r

-  ) \r
+  )\r

 ;\r
 \r
 UINT32\r
 ;\r
 \r
 UINT32\r


@@ -395,7 +403,7 @@ GetSkuEnabledTokenNumber (
   UINT32 LocalTokenNumber,\r
   UINTN  Size,\r
   BOOLEAN IsPeiDb\r
   UINT32 LocalTokenNumber,\r
   UINTN  Size,\r
   BOOLEAN IsPeiDb\r

-  ) \r
+  )\r

 ;\r
 \r
 EFI_STATUS\r
 ;\r
 \r
 EFI_STATUS\r


@@ -437,7 +445,7 @@ BuildPcdDxeDataBase (
 );\r
 \r
 \r
 );\r
 \r
 \r

-UINTN           \r
+UINTN\r

 GetExPcdTokenNumber (\r
   IN CONST EFI_GUID             *Guid,\r
   IN UINT32                     ExTokenNumber\r
 GetExPcdTokenNumber (\r
   IN CONST EFI_GUID             *Guid,\r
   IN UINT32                     ExTokenNumber\r


@@ -446,7 +454,7 @@ GetExPcdTokenNumber (
 \r
 \r
 \r
 \r
 \r
 \r

-EFI_STATUS           \r
+EFI_STATUS\r

 ExGetNextTokeNumber (\r
   IN      CONST EFI_GUID    *Guid,\r
   IN OUT  UINTN             *TokenNumber,\r
 ExGetNextTokeNumber (\r
   IN      CONST EFI_GUID    *Guid,\r
   IN OUT  UINTN             *TokenNumber,\r