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

7 files changed, 8 insertions, 23 deletions

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 (