converted all surface area description files to new schema

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

3 files changed, 226 insertions, 147 deletions

diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa b/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa
index ec4a4267c7..c4c9c42693 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa
@@ -1,46 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

--->

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

+<!--Copyright (c) 2006, 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
+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.-->

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

   <MsaHeader>

-    <BaseName>BC</BaseName>

+    <ModuleName>BC</ModuleName>

     <ModuleType>UEFI_DRIVER</ModuleType>

-    <ComponentType>BS_DRIVER</ComponentType>

-    <Guid>A3f436EA-A127-4EF8-957C-8048606FF670</Guid>

-    <Version>0</Version>

+    <GuidValue>A3f436EA-A127-4EF8-957C-8048606FF670</GuidValue>

+    <Version>1.0</Version>

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

     <Description>FIX ME!</Description>

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

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

-    </License>

-    <Created>2006-03-12 17:09</Created>

-    <Updated>2006-03-19 15:19</Updated>

-    <Specification>0</Specification>

+    <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
+      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.</License>

+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

   </MsaHeader>

+  <ModuleDefinitions>

+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

+    <BinaryModule>false</BinaryModule>

+    <OutputFileBasename>BC</OutputFileBasename>

+  </ModuleDefinitions>

   <LibraryClassDefinitions>

-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverModelLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">PrintLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>DebugLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiDriverModelLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiDriverEntryPoint</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>BaseLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>PrintLib</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>

   <SourceFiles>

     <Filename>bc.c</Filename>

@@ -57,38 +73,57 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>ComponentName.c</Filename>

     <Filename>Print.c</Filename>

   </SourceFiles>

-  <Includes>

-    <PackageName>MdePkg</PackageName>

-    <PackageName>EdkModulePkg</PackageName>

-  </Includes>

+  <PackageDependencies>

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

+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>

+  </PackageDependencies>

   <Protocols>

-    <Protocol Usage="TO_START">Bis</Protocol>    

-    <Protocol Usage="BY_START">LoadFile</Protocol>

-    <Protocol Usage="SOMETIMES_PRODUCED">PxeBaseCodeCallBack</Protocol>

-    <Protocol Usage="TO_START">SimpleNetwork</Protocol>

-    <Protocol Usage="TO_START">DevicePath</Protocol>

-    <Protocol Usage="SOMETIMES_CONSUMED">NetworkInterfaceIdentifier</Protocol>

-    <Protocol Usage="SOMETIMES_CONSUMED">NetworkInterfaceIdentifier2</Protocol>

-    <Protocol Usage="BY_START">PxeBaseCode</Protocol>

+    <Protocol Usage="TO_START">

+      <ProtocolCName>Bis</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="BY_START">

+      <ProtocolCName>LoadFile</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="SOMETIMES_PRODUCED">

+      <ProtocolCName>PxeBaseCodeCallBack</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="TO_START">

+      <ProtocolCName>SimpleNetwork</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="TO_START">

+      <ProtocolCName>DevicePath</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="SOMETIMES_CONSUMED">

+      <ProtocolCName>NetworkInterfaceIdentifier</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="SOMETIMES_CONSUMED">

+      <ProtocolCName>NetworkInterfaceIdentifier2</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="BY_START">

+      <ProtocolCName>PxeBaseCode</ProtocolCName>

+    </Protocol>

   </Protocols>

   <SystemTables>

-    <SystemTable Usage="SOMETIMES_CONSUMED">

-      <Entry>gEfiSmbiosTableGuid</Entry>

-    </SystemTable>

+    <SystemTableCNames Usage="SOMETIMES_CONSUMED">

+      <SystemTableCName>gEfiSmbiosTableGuid</SystemTableCName>

+    </SystemTableCNames>

   </SystemTables>

   <Guids>

-    <GuidEntry Usage="ALWAYS_CONSUMED">

-      <C_Name>SmbiosTable</C_Name>

-    </GuidEntry>

+    <GuidCNames Usage="ALWAYS_CONSUMED">

+      <GuidCName>SmbiosTable</GuidCName>

+    </GuidCNames>

   </Guids>

   <Externs>

+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

+    <Specification>EDK_RELEASE_VERSION 0x00000000</Specification>

     <Extern>

       <ModuleEntryPoint>InitializeBCDriver</ModuleEntryPoint>

-      <ModuleUnloadImage></ModuleUnloadImage>

     </Extern>

     <Extern>

       <DriverBinding>gPxeBcDriverBinding</DriverBinding>

+    </Extern>

+    <Extern>

       <ComponentName>gPxeBcComponentName</ComponentName>

     </Extern>

   </Externs>

-</ModuleSurfaceArea>

+</ModuleSurfaceArea>
\ No newline at end of file
diff --git a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/Dhcp4.msa b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/Dhcp4.msa
index f34c858508..91450115b7 100644
--- a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/Dhcp4.msa
+++ b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/Dhcp4.msa
@@ -1,44 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

--->

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

+<!--Copyright (c) 2006, 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
+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.-->

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

   <MsaHeader>

-    <BaseName>Dhcp4</BaseName>

+    <ModuleName>Dhcp4</ModuleName>

     <ModuleType>UEFI_DRIVER</ModuleType>

-    <ComponentType>BS_DRIVER</ComponentType>

-    <Guid>a46c3330-be36-4977-9d24-a7cf92eef0fe</Guid>

-    <Version>0</Version>

+    <GuidValue>a46c3330-be36-4977-9d24-a7cf92eef0fe</GuidValue>

+    <Version>1.0</Version>

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

     <Description>FIX ME!</Description>

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

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

-    </License>

-    <Created>2006-03-12 17:09</Created>

-    <Updated>2006-03-19 15:19</Updated>

-    <Specification>0</Specification>

+    <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
+      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.</License>

+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

   </MsaHeader>

+  <ModuleDefinitions>

+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

+    <BinaryModule>false</BinaryModule>

+    <OutputFileBasename>Dhcp4</OutputFileBasename>

+  </ModuleDefinitions>

   <LibraryClassDefinitions>

-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverModelLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>DebugLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiDriverModelLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiDriverEntryPoint</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">

+      <Keyword>UefiBootServicesTableLib</Keyword>

+    </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>ComponentName.c</Filename>

@@ -51,24 +63,32 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>PxeDhcp4Setup.c</Filename>

     <Filename>support.c</Filename>

   </SourceFiles>

-  <Includes>

-    <PackageName>MdePkg</PackageName>

-    <PackageName>EdkModulePkg</PackageName>

-  </Includes>

+  <PackageDependencies>

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

+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>

+  </PackageDependencies>

   <Protocols>

-    <Protocol Usage="ALWAYS_CONSUMED">PxeDhcp4Callback</Protocol>

-    <Protocol Usage="BY_START">PxeDhcp4</Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">SimpleNetwork</Protocol>

-    <Protocol Usage="TO_START">PxeBaseCode</Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>PxeDhcp4Callback</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="BY_START">

+      <ProtocolCName>PxeDhcp4</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_CONSUMED">

+      <ProtocolCName>SimpleNetwork</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="TO_START">

+      <ProtocolCName>PxeBaseCode</ProtocolCName>

+    </Protocol>

   </Protocols>

   <Externs>

+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

+    <Specification>EDK_RELEASE_VERSION 0x00000000</Specification>

     <Extern>

-      <ModuleEntryPoint></ModuleEntryPoint>

-      <ModuleUnloadImage></ModuleUnloadImage>

+      <DriverBinding>gPxeDhcp4DriverBinding</DriverBinding>

     </Extern>

     <Extern>

-      <DriverBinding>gPxeDhcp4DriverBinding</DriverBinding>

       <ComponentName>gPxeDhcp4ComponentName</ComponentName>

     </Extern>

   </Externs>

-</ModuleSurfaceArea>

+</ModuleSurfaceArea>
\ No newline at end of file
diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.msa b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.msa
index 24957ed904..efd0e8b7dd 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.msa
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.msa
@@ -1,45 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<!--

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

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

--->

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

+<!--Copyright (c) 2006, 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
+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.-->

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

   <MsaHeader>

-    <BaseName>SNP</BaseName>

+    <ModuleName>SNP</ModuleName>

     <ModuleType>UEFI_DRIVER</ModuleType>

-    <ComponentType>BS_DRIVER</ComponentType>

-    <Guid>A2f436EA-A127-4EF8-957C-8048606FF670</Guid>

-    <Version>0</Version>

+    <GuidValue>A2f436EA-A127-4EF8-957C-8048606FF670</GuidValue>

+    <Version>1.0</Version>

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

     <Description>FIX ME!</Description>

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

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

-    </License>

-    <Created>2006-03-12 17:09</Created>

-    <Updated>2006-03-19 15:19</Updated>

-    <Specification>0</Specification>

+    <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
+      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.</License>

+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

   </MsaHeader>

+  <ModuleDefinitions>

+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

+    <BinaryModule>false</BinaryModule>

+    <OutputFileBasename>SNP</OutputFileBasename>

+  </ModuleDefinitions>

   <LibraryClassDefinitions>

-    <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverModelLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiDriverEntryPoint</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>DebugLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiDriverModelLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiDriverEntryPoint</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>BaseLib</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>

   <SourceFiles>

     <Filename>callback.c</Filename>

@@ -61,25 +75,35 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>WaitForPacket.c</Filename>

     <Filename>ComponentName.c</Filename>

   </SourceFiles>

-  <Includes>

-    <PackageName>MdePkg</PackageName>

-    <PackageName>EdkModulePkg</PackageName>

-  </Includes>

+  <PackageDependencies>

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

+    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>

+  </PackageDependencies>

   <Protocols>

-    <Protocol Usage="BY_START">SimpleNetwork</Protocol>

-    <Protocol Usage="TO_START">PciIo</Protocol>

-    <Protocol Usage="TO_START">DevicePath</Protocol>

-    <Protocol Usage="SOMETIMES_CONSUMED">NetworkInterfaceIdentifier</Protocol>

-    <Protocol Usage="TO_START">NetworkInterfaceIdentifier2</Protocol>

+    <Protocol Usage="BY_START">

+      <ProtocolCName>SimpleNetwork</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="TO_START">

+      <ProtocolCName>PciIo</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="TO_START">

+      <ProtocolCName>DevicePath</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="SOMETIMES_CONSUMED">

+      <ProtocolCName>NetworkInterfaceIdentifier</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="TO_START">

+      <ProtocolCName>NetworkInterfaceIdentifier2</ProtocolCName>

+    </Protocol>

   </Protocols>

   <Externs>

+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

+    <Specification>EDK_RELEASE_VERSION 0x00000000</Specification>

     <Extern>

-      <ModuleEntryPoint></ModuleEntryPoint>

-      <ModuleUnloadImage></ModuleUnloadImage>

+      <DriverBinding>mSimpleNetworkDriverBinding</DriverBinding>

     </Extern>

     <Extern>

-      <DriverBinding>mSimpleNetworkDriverBinding</DriverBinding>

       <ComponentName>gSimpleNetworkComponentName</ComponentName>

     </Extern>

   </Externs>

-</ModuleSurfaceArea>

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