Merge PVCS #7739.

[mirror_edk2.git] / EdkModulePkg / Universal / Network / PxeBc / Dxe / BC.msa

diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa b/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa
index 9938436ef8aea4cd025eb2efe62d4d4a741bb8ae..6a2321ea5cbc1aad6d5bb0fa23c11cd9f90cc8b2 100644 (file)
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa
@@ -1,21 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<!--Copyright (c) 2006, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->\r
-<ModuleSurfaceArea  xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
   <MsaHeader>\r
     <ModuleName>BC</ModuleName>\r
     <ModuleType>UEFI_DRIVER</ModuleType>\r
     <GuidValue>A3f436EA-A127-4EF8-957C-8048606FF670</GuidValue>\r
     <Version>1.0</Version>\r
-    <Abstract>Component description file for DiskIo module.</Abstract>\r
-    <Description>FIX ME!</Description>\r
-    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>\r
+    <Abstract>Component description file for BC module.</Abstract>\r
+    <Description>This module provides basic network capability.</Description>\r
+    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
     <License>All rights reserved. This program and the accompanying materials\r
       are licensed and made available under the terms and conditions of the BSD License\r
       which accompanies this distribution.  The full text of the license may be found at\r
@@ -25,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>IA32 X64 IPF</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>BC</OutputFileBasename>\r
   </ModuleDefinitions>\r
@@ -67,6 +59,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Filename>pxe_bc_mtftp.c</Filename>\r
     <Filename>pxe_bc_udp.c</Filename>\r
     <Filename>pxe_loadfile.c</Filename>\r
+    <Filename>hton.h</Filename>\r
+    <Filename>tftp.h</Filename>\r
     <Filename>dhcp.h</Filename>\r
     <Filename>bc.h</Filename>\r
     <Filename>ip.h</Filename>\r
@@ -75,32 +69,32 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
-    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>\r
+    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Protocol Usage="TO_START">\r
-      <ProtocolCName>Bis</ProtocolCName>\r
+      <ProtocolCName>gEfiBisProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="BY_START">\r
-      <ProtocolCName>LoadFile</ProtocolCName>\r
+      <ProtocolCName>gEfiLoadFileProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="SOMETIMES_PRODUCED">\r
-      <ProtocolCName>PxeBaseCodeCallBack</ProtocolCName>\r
+      <ProtocolCName>gEfiPxeBaseCodeCallbackProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="TO_START">\r
-      <ProtocolCName>SimpleNetwork</ProtocolCName>\r
+      <ProtocolCName>gEfiSimpleNetworkProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="TO_START">\r
-      <ProtocolCName>DevicePath</ProtocolCName>\r
+      <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="SOMETIMES_CONSUMED">\r
-      <ProtocolCName>NetworkInterfaceIdentifier</ProtocolCName>\r
+      <ProtocolCName>gEfiNetworkInterfaceIdentifierProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="SOMETIMES_CONSUMED">\r
-      <ProtocolCName>NetworkInterfaceIdentifier2</ProtocolCName>\r
+      <ProtocolCName>gEfiNetworkInterfaceIdentifierProtocolGuid_31</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="BY_START">\r
-      <ProtocolCName>PxeBaseCode</ProtocolCName>\r
+      <ProtocolCName>gEfiPxeBaseCodeProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r
   <SystemTables>\r
@@ -110,7 +104,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </SystemTables>\r
   <Guids>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>SmbiosTable</GuidCName>\r
+      <GuidCName>gEfiSmbiosTableGuid</GuidCName>\r
     </GuidCNames>\r
   </Guids>\r
   <Externs>\r
@@ -121,8 +115,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </Extern>\r
     <Extern>\r
       <DriverBinding>gPxeBcDriverBinding</DriverBinding>\r
-    </Extern>\r
-    <Extern>\r
       <ComponentName>gPxeBcComponentName</ComponentName>\r
     </Extern>\r
   </Externs>\r