Merger DriverBinding and ComponentName into one <extern> section for all *.msa files

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

6 files changed, 10 insertions, 24 deletions

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa
index 458c5e19fd..0e5a08c2b6 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa
@@ -93,11 +93,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gWinNtBlockIoDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gWinNtBlockIoComponentName</ComponentName>

-    </Extern>

-    <Extern>

       <DriverDiag>gWinNtBlockIoDriverDiagnostics</DriverDiag>

     </Extern>

   </Externs>

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa
index 3f592b89af..c2e3aec3dd 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa
@@ -88,8 +88,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gWinNtConsoleDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gWinNtConsoleComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa
index 801fd8f22e..6c8395e570 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa
@@ -92,8 +92,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gWinNtSerialIoDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gWinNtSerialIoComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa
index 8f8d518131..0fe6db0ea2 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa
@@ -16,8 +16,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Abstract>Simple filesystem driver</Abstract>

     <Description>

       Produce Simple File System abstractions for directories on your PC using Win32 APIs.

-      The configuration of what devices to mount or emulate comes from NT 

-      environment variables. The variables must be visible to the Microsoft* 

+      The configuration of what devices to mount or emulate comes from NT

+      environment variables. The variables must be visible to the Microsoft*

       Developer Studio for them to work.

     </Description>

     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>

@@ -97,8 +97,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gWinNtSimpleFileSystemDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gWinNtSimpleFileSystemComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa
index 777d9c0a86..216f4b24e9 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa
@@ -16,9 +16,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Abstract>Uga driver</Abstract>

     <Description>

       UGA is short hand for Universal Graphics Abstraction protocol.

-      This file is a verision of UgaIo the uses WinNtThunk system calls as an IO 

+      This file is a verision of UgaIo the uses WinNtThunk system calls as an IO

       abstraction. For a PCI device WinNtIo would be replaced with

-      a PCI IO abstraction that abstracted a specific PCI device. 

+      a PCI IO abstraction that abstracted a specific PCI device.

     </Description>

     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>

     <License>All rights reserved. This program and the accompanying materials

@@ -100,8 +100,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gWinNtUgaDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gWinNtUgaComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
index 8d5582ae9c..1610645b71 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
@@ -15,8 +15,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Version>1.0</Version>

     <Abstract>Win NT Bus driver</Abstract>

     <Description>

-      This following section documents the envirnoment variables for the Win NT 

-      build.  These variables are used to define the (virtual) hardware 

+      This following section documents the envirnoment variables for the Win NT

+      build.  These variables are used to define the (virtual) hardware

       configuration of the NT environment

     </Description>

     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>

@@ -123,8 +123,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gWinNtBusDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gWinNtBusDriverComponentName</ComponentName>

     </Extern>

   </Externs>

@@ -132,7 +130,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdWinNtConsole</C_Name>

       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

-      <HelpText>This PCD declares the title string of the text console window. 

+      <HelpText>This PCD declares the title string of the text console window.

         such as "My EFI Console".

         The item type of this PCD can only be "DYNAMIC".</HelpText>

     </PcdEntry>

@@ -151,21 +149,21 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdWinNtFileSystem</C_Name>

       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

-      <HelpText>This PCD defines the windows directory who will be mounted as 

+      <HelpText>This PCD defines the windows directory who will be mounted as

         harddisk in simulator.

         The item type of this PCD can only be "DYNAMIC".</HelpText>

     </PcdEntry>

     <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdWinNtVirtualDisk</C_Name>

       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

-      <HelpText>This PCD defines the devices which use a file to emulate a hard disk or 

+      <HelpText>This PCD defines the devices which use a file to emulate a hard disk or

         removable media device

         The item type if this PCD can only be "DYNAMIC".</HelpText>

     </PcdEntry>

     <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdWinNtPhysicalDisk</C_Name>

       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

-      <HelpText>This PCD defines physical disk which will be simualted as a 

+      <HelpText>This PCD defines physical disk which will be simualted as a

         harddisk in simulator.

         The item type of this PCD can only be "DYNAMIC".</HelpText>

     </PcdEntry>