cleanup to remove migration comments.

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

18 files changed, 4 insertions, 86 deletions

diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
index 6ddf256..b40e0ee 100644
--- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
+++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
@@ -20,8 +20,6 @@ Abstract:
 --*/

 

 #include "Bds.h"

-//@MT:#include "BdsLib.h"

-//@MT:#include "BdsPlatform.h"

 #include "Language.h"

 #include "FrontPage.h"

 #include "Hotkey.h"

@@ -41,8 +39,6 @@ UINT16                          *mBootNext = NULL;
 

 EFI_HANDLE                      mBdsImageHandle;

 

-//@MT:EFI_DRIVER_ENTRY_POINT (BdsInitialize)

-

 EFI_STATUS

 EFIAPI

 BdsInitialize (

@@ -72,9 +68,6 @@ Returns:
 {

   EFI_STATUS  Status;

 

-  //@MT:EdkII Library Constructor should initialize library automatically

-  //@MT:DxeInitializeDriverLib (ImageHandle, SystemTable);

-

   mBdsImageHandle = ImageHandle;

 

   //

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c
index 030aa5e..2f0d5d9 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c
@@ -22,8 +22,6 @@ Abstract:
 --*/

 

 #include "BBSsupport.h"

-//@MT:#include "BdsLib.h"

-//@MT:#include EFI_PROTOCOL_DEFINITION (LegacyBios)

 

 EFI_DEVICE_PATH_PROTOCOL  EndDevicePath[] = {

   END_DEVICE_PATH_TYPE,

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h b/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h
index 7f0ce2f..532223f 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h
@@ -24,10 +24,6 @@ Revision History
 #ifndef _EFI_BDS_BBS_SUPPORT_H

 #define _EFI_BDS_BBS_SUPPORT_H

 

-//@MT:#include "Tiano.h"

-//@MT:#include "EfiDriverLib.h"

-//@MT:#include "EfiPrintLib.h"

-//@MT:#include "BdsLib.h"

 #include "BootMaint.h"

 //

 // Bugbug: Candidate for a PCD entries

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/BmLib.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/BmLib.c
index 15b2080..e9a7409 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/BmLib.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/BmLib.c
@@ -21,8 +21,6 @@ AgBStract:
 

 #include "BootMaint.h"

 

-//@MT:#include EFI_GUID_DEFINITION (DataHubRecords)

-

 VOID *

 EfiAllocateZeroPool (

   IN UINTN            Size

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
index b9f6dba..9cf2a9d 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
@@ -20,7 +20,6 @@ Abstract:
 --*/

 

 #include "BootMaint.h"

-//@MT:#include "BdsStrDefs.h"

 #include "FormGuid.h"

 #include "Bds.h"

 #include "FrontPage.h"

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h b/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
index 3dfb324..0de7b05 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
@@ -22,36 +22,12 @@ Revision History
 #ifndef _BOOT_MAINT_H

 #define _BOOT_MAINT_H

 

-//@MT:#include "Tiano.h"

-//@MT:#include "EfiPrintLib.h"

-//@MT:#include "EfiImage.h"

-//@MT:#include "UefiIfrLibrary.h"

-//@MT:#include "EfiDriverLib.h"

-//@MT:#include "BdsStrDefs.h"

-//@MT:#include "BdsLib.h"

 #include "Bds.h"

 #include "BBSsupport.h"

 #include "FormGuid.h"

 #include "FrontPage.h"

 

 //

-// Protocol definition included

-//

-//@MT:#include EFI_PROTOCOL_DEFINITION (BlockIo)

-//@MT:#include EFI_PROTOCOL_DEFINITION (DevicePath)

-//@MT:#include EFI_PROTOCOL_DEFINITION (DiskIo)

-//@MT:#include EFI_PROTOCOL_DEFINITION (LoadFile)

-//@MT:#include EFI_PROTOCOL_DEFINITION (SerialIo)

-//@MT:#include EFI_PROTOCOL_DEFINITION (SimpleFileSystem)

-//@MT:#include EFI_PROTOCOL_DEFINITION (FileInfo)

-//@MT:#include EFI_PROTOCOL_DEFINITION (FileSystemVolumeLabelInfo)

-//@MT:#include EFI_PROTOCOL_DEFINITION (UnicodeCollation)

-//@MT:#include EFI_PROTOCOL_DEFINITION (VariableStore)

-//@MT:#include EFI_PROTOCOL_DEFINITION (LegacyBios)

-//@MT:#include EFI_PROTOCOL_DEFINITION (LoadedImage)

-//@MT:#include EFI_ARCH_PROTOCOL_DEFINITION (Bds)

-

-//

 // Constants which are variable names used to access variables

 //

 #define VarLegacyDevOrder L"LegacyDevOrder"

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
index e3ce542..811702f 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
@@ -20,7 +20,6 @@ Abstract:
 --*/

 

 #include "BootMaint.h"

-//@MT:#include "BdsPlatform.h"

 

 VOID

 UpdateFileExplorePage (

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/FormGuid.h b/MdeModulePkg/Universal/BdsDxe/BootMaint/FormGuid.h
index aa0091d..9c0adf2 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/FormGuid.h
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/FormGuid.h
@@ -23,12 +23,12 @@ Abstract:
 

 #define BOOT_MAINT_FORMSET_GUID \

   { \

-  0x642237c7, 0x35d4, 0x472d, 0x83, 0x65, 0x12, 0xe0, 0xcc, 0xf2, 0x7a, 0x22 \

+  0x642237c7, 0x35d4, 0x472d, {0x83, 0x65, 0x12, 0xe0, 0xcc, 0xf2, 0x7a, 0x22} \

   }

 

 #define FILE_EXPLORE_FORMSET_GUID \

   { \

-  0x1f2d63e1, 0xfebd, 0x4dc7, 0x9c, 0xc5, 0xba, 0x2b, 0x1c, 0xef, 0x9c, 0x5b \

+  0x1f2d63e1, 0xfebd, 0x4dc7, {0x9c, 0xc5, 0xba, 0x2b, 0x1c, 0xef, 0x9c, 0x5b} \

   }

 

 #define FORM_MAIN_ID                         0x1001

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
index 534b00f..d1608bf 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
@@ -20,10 +20,9 @@ Abstract:
 --*/

 

 #include "BootMaint.h"

-//@MT:#include "BdsPlatform.h"

 

 EFI_GUID gTerminalDriverGuid = {

-  0x10634d8e, 0x1c05, 0x46cb, 0xbb, 0xc, 0x5a, 0xfd, 0xc8, 0x29, 0xa8, 0xc8

+  0x10634d8e, 0x1c05, 0x46cb, {0xbb, 0xc, 0x5a, 0xfd, 0xc8, 0x29, 0xa8, 0xc8}

 };

 

 VOID

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/Variable.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/Variable.c
index d01e1ba..f5a1038 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/Variable.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/Variable.c
@@ -20,7 +20,6 @@ Abstract:
 --*/

 

 #include "BootMaint.h"

-//@MT:#include "BdsPlatform.h"

 

 EFI_STATUS

 Var_DelBootOption (

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManager.h b/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManager.h
index b9f6d29..fab04d2 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManager.h
+++ b/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManager.h
@@ -24,11 +24,7 @@ Revision History
 #ifndef _EFI_BOOT_MANAGER_H

 #define _EFI_BOOT_MANAGER_H

 

-//@MT:#include "Tiano.h"

 #include "Bds.h"

-//@MT:#include "BdsLib.h"

-//@MT:#include "BdsPlatform.h"

-//@MT:#include "UefiIfrLibrary.h"

 #include "FrontPage.h"

 

 //

diff --git a/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.h b/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.h
index b69e31e..0469456 100644
--- a/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.h
+++ b/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.h
@@ -24,7 +24,6 @@ Revision History
 #ifndef _DEVICE_MANAGER_H

 #define _DEVICE_MANAGER_H

 

-//@MT:#include "Tiano.h"

 #include "Bds.h"

 #include "FrontPage.h"

 

@@ -33,7 +32,7 @@ Revision History
 //

 #define DEVICE_MANAGER_FORMSET_GUID  \

   { \

-    0x3ebfa8e6, 0x511d, 0x4b5b, 0xa9, 0x5f, 0xfb, 0x38, 0x26, 0xf, 0x1c, 0x27 \

+  0x3ebfa8e6, 0x511d, 0x4b5b, {0xa9, 0x5f, 0xfb, 0x38, 0x26, 0xf, 0x1c, 0x27} \

   }

 

 #define LABEL_VBIOS                          0x0040

diff --git a/MdeModulePkg/Universal/BdsDxe/FrontPage.c b/MdeModulePkg/Universal/BdsDxe/FrontPage.c
index 87cff67..b82b40f 100644
--- a/MdeModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/MdeModulePkg/Universal/BdsDxe/FrontPage.c
@@ -20,8 +20,6 @@ Abstract:
 --*/

 

 #include "Bds.h"

-//@MT:#include "BdsLib.h"

-//@MT:#include "BdsPlatform.h"

 #include "FrontPage.h"

 

 EFI_GUID  mFrontPageGuid      = FRONT_PAGE_FORMSET_GUID;

diff --git a/MdeModulePkg/Universal/BdsDxe/FrontPage.h b/MdeModulePkg/Universal/BdsDxe/FrontPage.h
index b7394fc..fc01d16 100644
--- a/MdeModulePkg/Universal/BdsDxe/FrontPage.h
+++ b/MdeModulePkg/Universal/BdsDxe/FrontPage.h
@@ -24,29 +24,17 @@ Revision History
 #ifndef _FRONT_PAGE_H

 #define _FRONT_PAGE_H

 

-//@MT:#include "Tiano.h"

-//@MT:#include "EfiDriverLib.h"

-//@MT:#include "UefiIfrLibrary.h"

 #include "DeviceMngr/DeviceManager.h"

 #include "BootMaint/BootMaint.h"

 #include "BootMngr/BootManager.h"

 #include "String.h"

 

-//@MT:#include EFI_PROTOCOL_DEFINITION (HiiDatabase)

-//@MT:#include EFI_PROTOCOL_DEFINITION (HiiString)

-//@MT:#include EFI_PROTOCOL_DEFINITION (HiiConfigAccess)

-//@MT:#include EFI_PROTOCOL_DEFINITION (FormBrowser2)

-//@MT:#include EFI_PROTOCOL_DEFINITION (DataHub)

-

-//@MT:#include EFI_GUID_DEFINITION (DataHubRecords)

-

 #define ONE_SECOND  10000000

 

 //

 // This is the VFR compiler generated header file which defines the

 // string identifiers.

 //

-//@MT:#include "BdsStrDefs.h"

 #define PRINTABLE_LANGUAGE_NAME_STRING_ID     0x0001

 

 //

diff --git a/MdeModulePkg/Universal/BdsDxe/Hotkey.h b/MdeModulePkg/Universal/BdsDxe/Hotkey.h
index 0eeb427..87059e1 100644
--- a/MdeModulePkg/Universal/BdsDxe/Hotkey.h
+++ b/MdeModulePkg/Universal/BdsDxe/Hotkey.h
@@ -27,13 +27,6 @@ Revision History
 

 #include "Bds.h"

 #include "String.h"

-//@MT:#include "Tiano.h"

-//@MT:#include "EfiDriverLib.h"

-//@MT:#include "BdsPlatform.h"

-//@MT:#include "BdsLib.h"

-

-//@MT:#include EFI_PROTOCOL_DEFINITION (SimpleTextInputEx)

-

 

 #define GET_KEY_CODE_COUNT(KeyOptions)      (((KeyOptions) & EFI_KEY_CODE_COUNT) >> 8)

 

diff --git a/MdeModulePkg/Universal/BdsDxe/Language.h b/MdeModulePkg/Universal/BdsDxe/Language.h
index 9eaab95..586a59a 100644
--- a/MdeModulePkg/Universal/BdsDxe/Language.h
+++ b/MdeModulePkg/Universal/BdsDxe/Language.h
@@ -24,14 +24,8 @@ Revision History
 #ifndef _LANGUAGE_H

 #define _LANGUAGE_H

 

-//@MT:#include "Tiano.h"

-//@MT:#include "EfiDriverLib.h"

-

-//@MT:#include "BdsLib.h"

 #include "String.h"

 

-//@MT:#include EFI_GUID_DEFINITION (GlobalVariable)

-

 VOID

 InitializeLanguage (

   BOOLEAN LangCodesSettingRequired

diff --git a/MdeModulePkg/Universal/BdsDxe/MemoryTest.c b/MdeModulePkg/Universal/BdsDxe/MemoryTest.c
index 246ff96..b9f24e6 100644
--- a/MdeModulePkg/Universal/BdsDxe/MemoryTest.c
+++ b/MdeModulePkg/Universal/BdsDxe/MemoryTest.c
@@ -20,13 +20,8 @@ Abstract:
 --*/

 

 #include "Bds.h"

-//@MT:#include "bdslib.h"

-//@MT:#include "BdsPlatform.h"

-//@MT:#include "EfiPrintLib.h"

 #include "String.h"

 

-//@MT:#include EFI_GUID_DEFINITION (BootState)

-

 //

 // BDS Platform Functions

 //

diff --git a/MdeModulePkg/Universal/BdsDxe/String.h b/MdeModulePkg/Universal/BdsDxe/String.h
index 930cc73..14c42a9 100644
--- a/MdeModulePkg/Universal/BdsDxe/String.h
+++ b/MdeModulePkg/Universal/BdsDxe/String.h
@@ -25,7 +25,6 @@ Revision History
 #define _STRING_H_

 

 #include "Bds.h"

-//@MT:#include "UefiIfrLibrary.h"

 

 extern EFI_HII_HANDLE gStringPackHandle;

 

@@ -33,7 +32,6 @@ extern EFI_HII_HANDLE gStringPackHandle;
 // This is the VFR compiler generated header file which defines the

 // string identifiers.

 //

-//@MT:#include "BdsStrDefs.h"

 

 extern UINT8  BdsStrings[];