Update MdeModulePkg to not use EFI_SPECIFICATION_VERSION and PI_SPECIFICATION_VERSION...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9951 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf
index 308fc08c6e08ee3b4ed0698e5d3c4575ca1a091c..a8a9dcd68c0a035f4791cba09c3a2b53405e19a0 100644 (file)
--- a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf
+++ b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf
@@ -3,7 +3,7 @@
 #  to provide read, write and modify access to Pci configuration space in PEI phase. \r
 #  To follow PI specification, these services also support access to the unaligned Pci address.\r
 #\r
-#  Copyright (c) 2006 - 2008, Intel Corporation\r
+#  Copyright (c) 2006 - 2010, Intel Corporation\r
 #\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
@@ -22,7 +22,6 @@
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r
   ENTRY_POINT                    = PeimInitializePciCfg\r
-  PI_SPECIFICATION_VERSION       = 0x00010000\r
 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r
@@ -42,7 +41,7 @@
   PciLib\r
   BaseLib\r
   DebugLib\r
-\r
+  PeiServicesLib\r
 \r
 [Ppis]\r
   gEfiPciCfg2PpiGuid                   ## PRODUCED\r

diff --git a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
index d2ca19c7b065156f2ad3c5c909d8ba37908188f3..32dc96e24916c17645b30f742f278b01cd989b53 100644 (file)
--- a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
+++ b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
@@ -3,7 +3,7 @@
   to provide read, write and modify access to Pci configuration space in PEI phase. \r
   To follow PI specification, these services also support access to the unaligned Pci address.\r
 \r
-  Copyright (c) 2006 - 2008, Intel Corporation\r
+  Copyright (c) 2006 - 2010, 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
@@ -20,6 +20,7 @@
 #include <Library/DebugLib.h>\r
 #include <Library/PciLib.h>\r
 #include <Library/PeimEntryPoint.h>\r
+#include <Library/PeiServicesLib.h>\r
 #include <IndustryStandard/Pci.h>\r
 \r
 /**\r
@@ -308,10 +309,9 @@ PeimInitializePciCfg (
 {\r
   EFI_STATUS            Status;\r
 \r
-  ASSERT ((**PeiServices).Hdr.Revision >= PI_SPECIFICATION_VERSION);\r
-\r
   (**(EFI_PEI_SERVICES **)PeiServices).PciCfg = &gPciCfg2Ppi;\r
-  Status = (**PeiServices).InstallPpi (PeiServices, &gPciCfg2PpiList);\r
+  Status = PeiServicesInstallPpi (&gPciCfg2PpiList);\r
+  ASSERT_EFI_ERROR (Status);\r
 \r
   return Status;\r
 }\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index 77c6ff984f094e846f8b9e0e1c5a369f7998d8d6..40030be1961b49c448e64d46ec6a8aca507ba55d 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -150,13 +150,11 @@ typedef struct {
 //\r
 #define EXPRESSION_STACK_SIZE_INCREMENT    0x100\r
 \r
+#define EFI_SPECIFICATION_MAJOR_VERSION    0x2\r
+#define EFI_SPECIFICATION_MINOR_VERSION    0x1\r
+#define EFI_SPECIFICATION_ERRATA_VERSION   0x0\r
+#define EFI_IFR_SPECIFICATION_VERSION  (UINT16)((EFI_SPECIFICATION_MAJOR_VERSION << 8) | (EFI_SPECIFICATION_MINOR_VERSION << 4) | EFI_SPECIFICATION_ERRATA_VERSION)\r
 \r
-#define EFI_SPECIFICATION_ERRATA_VERSION   0\r
-\r
-#define EFI_IFR_SPECIFICATION_VERSION  \\r
-        ((((EFI_SPECIFICATION_VERSION) >> 8) & 0xff00) | \\r
-         (((EFI_SPECIFICATION_VERSION) & 0xf) << 4) | \\r
-         ((EFI_SPECIFICATION_ERRATA_VERSION) & 0xf))\r
 \r
 #define SETUP_DRIVER_SIGNATURE SIGNATURE_32 ('F', 'B', 'D', 'V')\r
 typedef struct {\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
index 77b0d528c7c1dc60a9237b78152a2b7b36e50346..864a9a173fd65d7cbf40eabf0892f293c8d53fb7 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
@@ -1,7 +1,7 @@
 #/** @file\r
 # The DXE driver produces FORM BROWSER protocols defined in UEFI HII 2.1 specificatin.\r
 #\r
-# Copyright (c) 2007 - 2009, Intel Corporation. All rights reserved.\r
+# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.\r
 #\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
@@ -20,7 +20,6 @@
   FILE_GUID                      = EBf342FE-B1D3-4EF8-957C-8048606FF671\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
-  EFI_SPECIFICATION_VERSION      = 0x0002000A\r
   ENTRY_POINT                    = InitializeSetup\r
 \r
 #\r