retire gEfiFirmwareVolumeDispatcherProtocolGuid as its original design is used to signify such FV need to be dispatched or not.

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

7 files changed, 1 insertions, 56 deletions

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index f80f36ffc8..08ddc90ef6 100644
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -1114,18 +1114,6 @@ BdsLibEnumerateAllBootOption (
         &FvHandleBuffer

         );

   for (Index = 0; Index < FvHandleCount; Index++) {

-    //

-    // Only care the dispatched FV. If no dispatch protocol on the FV, it is not dispatched, then skip it.

-    //

-    Status = gBS->HandleProtocol (

-                    FvHandleBuffer[Index],

-                    &gEfiFirmwareVolumeDispatchProtocolGuid,

-                    (VOID **) &Fv

-                    );

-    if (EFI_ERROR (Status)) {

-      continue;

-    }

-    

     gBS->HandleProtocol (

           FvHandleBuffer[Index],

           &gEfiFirmwareVolume2ProtocolGuid,

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
index 4921ab990f..871216dea4 100644
--- 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)

   gEfiUartDevicePathGuid                        ## CONSUMES ## GUID (Identify the device path for UARD device)

   gEfiSasDevicePathGuid                         ## CONSUMES ## GUID (Identify the device path for SAS device)

-  

+

 [Protocols]

   gEfiSimpleFileSystemProtocolGuid              # PROTOCOL CONSUMES

   gEfiSimpleTextOutProtocolGuid                 # PROTOCOL CONSUMES

@@ -102,7 +102,6 @@
   gEfiLegacyBiosProtocolGuid                    # PROTOCOL SOMETIMES_CONSUMES

   gEfiCpuArchProtocolGuid                       # PROTOCOL CONSUMES

   gEfiDevicePathProtocolGuid                    # PROTOCOL CONSUMES

-  gEfiFirmwareVolumeDispatchProtocolGuid        # PROTOCOL CONSUMES

   gEfiAcpiS3SaveProtocolGuid                    # PROTOCOL CONSUMES

   gEfiGraphicsOutputProtocolGuid                # PROTOCOL SOMETIMES_CONSUMES ## not gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport

   gEfiUgaDrawProtocolGuid                       # PROTOCOL SOMETIMES_CONSUMES ## gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport

diff --git a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
index 0add1e27e6..7e6ddce77a 100644
--- a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
@@ -962,15 +962,6 @@ CoreFwVolEventProtocolNotify (
       continue;

     }

 

-    Status = CoreHandleProtocol (FvHandle, &gEfiFirmwareVolumeDispatchProtocolGuid, (VOID **)&Fv);

-    if (EFI_ERROR (Status)) {

-      //

-      // If no dispatch protocol then skip, but do not marked as being processed as it

-      // may show up later.

-      //

-      continue;

-    }

-

     //

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

     //

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index af0835385c..e6a126bd89 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -125,7 +125,6 @@
   gEfiPlatformDriverOverrideProtocolGuid        ## CONSUMES

   gEfiDriverBindingProtocolGuid                 ## SOMETIMES_CONSUMES

   gEfiFirmwareVolumeBlockProtocolGuid           ## PRODUCES

-  gEfiFirmwareVolumeDispatchProtocolGuid        ## PRODUCES

   gEfiFirmwareVolume2ProtocolGuid               ## PRODUCES

   gEfiCpuArchProtocolGuid                       ## CONSUMES

   gEfiDevicePathProtocolGuid                    ## CONSUMES

diff --git a/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c b/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c
index 2c0cfd7776..ba2501451b 100644
--- a/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c
+++ b/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.c
@@ -495,7 +495,6 @@ ProduceFVBProtocolOnBuffer (
              &FvbDev->Handle,

              &gEfiFirmwareVolumeBlockProtocolGuid,     &FvbDev->FwVolBlockInstance,

              &gEfiDevicePathProtocolGuid,              &FvbDev->DevicePath,

-             &gEfiFirmwareVolumeDispatchProtocolGuid,  NULL,

              NULL

              );

 

diff --git a/MdeModulePkg/Include/Protocol/FirmwareVolumeDispatch.h b/MdeModulePkg/Include/Protocol/FirmwareVolumeDispatch.h
deleted file mode 100644
index 81ced024b5..0000000000
--- a/MdeModulePkg/Include/Protocol/FirmwareVolumeDispatch.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/** @file

-  This file declares Firmware Volume Dispatch protocol.

-

-  This protocol will be installed into FV Handle if the drivers in this Firmware Volume 

-  are required to be dispatched by the core dispatcher.

-

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

-

-**/

-

-#ifndef __FIRMWARE_VOLUME_DISPATCH_H__

-#define __FIRMWARE_VOLUME_DISPATCH_H__

-

-#define EFI_FIRMWARE_VOLUME_DISPATCH_PROTOCOL_GUID \

-  { 0x7aa35a69, 0x506c, 0x444f, {0xa7, 0xaf, 0x69, 0x4b, 0xf5, 0x6f, 0x71, 0xc8 } }

-

-

-extern EFI_GUID gEfiFirmwareVolumeDispatchProtocolGuid;

-

-#endif

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 734ee32b52..11caaa27af 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -227,10 +227,6 @@
   ## Include/Protocol/Crc32GuidedSectionExtraction.h

   gEfiCrc32GuidedSectionExtractionProtocolGuid = { 0xFC1BCDB0, 0x7D31, 0x49aa, {0x93, 0x6A, 0xA4, 0x60, 0x0D, 0x9D, 0xD0, 0x83 } }

   

-  ## Protocol guid tells the core dispatcher to dispatch this Firmware Volume.

-  ## Include/Protocol/FirmwareVolumeDispatch.h

-  gEfiFirmwareVolumeDispatchProtocolGuid = { 0x7AA35A69, 0x506C, 0x444F, { 0xA7, 0xAF, 0x69, 0x4B, 0xF5, 0x6F, 0x71, 0xC8 }}

-

   ## Include/Protocol/NicIp4Config.h

   gEfiNicIp4ConfigProtocolGuid   = {0xdca3d4d, 0x12da, 0x4728,  { 0xbf, 0x7e, 0x86, 0xce, 0xb9, 0x28, 0xd0, 0x67 }}