Remove unnecessary use of FixedPcdxxx() functions and [FixedPcd] INF sections. These...

Do some minor clean ups to INF files

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

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
index 5d502f68b92150bc698b7ad6491edc7922790060..0f7605387e1635a5b35a75e190cf728ef6f90cd4 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
@@ -5,7 +5,7 @@
 #  space for these devices. Please use PCD feature flag PcdPciBusHotplugDeviceSupport to enable\r
 #  hot plug supporting.\r
 #\r
 #  space for these devices. Please use PCD feature flag PcdPciBusHotplugDeviceSupport to enable\r
 #  hot plug supporting.\r
 #\r

-#  Copyright (c) 2006 - 2009, 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
 #\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


@@ -23,7 +23,6 @@
   FILE_GUID                      = 93B80004-9FB3-11d4-9A3A-0090273FC14D\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 93B80004-9FB3-11d4-9A3A-0090273FC14D\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  EFI_SPECIFICATION_VERSION      = 0x00020000\r

   ENTRY_POINT                    = PciBusEntryPoint\r
 \r
 #\r
   ENTRY_POINT                    = PciBusEntryPoint\r
 \r
 #\r


@@ -36,7 +35,7 @@
 #  COMPONENT_NAME2               =  gPciBusComponentName2\r
 #\r
 \r
 #  COMPONENT_NAME2               =  gPciBusComponentName2\r
 #\r
 \r

-[Sources.common]\r
+[Sources]\r

   PciLib.c\r
   PciIo.c\r
   PciBus.c\r
   PciLib.c\r
   PciIo.c\r
   PciBus.c\r


@@ -99,14 +98,14 @@
   gEfiIncompatiblePciDeviceSupportProtocolGuid    ## CONSUMED\r
   gEfiLoadFile2ProtocolGuid                       ## CONSUMED\r
 \r
   gEfiIncompatiblePciDeviceSupportProtocolGuid    ## CONSUMED\r
   gEfiLoadFile2ProtocolGuid                       ## CONSUMED\r
 \r

-[FeaturePcd.common]\r
+[FeaturePcd]\r

   gEfiMdeModulePkgTokenSpaceGuid.PcdPciBusHotplugDeviceSupport\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdAriSupport\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMrIovSupport\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPciBridgeIoAlignmentProbe\r
 \r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPciBusHotplugDeviceSupport\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdAriSupport\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMrIovSupport\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPciBridgeIoAlignmentProbe\r
 \r

-[FixedPcd.common]\r
+[Pcd]\r

   gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSystemPageSize\r
 \r
 # [Event]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSystemPageSize\r
 \r
 # [Event]\r

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
index 7d08246711b1fd9209edbbf5a1dda00508add3f8..5a20b6a158a2ef45020cf72da6d7aaa86d54be73 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
@@ -2040,7 +2040,7 @@ CreatePciIoDevice (
                  );\r
     DEBUG ((EFI_D_INFO, "PCI-IOV B%x.D%x.F%x - SupportedPageSize - 0x%x\n", (UINTN)Bus, (UINTN)Device, (UINTN)Func, PciIoDevice->SystemPageSize));\r
 \r
                  );\r
     DEBUG ((EFI_D_INFO, "PCI-IOV B%x.D%x.F%x - SupportedPageSize - 0x%x\n", (UINTN)Bus, (UINTN)Device, (UINTN)Func, PciIoDevice->SystemPageSize));\r
 \r

-    PciIoDevice->SystemPageSize = (FixedPcdGet32(PcdSrIovSystemPageSize) & PciIoDevice->SystemPageSize);\r
+    PciIoDevice->SystemPageSize = (PcdGet32 (PcdSrIovSystemPageSize) & PciIoDevice->SystemPageSize);\r

     ASSERT (PciIoDevice->SystemPageSize != 0);\r
 \r
     PciIo->Pci.Write (\r
     ASSERT (PciIoDevice->SystemPageSize != 0);\r
 \r
     PciIo->Pci.Write (\r

diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index 7e27ae772346263158e93b728fd7e36c030278a1..0f712ede481a28400a40528777e1e5a1850750ef 100644 (file)
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -75,7 +75,7 @@ DiscoverPeimsAndOrderWithApriori (
   //\r
   // Go ahead to scan this Fv, and cache FileHandles within it.\r
   //\r
   //\r
   // Go ahead to scan this Fv, and cache FileHandles within it.\r
   //\r

-  for (PeimCount = 0; PeimCount < FixedPcdGet32 (PcdPeiCoreMaxPeimPerFv); PeimCount++) {\r
+  for (PeimCount = 0; PeimCount < PcdGet32 (PcdPeiCoreMaxPeimPerFv); PeimCount++) {\r

     Status = FvPpi->FindFileByType (FvPpi, PEI_CORE_INTERNAL_FFS_FILE_DISPATCH_TYPE, CoreFileHandle->FvHandle, &FileHandle);\r
     if (Status != EFI_SUCCESS) {\r
       break;\r
     Status = FvPpi->FindFileByType (FvPpi, PEI_CORE_INTERNAL_FFS_FILE_DISPATCH_TYPE, CoreFileHandle->FvHandle, &FileHandle);\r
     if (Status != EFI_SUCCESS) {\r
       break;\r


@@ -88,7 +88,7 @@ DiscoverPeimsAndOrderWithApriori (
   // Check whether the count of Peims exceeds the max support PEIMs in a FV image\r
   // If more Peims are required in a FV image, PcdPeiCoreMaxPeimPerFv can be set to a larger value in DSC file.\r
   //\r
   // Check whether the count of Peims exceeds the max support PEIMs in a FV image\r
   // If more Peims are required in a FV image, PcdPeiCoreMaxPeimPerFv can be set to a larger value in DSC file.\r
   //\r

-  ASSERT (PeimCount < FixedPcdGet32 (PcdPeiCoreMaxPeimPerFv));\r
+  ASSERT (PeimCount < PcdGet32 (PcdPeiCoreMaxPeimPerFv));\r

 \r
   //\r
   // Get Apriori File handle\r
 \r
   //\r
   // Get Apriori File handle\r


@@ -293,7 +293,7 @@ PeiDispatcher (
     SaveCurrentFileHandle =  Private->CurrentFileHandle;\r
 \r
     for (Index1 = 0; Index1 <= SaveCurrentFvCount; Index1++) {\r
     SaveCurrentFileHandle =  Private->CurrentFileHandle;\r
 \r
     for (Index1 = 0; Index1 <= SaveCurrentFvCount; Index1++) {\r

-      for (Index2 = 0; (Index2 < FixedPcdGet32 (PcdPeiCoreMaxPeimPerFv)) && (Private->Fv[Index1].FvFileHandles[Index2] != NULL); Index2++) {\r
+      for (Index2 = 0; (Index2 < PcdGet32 (PcdPeiCoreMaxPeimPerFv)) && (Private->Fv[Index1].FvFileHandles[Index2] != NULL); Index2++) {\r

         if (Private->Fv[Index1].PeimState[Index2] == PEIM_STATE_REGISITER_FOR_SHADOW) {\r
           PeimFileHandle = Private->Fv[Index1].FvFileHandles[Index2];\r
           Status = PeiLoadImage (\r
         if (Private->Fv[Index1].PeimState[Index2] == PEIM_STATE_REGISITER_FOR_SHADOW) {\r
           PeimFileHandle = Private->Fv[Index1].FvFileHandles[Index2];\r
           Status = PeiLoadImage (\r


@@ -379,7 +379,7 @@ PeiDispatcher (
       // Start to dispatch all modules within the current Fv.\r
       //\r
       for (PeimCount = Private->CurrentPeimCount;\r
       // Start to dispatch all modules within the current Fv.\r
       //\r
       for (PeimCount = Private->CurrentPeimCount;\r

-           (PeimCount < FixedPcdGet32 (PcdPeiCoreMaxPeimPerFv)) && (Private->CurrentFvFileHandles[PeimCount] != NULL);\r
+           (PeimCount < PcdGet32 (PcdPeiCoreMaxPeimPerFv)) && (Private->CurrentFvFileHandles[PeimCount] != NULL);\r

            PeimCount++) {\r
         Private->CurrentPeimCount  = PeimCount;\r
         PeimFileHandle = Private->CurrentFileHandle = Private->CurrentFvFileHandles[PeimCount];\r
            PeimCount++) {\r
         Private->CurrentPeimCount  = PeimCount;\r
         PeimFileHandle = Private->CurrentFileHandle = Private->CurrentFvFileHandles[PeimCount];\r

diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
index d2bd6c493ef45e17877bfac9cb7d53243f51deac..3c0046affc9536d35c011a61ec297ba7c29966c9 100644 (file)
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
@@ -368,8 +368,8 @@ FirmwareVolmeInfoPpiNotifyCallback (
   Status       = EFI_SUCCESS;\r
   PrivateData  = PEI_CORE_INSTANCE_FROM_PS_THIS (PeiServices);\r
 \r
   Status       = EFI_SUCCESS;\r
   PrivateData  = PEI_CORE_INSTANCE_FROM_PS_THIS (PeiServices);\r
 \r

-  if (PrivateData->FvCount >= FixedPcdGet32 (PcdPeiCoreMaxFvSupported)) {\r
-    DEBUG ((EFI_D_ERROR, "The number of Fv Images (%d) exceed the max supported FVs (%d) in Pei", PrivateData->FvCount + 1, FixedPcdGet32 (PcdPeiCoreMaxFvSupported)));\r
+  if (PrivateData->FvCount >= PcdGet32 (PcdPeiCoreMaxFvSupported)) {\r
+    DEBUG ((EFI_D_ERROR, "The number of Fv Images (%d) exceed the max supported FVs (%d) in Pei", PrivateData->FvCount + 1, PcdGet32 (PcdPeiCoreMaxFvSupported)));\r

     DEBUG ((EFI_D_ERROR, "PcdPeiCoreMaxFvSupported value need be reconfigurated in DSC"));\r
     ASSERT (FALSE);\r
   }\r
     DEBUG ((EFI_D_ERROR, "PcdPeiCoreMaxFvSupported value need be reconfigurated in DSC"));\r
     ASSERT (FALSE);\r
   }\r


@@ -1417,7 +1417,7 @@ PeiReinitializeFv (
   //\r
   // Fixup all FvPpi pointers for the implementation in flash to permanent memory.\r
   //\r
   //\r
   // Fixup all FvPpi pointers for the implementation in flash to permanent memory.\r
   //\r

-  for (Index = 0; Index < FixedPcdGet32 (PcdPeiCoreMaxFvSupported); Index ++) {\r
+  for (Index = 0; Index < PcdGet32 (PcdPeiCoreMaxFvSupported); Index ++) {\r

     if (PrivateData->Fv[Index].FvPpi == OldFfs2FvPpi) {\r
       PrivateData->Fv[Index].FvPpi = &mPeiFfs2FvPpi;\r
     }\r
     if (PrivateData->Fv[Index].FvPpi == OldFfs2FvPpi) {\r
       PrivateData->Fv[Index].FvPpi = &mPeiFfs2FvPpi;\r
     }\r


@@ -1452,7 +1452,7 @@ AddUnknownFormatFvInfo (
 {\r
   PEI_CORE_UNKNOW_FORMAT_FV_INFO    *NewUnknownFv;\r
   \r
 {\r
   PEI_CORE_UNKNOW_FORMAT_FV_INFO    *NewUnknownFv;\r
   \r

-  if (PrivateData->UnknownFvInfoCount + 1 >= FixedPcdGet32 (PcdPeiCoreMaxPeimPerFv)) {\r
+  if (PrivateData->UnknownFvInfoCount + 1 >= PcdGet32 (PcdPeiCoreMaxPeimPerFv)) {\r

     return EFI_OUT_OF_RESOURCES;\r
   }\r
   \r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   \r

diff --git a/MdeModulePkg/Core/Pei/Ppi/Ppi.c b/MdeModulePkg/Core/Pei/Ppi/Ppi.c
index 04b29ecd73801a434639d3a57df420a4126d8f2a..68593a6d1d493fbe42cd5edff3e46a5bb54f7f82 100644 (file)
--- a/MdeModulePkg/Core/Pei/Ppi/Ppi.c
+++ b/MdeModulePkg/Core/Pei/Ppi/Ppi.c
@@ -1,7 +1,7 @@
 /** @file\r
   EFI PEI Core PPI services\r
   \r
 /** @file\r
   EFI PEI Core PPI services\r
   \r

-Copyright (c) 2006, 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
 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


@@ -30,9 +30,9 @@ InitializePpiServices (
   )\r
 {\r
   if (OldCoreData == NULL) {\r
   )\r
 {\r
   if (OldCoreData == NULL) {\r

-    PrivateData->PpiData.NotifyListEnd = FixedPcdGet32 (PcdPeiCoreMaxPpiSupported)-1;\r
-    PrivateData->PpiData.DispatchListEnd = FixedPcdGet32 (PcdPeiCoreMaxPpiSupported)-1;\r
-    PrivateData->PpiData.LastDispatchedNotify = FixedPcdGet32 (PcdPeiCoreMaxPpiSupported)-1;\r
+    PrivateData->PpiData.NotifyListEnd = PcdGet32 (PcdPeiCoreMaxPpiSupported)-1;\r
+    PrivateData->PpiData.DispatchListEnd = PcdGet32 (PcdPeiCoreMaxPpiSupported)-1;\r
+    PrivateData->PpiData.LastDispatchedNotify = PcdGet32 (PcdPeiCoreMaxPpiSupported)-1;\r

   }\r
 }\r
 \r
   }\r
 }\r
 \r


@@ -60,7 +60,7 @@ ConvertPpiPointers (
   UINT8                 Index;\r
   PEI_PPI_LIST_POINTERS *PpiPointer;\r
 \r
   UINT8                 Index;\r
   PEI_PPI_LIST_POINTERS *PpiPointer;\r
 \r

-  for (Index = 0; Index < FixedPcdGet32 (PcdPeiCoreMaxPpiSupported); Index++) {\r
+  for (Index = 0; Index < PcdGet32 (PcdPeiCoreMaxPpiSupported); Index++) {\r

     if (Index < PrivateData->PpiData.PpiListEnd ||\r
         Index > PrivateData->PpiData.NotifyListEnd) {\r
       PpiPointer = &PrivateData->PpiData.PpiListPtrs[Index];\r
     if (Index < PrivateData->PpiData.PpiListEnd ||\r
         Index > PrivateData->PpiData.NotifyListEnd) {\r
       PpiPointer = &PrivateData->PpiData.PpiListPtrs[Index];\r


@@ -254,7 +254,7 @@ PeiReInstallPpi (
   // Remove the old PPI from the database, add the new one.\r
   //\r
   DEBUG((EFI_D_INFO, "Reinstall PPI: %g\n", NewPpi->Guid));\r
   // Remove the old PPI from the database, add the new one.\r
   //\r
   DEBUG((EFI_D_INFO, "Reinstall PPI: %g\n", NewPpi->Guid));\r

-  ASSERT (Index < FixedPcdGet32 (PcdPeiCoreMaxPpiSupported));\r
+  ASSERT (Index < (INTN)(PcdGet32 (PcdPeiCoreMaxPpiSupported)));\r

   PrivateData->PpiData.PpiListPtrs[Index].Ppi = (EFI_PEI_PPI_DESCRIPTOR *) NewPpi;\r
 \r
   //\r
   PrivateData->PpiData.PpiListPtrs[Index].Ppi = (EFI_PEI_PPI_DESCRIPTOR *) NewPpi;\r
 \r
   //\r


@@ -512,7 +512,7 @@ ProcessNotifyList (
         EFI_PEI_PPI_DESCRIPTOR_NOTIFY_DISPATCH,\r
         PrivateData->PpiData.LastDispatchedInstall,\r
         PrivateData->PpiData.PpiListEnd,\r
         EFI_PEI_PPI_DESCRIPTOR_NOTIFY_DISPATCH,\r
         PrivateData->PpiData.LastDispatchedInstall,\r
         PrivateData->PpiData.PpiListEnd,\r

-        FixedPcdGet32 (PcdPeiCoreMaxPpiSupported)-1,\r
+        PcdGet32 (PcdPeiCoreMaxPpiSupported)-1,\r

         PrivateData->PpiData.DispatchListEnd\r
         );\r
       PrivateData->PpiData.LastDispatchedInstall = TempValue;\r
         PrivateData->PpiData.DispatchListEnd\r
         );\r
       PrivateData->PpiData.LastDispatchedInstall = TempValue;\r

diff --git a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c
index f6ad7c8eb64635be4d48074aeb4a2f6ba96912ac..81ecc2a4dc3ce636f68fe8b11071c7a271c4de57 100755 (executable)
--- a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c
+++ b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatform.c
@@ -1,7 +1,7 @@
 /** @file\r
   Sample ACPI Platform Driver\r
 \r
 /** @file\r
   Sample ACPI Platform Driver\r
 \r

-  Copyright (c) 2008 - 2009, Intel Corporation<BR>\r
+  Copyright (c) 2008 - 2010, Intel Corporation<BR>\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
   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


@@ -93,7 +93,7 @@ LocateFvInstanceWithTables (
     //\r
     Status = FvInstance->ReadFile (\r
                            FvInstance,\r
     //\r
     Status = FvInstance->ReadFile (\r
                            FvInstance,\r

-                           (EFI_GUID*)FixedPcdGetPtr (PcdAcpiTableStorageFile),\r
+                           (EFI_GUID*)PcdGetPtr (PcdAcpiTableStorageFile),\r

                            NULL,\r
                            &Size,\r
                            &FileType,\r
                            NULL,\r
                            &Size,\r
                            &FileType,\r


@@ -207,7 +207,7 @@ AcpiPlatformEntryPoint (
 \r
     Status = FwVol->ReadSection (\r
                       FwVol,\r
 \r
     Status = FwVol->ReadSection (\r
                       FwVol,\r

-                      (EFI_GUID*)FixedPcdGetPtr (PcdAcpiTableStorageFile),\r
+                      (EFI_GUID*)PcdGetPtr (PcdAcpiTableStorageFile),\r

                       EFI_SECTION_RAW,\r
                       Instance,\r
                       (VOID**) &CurrentTable,\r
                       EFI_SECTION_RAW,\r
                       Instance,\r
                       (VOID**) &CurrentTable,\r

diff --git a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
index 14b9e100913e3e3ffb2d56fb54d42c1da8a800d2..a92ec5ba6a20fcbaf8d62a0a40a8fdf478f9d65e 100755 (executable)
--- a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
+++ b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
@@ -1,7 +1,7 @@
 #/** @file\r
 #  Sample ACPI Platform Driver\r
 #\r
 #/** @file\r
 #  Sample ACPI Platform Driver\r
 #\r

-#  Copyright (c) 2008 - 2009, Intel Corporation. <BR>\r
+#  Copyright (c) 2008 - 2010, Intel Corporation. <BR>\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
 #  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


@@ -18,8 +18,6 @@
   FILE_GUID                      = cb933912-df8f-4305-b1f9-7b44fa11395c\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = cb933912-df8f-4305-b1f9-7b44fa11395c\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  EDK_RELEASE_VERSION            = 0x00020000\r
-  EFI_SPECIFICATION_VERSION      = 0x00020000\r

   ENTRY_POINT                    = AcpiPlatformEntryPoint\r
 \r
 #\r
   ENTRY_POINT                    = AcpiPlatformEntryPoint\r
 \r
 #\r


@@ -28,7 +26,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 \r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 \r

-[Sources.common]\r
+[Sources]\r

   AcpiPlatform.c\r
 \r
 [Packages]\r
   AcpiPlatform.c\r
 \r
 [Packages]\r


@@ -47,7 +45,7 @@
 [Protocols]\r
   gEfiAcpiTableProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED\r
 \r
 [Protocols]\r
   gEfiAcpiTableProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED\r
 \r

-[FixedPcd.common]\r
+[Pcd]\r

   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiTableStorageFile\r
 \r
 [Depex]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiTableStorageFile\r
 \r
 [Depex]\r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
index b33d19510daf519615f18de6f0078f2c524f2e42..0ae261f019bc4d38c15147e998c118ebba039e5c 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
@@ -598,7 +598,7 @@ TerminalDriverBindingStart (
         goto Error;\r
       }\r
 \r
         goto Error;\r
       }\r
 \r

-      TerminalType = FixedPcdGet8 (PcdDefaultTerminalType);\r
+      TerminalType = PcdGet8 (PcdDefaultTerminalType);\r

       //\r
       // Must be between PCANSITYPE (0) and VTUTF8TYPE (3)\r
       //\r
       //\r
       // Must be between PCANSITYPE (0) and VTUTF8TYPE (3)\r
       //\r

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
index 5e5bacbcfcdf7bc8c2c0fd0c96683548fb2652e0..e3739aae576232f6a4c80490415e2101e9d17cf2 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
@@ -276,7 +276,7 @@
 #            - Variable GUID for HII type PCD\r
 #            - Token space GUID for dynamicex type PCD \r
 #\r
 #            - Variable GUID for HII type PCD\r
 #            - Token space GUID for dynamicex type PCD \r
 #\r

-# Copyright (c) 2006 - 2009, 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
 #\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


@@ -303,7 +303,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 \r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
 \r

-[Sources.common]\r
+[Sources]\r

   Pcd.c\r
   Service.c\r
   Service.h\r
   Pcd.c\r
   Service.c\r
   Service.h\r


@@ -331,7 +331,7 @@
   gPcdProtocolGuid                              ## PRODUCES\r
   gEfiPcdProtocolGuid                           ## PRODUCES\r
   \r
   gPcdProtocolGuid                              ## PRODUCES\r
   gEfiPcdProtocolGuid                           ## PRODUCES\r
   \r

-[FixedPcd.common]\r
+[Pcd]\r

   gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress\r
 \r
 [Depex]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress\r
 \r
 [Depex]\r

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.c b/MdeModulePkg/Universal/PCD/Dxe/Service.c
index 1999ac6cc498068fcf624586c30b36842c1644d9..5cd9eb8ce56ad87097f26b58c6350bba776c0e05 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.c
@@ -119,7 +119,7 @@ GetWorker (
   switch (LocalTokenNumber & PCD_TYPE_ALL_SET) {\r
     case PCD_TYPE_VPD:\r
       VpdHead = (VPD_HEAD *) ((UINT8 *) PcdDb + Offset);\r
   switch (LocalTokenNumber & PCD_TYPE_ALL_SET) {\r
     case PCD_TYPE_VPD:\r
       VpdHead = (VPD_HEAD *) ((UINT8 *) PcdDb + Offset);\r

-      RetPtr = (VOID *) (UINTN) (FixedPcdGet32(PcdVpdBaseAddress) + VpdHead->Offset);\r
+      RetPtr = (VOID *) (UINTN) (PcdGet32 (PcdVpdBaseAddress) + VpdHead->Offset);\r

       break;\r
       \r
     case PCD_TYPE_HII:\r
       break;\r
       \r
     case PCD_TYPE_HII:\r

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
index fc392909113bb02bd6108e33cb658c8d22e57787..103965996be3c125d1df08998d2eef9c365e7616 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
@@ -271,7 +271,7 @@
 #            - Variable GUID for HII type PCD\r
 #            - Token space GUID for dynamicex type PCD \r
 #    \r
 #            - Variable GUID for HII type PCD\r
 #            - Token space GUID for dynamicex type PCD \r
 #    \r

-# Copyright (c) 2006 - 2009, 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
 #\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


@@ -298,7 +298,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r

-[Sources.common]\r
+[Sources]\r

   Service.c\r
   Service.h\r
   Pcd.c\r
   Service.c\r
   Service.h\r
   Pcd.c\r


@@ -328,7 +328,7 @@
 [FeaturePcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiFullPcdDatabaseEnable\r
 \r
 [FeaturePcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiFullPcdDatabaseEnable\r
 \r

-[FixedPcd]\r
+[Pcd]\r

   gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPcdCallBackNumberPerPcdEntry || PcdPeiFullPcdDatabaseEnable\r
 \r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPcdCallBackNumberPerPcdEntry || PcdPeiFullPcdDatabaseEnable\r
 \r

diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.c b/MdeModulePkg/Universal/PCD/Pei/Service.c
index 135d3dd3975141b5ac9130ee77d048daf6d6d1d8..ec91699182b176a583572d818efc4f1cddaaad6d 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Pei/Service.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Service.c
@@ -87,13 +87,13 @@ PeiRegisterCallBackWorker (
   ASSERT (GuidHob != NULL);\r
   \r
   CallbackTable = GET_GUID_HOB_DATA (GuidHob);\r
   ASSERT (GuidHob != NULL);\r
   \r
   CallbackTable = GET_GUID_HOB_DATA (GuidHob);\r

-  CallbackTable = CallbackTable + (TokenNumber * FixedPcdGet32(PcdMaxPeiPcdCallBackNumberPerPcdEntry));\r
+  CallbackTable = CallbackTable + (TokenNumber * PcdGet32 (PcdMaxPeiPcdCallBackNumberPerPcdEntry));\r

 \r
   Compare = Register? NULL: CallBackFunction;\r
   Assign  = Register? CallBackFunction: NULL;\r
 \r
 \r
 \r
   Compare = Register? NULL: CallBackFunction;\r
   Assign  = Register? CallBackFunction: NULL;\r
 \r
 \r

-  for (Idx = 0; Idx < FixedPcdGet32(PcdMaxPeiPcdCallBackNumberPerPcdEntry); Idx++) {\r
+  for (Idx = 0; Idx < PcdGet32 (PcdMaxPeiPcdCallBackNumberPerPcdEntry); Idx++) {\r

     if (CallbackTable[Idx] == Compare) {\r
       CallbackTable[Idx] = Assign;\r
       return EFI_SUCCESS;\r
     if (CallbackTable[Idx] == Compare) {\r
       CallbackTable[Idx] = Assign;\r
       return EFI_SUCCESS;\r


@@ -126,7 +126,7 @@ BuildPcdDatabase (
   \r
   CopyMem (&Database->Init, &gPEIPcdDbInit, sizeof (gPEIPcdDbInit));\r
 \r
   \r
   CopyMem (&Database->Init, &gPEIPcdDbInit, sizeof (gPEIPcdDbInit));\r
 \r

-  SizeOfCallbackFnTable = PEI_LOCAL_TOKEN_NUMBER * sizeof (PCD_PPI_CALLBACK) * FixedPcdGet32(PcdMaxPeiPcdCallBackNumberPerPcdEntry);\r
+  SizeOfCallbackFnTable = PEI_LOCAL_TOKEN_NUMBER * sizeof (PCD_PPI_CALLBACK) * PcdGet32 (PcdMaxPeiPcdCallBackNumberPerPcdEntry);\r

 \r
   CallbackFnTable = BuildGuidHob (&gEfiCallerIdGuid, SizeOfCallbackFnTable);\r
   \r
 \r
   CallbackFnTable = BuildGuidHob (&gEfiCallerIdGuid, SizeOfCallbackFnTable);\r
   \r


@@ -300,9 +300,9 @@ InvokeCallbackOnSet (
   \r
   CallbackTable = GET_GUID_HOB_DATA (GuidHob);\r
 \r
   \r
   CallbackTable = GET_GUID_HOB_DATA (GuidHob);\r
 \r

-  CallbackTable += (TokenNumber * FixedPcdGet32(PcdMaxPeiPcdCallBackNumberPerPcdEntry));\r
+  CallbackTable += (TokenNumber * PcdGet32 (PcdMaxPeiPcdCallBackNumberPerPcdEntry));\r

 \r
 \r

-  for (Idx = 0; Idx < FixedPcdGet32(PcdMaxPeiPcdCallBackNumberPerPcdEntry); Idx++) {\r
+  for (Idx = 0; Idx < PcdGet32 (PcdMaxPeiPcdCallBackNumberPerPcdEntry); Idx++) {\r

     if (CallbackTable[Idx] != NULL) {\r
       CallbackTable[Idx] (Guid,\r
                           (Guid == NULL)? TokenNumber: ExTokenNumber,\r
     if (CallbackTable[Idx] != NULL) {\r
       CallbackTable[Idx] (Guid,\r
                           (Guid == NULL)? TokenNumber: ExTokenNumber,\r


@@ -621,7 +621,7 @@ GetWorker (
     {\r
       VPD_HEAD *VpdHead;\r
       VpdHead = (VPD_HEAD *) ((UINT8 *)PeiPcdDb + Offset);\r
     {\r
       VPD_HEAD *VpdHead;\r
       VpdHead = (VPD_HEAD *) ((UINT8 *)PeiPcdDb + Offset);\r

-      return (VOID *) (UINTN) (FixedPcdGet32(PcdVpdBaseAddress) + VpdHead->Offset);\r
+      return (VOID *) (UINTN) (PcdGet32 (PcdVpdBaseAddress) + VpdHead->Offset);\r

     }\r
       \r
     case PCD_TYPE_HII:\r
     }\r
       \r
     case PCD_TYPE_HII:\r

diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
index 622fe530b3057485e15969e097087ff3897b528e..bc3458c4297b1bb72704c02ef1dcd00a7c21d54e 100644 (file)
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
+++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
@@ -3,7 +3,7 @@
   Emulation Variable services operate on the runtime volatile memory.\r
   The nonvolatile variable space doesn't exist.\r
 \r
   Emulation Variable services operate on the runtime volatile memory.\r
   The nonvolatile variable space doesn't exist.\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
 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


@@ -767,9 +767,9 @@ UpdateVariable (
   if ((Attributes & EFI_VARIABLE_NON_VOLATILE) != 0) {\r
     NonVolatileVarableStoreSize = ((VARIABLE_STORE_HEADER *)(UINTN)(Global->NonVolatileVariableBase))->Size;\r
     if ((((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) != 0) \r
   if ((Attributes & EFI_VARIABLE_NON_VOLATILE) != 0) {\r
     NonVolatileVarableStoreSize = ((VARIABLE_STORE_HEADER *)(UINTN)(Global->NonVolatileVariableBase))->Size;\r
     if ((((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) != 0) \r

-      && ((VarSize + mVariableModuleGlobal->HwErrVariableTotalSize) > FixedPcdGet32(PcdHwErrStorageSize)))\r
+      && ((VarSize + mVariableModuleGlobal->HwErrVariableTotalSize) > PcdGet32 (PcdHwErrStorageSize)))\r

       || (((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == 0) \r
       || (((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == 0) \r

-      && ((VarSize + mVariableModuleGlobal->CommonVariableTotalSize) > NonVolatileVarableStoreSize - sizeof (VARIABLE_STORE_HEADER) - FixedPcdGet32(PcdHwErrStorageSize)))) {\r
+      && ((VarSize + mVariableModuleGlobal->CommonVariableTotalSize) > NonVolatileVarableStoreSize - sizeof (VARIABLE_STORE_HEADER) - PcdGet32 (PcdHwErrStorageSize)))) {\r

       Status = EFI_OUT_OF_RESOURCES;\r
       goto Done;\r
     }\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto Done;\r
     }\r


@@ -1166,12 +1166,12 @@ EmuSetVariable (
   }\r
   //\r
   //  The size of the VariableName, including the Unicode Null in bytes plus\r
   }\r
   //\r
   //  The size of the VariableName, including the Unicode Null in bytes plus\r

-  //  the DataSize is limited to maximum size of FixedPcdGet32(PcdMaxHardwareErrorVariableSize)\r
-  //  bytes for HwErrRec, and FixedPcdGet32(PcdMaxVariableSize) bytes for the others.\r
+  //  the DataSize is limited to maximum size of PcdGet32 (PcdMaxHardwareErrorVariableSize)\r
+  //  bytes for HwErrRec, and PcdGet32 (PcdMaxVariableSize) bytes for the others.\r

   //\r
   if ((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == EFI_VARIABLE_HARDWARE_ERROR_RECORD) {\r
   //\r
   if ((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == EFI_VARIABLE_HARDWARE_ERROR_RECORD) {\r

-    if ((DataSize > FixedPcdGet32(PcdMaxHardwareErrorVariableSize)) ||                                                       \r
-        (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > FixedPcdGet32(PcdMaxHardwareErrorVariableSize))) {\r
+    if ((DataSize > PcdGet32 (PcdMaxHardwareErrorVariableSize)) ||                                                       \r
+        (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > PcdGet32 (PcdMaxHardwareErrorVariableSize))) {\r

       return EFI_INVALID_PARAMETER;\r
     }\r
     //\r
       return EFI_INVALID_PARAMETER;\r
     }\r
     //\r


@@ -1183,10 +1183,10 @@ EmuSetVariable (
   } else {\r
   //\r
   //  The size of the VariableName, including the Unicode Null in bytes plus\r
   } else {\r
   //\r
   //  The size of the VariableName, including the Unicode Null in bytes plus\r

-  //  the DataSize is limited to maximum size of FixedPcdGet32(PcdMaxVariableSize) bytes.\r
+  //  the DataSize is limited to maximum size of PcdGet32 (PcdMaxVariableSize) bytes.\r

   //\r
   //\r

-    if ((DataSize > FixedPcdGet32(PcdMaxVariableSize)) ||\r
-        (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > FixedPcdGet32(PcdMaxVariableSize))) {\r
+    if ((DataSize > PcdGet32 (PcdMaxVariableSize)) ||\r
+        (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > PcdGet32 (PcdMaxVariableSize))) {\r

       return EFI_INVALID_PARAMETER;\r
     }  \r
   }\r
       return EFI_INVALID_PARAMETER;\r
     }  \r
   }\r


@@ -1301,18 +1301,18 @@ EmuQueryVariableInfo (
   // Harware error record variable needs larger size.\r
   //\r
   if ((Attributes & (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_HARDWARE_ERROR_RECORD)) == (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_HARDWARE_ERROR_RECORD)) {\r
   // Harware error record variable needs larger size.\r
   //\r
   if ((Attributes & (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_HARDWARE_ERROR_RECORD)) == (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_HARDWARE_ERROR_RECORD)) {\r

-    *MaximumVariableStorageSize = FixedPcdGet32(PcdHwErrStorageSize);\r
-    *MaximumVariableSize = FixedPcdGet32(PcdMaxHardwareErrorVariableSize) - sizeof (VARIABLE_HEADER);\r
+    *MaximumVariableStorageSize = PcdGet32 (PcdHwErrStorageSize);\r
+    *MaximumVariableSize = PcdGet32 (PcdMaxHardwareErrorVariableSize) - sizeof (VARIABLE_HEADER);\r

   } else {\r
     if ((Attributes & EFI_VARIABLE_NON_VOLATILE) != 0) {\r
   } else {\r
     if ((Attributes & EFI_VARIABLE_NON_VOLATILE) != 0) {\r

-      ASSERT (FixedPcdGet32(PcdHwErrStorageSize) < VariableStoreHeader->Size);\r
-      *MaximumVariableStorageSize = VariableStoreHeader->Size - sizeof (VARIABLE_STORE_HEADER) - FixedPcdGet32(PcdHwErrStorageSize);\r
+      ASSERT (PcdGet32 (PcdHwErrStorageSize) < VariableStoreHeader->Size);\r
+      *MaximumVariableStorageSize = VariableStoreHeader->Size - sizeof (VARIABLE_STORE_HEADER) - PcdGet32 (PcdHwErrStorageSize);\r

     }\r
 \r
     //\r
     }\r
 \r
     //\r

-    // Let *MaximumVariableSize be FixedPcdGet32(PcdMaxVariableSize) with the exception of the variable header size.\r
+    // Let *MaximumVariableSize be PcdGet32 (PcdMaxVariableSize) with the exception of the variable header size.\r

     //\r
     //\r

-    *MaximumVariableSize = FixedPcdGet32(PcdMaxVariableSize) - sizeof (VARIABLE_HEADER);\r
+    *MaximumVariableSize = PcdGet32 (PcdMaxVariableSize) - sizeof (VARIABLE_HEADER);\r

   }\r
 \r
   //\r
   }\r
 \r
   //\r


@@ -1392,15 +1392,13 @@ InitializeVariableStore (
   // ensure that the value of PcdHwErrStorageSize is less than or equal to the value of \r
   // PcdVariableStoreSize.\r
   //\r
   // ensure that the value of PcdHwErrStorageSize is less than or equal to the value of \r
   // PcdVariableStoreSize.\r
   //\r

-  ASSERT (FixedPcdGet32(PcdHwErrStorageSize) <= FixedPcdGet32(PcdVariableStoreSize));\r
+  ASSERT (PcdGet32 (PcdHwErrStorageSize) <= PcdGet32 (PcdVariableStoreSize));\r

 \r
   //\r
   // Allocate memory for variable store.\r
   //\r
   if (VolatileStore || (PcdGet64 (PcdEmuVariableNvStoreReserved) == 0)) {\r
 \r
   //\r
   // Allocate memory for variable store.\r
   //\r
   if (VolatileStore || (PcdGet64 (PcdEmuVariableNvStoreReserved) == 0)) {\r

-    VariableStore = (VARIABLE_STORE_HEADER *) AllocateRuntimePool (\r
-                                                FixedPcdGet32(PcdVariableStoreSize)\r
-                                                );\r
+    VariableStore = (VARIABLE_STORE_HEADER *) AllocateRuntimePool (PcdGet32 (PcdVariableStoreSize));\r

   } else {\r
     //\r
     // A memory location has been reserved for the NV variable store.  Certain\r
   } else {\r
     //\r
     // A memory location has been reserved for the NV variable store.  Certain\r


@@ -1411,7 +1409,7 @@ InitializeVariableStore (
       (VARIABLE_STORE_HEADER *)(VOID*)(UINTN)\r
         PcdGet64 (PcdEmuVariableNvStoreReserved);\r
     if (\r
       (VARIABLE_STORE_HEADER *)(VOID*)(UINTN)\r
         PcdGet64 (PcdEmuVariableNvStoreReserved);\r
     if (\r

-         (VariableStore->Size == FixedPcdGet32(PcdVariableStoreSize)) &&\r
+         (VariableStore->Size == PcdGet32 (PcdVariableStoreSize)) &&\r

          (VariableStore->Format == VARIABLE_STORE_FORMATTED) &&\r
          (VariableStore->State == VARIABLE_STORE_HEALTHY)\r
        ) {\r
          (VariableStore->Format == VARIABLE_STORE_FORMATTED) &&\r
          (VariableStore->State == VARIABLE_STORE_HEALTHY)\r
        ) {\r


@@ -1429,7 +1427,7 @@ InitializeVariableStore (
   }\r
 \r
   if (FullyInitializeStore) {\r
   }\r
 \r
   if (FullyInitializeStore) {\r

-    SetMem (VariableStore, FixedPcdGet32(PcdVariableStoreSize), 0xff);\r
+    SetMem (VariableStore, PcdGet32 (PcdVariableStoreSize), 0xff);\r

   }\r
 \r
   //\r
   }\r
 \r
   //\r


@@ -1439,7 +1437,7 @@ InitializeVariableStore (
   InitializeLocationForLastVariableOffset (VariableStore, LastVariableOffset);\r
 \r
   CopyGuid (&VariableStore->Signature, &gEfiVariableGuid);\r
   InitializeLocationForLastVariableOffset (VariableStore, LastVariableOffset);\r
 \r
   CopyGuid (&VariableStore->Signature, &gEfiVariableGuid);\r

-  VariableStore->Size       = FixedPcdGet32(PcdVariableStoreSize);\r
+  VariableStore->Size       = PcdGet32 (PcdVariableStoreSize);\r

   VariableStore->Format     = VARIABLE_STORE_FORMATTED;\r
   VariableStore->State      = VARIABLE_STORE_HEALTHY;\r
   VariableStore->Reserved   = 0;\r
   VariableStore->Format     = VARIABLE_STORE_FORMATTED;\r
   VariableStore->State      = VARIABLE_STORE_HEALTHY;\r
   VariableStore->Reserved   = 0;\r

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
index 50c1cca82a6c963865b8d9aec426d7629aff9306..c71c8d541dbd97cd0daed9a3880261ee7212f801 100644 (file)
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
@@ -3,7 +3,7 @@
   Implement all four UEFI Runtime Variable services for the nonvolatile\r
   and volatile storage space and install variable architecture protocol.\r
   \r
   Implement all four UEFI Runtime Variable services for the nonvolatile\r
   and volatile storage space and install variable architecture protocol.\r
   \r

-Copyright (c) 2006 - 2009, 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
 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


@@ -1475,7 +1475,7 @@ UpdateVariable (
   // as a temporary storage.\r
   //\r
   NextVariable = GetEndPointer ((VARIABLE_STORE_HEADER *) ((UINTN) mVariableModuleGlobal->VariableGlobal.VolatileVariableBase));\r
   // as a temporary storage.\r
   //\r
   NextVariable = GetEndPointer ((VARIABLE_STORE_HEADER *) ((UINTN) mVariableModuleGlobal->VariableGlobal.VolatileVariableBase));\r

-  ScratchSize = MAX(FixedPcdGet32(PcdMaxVariableSize), FixedPcdGet32(PcdMaxHardwareErrorVariableSize));\r
+  ScratchSize = MAX (PcdGet32 (PcdMaxVariableSize), PcdGet32 (PcdMaxHardwareErrorVariableSize));\r

 \r
   SetMem (NextVariable, ScratchSize, 0xff);\r
 \r
 \r
   SetMem (NextVariable, ScratchSize, 0xff);\r
 \r


@@ -1519,9 +1519,9 @@ UpdateVariable (
     Volatile = FALSE;\r
     NonVolatileVarableStoreSize = ((VARIABLE_STORE_HEADER *)(UINTN)(mVariableModuleGlobal->VariableGlobal.NonVolatileVariableBase))->Size;\r
     if ((((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) != 0) \r
     Volatile = FALSE;\r
     NonVolatileVarableStoreSize = ((VARIABLE_STORE_HEADER *)(UINTN)(mVariableModuleGlobal->VariableGlobal.NonVolatileVariableBase))->Size;\r
     if ((((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) != 0) \r

-      && ((VarSize + mVariableModuleGlobal->HwErrVariableTotalSize) > FixedPcdGet32(PcdHwErrStorageSize)))\r
+      && ((VarSize + mVariableModuleGlobal->HwErrVariableTotalSize) > PcdGet32 (PcdHwErrStorageSize)))\r

       || (((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == 0) \r
       || (((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == 0) \r

-      && ((VarSize + mVariableModuleGlobal->CommonVariableTotalSize) > NonVolatileVarableStoreSize - sizeof (VARIABLE_STORE_HEADER) - FixedPcdGet32(PcdHwErrStorageSize)))) {\r
+      && ((VarSize + mVariableModuleGlobal->CommonVariableTotalSize) > NonVolatileVarableStoreSize - sizeof (VARIABLE_STORE_HEADER) - PcdGet32 (PcdHwErrStorageSize)))) {\r

       if (EfiAtRuntime ()) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
         goto Done;\r
       if (EfiAtRuntime ()) {\r
         Status = EFI_OUT_OF_RESOURCES;\r
         goto Done;\r


@@ -1538,9 +1538,9 @@ UpdateVariable (
       // If still no enough space, return out of resources\r
       //\r
       if ((((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) != 0) \r
       // If still no enough space, return out of resources\r
       //\r
       if ((((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) != 0) \r

-        && ((VarSize + mVariableModuleGlobal->HwErrVariableTotalSize) > FixedPcdGet32(PcdHwErrStorageSize)))\r
+        && ((VarSize + mVariableModuleGlobal->HwErrVariableTotalSize) > PcdGet32 (PcdHwErrStorageSize)))\r

         || (((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == 0) \r
         || (((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == 0) \r

-        && ((VarSize + mVariableModuleGlobal->CommonVariableTotalSize) > NonVolatileVarableStoreSize - sizeof (VARIABLE_STORE_HEADER) - FixedPcdGet32(PcdHwErrStorageSize)))) {\r
+        && ((VarSize + mVariableModuleGlobal->CommonVariableTotalSize) > NonVolatileVarableStoreSize - sizeof (VARIABLE_STORE_HEADER) - PcdGet32 (PcdHwErrStorageSize)))) {\r

         Status = EFI_OUT_OF_RESOURCES;\r
         goto Done;\r
       }\r
         Status = EFI_OUT_OF_RESOURCES;\r
         goto Done;\r
       }\r


@@ -1943,12 +1943,12 @@ RuntimeServiceSetVariable (
 \r
   //\r
   //  The size of the VariableName, including the Unicode Null in bytes plus\r
 \r
   //\r
   //  The size of the VariableName, including the Unicode Null in bytes plus\r

-  //  the DataSize is limited to maximum size of FixedPcdGet32(PcdMaxHardwareErrorVariableSize)\r
-  //  bytes for HwErrRec, and FixedPcdGet32(PcdMaxVariableSize) bytes for the others.\r
+  //  the DataSize is limited to maximum size of PcdGet32 (PcdMaxHardwareErrorVariableSize)\r
+  //  bytes for HwErrRec, and PcdGet32 (PcdMaxVariableSize) bytes for the others.\r

   //\r
   if ((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == EFI_VARIABLE_HARDWARE_ERROR_RECORD) {\r
   //\r
   if ((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) == EFI_VARIABLE_HARDWARE_ERROR_RECORD) {\r

-    if ((DataSize > FixedPcdGet32(PcdMaxHardwareErrorVariableSize)) ||\r
-        (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > FixedPcdGet32(PcdMaxHardwareErrorVariableSize))) {\r
+    if ((DataSize > PcdGet32 (PcdMaxHardwareErrorVariableSize)) ||\r
+        (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > PcdGet32 (PcdMaxHardwareErrorVariableSize))) {\r

       return EFI_INVALID_PARAMETER;\r
     }\r
     //\r
       return EFI_INVALID_PARAMETER;\r
     }\r
     //\r


@@ -1960,10 +1960,10 @@ RuntimeServiceSetVariable (
   } else {\r
     //\r
     //  The size of the VariableName, including the Unicode Null in bytes plus\r
   } else {\r
     //\r
     //  The size of the VariableName, including the Unicode Null in bytes plus\r

-    //  the DataSize is limited to maximum size of FixedPcdGet32(PcdMaxVariableSize) bytes.\r
+    //  the DataSize is limited to maximum size of PcdGet32 (PcdMaxVariableSize) bytes.\r

     //\r
     //\r

-    if ((DataSize > FixedPcdGet32(PcdMaxVariableSize)) ||\r
-        (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > FixedPcdGet32(PcdMaxVariableSize))) {\r
+    if ((DataSize > PcdGet32 (PcdMaxVariableSize)) ||\r
+        (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > PcdGet32 (PcdMaxVariableSize))) {\r

       return EFI_INVALID_PARAMETER;\r
     }  \r
   }  \r
       return EFI_INVALID_PARAMETER;\r
     }  \r
   }  \r


@@ -2091,18 +2091,18 @@ RuntimeServiceQueryVariableInfo (
   // Harware error record variable needs larger size.\r
   //\r
   if ((Attributes & (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_HARDWARE_ERROR_RECORD)) == (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_HARDWARE_ERROR_RECORD)) {\r
   // Harware error record variable needs larger size.\r
   //\r
   if ((Attributes & (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_HARDWARE_ERROR_RECORD)) == (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_HARDWARE_ERROR_RECORD)) {\r

-    *MaximumVariableStorageSize = FixedPcdGet32(PcdHwErrStorageSize);\r
-    *MaximumVariableSize = FixedPcdGet32(PcdMaxHardwareErrorVariableSize) - sizeof (VARIABLE_HEADER);\r
+    *MaximumVariableStorageSize = PcdGet32 (PcdHwErrStorageSize);\r
+    *MaximumVariableSize = PcdGet32 (PcdMaxHardwareErrorVariableSize) - sizeof (VARIABLE_HEADER);\r

   } else {\r
     if ((Attributes & EFI_VARIABLE_NON_VOLATILE) != 0) {\r
   } else {\r
     if ((Attributes & EFI_VARIABLE_NON_VOLATILE) != 0) {\r

-      ASSERT (FixedPcdGet32(PcdHwErrStorageSize) < VariableStoreHeader->Size);\r
-      *MaximumVariableStorageSize = VariableStoreHeader->Size - sizeof (VARIABLE_STORE_HEADER) - FixedPcdGet32(PcdHwErrStorageSize);\r
+      ASSERT (PcdGet32 (PcdHwErrStorageSize) < VariableStoreHeader->Size);\r
+      *MaximumVariableStorageSize = VariableStoreHeader->Size - sizeof (VARIABLE_STORE_HEADER) - PcdGet32 (PcdHwErrStorageSize);\r

     }\r
 \r
     //\r
     }\r
 \r
     //\r

-    // Let *MaximumVariableSize be FixedPcdGet32(PcdMaxVariableSize) with the exception of the variable header size.\r
+    // Let *MaximumVariableSize be PcdGet32 (PcdMaxVariableSize) with the exception of the variable header size.\r

     //\r
     //\r

-    *MaximumVariableSize = FixedPcdGet32(PcdMaxVariableSize) - sizeof (VARIABLE_HEADER);\r
+    *MaximumVariableSize = PcdGet32 (PcdMaxVariableSize) - sizeof (VARIABLE_HEADER);\r

   }\r
 \r
   //\r
   }\r
 \r
   //\r


@@ -2259,19 +2259,19 @@ VariableCommonInitialize (
   // ensure that the value of PcdHwErrStorageSize is less than or equal to the value of \r
   // PcdFlashNvStorageVariableSize.\r
   //\r
   // ensure that the value of PcdHwErrStorageSize is less than or equal to the value of \r
   // PcdFlashNvStorageVariableSize.\r
   //\r

-  ASSERT (FixedPcdGet32(PcdHwErrStorageSize) <= FixedPcdGet32(PcdFlashNvStorageVariableSize));\r
+  ASSERT (PcdGet32 (PcdHwErrStorageSize) <= PcdGet32 (PcdFlashNvStorageVariableSize));\r

 \r
   //\r
   // Allocate memory for volatile variable store, note that there is a scratch space to store scratch data.\r
   //\r
 \r
   //\r
   // Allocate memory for volatile variable store, note that there is a scratch space to store scratch data.\r
   //\r

-  ScratchSize = MAX(FixedPcdGet32(PcdMaxVariableSize), FixedPcdGet32(PcdMaxHardwareErrorVariableSize));\r
-  VolatileVariableStore = AllocateRuntimePool (FixedPcdGet32(PcdVariableStoreSize) + ScratchSize);\r
+  ScratchSize = MAX (PcdGet32 (PcdMaxVariableSize), PcdGet32 (PcdMaxHardwareErrorVariableSize));\r
+  VolatileVariableStore = AllocateRuntimePool (PcdGet32 (PcdVariableStoreSize) + ScratchSize);\r

   if (VolatileVariableStore == NULL) {\r
     FreePool (mVariableModuleGlobal);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
   if (VolatileVariableStore == NULL) {\r
     FreePool (mVariableModuleGlobal);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r

-  SetMem (VolatileVariableStore, FixedPcdGet32(PcdVariableStoreSize) + ScratchSize, 0xff);\r
+  SetMem (VolatileVariableStore, PcdGet32 (PcdVariableStoreSize) + ScratchSize, 0xff);\r

 \r
   //\r
   //  Variable Specific Data\r
 \r
   //\r
   //  Variable Specific Data\r


@@ -2281,7 +2281,7 @@ VariableCommonInitialize (
   mVariableModuleGlobal->FvbInstance = FvbProtocol;\r
 \r
   CopyGuid (&VolatileVariableStore->Signature, &gEfiVariableGuid);\r
   mVariableModuleGlobal->FvbInstance = FvbProtocol;\r
 \r
   CopyGuid (&VolatileVariableStore->Signature, &gEfiVariableGuid);\r

-  VolatileVariableStore->Size                       = FixedPcdGet32(PcdVariableStoreSize);\r
+  VolatileVariableStore->Size                       = PcdGet32 (PcdVariableStoreSize);\r

   VolatileVariableStore->Format                     = VARIABLE_STORE_FORMATTED;\r
   VolatileVariableStore->State                      = VARIABLE_STORE_HEALTHY;\r
   VolatileVariableStore->Reserved                   = 0;\r
   VolatileVariableStore->Format                     = VARIABLE_STORE_FORMATTED;\r
   VolatileVariableStore->State                      = VARIABLE_STORE_HEALTHY;\r
   VolatileVariableStore->Reserved                   = 0;\r