1. Correct File header to ## @file

2. Remove unnecessary .common] postfix on section.

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

53 files changed, 208 insertions, 208 deletions

diff --git a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
index a92ec5ba6a..0a47d738ba 100755
--- a/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
+++ b/MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
@@ -1,4 +1,4 @@
-#/** @file

+## @file

 #  Sample ACPI Platform Driver

 #

 #  Copyright (c) 2008 - 2010, Intel Corporation. <BR>

@@ -10,7 +10,7 @@
 #  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]

   INF_VERSION                    = 0x00010005

diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
index 4eb4b571b6..7bbefc0856 100755
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
+++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
@@ -1,4 +1,4 @@
-#/** @file

+## @file

 #  ACPI Table Protocol Driver

 #

 #  Copyright (c) 2006, 2008, 2009 Intel Corporation<BR> All rights

@@ -10,7 +10,7 @@
 #  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]

   INF_VERSION                    = 0x00010005

@@ -29,7 +29,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

 #

 

-[Sources.common]

+[Sources]

   AcpiTableProtocol.c

   AcpiTable.h

   AcpiTable.c

diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
index c627e9b8d6..cfee3414e5 100644
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
@@ -1,4 +1,4 @@
-#/** @file

+## @file

 #  

 #  Capsule Runtime Driver produces two UEFI capsule runtime services.

 #  (UpdateCapsule, QueryCapsuleCapabilities)

@@ -14,7 +14,7 @@
 #  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]

   INF_VERSION                    = 0x00010005

@@ -30,7 +30,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

 #

 

-[Sources.common]

+[Sources]

   CapsuleService.c

 

 [Packages]

diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
index 892d051a1a..ee82193d96 100644
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
+++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
@@ -1,8 +1,8 @@
-#/** @file

+## @file

 # Console Platfrom DXE Driver that specifies whether device can be used as console

 # input/output device or error output device and update global variables accordingly.

 #

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

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

@@ -12,7 +12,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

@@ -35,7 +35,7 @@
 #  COMPONENT_NAME2               =  gConPlatformComponentName2

 #

 

-[Sources.common]

+[Sources]

   ComponentName.c

   ConPlatform.h

   ConPlatform.c

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
index 0d6ac27cb7..d1dea7abbb 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
@@ -1,4 +1,4 @@
-#/** @file

+## @file

 # This driver provides multi console supports.

 #

 # This driver acts as a virtual console, takes over the console I/O control from selected

@@ -10,7 +10,7 @@
 # Note: If only UGA Draw protocol is installed in system table, PcdUgaConsumeSupport

 # should be set to TRUE.

 #

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

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

@@ -20,7 +20,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

@@ -49,7 +49,7 @@
 #  COMPONENT_NAME2               =  gConSplitterStdErrComponentName2

 #

 

-[Sources.common]

+[Sources]

   ConSplitterGraphics.c

   ComponentName.c

   ConSplitter.h

@@ -85,12 +85,12 @@
   gEfiUgaDrawProtocolGuid                       ## BY_START

 

 

-[FeaturePcd.common]

+[FeaturePcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport

   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport

   gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport

 

-[Pcd.common]

+[Pcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow

   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn

 

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
index a12406c236..0b39bcbbdb 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
@@ -1,10 +1,10 @@
-#/** @file

+## @file

 # 

 #  Component description file for GraphicsConsole module

 #

 #  This is the main routine for initializing the Graphics Console support routines.

 #  

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

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

@@ -13,7 +13,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

@@ -33,7 +33,7 @@
 #  COMPONENT_NAME2               =  gGraphicsConsoleComponentName2

 #

 

-[Sources.common]

+[Sources]

   ComponentName.c

   LaffStd.c

   GraphicsConsole.c

@@ -60,5 +60,5 @@
   gEfiHiiFontProtocolGuid                       ## TO_START

   gEfiHiiDatabaseProtocolGuid                   ## TO_START   

 

-[FeaturePcd.common]

+[FeaturePcd]

   gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport
\ No newline at end of file
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
index d5fa0449ba..f993802156 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
@@ -1,4 +1,4 @@
-#/** @file

+## @file

 #

 #  Component description file for Terminal module.

 #

@@ -13,7 +13,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

@@ -33,7 +33,7 @@
 #  COMPONENT_NAME2               =  gTerminalComponentName2

 #

 

-[Sources.common]

+[Sources]

   ComponentName.c

   Vtutf8.c

   Ansi.c

diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.inf b/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.inf
index 8c1d868621..a822192f15 100644
--- a/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.inf
+++ b/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.inf
@@ -1,10 +1,10 @@
-#/** @file

+## @file

 # This driver produces Debug Port protocol to be used by debug agent to communicate with

 # the remote debug host.

 #

 # This driver binds exclusively to a standard UART serial port on the controller handle,

 #  and initializes serial Io interface, publishs Debug Port and Device Path Protocol.

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

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

@@ -14,7 +14,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

@@ -37,7 +37,7 @@
 #

 #

 

-[Sources.common]

+[Sources]

   ComponentName.c

   DebugPort.c

   DebugPort.h

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf
index 301fcaaf61..8b146ac951 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf
+++ b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf
@@ -1,4 +1,4 @@
-#/** @file

+## @file

 # This driver installs Debug Support protocol for the selected processor.

 #

 # This driver provides the capabilities for debug-agent to gain control of the machine

@@ -6,7 +6,7 @@
 # provides debug-agent to periodically gain control during operation of the machine to

 # check for asynchronous commands form the host.

 #

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

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

@@ -16,7 +16,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

@@ -32,7 +32,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF

 #

 

-[Sources.common]

+[Sources]

   DebugSupport.c

 

 [Sources.Ia32]

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf b/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
index b42e87da81..ed99a25bc9 100644
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
@@ -1,4 +1,4 @@
-#/** @file

+## @file

 #  Device path driver that produces three UEFI device path protocols.

 #

 #  This driver produces Device Path Utilities protocol and optionally

@@ -6,7 +6,7 @@
 #  PcdDevicePathSupportDevicePathToText & PcdDevicePathSupportDevicePathFromText

 #  respectively.

 #

-#  Copyright (c) 2006 - 2008, Intel Corporation. <BR>

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

@@ -15,7 +15,7 @@
 #  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]

   INF_VERSION                    = 0x00010005

@@ -31,7 +31,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

 #

 

-[Sources.common]

+[Sources]

   DevicePathUtilities.c

   DevicePathToText.c   ||||PcdDevicePathSupportDevicePathToText

   DevicePathFromText.c ||||PcdDevicePathSupportDevicePathFromText

@@ -67,7 +67,7 @@
   gEfiDevicePathUtilitiesProtocolGuid ## CONSUMES

   gEfiDebugPortProtocolGuid          | PcdDevicePathSupportDevicePathFromText OR PcdDevicePathSupportDevicePathToText ## SOMETIMES_CONSUMES ## GUID

 

-[FeaturePcd.common]

+[FeaturePcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText

   gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText

 

diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
index 1ae0008252..7279acf99a 100644
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
+++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
@@ -1,4 +1,4 @@
-#/** @file

+## @file

 #  Module that lays Disk I/O protocol on every Block I/O protocol.

 #

 #  This module produces Disk I/O protocol to abstract the block accesses

@@ -8,7 +8,7 @@
 #  already have a Disk I/O protocol. File systems and other disk access

 #  code utilize the Disk I/O protocol.

 #  

-#  Copyright (c) 2006 - 2008, Intel Corporation. <BR>

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

@@ -17,7 +17,7 @@
 #  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]

   INF_VERSION                    = 0x00010005

@@ -37,7 +37,7 @@
 #  COMPONENT_NAME2               =  gDiskIoComponentName2

 #

 

-[Sources.common]

+[Sources]

   ComponentName.c

   DiskIo.h

   DiskIo.c

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf b/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
index 596e1e96d4..6be45a94bd 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
@@ -1,4 +1,4 @@
-#/** @file

+## @file

 #  Modules that produces the logic Block I/O protocol for every partition

 #  it discovers via the physical Block I/O.

 #

@@ -7,7 +7,7 @@
 #  The partition of physical BlockIo device supported is one of legacy MBR, GPT,

 #  and "El Torito" partitions.

 #  

-#  Copyright (c) 2006 - 2008, Intel Corporation. <BR>

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

@@ -16,7 +16,7 @@
 #  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]

   INF_VERSION                    = 0x00010005

@@ -36,7 +36,7 @@
 #  COMPONENT_NAME2               = gPartitionComponentName2

 #

 

-[Sources.common]

+[Sources]

   ComponentName.c

   Mbr.c

   Gpt.c

diff --git a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
index 9f4ea8256d..ba8122b882 100644
--- a/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
+++ b/MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
@@ -1,4 +1,4 @@
-#/** @file

+## @file

 #  English module that provides Unicode Collation supports.

 #  

 #  This driver installs Unicode ISO 639-2 Collation and

@@ -7,7 +7,7 @@
 #  It allows code running in the boot services environment to perform lexical

 #  comparison functions on Unicode strings for English languages.

 #  

-#  Copyright (c) 2006 - 2008, Intel Corporation. <BR>

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

@@ -16,7 +16,7 @@
 #  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]

   INF_VERSION                    = 0x00010005

@@ -32,7 +32,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

 #

 

-[Sources.common]

+[Sources]

   UnicodeCollationEng.c

   UnicodeCollationEng.h

 

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
index 86613e937d..abb7d16d9a 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
@@ -1,8 +1,8 @@
-#/** @file

+## @file

 # This is a sample driver which show how HII protocol, VFR and UNI files are used to

 # create a driver which can be dipslayed and configured by a UEFI HII Form Browser.

 #

-# Copyright (c) 2007 - 2009, Intel Corporation. All rights reserved.

+# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.

 #

 #  All rights reserved. This program and the accompanying materials

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

@@ -13,7 +13,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

@@ -30,7 +30,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

 #

 

-[Sources.common]

+[Sources]

   DriverSample.c

   inventorystrings.uni

   NVDataStruc.h

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDxe.inf b/MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
index a52491aa40..b82b2595e3 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
@@ -1,11 +1,11 @@
-#/** @file

+## @file

 #  Module that produces EBC Interprete and EBC Debug Support protocols.

 #  

 #  This module implements EFI Byte Code (EBC) Virtual Machine that can provide 

 #  platform and processor-independent mechanisms for loading and executing EFI

 #  device drivers.

 #

-#  Copyright (c) 2006 - 2008, Intel Corporation. <BR>

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

@@ -14,7 +14,7 @@
 #  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]

   INF_VERSION                    = 0x00010005

@@ -30,7 +30,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF

 #

 

-[Sources.common]

+[Sources]

   EbcExecute.h

   EbcExecute.c

   EbcInt.h

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
index 720c591990..47e85f1053 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
@@ -1,9 +1,9 @@
-#/** @file

+## @file

 # This driver installs Fault Tolerant Write (FTW) protocol, 

 # which provides fault tolerant write capability for block devices.

 # Its implementation depends on the full functionality FVB protocol that support read, write/erase flash access.

 #

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

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

@@ -12,7 +12,7 @@
 #  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]

   INF_VERSION                    = 0x00010005

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

 #

 

-[Sources.common]

+[Sources]

   FtwMisc.c

   UpdateWorkingBlock.c

   FaultTolerantWrite.c

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
index 9b38c9cf64..caaa8854e1 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
@@ -1,7 +1,7 @@
-#/** @file

+## @file

 # The DXE driver produces HII protocols defined in UEFI HII 2.1 specificatin.

 #

-# Copyright (c) 2007, Intel Corporation. All rights reserved.

+# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.

 #

 #  All rights reserved. This program and the accompanying materials       

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

@@ -12,7 +12,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

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

 #

 

-[Sources.common]

+[Sources]

   HiiDatabaseEntry.c

   Image.c

   HiiDatabase.h

@@ -64,10 +64,10 @@
   gEfiHiiFontProtocolGuid                                               ## PRODUCES

   gEfiHiiConfigAccessProtocolGuid                                       ## CONSUMES

 

-[FeaturePcd.common]

+[FeaturePcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdSupportHiiImageProtocol

 

-[Pcd.common]

+[Pcd]

   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang

 

 [Guids]  

diff --git a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleDxe.inf b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleDxe.inf
index 82e24128ef..f5ebc579b4 100644
--- a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleDxe.inf
+++ b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleDxe.inf
@@ -1,8 +1,8 @@
-#/** @file

+## @file

 # This is an example of how a driver retrieve HII data using HII Package List

 # Protocol, and how to publish the HII data.

 #

-#  Copyright (c) 2009, Intel Corporation. All rights reserved.

+#  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.

 #

 #  All rights reserved. This program and the accompanying materials

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

@@ -13,7 +13,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

diff --git a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.inf b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.inf
index 78667d7f68..1f4fa761ad 100644
--- a/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.inf
+++ b/MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.inf
@@ -1,4 +1,4 @@
-#/** @file

+## @file

 #  Produces the Legacy Region 2 Protocol.

 #

 #  This generic implementation of the Legacy Region 2 Protocol does not actually 

@@ -20,7 +20,7 @@
 # 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]

   INF_VERSION                    = 0x00010005

diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
index c030ef5728..4a52c9151c 100644
--- a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
+++ b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
@@ -1,7 +1,7 @@
-#/** @file

+## @file

 #   This driver installs Generic Memory Test Protocol which does not perform real memory test.

 #  

-#  Copyright (c) 2006 - 2008, Intel Corporation. <BR>

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

@@ -10,7 +10,7 @@
 #  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]

   INF_VERSION                    = 0x00010005

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

 #

 

-[Sources.common]

+[Sources]

   NullMemoryTest.h

   NullMemoryTest.c

 

diff --git a/MdeModulePkg/Universal/Metronome/Metronome.inf b/MdeModulePkg/Universal/Metronome/Metronome.inf
index 3315001d56..d47cfc7ac9 100644
--- a/MdeModulePkg/Universal/Metronome/Metronome.inf
+++ b/MdeModulePkg/Universal/Metronome/Metronome.inf
@@ -1,4 +1,4 @@
-#/** @file

+## @file

 # This module produces the Metronome Architectural Protocol on top of Timer Library.

 #

 # This is a generic implementation of the Metronome Architectural Protocol that

@@ -11,7 +11,7 @@
 # overflows that could occur for long delays if only nanoseconds were used and also

 # provides the greatest accuracy for small delays. 

 #

-# Copyright (c) 2008, Intel Corporation                                                         

+# Copyright (c) 2008 - 2010, 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        

@@ -20,7 +20,7 @@
 # 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]

   INF_VERSION                    = 0x00010005

@@ -45,7 +45,7 @@
   TimerLib

   DebugLib

 

-[Sources.common]

+[Sources]

   Metronome.c

   Metronome.h

 

diff --git a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf b/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
index 9bcb62e117..b2c022d157 100644
--- a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
@@ -1,8 +1,8 @@
-#/** @file

+## @file

 # This module produces the UEFI boot service GetNextMonotonicCount()

 # and runtime service GetNextHighMonotonicCount().

 #

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

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

@@ -12,7 +12,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

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

 #

 

-[Sources.common]

+[Sources]

   MonotonicCounter.c

 

 

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
index a3b2427463..b302674498 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
@@ -1,7 +1,7 @@
-#/** @file

+## @file

 # Component description file for ARP module

 #

-# Copyright (c) 2006, Intel Corporation

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

@@ -12,7 +12,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

@@ -32,7 +32,7 @@
 #  COMPONENT_NAME2               =  gArpComponentName2

 #

 

-[Sources.common]

+[Sources]

   ArpMain.c

   ArpDriver.h

   ComponentName.c

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
index f95dfed5ac..95879bb364 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
@@ -1,7 +1,7 @@
-#/** @file

+## @file

 # Component name for module Dhcp4

 #

-# Copyright (c) 2007, Intel Corporation

+# Copyright (c) 2007 - 2010, 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

@@ -12,7 +12,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

@@ -32,7 +32,7 @@
 #  COMPONENT_NAME2               =  gDhcp4ComponentName2

 #

 

-[Sources.common]

+[Sources]

   Dhcp4Impl.c

   Dhcp4Io.c

   Dhcp4Io.h

diff --git a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf b/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
index 9679d774f1..62f141852c 100644
--- a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
+++ b/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
@@ -1,7 +1,7 @@
-#/** @file

+## @file

 # Component description file for DPC module

 #

-# Copyright (c) 2007, Intel Corporation

+# Copyright (c) 2007 - 2010, 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

@@ -12,7 +12,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION               = 0x00010005

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

 #

 

-[Sources.common]

+[Sources]

   Dpc.c

   Dpc.h

 

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
index a3b6789eb7..f6cd8010c0 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
@@ -1,16 +1,16 @@
-/** @file

-  Component description file for IScsi module.

-

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

-

-**/

+## @file

+#  Component description file for IScsi module.

+#

+# Copyright (c) 2004 - 2010, 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.

+#

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

@@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #  COMPONENT_NAME2               =  gIScsiComponentName2

 #

 

-[Sources.common]

+[Sources]

   IScsiTcp4Io.h

   IScsiProto.h

   IScsiMisc.h

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
index e49c895a85..5090a06938 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
@@ -1,7 +1,7 @@
-#/** @file

+## @file

 # Component name for module Ip4Config

 #

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

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

@@ -12,7 +12,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

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

 #

 

-[Sources.common]

+[Sources]

   ComponentName.c

   NicIp4Variable.c

   Ip4ConfigDriver.c

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
index 0d0ea9146d..e20e44978b 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
@@ -1,7 +1,7 @@
-#/** @file

+## @file

 # Component name for module Ip4

 #

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

+# Copyright (c) 2007 - 2010, 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

@@ -12,7 +12,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

@@ -33,7 +33,7 @@
 #  COMPONENT_NAME2               =  gIp4ComponentName2

 #

 

-[Sources.common]

+[Sources]

   Ip4Driver.c

   Ip4Option.h

   Ip4Route.h

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
index 6347d97dee..436038eb9b 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
@@ -1,7 +1,7 @@
 ## @file

 #  Component description file for Mnp module.

 #

-#  Copyright (c) 2006 - 2009, Intel Corporation. <BR>

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

@@ -30,7 +30,7 @@
 #  COMPONENT_NAME2               =  gMnpComponentName2

 #

 

-[Sources.common]

+[Sources]

   MnpMain.c

   MnpIo.c

   ComponentName.h

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
index b45914d3af..0475034588 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
@@ -1,7 +1,7 @@
-#/** @file

+## @file

 # Component name for module Mtftp4

 #

-# Copyright (c) 2007, Intel Corporation

+# Copyright (c) 2007 - 2010, 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

@@ -12,7 +12,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

@@ -32,7 +32,7 @@
 #  COMPONENT_NAME2               =  gMtftp4ComponentName2

 #

 

-[Sources.common]

+[Sources]

   Mtftp4Option.c

   Mtftp4Rrq.c

   Mtftp4Impl.h

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
index 0d53e33a65..287edcc2d7 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
+++ b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
@@ -1,7 +1,7 @@
-#/** @file

+## @file

 #    Component description file for SNP module.

 #

-# Copyright (c) 2006 - 2009, Intel Corporation. <BR> 

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

@@ -10,7 +10,7 @@
 # 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]

   INF_VERSION                    = 0x00010005

@@ -30,7 +30,7 @@
 #  COMPONENT_NAME2               =  gSimpleNetworkComponentName2

 #

 

-[Sources.common]

+[Sources]

   Receive.c

   Snp.h

   Nvdata.c

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
index ba1274dfa8..96607c8d87 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
@@ -1,8 +1,8 @@
-#/** @file

+## @file

 # Component name for module Tcp4

 #

 # FIX ME!

-# Copyright (c) 2006, Intel Corporation.

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

@@ -13,7 +13,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

@@ -33,7 +33,7 @@
 #  COMPONENT_NAME2               =  gTcp4ComponentName2

 #

 

-[Sources.common]

+[Sources]

   SockImpl.c

   SockInterface.c

   Tcp4Proto.h

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
index 8303672d61..e74882b01a 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
@@ -1,8 +1,8 @@
-#/** @file

+## @file

 # Component name for module Udp4

 #

 # FIX ME!

-# Copyright (c) 2006, Intel Corporation.

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

@@ -13,7 +13,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

@@ -33,7 +33,7 @@
 #  COMPONENT_NAME2               =  gUdp4ComponentName2

 #

 

-[Sources.common]

+[Sources]

   Udp4Impl.h

   Udp4Main.c

   ComponentName.c

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
index 4df333e1a6..535a59cd47 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
@@ -34,7 +34,7 @@
 #  COMPONENT_NAME2               =  gPxeBcComponentName2

 #

 

-[Sources.common]

+[Sources]

   PxeBcMtftp.c

   PxeBcSupport.h

   PxeBcSupport.c

diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
index 40b0433e7b..51d7031f85 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
+++ b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
@@ -1,7 +1,7 @@
 ## @file

 #  Component description file for VLAN configuration module.

 #

-#  Copyright (c) 2009, Intel Corporation.

+#  Copyright (c) 2009 - 2010, 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

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

 #

 

-[Sources.common]

+[Sources]

   ComponentName.c

   VlanConfigDriver.c

   VlanConfigImpl.c

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
index e3739aae57..02e9026d34 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
@@ -1,4 +1,4 @@
-#/** @file

+## @file

 # PCD DXE driver manage database contains all dynamic PCD entries initialized in 

 # PEI phase, DXE phase and produce the implementation of PCD protocol.

 #

@@ -286,7 +286,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
index 103965996b..d3e4c48d29 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
@@ -1,4 +1,4 @@
-#/** @file

+## @file

 # PCD PEIM produces PCD database to manage all dynamic PCD in PEI phase and install Pcd Ppi service.

 #

 # There are two PCD PPIs as follows:

@@ -281,7 +281,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

diff --git a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf
index a8a9dcd68c..eda3628ade 100644
--- a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf
+++ b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf
@@ -1,4 +1,4 @@
-#/** @file

+## @file

 #  This driver installs Single Segment Pci Configuration 2 PPI 

 #  to provide read, write and modify access to Pci configuration space in PEI phase. 

 #  To follow PI specification, these services also support access to the unaligned Pci address.

@@ -13,7 +13,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

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

 #

 

-[Sources.common]

+[Sources]

   PciCfg2.c

 

 [Packages]

diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf
index fae955c590..71c53df794 100644
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf
+++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf
@@ -1,4 +1,4 @@
-#/** @file

+## @file

 #  This driver produces UEFI PLATFORM_DRIVER_OVERRIDE_PROTOCOL if this protocol doesn't exist.

 #  It doesn't install again if this protocol exists.

 #  It only implements one interface GetDriver of PLATFORM_DRIVER_OVERRIDE_PROTOCOL protocol 

@@ -16,7 +16,7 @@
 #  4. It save all the mapping info in NV variables for the following boot, 

 #     which will be consumed by GetDriver API of the produced the platform override protocol.

 #

-# Copyright (c) 2007 - 2009, Intel Corporation. All rights reserved.

+# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.

 #

 #  All rights reserved. This program and the accompanying materials

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

@@ -26,7 +26,7 @@
 #  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]

   INF_VERSION                    = 0x00010005

@@ -43,7 +43,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

 #

 

-[Sources.common]

+[Sources]

   VfrStrings.uni

   Vfr.vfr

   PlatDriOverrideDxe.c

diff --git a/MdeModulePkg/Universal/PrintDxe/PrintDxe.inf b/MdeModulePkg/Universal/PrintDxe/PrintDxe.inf
index 9dfa81bf65..6afd9290e1 100644
--- a/MdeModulePkg/Universal/PrintDxe/PrintDxe.inf
+++ b/MdeModulePkg/Universal/PrintDxe/PrintDxe.inf
@@ -1,9 +1,9 @@
-#/** @file

+## @file

 #  Print DXE driver that produces Print2 Protocol.

 #

 #  This driver produces Print2 protocol layered on top of the PrintLib from the MdePkg.

 #

-#  Copyright (c) 2009, Intel Corporation. <BR>

+#  Copyright (c) 2009 - 2010, 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

@@ -12,7 +12,7 @@
 #  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]

   INF_VERSION                    = 0x00010005

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

 #

 

-[Sources.common]

+[Sources]

   Print.c

 

 [Packages]

diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf b/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
index f87d2d8753..b3d8de4030 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
@@ -1,7 +1,7 @@
-#/** @file

+## @file

 #  Report Status Code Router PEIM which produces Report Stataus Code Handler PPI and Status Code PPI.

 #

-#  Copyright (c) 2009, Intel Corporation.

+#  Copyright (c) 2009 - 2010, 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

@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

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

 #

 

-[Sources.common]

+[Sources]

   ReportStatusCodeRouterPei.c

   ReportStatusCodeRouterPei.h

 

diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
index c9c54e8381..07d1c9b9a6 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
@@ -1,8 +1,8 @@
-#/** @file

+## @file

 #  Report Status Code Router Driver which produces Report Stataus Code Handler Protocol

 #  and Status Code Runtime Protocol.

 #

-#  Copyright (c) 2009, Intel Corporation.

+#  Copyright (c) 2009 - 2010, 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

@@ -12,7 +12,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

@@ -27,7 +27,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

 #

 

-[Sources.common]

+[Sources]

   ReportStatusCodeRouterRuntimeDxe.c

   ReportStatusCodeRouterRuntimeDxe.h

 

diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
index d3ca177c17..0bd8465597 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
@@ -1,4 +1,4 @@
-#/** @file

+## @file

 #  Report Status Code Router Driver which produces Report Stataus Code Handler Protocol

 #  and Status Code Runtime Protocol.

 #

@@ -12,7 +12,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

diff --git a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
index 4830a82a18..c59bb4b810 100644
--- a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
+++ b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
@@ -1,7 +1,7 @@
-#/** @file

+## @file

 #  This driver produces security architectural protocol based on SecurityManagementLib.

 #

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

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

@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

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

 #

 

-[Sources.common]

+[Sources]

   SecurityStub.c

 

 [Packages]

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
index 864a9a173f..4b5128b2d6 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
@@ -1,4 +1,4 @@
-#/** @file

+## @file

 # The DXE driver produces FORM BROWSER protocols defined in UEFI HII 2.1 specificatin.

 #

 # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.

@@ -12,7 +12,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

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

 #

 

-[Sources.common]

+[Sources]

   SetupBrowserStr.uni

   Setup.c

   Setup.h

@@ -73,7 +73,7 @@
   gEfiUnicodeCollation2ProtocolGuid             ## CONSUMES

   gEfiUserManagerProtocolGuid                   ## SOMETIMES_CONSUMES

 

-[FeaturePcd.common]

+[FeaturePcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport

 

 [Depex]

diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
index 9c16b83164..c54d0529bf 100644
--- a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
+++ b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
@@ -1,4 +1,4 @@
-#/** @file

+## @file

 # Component description file for Smbios module.

 #

 # This driver initializes and installs the SMBIOS protocol.

@@ -12,7 +12,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

@@ -31,7 +31,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

 #

 

-[Sources.common]

+[Sources]

   SmbiosDxe.h

   SmbiosDxe.c

 

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
index 189da71d0b..49c645250e 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
@@ -1,8 +1,8 @@
-#/** @file

+## @file

 #  Report Status Code Handler PEIM which produces general handlers and hook them

 #  onto the PEI status code router.

 #

-#  Copyright (c) 2009, Intel Corporation.

+#  Copyright (c) 2009 - 2010, 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

@@ -12,7 +12,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

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

 #

 

-[Sources.common]

+[Sources]

   StatusCodeHandlerPei.c

   StatusCodeHandlerPei.h

   SerialStatusCodeWorker.c

@@ -53,11 +53,11 @@
 [Ppis]

   gEfiPeiRscHandlerPpiGuid                      ## CONSUMES

 

-[FeaturePcd.common]

+[FeaturePcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory

   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial

 

-[Pcd.common]

+[Pcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|PcdStatusCodeUseMemory

 

 [Depex]

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
index ec176eb086..57329ffc59 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
@@ -1,8 +1,8 @@
-#/** @file

+## @file

 #  Status Code Handler Driver which produces general handlers and hook them

 #  onto the DXE status code router.

 #

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

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

@@ -12,7 +12,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

@@ -27,7 +27,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

 #

 

-[Sources.common]

+[Sources]

   StatusCodeHandlerRuntimeDxe.c

   StatusCodeHandlerRuntimeDxe.h

   SerialStatusCodeWorker.c

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf
index 6963022526..00329171d2 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf
@@ -1,4 +1,4 @@
-#/** @file

+## @file

 #  Status Code Handler Driver which produces general handlers and hook them

 #  onto the SMM status code router.

 #

@@ -12,7 +12,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
index ffd92c66ad..d2c5b96b9d 100644
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
@@ -1,8 +1,8 @@
-#/** @file

+## @file

 # Emulation Variable for EFI_RUNTIME_SERVICES.

 #

 # This module provides three EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName

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

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

@@ -12,7 +12,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

@@ -28,7 +28,7 @@
 #  VALID_ARCHITECTURES           = IA32 X64 EBC

 #

 

-[Sources.common]

+[Sources]

   InitVariable.c

   EmuVariable.c

   Variable.h

@@ -59,7 +59,7 @@
   gEfiGlobalVariableGuid                        ## PRODUCES ## Variable Guid

   gEfiVariableGuid

 

-[Pcd.common]

+[Pcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved

   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize

   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize

diff --git a/MdeModulePkg/Universal/Variable/Pei/VariablePei.inf b/MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
index b406f8aa6f..fc5d09dbf8 100644
--- a/MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
+++ b/MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
@@ -1,9 +1,9 @@
-#/** @file

+## @file

 #

 #  Implement ReadOnly Variable Services required by PEIM and install

 #  PEI ReadOnly Varaiable2 PPI. These services operates the non-volatile storage space.

 #

-#  Copyright (c) 2006 - 2008, Intel Corporation<BR>

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

@@ -12,7 +12,7 @@
 #  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]

   INF_VERSION                    = 0x00010005

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

 #

 

-[Sources.common]

+[Sources]

   Variable.c

   Variable.h

 

@@ -51,7 +51,7 @@
 [Ppis]

   gEfiPeiReadOnlyVariable2PpiGuid                ## SOMETIMES_PRODUCES (Not for boot mode RECOVERY)

 

-[Pcd.common]

+[Pcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase  ## CONSUMES

 

 [Depex]

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
index 64246a707f..34b404fd4c 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
@@ -1,8 +1,8 @@
-#/** @file

+## @file

 # Component description file for Variable module.

 #

 # This module installs three EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName.

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

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

@@ -12,7 +12,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

@@ -30,7 +30,7 @@
 #  VIRTUAL_ADDRESS_MAP_CALLBACK  =  VariableClassAddressChangeEvent

 #

 

-[Sources.common]

+[Sources]

   Reclaim.c

   Variable.c

   Variable.h

@@ -63,7 +63,7 @@
   gEfiGlobalVariableGuid                        ## PRODUCES ## Variable Guid

   gEfiEventVirtualAddressChangeGuid             ## PRODUCES ## Event

 

-[Pcd.common]

+[Pcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize

   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase

   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize

@@ -71,7 +71,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize

   gEfiMdeModulePkgTokenSpaceGuid.PcdHwErrStorageSize

   

-[FeaturePcd.common]

+[FeaturePcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics  ## SOMETIME_CONSUMES (statistic the information of variable.)

 

 [Depex]

diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
index 720fd54e6a..0e459dac2a 100644
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
+++ b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
@@ -1,4 +1,4 @@
-#/** @file

+## @file

 # Generic watchdog timer driver produceing Watchdog Timer Architectural Protocol using UEFI APIs.

 #

 # Copyright (c) 2006 - 2010, Intel Corporation

@@ -11,7 +11,7 @@
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #

-#**/

+##

 

 [Defines]

   INF_VERSION                    = 0x00010005

@@ -30,7 +30,7 @@
 [Packages]

   MdePkg/MdePkg.dec

 

-[Sources.common]

+[Sources]

   WatchdogTimer.h

   WatchdogTimer.c