retire gEfiFirmwareVolumeDispatcherProtocolGuid as its original design is used to...

Currently our code has not such usage model, so Mike recommended us to retire this guid

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

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index f80f36ffc8841dcce4d82adb76774d3c86a19b19..08ddc90ef63aa781abd8d916cc0a641472255559 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -1114,18 +1114,6 @@ BdsLibEnumerateAllBootOption (
         &FvHandleBuffer\r
         );\r
   for (Index = 0; Index < FvHandleCount; Index++) {\r
         &FvHandleBuffer\r
         );\r
   for (Index = 0; Index < FvHandleCount; Index++) {\r

-    //\r
-    // Only care the dispatched FV. If no dispatch protocol on the FV, it is not dispatched, then skip it.\r
-    //\r
-    Status = gBS->HandleProtocol (\r
-                    FvHandleBuffer[Index],\r
-                    &gEfiFirmwareVolumeDispatchProtocolGuid,\r
-                    (VOID **) &Fv\r
-                    );\r
-    if (EFI_ERROR (Status)) {\r
-      continue;\r
-    }\r
-    \r

     gBS->HandleProtocol (\r
           FvHandleBuffer[Index],\r
           &gEfiFirmwareVolume2ProtocolGuid,\r
     gBS->HandleProtocol (\r
           FvHandleBuffer[Index],\r
           &gEfiFirmwareVolume2ProtocolGuid,\r

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
index 4921ab990f5ed9aa303e1f288a6ad6c9b202e074..871216dea41bc8cc356c90d93b877cf71ebf5bc9 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
@@ -87,7 +87,7 @@
   gPerformanceProtocolGuid                      ## SOMETIMES_PRODUCES ## Variable:L"PerfDataMemAddr" (The ACPI address of performance data)\r
   gEfiUartDevicePathGuid                        ## CONSUMES ## GUID (Identify the device path for UARD device)\r
   gEfiSasDevicePathGuid                         ## CONSUMES ## GUID (Identify the device path for SAS device)\r
   gPerformanceProtocolGuid                      ## SOMETIMES_PRODUCES ## Variable:L"PerfDataMemAddr" (The ACPI address of performance data)\r
   gEfiUartDevicePathGuid                        ## CONSUMES ## GUID (Identify the device path for UARD device)\r
   gEfiSasDevicePathGuid                         ## CONSUMES ## GUID (Identify the device path for SAS device)\r

-  \r
+\r

 [Protocols]\r
   gEfiSimpleFileSystemProtocolGuid              # PROTOCOL CONSUMES\r
   gEfiSimpleTextOutProtocolGuid                 # PROTOCOL CONSUMES\r
 [Protocols]\r
   gEfiSimpleFileSystemProtocolGuid              # PROTOCOL CONSUMES\r
   gEfiSimpleTextOutProtocolGuid                 # PROTOCOL CONSUMES\r


@@ -102,7 +102,6 @@
   gEfiLegacyBiosProtocolGuid                    # PROTOCOL SOMETIMES_CONSUMES\r
   gEfiCpuArchProtocolGuid                       # PROTOCOL CONSUMES\r
   gEfiDevicePathProtocolGuid                    # PROTOCOL CONSUMES\r
   gEfiLegacyBiosProtocolGuid                    # PROTOCOL SOMETIMES_CONSUMES\r
   gEfiCpuArchProtocolGuid                       # PROTOCOL CONSUMES\r
   gEfiDevicePathProtocolGuid                    # PROTOCOL CONSUMES\r

-  gEfiFirmwareVolumeDispatchProtocolGuid        # PROTOCOL CONSUMES\r

   gEfiAcpiS3SaveProtocolGuid                    # PROTOCOL CONSUMES\r
   gEfiGraphicsOutputProtocolGuid                # PROTOCOL SOMETIMES_CONSUMES ## not gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport\r
   gEfiUgaDrawProtocolGuid                       # PROTOCOL SOMETIMES_CONSUMES ## gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport\r
   gEfiAcpiS3SaveProtocolGuid                    # PROTOCOL CONSUMES\r
   gEfiGraphicsOutputProtocolGuid                # PROTOCOL SOMETIMES_CONSUMES ## not gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport\r
   gEfiUgaDrawProtocolGuid                       # PROTOCOL SOMETIMES_CONSUMES ## gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport\r

diff --git a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
index 0add1e27e62043c2ffabf4b44f42d1a1f24166f8..7e6ddce77a0fd6cd4c81e9307d49ba4228cb6fb3 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
@@ -962,15 +962,6 @@ CoreFwVolEventProtocolNotify (
       continue;\r
     }\r
 \r
       continue;\r
     }\r
 \r

-    Status = CoreHandleProtocol (FvHandle, &gEfiFirmwareVolumeDispatchProtocolGuid, (VOID **)&Fv);\r
-    if (EFI_ERROR (Status)) {\r
-      //\r
-      // If no dispatch protocol then skip, but do not marked as being processed as it\r
-      // may show up later.\r
-      //\r
-      continue;\r
-    }\r
-\r

     //\r
     // Since we are about to process this Fv mark it as processed.\r
     //\r
     //\r
     // Since we are about to process this Fv mark it as processed.\r
     //\r

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index af0835385cdada90c18d6b2415548a508ae9d6f8..e6a126bd8953bd4d7b71fb351ae08dcd7bb24fd4 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -125,7 +125,6 @@
   gEfiPlatformDriverOverrideProtocolGuid        ## CONSUMES\r
   gEfiDriverBindingProtocolGuid                 ## SOMETIMES_CONSUMES\r
   gEfiFirmwareVolumeBlockProtocolGuid           ## PRODUCES\r
   gEfiPlatformDriverOverrideProtocolGuid        ## CONSUMES\r
   gEfiDriverBindingProtocolGuid                 ## SOMETIMES_CONSUMES\r
   gEfiFirmwareVolumeBlockProtocolGuid           ## PRODUCES\r

-  gEfiFirmwareVolumeDispatchProtocolGuid        ## PRODUCES\r

   gEfiFirmwareVolume2ProtocolGuid               ## PRODUCES\r
   gEfiCpuArchProtocolGuid                       ## CONSUMES\r
   gEfiDevicePathProtocolGuid                    ## CONSUMES\r
   gEfiFirmwareVolume2ProtocolGuid               ## PRODUCES\r
   gEfiCpuArchProtocolGuid                       ## CONSUMES\r
   gEfiDevicePathProtocolGuid                    ## CONSUMES\r

diff --git a/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c b/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c
index 2c0cfd77761a7e39b338070fdb04b32c29ed19d0..ba2501451b3a0f07e6878b4285521e575f0e13d9 100644 (file)
--- a/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c
+++ b/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c
@@ -495,7 +495,6 @@ ProduceFVBProtocolOnBuffer (
              &FvbDev->Handle,\r
              &gEfiFirmwareVolumeBlockProtocolGuid,     &FvbDev->FwVolBlockInstance,\r
              &gEfiDevicePathProtocolGuid,              &FvbDev->DevicePath,\r
              &FvbDev->Handle,\r
              &gEfiFirmwareVolumeBlockProtocolGuid,     &FvbDev->FwVolBlockInstance,\r
              &gEfiDevicePathProtocolGuid,              &FvbDev->DevicePath,\r

-             &gEfiFirmwareVolumeDispatchProtocolGuid,  NULL,\r

              NULL\r
              );\r
 \r
              NULL\r
              );\r
 \r

diff --git a/MdeModulePkg/Include/Protocol/FirmwareVolumeDispatch.h b/MdeModulePkg/Include/Protocol/FirmwareVolumeDispatch.h
deleted file mode 100644 (file)
index 81ced02..0000000
--- a/MdeModulePkg/Include/Protocol/FirmwareVolumeDispatch.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/** @file\r
-  This file declares Firmware Volume Dispatch protocol.\r
-\r
-  This protocol will be installed into FV Handle if the drivers in this Firmware Volume \r
-  are required to be dispatched by the core dispatcher.\r
-\r
-  Copyright (c) 2006 - 2008, 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
-\r
-**/\r
-\r
-#ifndef __FIRMWARE_VOLUME_DISPATCH_H__\r
-#define __FIRMWARE_VOLUME_DISPATCH_H__\r
-\r
-#define EFI_FIRMWARE_VOLUME_DISPATCH_PROTOCOL_GUID \\r
-  { 0x7aa35a69, 0x506c, 0x444f, {0xa7, 0xaf, 0x69, 0x4b, 0xf5, 0x6f, 0x71, 0xc8 } }\r
-\r
-\r
-extern EFI_GUID gEfiFirmwareVolumeDispatchProtocolGuid;\r
-\r
-#endif\r

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 734ee32b521fcb8b8ceff0b3670a696440987bd2..11caaa27af90ba590dabf2c4b1066a0257c909a1 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -227,10 +227,6 @@
   ## Include/Protocol/Crc32GuidedSectionExtraction.h\r
   gEfiCrc32GuidedSectionExtractionProtocolGuid = { 0xFC1BCDB0, 0x7D31, 0x49aa, {0x93, 0x6A, 0xA4, 0x60, 0x0D, 0x9D, 0xD0, 0x83 } }\r
   \r
   ## Include/Protocol/Crc32GuidedSectionExtraction.h\r
   gEfiCrc32GuidedSectionExtractionProtocolGuid = { 0xFC1BCDB0, 0x7D31, 0x49aa, {0x93, 0x6A, 0xA4, 0x60, 0x0D, 0x9D, 0xD0, 0x83 } }\r
   \r

-  ## Protocol guid tells the core dispatcher to dispatch this Firmware Volume.\r
-  ## Include/Protocol/FirmwareVolumeDispatch.h\r
-  gEfiFirmwareVolumeDispatchProtocolGuid = { 0x7AA35A69, 0x506C, 0x444F, { 0xA7, 0xAF, 0x69, 0x4B, 0xF5, 0x6F, 0x71, 0xC8 }}\r
-\r

   ## Include/Protocol/NicIp4Config.h\r
   gEfiNicIp4ConfigProtocolGuid   = {0xdca3d4d, 0x12da, 0x4728,  { 0xbf, 0x7e, 0x86, 0xce, 0xb9, 0x28, 0xd0, 0x67 }}\r
   \r
   ## Include/Protocol/NicIp4Config.h\r
   gEfiNicIp4ConfigProtocolGuid   = {0xdca3d4d, 0x12da, 0x4728,  { 0xbf, 0x7e, 0x86, 0xce, 0xb9, 0x28, 0xd0, 0x67 }}\r
   \r