8 files changed, 40 insertions, 99 deletions
diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Boolean.c b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Boolean.c
index f5450b436d..570b7cd008 100644
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Boolean.c
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Boolean.c
@@ -1,6 +1,7 @@
-/*++
+/**@file
+
 
-Copyright (c) 2006 - 2007, Intel Corporation
+Copyright (c) 2006, 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
@@ -9,16 +10,8 @@ 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:
-
-  Boolean.c
+**/
 
-Abstract:
-
-  This routine will evaluate the IFR inconsistency data to determine if
-  something is a valid entry for a particular expression
-
---*/
 
 
 #include "Setup.h"
diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Colors.h b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Colors.h
index d47838f643..d982951757 100644
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Colors.h
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Colors.h
@@ -1,24 +1,17 @@
-/*++
+/**@file
+
 
 Copyright (c) 2006, 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                                            
-        
+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:
-
-  Colors.h
-
-Abstract:
-
-
-Revision History
+**/
 
---*/
 
 #ifndef _COLORS_H
 #define _COLORS_H
diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/InputHandler.c b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/InputHandler.c
index 85e1a0cf98..c689bc1ba0 100644
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/InputHandler.c
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/InputHandler.c
@@ -1,6 +1,7 @@
-/*++
+/**@file
+   Implementation for handling user input from the User Interface
 
-Copyright (c) 2006 - 2007, Intel Corporation
+Copyright (c) 2006, 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
@@ -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:
-
-  InputHandler.C
-
-Abstract:
-
-  Implementation for handling user input from the User Interface
-
-Revision History
-
---*/
+**/
 
 #include "Setup.h"
 #include "Ui.h"
diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Presentation.c b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Presentation.c
index 6bbe810ee2..3452a8d5a2 100644
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -1,5 +1,7 @@
-/*++
-Copyright (c) 2006 - 2007, Intel Corporation
+/**@file
+
+
+Copyright (c) 2006, 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
@@ -8,16 +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:
-  Presentation.c
-
-Abstract:
-
-  Some presentation routines.
-
-Revision History:
-
---*/
+**/
 
 #include "Setup.h"
 #include "Ui.h"
diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Print.c b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Print.c
index 9e08f96993..b4cf1c24e6 100644
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Print.c
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Print.c
@@ -1,20 +1,4 @@
-/*++
-
-Copyright (c) 2006, 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:
-
-  Print.c
-
-Abstract:
-
+/**@file
   Basic Ascii AvSPrintf() function named VSPrint(). VSPrint() enables very
   simple implemenation of SPrint() and Print() to support debug.
 
@@ -30,7 +14,16 @@ Abstract:
     'c' - argument is an ascii character
     '%' - Print a %
 
---*/
+Copyright (c) 2006, 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.
+
+**/
 
 #include "Print.h"
 
diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Print.h b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Print.h
index 76f8977f56..b85d276e60 100644
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Print.h
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Print.h
@@ -1,4 +1,6 @@
-/*++
+/**@file
+
+  Private data for Print.c
 
 Copyright (c) 2006, Intel Corporation
 All rights reserved. This program and the accompanying materials
@@ -7,17 +9,9 @@ which accompanies this distribution.  The full text of the license may be found
 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:
-
-  Print.h
-
-Abstract:
-
-  Private data for Print.c
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
---*/
+**/
 
 #ifndef _PRINT_H_
 #define _PRINT_H_
diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.h b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.h
index f91b40498c..bc26a5905d 100644
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -1,4 +1,5 @@
-/*++
+/**@file
+
 
 Copyright (c) 2006, Intel Corporation
 All rights reserved. This program and the accompanying materials
@@ -9,16 +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:
-
-  Setup.h
-
-Abstract:
-
-
-Revision History
-
---*/
+**/
 
 #ifndef _SETUP_H
 #define _SETUP_H
diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.h b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.h
index 784e04b135..0e92852c4a 100644
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.h
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.h
@@ -1,4 +1,5 @@
-/*++
+/**@file
+
 
 Copyright (c) 2006, Intel Corporation
 All rights reserved. This program and the accompanying materials
@@ -9,17 +10,8 @@ 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:
-
-  Ui.h 
-
-Abstract:
-
-  Head file UI
-
-Revision History
+**/
 
---*/
 
 #ifndef _UI_H
 #define _UI_H