Clean up MSA file of the checked in modules which include:

1) remove unused library class
2) remove unreferenced GUIDs


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

14 files changed, 26 insertions, 81 deletions

diff --git a/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430.msa b/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430.msa
index 6a74c262de..a675ad563d 100644
--- a/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430.msa
+++ b/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430.msa
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">

+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

   <MsaHeader>

     <ModuleName>CirrusLogic5430UgaDraw</ModuleName>

     <ModuleType>UEFI_DRIVER</ModuleType>

     <GuidValue>555F76EA-785F-40d7-9174-153C43636C68</GuidValue>

     <Version>1.0</Version>

     <Abstract>Component description file for CirrusLogic5430 module</Abstract>

-    <Description>

-      Cirrus Logic 5430 Controller Driver.This driver is a sample implementation

+    <Description>Cirrus Logic 5430 Controller Driver.This driver is a sample implementation

       of the UGA Draw Protocol for the Cirrus Logic 5430 family of PCI video controllers.

       This driver is only usable in the EFI pre-boot environment.  This sample is

       intended to show how the UGA Draw Protocol is able to function.  The UGA I/O

       Protocol is not implemented in this sample.  A fully compliant EFI UGA driver

       requires both the UGA Draw and the UGA I/O Protocol.  Please refer to Microsoft's

       documentation on UGA for details on how to write a UGA driver that is able

-      to function both in the EFI pre-boot environment and from the OS runtime.

-    </Description>

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

+      to function both in the EFI pre-boot environment and from the OS runtime.</Description>

+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>

     <License>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

@@ -41,15 +39,9 @@
       <Keyword>UefiDriverEntryPoint</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseMemoryLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>MemoryAllocationLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

@@ -81,4 +73,4 @@
       <ComponentName>gCirrusLogic5430ComponentName</ComponentName>

     </Extern>

   </Externs>

-</ModuleSurfaceArea>
\ No newline at end of file
+</ModuleSurfaceArea>

diff --git a/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.msa b/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.msa
index d4af1f85bf..9e71d0e970 100644
--- a/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.msa
+++ b/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<ModuleSurfaceArea  xmlns="http://www.TianoCore.org/2006/Edk2.0">

+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

   <MsaHeader>

     <ModuleName>Ehci</ModuleName>

     <ModuleType>UEFI_DRIVER</ModuleType>

@@ -7,7 +7,7 @@
     <Version>1.0</Version>

     <Abstract>Component description file for Ehci module</Abstract>

     <Description>This module provides USB2 Host Controller Protocol implementation for Enhanced Host Controller Interface</Description>

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

+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>

     <License>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

diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
index 9d73da2d05..712ae999da 100644
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
@@ -9,7 +9,7 @@
     <Description>PCI bus driver. This module will probe all PCI devices and allocate MMIO and IO

        space for these devices. Please use PCD feature flag PcdPciBusHotplugDeviceSupport to enable

        support hot plug.</Description>

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

+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>

     <License>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

@@ -55,9 +55,6 @@
       <Keyword>DevicePathLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>PeCoffGetEntryPointLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>PcdLib</Keyword>

     </LibraryClass>

   </LibraryClassDefinitions>

@@ -145,9 +142,6 @@
     <GuidCNames Usage="SOMETIMES_CONSUMED">

       <GuidCName>gEfiPciOptionRomTableGuid</GuidCName>

     </GuidCNames>

-    <GuidCNames Usage="SOMETIMES_CONSUMED">

-      <GuidCName>gEfiStatusCodeSpecificDataGuid</GuidCName>

-    </GuidCNames>

     <GuidCNames Usage="PRIVATE">

       <GuidCName>gEfiPciHotplugDeviceGuid</GuidCName>

     </GuidCNames>

diff --git a/EdkModulePkg/Bus/Pci/Uhci/Dxe/Uhci.msa b/EdkModulePkg/Bus/Pci/Uhci/Dxe/Uhci.msa
index 32d673fa04..4f5aa7053e 100644
--- a/EdkModulePkg/Bus/Pci/Uhci/Dxe/Uhci.msa
+++ b/EdkModulePkg/Bus/Pci/Uhci/Dxe/Uhci.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">

+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

   <MsaHeader>

     <ModuleName>Uhci</ModuleName>

     <ModuleType>UEFI_DRIVER</ModuleType>

@@ -7,7 +7,7 @@
     <Version>1.0</Version>

     <Abstract>Component description file for Uhci module</Abstract>

     <Description>This module provides USB Host Controller Protocol implementation for Universal Host Controller Interface</Description>

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

+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>

     <License>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

diff --git a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Undi.msa b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Undi.msa
index 419c433b42..b9c7b28ffa 100644
--- a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Undi.msa
+++ b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Undi.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">

+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

   <MsaHeader>

     <ModuleName>Undi</ModuleName>

     <ModuleType>DXE_RUNTIME_DRIVER</ModuleType>

@@ -7,7 +7,7 @@
     <Version>1.0</Version>

     <Abstract>Component description file for Undi module.</Abstract>

     <Description>This module provides support for Universal Network Driver Interface</Description>

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

+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>

     <License>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

@@ -23,33 +23,21 @@
   </ModuleDefinitions>

   <LibraryClassDefinitions>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>UefiLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiDriverEntryPoint</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiDriverModelLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiRuntimeLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>DebugLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>HobLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>BaseMemoryLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>MemoryAllocationLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiBootServicesTableLib</Keyword>

     </LibraryClass>

   </LibraryClassDefinitions>

@@ -62,7 +50,6 @@
   </SourceFiles>

   <PackageDependencies>

     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

   </PackageDependencies>

   <Protocols>

     <Protocol Usage="TO_START">

diff --git a/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.msa b/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.msa
index d5323ba7cd..4dba8273b8 100644
--- a/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.msa
+++ b/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.msa
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">

+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

   <MsaHeader>

     <ModuleName>ScsiBus</ModuleName>

     <ModuleType>DXE_DRIVER</ModuleType>

     <GuidValue>0167CCC4-D0F7-4f21-A3EF-9E64B7CDCE8B</GuidValue>

     <Version>1.0</Version>

     <Abstract>Component description file for Scsi Bus module.</Abstract>

-    <Description>

-      SCSI bus driver. This driver scans all SCSI devices and export SCSI IO protocol

-    </Description>

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

+    <Description>SCSI bus driver. This driver scans all SCSI devices and export SCSI IO protocol</Description>

+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>

     <License>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

@@ -43,9 +41,6 @@
       <Keyword>EdkScsiLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>MemoryAllocationLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiBootServicesTableLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

diff --git a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.msa b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.msa
index 0ed8f2ed16..eb722a2116 100644
--- a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.msa
+++ b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.msa
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">

+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

   <MsaHeader>

     <ModuleName>ScsiDisk</ModuleName>

     <ModuleType>DXE_DRIVER</ModuleType>

     <GuidValue>0A66E322-3740-4cce-AD62-BD172CECCA35</GuidValue>

     <Version>1.0</Version>

     <Abstract>Component description file for Scsi Disk module.Revision History</Abstract>

-    <Description>

-       Scsi Disk driver. This driver detected the Scsi disk media and export block io protocol

-    </Description>

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

+    <Description>Scsi Disk driver. This driver detected the Scsi disk media and export block io protocol</Description>

+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>

     <License>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

@@ -34,9 +32,6 @@
       <Keyword>UefiDriverEntryPoint</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

@@ -46,9 +41,6 @@
       <Keyword>EdkScsiLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>MemoryAllocationLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiBootServicesTableLib</Keyword>

     </LibraryClass>

   </LibraryClassDefinitions>

diff --git a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/UsbBot.msa b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/UsbBot.msa
index a8884352e3..ac857bd07e 100644
--- a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/UsbBot.msa
+++ b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/UsbBot.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">

+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

   <MsaHeader>

     <ModuleName>UsbBot</ModuleName>

     <ModuleType>DXE_DRIVER</ModuleType>

@@ -7,7 +7,7 @@
     <Version>1.0</Version>

     <Abstract>Component description file for UsbBot module</Abstract>

     <Description>This module provides support for USB Bulk-Only Transport</Description>

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

+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>

     <License>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

@@ -32,9 +32,6 @@
       <Keyword>UefiDriverEntryPoint</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

diff --git a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.h b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.h
index 6e43a1b940..4fb76bbf80 100644
--- a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.h
+++ b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/bot.h
@@ -76,7 +76,6 @@ typedef struct {
 //

 extern EFI_DRIVER_BINDING_PROTOCOL  gUsbBotDriverBinding;

 extern EFI_COMPONENT_NAME_PROTOCOL  gUsbBotComponentName;

-extern EFI_GUID                     gUsbBotDriverGuid;

 

 //

 // Bot Driver Binding Protocol

diff --git a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/UsbBus.msa b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/UsbBus.msa
index 974c419208..bc7715dfd6 100644
--- a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/UsbBus.msa
+++ b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/UsbBus.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">

+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

   <MsaHeader>

     <ModuleName>UsbBus</ModuleName>

     <ModuleType>DXE_DRIVER</ModuleType>

@@ -7,7 +7,7 @@
     <Version>1.0</Version>

     <Abstract>Component description file for UsbBus module</Abstract>

     <Description>This module provides support for USB bus enumeration and USB IO protocol implementation</Description>

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

+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>

     <License>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

diff --git a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.h b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.h
index ce0e698013..be60aedb76 100644
--- a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.h
+++ b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.h
@@ -173,7 +173,6 @@ typedef struct _usb_bus_controller_device {
 //

 extern EFI_DRIVER_BINDING_PROTOCOL  gUsbBusDriverBinding;

 extern EFI_COMPONENT_NAME_PROTOCOL  gUsbBusComponentName;

-extern EFI_GUID                     gUSBBusDriverGuid;

 

 //

 // EFI_DRIVER_BINDING_PROTOCOL Protocol Interface

diff --git a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.msa b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.msa
index f6b3186d94..7eec693f2d 100644
--- a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.msa
+++ b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">

+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

   <MsaHeader>

     <ModuleName>UsbMassStorage</ModuleName>

     <ModuleType>DXE_DRIVER</ModuleType>

@@ -7,7 +7,7 @@
     <Version>1.0</Version>

     <Abstract>Component description file for UsbMassStorage module</Abstract>

     <Description>This module provides Block IO interface for USB mass storage class</Description>

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

+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>

     <License>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

@@ -32,18 +32,12 @@
       <Keyword>UefiDriverEntryPoint</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>BaseMemoryLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>EdkUsbLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>MemoryAllocationLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

diff --git a/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/UsbMouse.msa b/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/UsbMouse.msa
index 1b10780afc..0cbae7a7c3 100644
--- a/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/UsbMouse.msa
+++ b/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/UsbMouse.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">

+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

   <MsaHeader>

     <ModuleName>UsbMouse</ModuleName>

     <ModuleType>DXE_DRIVER</ModuleType>

@@ -7,7 +7,7 @@
     <Version>1.0</Version>

     <Abstract>Component description file for UsbMouse module</Abstract>

     <Description>This module provides support for USB mouse device</Description>

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

+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>

     <License>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

@@ -32,9 +32,6 @@
       <Keyword>UefiDriverEntryPoint</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

diff --git a/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/usbmouse.h b/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/usbmouse.h
index ac071db311..47aecc87da 100644
--- a/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/usbmouse.h
+++ b/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/usbmouse.h
@@ -73,7 +73,6 @@ USBMouseRecoveryHandler (
 //

 extern EFI_DRIVER_BINDING_PROTOCOL  gUsbMouseDriverBinding;

 extern EFI_COMPONENT_NAME_PROTOCOL  gUsbMouseComponentName;

-extern EFI_GUID                     gEfiUsbMouseDriverGuid;

 

 VOID

 MouseReportStatusCode (