1. Change the protocol usage type in UefiDriverModelLib

2. Remove a redundant Guid entry in spd

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

diff --git a/MdePkg/Library/UefiDriverModelLib/UefiDriverModelLib.msa b/MdePkg/Library/UefiDriverModelLib/UefiDriverModelLib.msa
index 2fd144d09796cc8dce5cfb79ca30b379e9887aef..3bcd9776b5c518be110a610de566fbf8a93796de 100644 (file)
--- a/MdePkg/Library/UefiDriverModelLib/UefiDriverModelLib.msa
+++ b/MdePkg/Library/UefiDriverModelLib/UefiDriverModelLib.msa
@@ -39,16 +39,16 @@
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
   </PackageDependencies>\r
   <Protocols>\r

-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="ALWAYS_PRODUCED">\r

       <ProtocolCName>gEfiDriverBindingProtocolGuid</ProtocolCName>\r
     </Protocol>\r
       <ProtocolCName>gEfiDriverBindingProtocolGuid</ProtocolCName>\r
     </Protocol>\r

-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="SOMETIMES_CONSUMED">\r

       <ProtocolCName>gEfiComponentNameProtocolGuid</ProtocolCName>\r
     </Protocol>\r
       <ProtocolCName>gEfiComponentNameProtocolGuid</ProtocolCName>\r
     </Protocol>\r

-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="SOMETIMES_CONSUMED">\r

       <ProtocolCName>gEfiDriverConfigurationProtocolGuid</ProtocolCName>\r
     </Protocol>\r
       <ProtocolCName>gEfiDriverConfigurationProtocolGuid</ProtocolCName>\r
     </Protocol>\r

-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="SOMETIMES_CONSUMED">\r

       <ProtocolCName>gEfiDriverDiagnosticsProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r
       <ProtocolCName>gEfiDriverDiagnosticsProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r

diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd
index 331ae706038e9f273fbfac1b982d8463c005e914..104b77f4de109819cd92c7eb4c54a64e40ba0063 100644 (file)
--- a/MdePkg/MdePkg.spd
+++ b/MdePkg/MdePkg.spd
@@ -1718,11 +1718,6 @@
       <GuidValue>1ACED566-76ED-4218-BC81-767F1F977A89</GuidValue>\r
       <HelpText/>\r
     </Entry>\r
       <GuidValue>1ACED566-76ED-4218-BC81-767F1F977A89</GuidValue>\r
       <HelpText/>\r
     </Entry>\r

-    <Entry Name="NetworkInterfaceIdentifier2">\r
-      <C_Name>gEfiNetworkInterfaceIdentifierProtocolGuid_31</C_Name>\r
-      <GuidValue>1ACED566-76ED-4218-BC81-767F1F977A89</GuidValue>\r
-      <HelpText/>\r
-    </Entry>\r

     <Entry Name="LoadedImage">\r
       <C_Name>gEfiLoadedImageProtocolGuid</C_Name>\r
       <GuidValue>5B1B31A1-9562-11D2-8E3F-00A0C969723B</GuidValue>\r
     <Entry Name="LoadedImage">\r
       <C_Name>gEfiLoadedImageProtocolGuid</C_Name>\r
       <GuidValue>5B1B31A1-9562-11D2-8E3F-00A0C969723B</GuidValue>\r