Correct typo in comments, clean IfrSupportLib.h

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

9 files changed, 13 insertions, 33 deletions

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
index c0094eed90..fb536f6351 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
@@ -32,6 +32,7 @@ Revision History
 #include <Protocol/HiiDatabase.h>

 #include <Protocol/HiiString.h>

 

+#include <MdeModuleHii.h>

 #include <Library/DebugLib.h>

 #include <Library/BaseMemoryLib.h>

 #include <Library/UefiRuntimeServicesTableLib.h>

@@ -43,9 +44,6 @@ Revision History
 #include <Library/HiiLib.h>

 #include <Library/ExtendedHiiLib.h>

 

-#include <MdeModuleHii.h>

-

-

 #include "NVDataStruc.h"

 

 //

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
index 62c5b2d7af..344f967f78 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
@@ -28,6 +28,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/SimpleTextOut.h>

 

 #include <Guid/HiiKeyBoardLayout.h>

+#include <Guid/GlobalVariable.h>

 

 

 #include <Library/DebugLib.h>

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
index f6d41b87a5..e89d2d4914 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h
@@ -15,6 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _ISCSI_CONFIG_H_

 #define _ISCSI_CONFIG_H_

 

+#include <Protocol/HiiConfigRouting.h>

 #include <Library/HiiLib.h>

 #include <Library/ExtendedHiiLib.h>

 #include <Library/IfrSupportLib.h>

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
index e403f3d4ad..0c44a64077 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -11,9 +11,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

-

-Module Name: Pcd.c

-

 **/

 

 #include "Service.h"

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
index 7695b84882..345e9f6fe4 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
@@ -3,7 +3,7 @@
 # PEI phase, DXE phase and produce the implementation of PCD protocol.

 # PCD database structure is generated at autogen.h/autogen.c in build time.

 #

-# Copyright (c) 2006 - 2007, Intel Corporation

+# Copyright (c) 2006 - 2009, Intel Corporation

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -52,10 +52,10 @@
   PcdLib

 

 [Guids]

-  gPcdDataBaseHobGuid                           # ALWAYS_CONSUMES  Hob: GUID_EXTENSION

+  gPcdDataBaseHobGuid                           ## CONSUMES  ## Hob: GUID_EXTENSION

 

 [Protocols]

-  gPcdProtocolGuid                              # PROTOCOL ALWAYS_PRODUCES

+  gPcdProtocolGuid                              ## PRODUCES

 

 [FeaturePcd.common]

   gEfiMdeModulePkgTokenSpaceGuid.PcdDxePcdDatabaseTraverseEnabled

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.c b/MdeModulePkg/Universal/PCD/Dxe/Service.c
index a1f966c717..71e92399f4 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.c
@@ -1018,7 +1018,7 @@ SetHiiVariable (
   space guid: token number} to local token number.

   

   @param Guid            Token space guid for dynamic-ex PCD entry.

-  @param ExTokenNumber   EDES_TODO: Add parameter description

+  @param ExTokenNumber   Dynamic-ex PCD token number.

 

   @return local token number for dynamic-ex PCD.

 

@@ -1049,7 +1049,6 @@ GetExPcdTokenNumber (
         if ((ExTokenNumber == ExMap[Index].ExTokenNumber) &&

             (MatchGuidIdx == ExMap[Index].ExGuidIndex)) {

             return ExMap[Index].LocalTokenNumber;

-

         }

       }

     }

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.h b/MdeModulePkg/Universal/PCD/Dxe/Service.h
index d0e94af57a..67114be3bb 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.h
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.h
@@ -10,9 +10,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

-

-Module Name: Service.h

-

 **/

 

 #ifndef _PCD_DXE_SERVICE_H_

@@ -32,20 +29,6 @@ Module Name: Service.h
 #include <Library/UefiRuntimeServicesTableLib.h>

 

 //

-// Please make sure the PCD Service PEIM Version is consistent with

-// the version of PCD Database generation tool

-//

-#define PCD_SERVICE_DXE_DRIVER_VERSION      2

-

-//

-// PCD_DXE_DATABASE_GENTOOL_VERSION is defined in Autogen.h

-// and generated by PCD Database generation tool.

-//

-//#if (PCD_SERVICE_DXE_DRIVER_VERSION != PCD_DXE_SERVICE_DRIVER_AUTOGEN_VERSION)

-//  #error "Please make sure the version of PCD Service DXE Driver and PCD DXE Database Generation Tool matches"

-//#endif

-

-//

 // Protocol Interface function declaration.

 //

 /**

@@ -997,7 +980,7 @@ BuildPcdDxeDataBase (
   space guid: token number} to local token number.

   

   @param Guid            Token space guid for dynamic-ex PCD entry.

-  @param ExTokenNumber   EDES_TODO: Add parameter description

+  @param ExTokenNumber   Dynamic-ex PCD token number.

 

   @return local token number for dynamic-ex PCD.

 

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
index 44e426e11c..cebcf47c36 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
@@ -48,12 +48,12 @@
 

 [Guids]

   gPcdPeiCallbackFnTableHobGuid                 ## RPIVATE   ## Hob

-  gPcdDataBaseHobGuid                           ## PRODUCED  ## Hob

-  gPcdDataBaseHobGuid                           ## CONSUMED  ## Hob

+  gPcdDataBaseHobGuid                           ## PRODUCES  ## Hob

+  gPcdDataBaseHobGuid                           ## CONSUMES  ## Hob

 

 [Ppis]

-  gEfiPeiReadOnlyVariable2PpiGuid               ## CONSUMED

-  gPcdPpiGuid                                   ## PRODUCED

+  gEfiPeiReadOnlyVariable2PpiGuid               ## CONSUMES

+  gPcdPpiGuid                                   ## PRODUCES

 

 [FeaturePcd.common]

   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseSetEnabled

diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c
index 4953486c51..24abaa654b 100644
--- a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c
+++ b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c
@@ -36,6 +36,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/ComponentName2.h>

 #include <Protocol/ComponentName.h>

 #include <Protocol/DriverBinding.h>

+#include <Guid/GlobalVariable.h>

 

 #include <Library/BaseLib.h>

 #include <Library/DebugLib.h>