41 files changed, 215 insertions, 490 deletions
diff --git a/MdeModulePkg/Universal/BdsDxe/Bds.h b/MdeModulePkg/Universal/BdsDxe/Bds.h
index 7c76120fa7..317c66dfad 100644
--- a/MdeModulePkg/Universal/BdsDxe/Bds.h
+++ b/MdeModulePkg/Universal/BdsDxe/Bds.h
@@ -1,6 +1,7 @@
-/*++
+/** @file
+  Head file for BDS Architectural Protocol implementation
 
-Copyright (c) 2004 - 2007, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,17 +10,7 @@ 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:
-
-  Bds.h
-
-Abstract:
-
-  Head file for BDS Architectural Protocol implementation
-
-Revision History
-
---*/
+**/
 
 #ifndef _BDS_MODULE_H_
 #define _BDS_MODULE_H_
diff --git a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
index 42f1e1c2be..f30cfaa6df 100644
--- a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
+++ b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
@@ -1,18 +1,16 @@
 #/** @file
-# Component discription file for Bds module
-#
-# N/A
-# Copyright (c) 2008, Intel Corporation
-#
+#  
+#    Component discription file for Bds module
+#  
+#  Copyright (c) 2008, Intel Corporation. <BR>
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
-#  which accompanies this distribution. The full text of the license may be found at
+#  which accompanies this distribution.  The full text of the license may be found at
 #  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.
-#
-#
+#  
 #**/
 
 [Defines]
diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
index b40e0ee7fa..52a6b497a5 100644
--- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
+++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
@@ -1,6 +1,7 @@
-/*++
+/** @file
+  The entry of the bds
 
-Copyright (c) 2004 - 2008, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,15 +10,7 @@ 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:
-
-  BdsEntry.c
-
-Abstract:
-
-  The entry of the bds
-
---*/
+**/
 
 #include "Bds.h"
 #include "Language.h"
diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c
index 2f0d5d9eb2..cb253c2fdf 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c
@@ -1,6 +1,9 @@
-/*++
+/** @file
+  This function deal with the legacy boot option, it create, delete
+  and manage the legacy boot option, all legacy boot option is getting from
+  the legacy BBS table.
 
-Copyright (c) 2004 - 2008, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,17 +12,7 @@ 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:
-
-  BBSsupport.c
-
-Abstract:
-
-  This function deal with the legacy boot option, it create, delete
-  and manage the legacy boot option, all legacy boot option is getting from
-  the legacy BBS table.
-
---*/
+**/
 
 #include "BBSsupport.h"
 
diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h b/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h
index 532223fa80..696f574605 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.h
@@ -1,6 +1,7 @@
-/*++
+/** @file
+  declares interface functions
 
-Copyright (c) 2004 - 2008, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,17 +10,7 @@ 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:
-
-  BBSsupport.h
-
-Abstract:
-
-  declares interface functions
-
-Revision History
-
---*/
+**/
 
 #ifndef _EFI_BDS_BBS_SUPPORT_H
 #define _EFI_BDS_BBS_SUPPORT_H
diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr b/MdeModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
index 93cbbeaf8f..4f38a34bba 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
@@ -1,25 +1,17 @@
-// *++
-//
-// Copyright (c) 2004 - 2007, 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
-// which accompanies this distribution.  The full text of the license may be found at
-// 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:
-//
-//   bm.vfr
-//
-// Abstract:
-//
-//   Boot Maintenance Utility Formset
-//
-// Revision History:
-//
-// --*/
+///** @file
+//  
+//    Boot Maintenance Utility Formset
+//  
+//  Copyright (c) 2004 - 2008, Intel Corporation. <BR>
+//  All rights reserved. This program and the accompanying materials
+//  are licensed and made available under the terms and conditions of the BSD License
+//  which accompanies this distribution.  The full text of the license may be found at
+//  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.
+//  
+//**/
 
 #include "FormGuid.h"
 
diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/BmLib.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/BmLib.c
index e9a7409371..b9606d7f1c 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/BmLib.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/BmLib.c
@@ -1,6 +1,7 @@
-/*++
+/** @file
+  Utility routines used by boot maintenance modules.
 
-Copyright (c) 2004 - 2008, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,15 +10,7 @@ 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:
-
-  bmlib.c
-
-AgBStract:
-
-  Boot Maintainence Helper functions
-
---*/
+**/
 
 #include "BootMaint.h"
 
diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/Bmstring.uni b/MdeModulePkg/Universal/BdsDxe/BootMaint/Bmstring.uni
index a332fb6ea3..bd94803045 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/Bmstring.uni
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/Bmstring.uni
diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
index a017e89b8c..4b75346fa1 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
@@ -1,6 +1,7 @@
-/*++
+/** @file
+  Boot Maintainence Main File
 
-Copyright (c) 2004 - 2008, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,15 +10,7 @@ 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:
-
-  BootMaint.c
-
-Abstract:
-
-  Boot Maintainence Main File
-
---*/
+**/
 
 #include "BootMaint.h"
 #include "FormGuid.h"
diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h b/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
index 4cc177d606..6a0e2728a9 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
@@ -1,6 +1,7 @@
-/*++
+/** @file
+  Header file for boot maintenance module.
 
-Copyright (c) 2004 - 2008, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,15 +10,7 @@ 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:
-
-  BootMaint.h
-
-Abstract:
-
-Revision History
-
---*/
+**/
 
 #ifndef _BOOT_MAINT_H
 #define _BOOT_MAINT_H
@@ -1052,6 +1045,12 @@ FormSetDispatcher (
   IN  BMM_CALLBACK_DATA    *CallbackData
   );
 
+VOID *
+EfiLibGetVariable (
+  IN CHAR16               *Name,
+  IN EFI_GUID             *VendorGuid
+  );
+
 //
 // Global variable in this program (defined in data.c)
 //
diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/BootOption.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
index c329d96f95..b0838bbeee 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
@@ -1,5 +1,11 @@
-/*++
-Copyright (c) 2004 - 2008, Intel Corporation
+/** @file
+  Provide boot option support for Application "BootMaint"
+
+  Include file system navigation, system handle selection
+
+  Boot option manipulation
+
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -8,21 +14,7 @@ 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:
-
-  bootoption.c
-
-Abstract:
-
-  Provide boot option support for Application "BootMaint"
-
-  Include file system navigation, system handle selection
-
-  Boot option manipulation
-
-Revision History
-
---*/
+**/
 
 #include "BootMaint.h"
 #include "BBSsupport.h"
diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c
index 7239e6f679..37ae770eeb 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c
@@ -1,5 +1,7 @@
-/*++
-Copyright (c) 2004 - 2008, Intel Corporation
+/** @file
+  handles console redirection from boot manager
+
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -8,18 +10,7 @@ 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:
-
-    consoleoption.c
-
-Abstract:
-
-    handles console redirection from boot manager
-
-
-Revision History
-
---*/
+**/
 
 #include "BootMaint.h"
 
diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/Data.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/Data.c
index 598d3c1075..482319ae93 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/Data.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/Data.c
@@ -1,6 +1,7 @@
-/*++
+/** @file
+  Define some data used for Boot Maint
 
-Copyright (c) 2004 - 2007, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,17 +10,7 @@ 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:
-
-  Data.c
-
-Abstract:
-
-  Define some data used for Boot Maint
-
-Revision History
-
---*/
+**/
 
 #include "BootMaint.h"
 
diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/FE.vfr b/MdeModulePkg/Universal/BdsDxe/BootMaint/FE.vfr
index 97d432185c..b89cf114cd 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/FE.vfr
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/FE.vfr
@@ -1,25 +1,17 @@
-// *++
-//
-// Copyright (c) 2004 - 2007, 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
-// which accompanies this distribution.  The full text of the license may be found at
-// 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:
-//
-//   FE.vfr
-//
-// Abstract:
-//
-//   File Explorer Formset
-//
-// Revision History:
-//
-// --*/
+///** @file
+//  
+//    File Explorer Formset
+//  
+//  Copyright (c) 2004 - 2008, Intel Corporation. <BR>
+//  All rights reserved. This program and the accompanying materials
+//  are licensed and made available under the terms and conditions of the BSD License
+//  which accompanies this distribution.  The full text of the license may be found at
+//  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.
+//  
+//**/
 
 #include "FormGuid.h"
 
diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
index 811702f1d3..882533fbce 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
@@ -1,6 +1,7 @@
-/*++
+/** @file
+  File explorer related functions.
 
-Copyright (c) 2004 - 2008, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,15 +10,7 @@ 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:
-
-  FileExplorer.c
-
-Abstract:
-
-  File explorer related functions.
-
---*/
+**/
 
 #include "BootMaint.h"
 
diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/FormGuid.h b/MdeModulePkg/Universal/BdsDxe/BootMaint/FormGuid.h
index 9c0adf2bba..5af27a6388 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/FormGuid.h
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/FormGuid.h
@@ -1,6 +1,7 @@
-/*++
+/** @file
+  Formset guids, form id and VarStore data structure for Boot Maintenance Manager.
 
-Copyright (c) 2004 - 2007, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,15 +10,7 @@ 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:
-
-  FormGuid.h
-
-Abstract:
-
-  Formset guids, form id and VarStore data structure for Boot Maintenance Manager.
-
---*/
+**/
 #ifndef _FORM_GUID_H
 #define _FORM_GUID_H
 
diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
index 01b547ec45..47d59a66f6 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
@@ -1,6 +1,7 @@
-/*++
+/** @file
+  Dynamically Update the pages
 
-Copyright (c) 2004 - 2008, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,15 +10,7 @@ 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:
-
-  UpdatePage.c
-
-Abstract:
-
-  Dynamically Update the pages
-
---*/
+**/
 
 #include "BootMaint.h"
 
diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/Variable.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/Variable.c
index cd18c038d8..4d0e3efb54 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/Variable.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/Variable.c
@@ -1,6 +1,7 @@
-/*++
+/** @file
+  Variable operation that will be used by bootmaint
 
-Copyright (c) 2004 - 2008, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,15 +10,7 @@ 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:
-
-  Variable.c
-
-Abstract:
-
-  Variable operation that will be used by bootmaint
-
---*/
+**/
 
 #include "BootMaint.h"
 
diff --git a/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManager.c b/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
index 03f3fa08df..ba7387e5e9 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
@@ -1,6 +1,7 @@
-/*++
+/** @file
+  The platform boot manager reference implement
 
-Copyright (c) 2004 - 2008, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,15 +10,7 @@ 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:
-
-  BootManager.c
-
-Abstract:
-
-  The platform boot manager reference implement
-
---*/
+**/
 
 #include "BootManager.h"
 
diff --git a/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManager.h b/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManager.h
index fab04d22a3..3f31ec49f3 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManager.h
+++ b/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManager.h
@@ -1,6 +1,7 @@
-/*++
+/** @file
+  The platform boot manager reference implement
 
-Copyright (c) 2004 - 2008, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,17 +10,7 @@ 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:
-
-  BootManager.h
-
-Abstract:
-
-  The platform boot manager reference implement
-
-Revision History
-
---*/
+**/
 
 #ifndef _EFI_BOOT_MANAGER_H
 #define _EFI_BOOT_MANAGER_H
diff --git a/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManagerStrings.uni b/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManagerStrings.uni
index 99b0cdf551..5a29d53761 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManagerStrings.uni
+++ b/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManagerStrings.uni
diff --git a/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr b/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr
index e31d2292d4..a70966cf3c 100644
--- a/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr
+++ b/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr
@@ -1,25 +1,17 @@
-// *++
-//
-// Copyright (c) 2004 - 2007, 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
-// which accompanies this distribution.  The full text of the license may be found at
-// 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:
-//
-//   BootManager.vfr
-//
-// Abstract:
-//
-//   Browser formset.
-//
-// Revision History:
-//
-// --*/
+///** @file
+//  
+//    Browser formset.
+//  
+//  Copyright (c) 2004 - 2008, Intel Corporation. <BR>
+//  All rights reserved. This program and the accompanying materials
+//  are licensed and made available under the terms and conditions of the BSD License
+//  which accompanies this distribution.  The full text of the license may be found at
+//  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.
+//  
+//**/
 
 #define FORMSET_GUID  { 0x847bc3fe, 0xb974, 0x446d, 0x94, 0x49, 0x5a, 0xd5, 0x41, 0x2e, 0x99, 0x3b }
 
diff --git a/MdeModulePkg/Universal/BdsDxe/Capsules.c b/MdeModulePkg/Universal/BdsDxe/Capsules.c
index 9969f486da..c3473abbd0 100644
--- a/MdeModulePkg/Universal/BdsDxe/Capsules.c
+++ b/MdeModulePkg/Universal/BdsDxe/Capsules.c
@@ -1,6 +1,7 @@
-/*++
+/** @file
+  BDS routines to handle capsules.
 
-Copyright (c) 2004 - 2008, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,15 +10,7 @@ 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:
-
-  Capsules.c
-
-Abstract:
-
-  BDS routines to handle capsules.
-
---*/
+**/
 #include "Bds.h"
 
 VOID
diff --git a/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c b/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
index 06645ecf6a..b698dd4e9f 100644
--- a/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
+++ b/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
@@ -1,6 +1,7 @@
-/*++
+/** @file
+  The platform device manager reference implement
 
-Copyright (c) 2004 - 2008, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,15 +10,7 @@ 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:
-
-  DeviceManager.c
-
-Abstract:
-
-  The platform device manager reference implement
-
---*/
+**/
 
 #include "DeviceManager.h"
 
diff --git a/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.h b/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.h
index 046945612e..3cc565bd81 100644
--- a/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.h
+++ b/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.h
@@ -1,6 +1,7 @@
-/*++
+/** @file
+  The platform device manager reference implement
 
-Copyright (c) 2004 - 2008, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,17 +10,7 @@ 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:
-
-  DeviceManager.c
-
-Abstract:
-
-  The platform device manager reference implement
-
-Revision History
-
---*/
+**/
 
 #ifndef _DEVICE_MANAGER_H
 #define _DEVICE_MANAGER_H
diff --git a/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerStrings.uni b/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerStrings.uni
index 99beee4c65..8cc4db2d7f 100644
--- a/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerStrings.uni
+++ b/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerStrings.uni
diff --git a/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.Vfr b/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.Vfr
index 78fff23f5d..14cafd4761 100644
--- a/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.Vfr
+++ b/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.Vfr
@@ -1,25 +1,17 @@
-// *++
-//
-// Copyright (c) 2004 - 2007, 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
-// which accompanies this distribution.  The full text of the license may be found at
-// 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:
-//
-//   DeviceManagerVfr.vfr
-//
-// Abstract:
-//
-//   Device Manager formset.
-//
-// Revision History:
-//
-// --*/
+///** @file
+//  
+//    Device Manager formset.
+//  
+//  Copyright (c) 2004 - 2008, Intel Corporation. <BR>
+//  All rights reserved. This program and the accompanying materials
+//  are licensed and made available under the terms and conditions of the BSD License
+//  which accompanies this distribution.  The full text of the license may be found at
+//  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.
+//  
+//**/
 
 #define FORMSET_GUID  { 0x3ebfa8e6, 0x511d, 0x4b5b, 0xa9, 0x5f, 0xfb, 0x38, 0x26, 0xf, 0x1c, 0x27 }
 
diff --git a/MdeModulePkg/Universal/BdsDxe/FrontPage.c b/MdeModulePkg/Universal/BdsDxe/FrontPage.c
index 2a0a81d08b..3151aeb1a5 100644
--- a/MdeModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/MdeModulePkg/Universal/BdsDxe/FrontPage.c
@@ -1,6 +1,7 @@
-/*++
+/** @file
+  FrontPage routines to handle the callbacks and browser calls
 
-Copyright (c) 2004 - 2008, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,15 +10,7 @@ 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:
-
-  FrontPage.c
-
-Abstract:
-
-  FrontPage routines to handle the callbacks and browser calls
-
---*/
+**/
 
 #include "Bds.h"
 #include "FrontPage.h"
diff --git a/MdeModulePkg/Universal/BdsDxe/FrontPage.h b/MdeModulePkg/Universal/BdsDxe/FrontPage.h
index fc01d16d54..00d8c685a5 100644
--- a/MdeModulePkg/Universal/BdsDxe/FrontPage.h
+++ b/MdeModulePkg/Universal/BdsDxe/FrontPage.h
@@ -1,6 +1,7 @@
-/*++
+/** @file
+  FrontPage routines to handle the callbacks and browser calls
 
-Copyright (c) 2004 - 2008, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,17 +10,7 @@ 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:
-
-  FrontPage.h
-
-Abstract:
-
-  FrontPage routines to handle the callbacks and browser calls
-
-Revision History
-
---*/
+**/
 
 #ifndef _FRONT_PAGE_H
 #define _FRONT_PAGE_H
diff --git a/MdeModulePkg/Universal/BdsDxe/FrontPageStrings.uni b/MdeModulePkg/Universal/BdsDxe/FrontPageStrings.uni
index b22fa5aa2a..4d55b2bbe8 100644
--- a/MdeModulePkg/Universal/BdsDxe/FrontPageStrings.uni
+++ b/MdeModulePkg/Universal/BdsDxe/FrontPageStrings.uni
diff --git a/MdeModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr b/MdeModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
index e7332aadbf..4bf657dc72 100644
--- a/MdeModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
+++ b/MdeModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
@@ -1,25 +1,17 @@
-// *++
-//
-// Copyright (c) 2007, 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
-// which accompanies this distribution.  The full text of the license may be found at
-// 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:
-//
-//   FrontPageVfr.vfr
-//
-// Abstract:
-//
-//   Browser formset.
-//
-// Revision History:
-//
-// --*/
+///** @file
+//  
+//    Browser formset.
+//  
+//  Copyright (c) 2007 - 2008, Intel Corporation. <BR>
+//  All rights reserved. This program and the accompanying materials
+//  are licensed and made available under the terms and conditions of the BSD License
+//  which accompanies this distribution.  The full text of the license may be found at
+//  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.
+//  
+//**/
 
 #define FORMSET_GUID  { 0x9e0c30bc, 0x3f06, 0x4ba6, 0x82, 0x88, 0x9, 0x17, 0x9b, 0x85, 0x5d, 0xbe }
 
diff --git a/MdeModulePkg/Universal/BdsDxe/Hotkey.c b/MdeModulePkg/Universal/BdsDxe/Hotkey.c
index ea4bbf5578..8dab5803d9 100644
--- a/MdeModulePkg/Universal/BdsDxe/Hotkey.c
+++ b/MdeModulePkg/Universal/BdsDxe/Hotkey.c
@@ -1,6 +1,8 @@
-/*++
+/** @file
+  Provides a way for 3rd party applications to register themselves for launch by the
+  Boot Manager based on hot key
 
-Copyright (c) 2007 - 2008, Intel Corporation
+Copyright (c) 2007 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,18 +11,7 @@ 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:
-
-  Hotkey.h
-
-Abstract:
-
-  Provides a way for 3rd party applications to register themselves for launch by the
-  Boot Manager based on hot key
-
-Revision History
-
---*/
+**/
 
 #include "Hotkey.h"
 
diff --git a/MdeModulePkg/Universal/BdsDxe/Hotkey.h b/MdeModulePkg/Universal/BdsDxe/Hotkey.h
index 87059e12e0..c34026b264 100644
--- a/MdeModulePkg/Universal/BdsDxe/Hotkey.h
+++ b/MdeModulePkg/Universal/BdsDxe/Hotkey.h
@@ -1,6 +1,8 @@
-/*++
+/** @file
+  Provides a way for 3rd party applications to register themselves for launch by the
+  Boot Manager based on hot key
 
-Copyright (c) 2007 - 2008, Intel Corporation
+Copyright (c) 2007 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,18 +11,7 @@ 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:
-
-  Hotkey.h
-
-Abstract:
-
-  Provides a way for 3rd party applications to register themselves for launch by the
-  Boot Manager based on hot key
-
-Revision History
-
---*/
+**/
 
 #ifndef _HOTKEY_H
 #define _HOTKEY_H
diff --git a/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.c b/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.c
index 339361e195..ec0b9d837e 100644
--- a/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.c
+++ b/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.c
@@ -1,6 +1,8 @@
-/*++
+/** @file
+  Set the level of support for Hardware Error Record Persistence that is
+  implemented by the platform.
 
-Copyright (c) 2007, Intel Corporation
+Copyright (c) 2007 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,18 +11,7 @@ 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:
-
-  HwErrRecSupport.c
-
-Abstract:
-
-  Set the level of support for Hardware Error Record Persistence that is
-  implemented by the platform.
-
-Revision History
-
---*/
+**/
 
 #include "HwErrRecSupport.h"
 
diff --git a/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.h b/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.h
index fdd62bad0b..8e18f5698d 100644
--- a/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.h
+++ b/MdeModulePkg/Universal/BdsDxe/HwErrRecSupport.h
@@ -1,6 +1,8 @@
-/*++
+/** @file
+  Set the level of support for Hardware Error Record Persistence that is
+  implemented by the platform.
 
-Copyright (c) 2007, Intel Corporation
+Copyright (c) 2007 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,18 +11,7 @@ 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:
-
-  HwErrRecSupport.h
-
-Abstract:
-
-  Set the level of support for Hardware Error Record Persistence that is
-  implemented by the platform.
-
-Revision History
-
---*/
+**/
 
 #ifndef _HW_ERR_REC_SUPPORT_H
 #define _HW_ERR_REC_SUPPORT_H
diff --git a/MdeModulePkg/Universal/BdsDxe/Language.c b/MdeModulePkg/Universal/BdsDxe/Language.c
index 907bb61e8b..5c7c87110e 100644
--- a/MdeModulePkg/Universal/BdsDxe/Language.c
+++ b/MdeModulePkg/Universal/BdsDxe/Language.c
@@ -1,6 +1,7 @@
-/*++
+/** @file
+  Language settings
 
-Copyright (c) 2004 - 2008, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,17 +10,7 @@ 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:
-
-  Language.c
-
-Abstract:
-
-  Language settings
-
-Revision History
-
---*/
+**/
 
 #include "Language.h"
 #include "FrontPage.h"
diff --git a/MdeModulePkg/Universal/BdsDxe/Language.h b/MdeModulePkg/Universal/BdsDxe/Language.h
index 586a59a555..3170b7d859 100644
--- a/MdeModulePkg/Universal/BdsDxe/Language.h
+++ b/MdeModulePkg/Universal/BdsDxe/Language.h
@@ -1,6 +1,7 @@
-/*++
+/** @file
+  Language setting
 
-Copyright (c) 2004 - 2008, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,17 +10,7 @@ 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:
-
-  Language.h
-
-Abstract:
-
-  Language setting
-
-Revision History
-
---*/
+**/
 
 #ifndef _LANGUAGE_H
 #define _LANGUAGE_H
diff --git a/MdeModulePkg/Universal/BdsDxe/MemoryTest.c b/MdeModulePkg/Universal/BdsDxe/MemoryTest.c
index fe167e0199..09d3ea3339 100644
--- a/MdeModulePkg/Universal/BdsDxe/MemoryTest.c
+++ b/MdeModulePkg/Universal/BdsDxe/MemoryTest.c
@@ -1,6 +1,7 @@
-/*++
+/** @file
+  Perform the platform memory test
 
-Copyright (c) 2004 - 2008, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,15 +10,7 @@ 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:
-
-  MemoryTest.c
-
-Abstract:
-
-  Perform the platform memory test
-
---*/
+**/
 
 #include "Bds.h"
 #include "String.h"
diff --git a/MdeModulePkg/Universal/BdsDxe/String.c b/MdeModulePkg/Universal/BdsDxe/String.c
index 9f03323d8f..97e1c8e8d2 100644
--- a/MdeModulePkg/Universal/BdsDxe/String.c
+++ b/MdeModulePkg/Universal/BdsDxe/String.c
@@ -1,6 +1,7 @@
-/*++
+/** @file
+  String support
 
-Copyright (c) 2004 - 2008, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,15 +10,7 @@ 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:
-
-  String.c
-
-Abstract:
-
-  String support
-
---*/
+**/
 
 #include "Bds.h"
 #include "Language.h"
diff --git a/MdeModulePkg/Universal/BdsDxe/String.h b/MdeModulePkg/Universal/BdsDxe/String.h
index 3aac0106ae..24299bcce1 100644
--- a/MdeModulePkg/Universal/BdsDxe/String.h
+++ b/MdeModulePkg/Universal/BdsDxe/String.h
@@ -1,6 +1,7 @@
-/*++
+/** @file
+  String support
 
-Copyright (c) 2004 - 2008, Intel Corporation
+Copyright (c) 2004 - 2008, Intel Corporation. <BR>
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -9,17 +10,7 @@ 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:
-
-  String.h
-
-Abstract:
-
-  String support
-
-Revision History
-
---*/
+**/
 
 #ifndef _STRING_H_
 #define _STRING_H_
diff --git a/MdeModulePkg/Universal/BdsDxe/Strings.uni b/MdeModulePkg/Universal/BdsDxe/Strings.uni
index c83bb8a991..0d4274a4a9 100644
--- a/MdeModulePkg/Universal/BdsDxe/Strings.uni
+++ b/MdeModulePkg/Universal/BdsDxe/Strings.uni