[edk2] [Patch] MdeModulePkg UefiBootManagerLib: Correct usages of GUID and Protocol

Liming Gao posted 1 patch 7 years, 1 month ago
Failed in applying to current master (apply log)
.../UefiBootManagerLib/UefiBootManagerLib.inf      | 54 ++++++++++++----------
1 file changed, 29 insertions(+), 25 deletions(-)
[edk2] [Patch] MdeModulePkg UefiBootManagerLib: Correct usages of GUID and Protocol
Posted by Liming Gao 7 years, 1 month ago
https://bugzilla.tianocore.org/show_bug.cgi?id=316

Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
---
 .../UefiBootManagerLib/UefiBootManagerLib.inf      | 54 ++++++++++++----------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf b/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
index bb7c00d..6442f22 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
+++ b/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
@@ -5,7 +5,7 @@
 #  manipulation, hotkey registration, UEFI boot, connect/disconnect, console
 #  manipulation, driver health checking and etc.
 #
-#  Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
 #  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -71,17 +71,21 @@
   SortLib
 
 [Guids]
-  gEfiMemoryTypeInformationGuid                 ## CONSUMES ## GUID (The identifier of memory type information type in system table)
-                                                ## CONSUMES ## GUID HOB (The hob holding memory type information)
-  gEfiGlobalVariableGuid                        ## SOMETIMES_PRODUCES ## Variable:L"BootCurrent" (The boot option of current boot)
-                                                ## SOMETIMES_CONSUMES ## Variable:L"BootXX" (Boot option variable)
-                                                ## CONSUMES           ## Variable:L"Timeout" (The time out value in second of showing progress bar)
-                                                ## SOMETIMES_CONSUMES ## Variable:L"BootOrder" (The boot option array)
-                                                ## SOMETIMES_CONSUMES ## Variable:L"DriverOrder" (The driver order list)
-                                                ## SOMETIMES_CONSUMES ## Variable:L"ConIn" (The device path of console in device)
-                                                ## SOMETIMES_CONSUMES ## Variable:L"ConOut" (The device path of console out device)
-                                                ## SOMETIMES_CONSUMES ## Variable:L"ErrOut" (The device path of error out device)
-  gEfiFileInfoGuid                              ## CONSUMES ## GUID
+  ## SOMETIMES_CONSUMES ## SystemTable (The identifier of memory type information type in system table)
+  ## SOMETIMES_CONSUMES ## HOB (The hob holding memory type information)
+  ## SOMETIMES_CONSUMES ## Variable:L"MemoryTypeInformation."
+  ## SOMETIMES_PRODUCES ## Variable:L"MemoryTypeInformation."
+  gEfiMemoryTypeInformationGuid
+
+  ## SOMETIMES_PRODUCES ## Variable:L"BootCurrent" (The boot option of current boot)
+  ## SOMETIMES_CONSUMES ## Variable:L"BootXX" (Boot option variable)
+  ## SOMETIMES_CONSUMES ## Variable:L"BootOrder" (The boot option array)
+  ## SOMETIMES_CONSUMES ## Variable:L"DriverOrder" (The driver order list)
+  ## SOMETIMES_CONSUMES ## Variable:L"ConIn" (The device path of console in device)
+  ## SOMETIMES_CONSUMES ## Variable:L"ConOut" (The device path of console out device)
+  ## SOMETIMES_CONSUMES ## Variable:L"ErrOut" (The device path of error out device)
+  gEfiGlobalVariableGuid
+
   gPerformanceProtocolGuid                      ## SOMETIMES_CONSUMES ## Variable:L"PerfDataMemAddr" (The ACPI address of performance data)
   gEdkiiStatusCodeDataTypeVariableGuid          ## SOMETIMES_CONSUMES ## GUID
   gEfiDiskInfoAhciInterfaceGuid                 ## SOMETIMES_CONSUMES ## GUID
@@ -90,26 +94,26 @@
 
 [Protocols]
   gEfiPciRootBridgeIoProtocolGuid               ## CONSUMES
-  gEfiSimpleFileSystemProtocolGuid              ## CONSUMES
-  gEfiLoadFileProtocolGuid                      ## CONSUMES
-  gEfiSimpleTextOutProtocolGuid                 ## CONSUMES
-  gEfiPciIoProtocolGuid                         ## CONSUMES
+  gEfiSimpleFileSystemProtocolGuid              ## SOMETIMES_CONSUMES
+  gEfiLoadFileProtocolGuid                      ## SOMETIMES_CONSUMES
+  gEfiSimpleTextOutProtocolGuid                 ## SOMETIMES_CONSUMES
+  gEfiPciIoProtocolGuid                         ## SOMETIMES_CONSUMES
   gEfiLoadedImageProtocolGuid                   ## CONSUMES
-  gEfiSimpleNetworkProtocolGuid                 ## CONSUMES
-  gEfiSimpleTextInProtocolGuid                  ## CONSUMES
-  gEfiBlockIoProtocolGuid                       ## CONSUMES
-  gEfiFirmwareVolume2ProtocolGuid               ## CONSUMES
-  gEfiDevicePathProtocolGuid                    ## CONSUMES
-  gEfiBootLogoProtocolGuid                      ## CONSUMES
-  gEfiSimpleTextInputExProtocolGuid             ## CONSUMES
-  gEdkiiVariableLockProtocolGuid                ## CONSUMES
+  gEfiSimpleNetworkProtocolGuid                 ## SOMETIMES_CONSUMES
+  gEfiSimpleTextInProtocolGuid                  ## SOMETIMES_CONSUMES
+  gEfiBlockIoProtocolGuid                       ## SOMETIMES_CONSUMES
+  gEfiFirmwareVolume2ProtocolGuid               ## SOMETIMES_CONSUMES
+  gEfiDevicePathProtocolGuid                    ## SOMETIMES_CONSUMES
+  gEfiBootLogoProtocolGuid                      ## SOMETIMES_CONSUMES
+  gEfiSimpleTextInputExProtocolGuid             ## SOMETIMES_CONSUMES
+  gEdkiiVariableLockProtocolGuid                ## SOMETIMES_CONSUMES
   gEfiGraphicsOutputProtocolGuid                ## SOMETIMES_CONSUMES
   gEfiUsbIoProtocolGuid                         ## SOMETIMES_CONSUMES
   gEfiDiskInfoProtocolGuid                      ## SOMETIMES_CONSUMES
   gEfiDriverHealthProtocolGuid                  ## SOMETIMES_CONSUMES
   gEfiFormBrowser2ProtocolGuid                  ## SOMETIMES_CONSUMES
   gEfiRamDiskProtocolGuid                       ## SOMETIMES_CONSUMES
-  gEfiDeferredImageLoadProtocolGuid             ## CONSUMES
+  gEfiDeferredImageLoadProtocolGuid             ## SOMETIMES_CONSUMES
 
 [Pcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange      ## SOMETIMES_CONSUMES
-- 
2.8.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch] MdeModulePkg UefiBootManagerLib: Correct usages of GUID and Protocol
Posted by Ni, Ruiyu 7 years, 1 month ago
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>

Thanks/Ray

> -----Original Message-----
> From: Gao, Liming
> Sent: Wednesday, February 15, 2017 4:40 PM
> To: edk2-devel@lists.01.org
> Cc: Ni, Ruiyu <ruiyu.ni@intel.com>
> Subject: [Patch] MdeModulePkg UefiBootManagerLib: Correct usages of
> GUID and Protocol
> 
> https://bugzilla.tianocore.org/show_bug.cgi?id=316
> 
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Liming Gao <liming.gao@intel.com>
> ---
>  .../UefiBootManagerLib/UefiBootManagerLib.inf      | 54 ++++++++++++-----
> -----
>  1 file changed, 29 insertions(+), 25 deletions(-)
> 
> diff --git
> a/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
> b/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
> index bb7c00d..6442f22 100644
> --- a/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
> +++
> b/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
> @@ -5,7 +5,7 @@
>  #  manipulation, hotkey registration, UEFI boot, connect/disconnect, console
>  #  manipulation, driver health checking and etc.
>  #
> -#  Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
>  #  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
>  #  This program and the accompanying materials
>  #  are licensed and made available under the terms and conditions of the
> BSD License
> @@ -71,17 +71,21 @@
>    SortLib
> 
>  [Guids]
> -  gEfiMemoryTypeInformationGuid                 ## CONSUMES ## GUID (The
> identifier of memory type information type in system table)
> -                                                ## CONSUMES ## GUID HOB (The hob holding
> memory type information)
> -  gEfiGlobalVariableGuid                        ## SOMETIMES_PRODUCES ##
> Variable:L"BootCurrent" (The boot option of current boot)
> -                                                ## SOMETIMES_CONSUMES ## Variable:L"BootXX"
> (Boot option variable)
> -                                                ## CONSUMES           ## Variable:L"Timeout" (The
> time out value in second of showing progress bar)
> -                                                ## SOMETIMES_CONSUMES ##
> Variable:L"BootOrder" (The boot option array)
> -                                                ## SOMETIMES_CONSUMES ##
> Variable:L"DriverOrder" (The driver order list)
> -                                                ## SOMETIMES_CONSUMES ## Variable:L"ConIn"
> (The device path of console in device)
> -                                                ## SOMETIMES_CONSUMES ## Variable:L"ConOut"
> (The device path of console out device)
> -                                                ## SOMETIMES_CONSUMES ## Variable:L"ErrOut"
> (The device path of error out device)
> -  gEfiFileInfoGuid                              ## CONSUMES ## GUID
> +  ## SOMETIMES_CONSUMES ## SystemTable (The identifier of memory
> type information type in system table)
> +  ## SOMETIMES_CONSUMES ## HOB (The hob holding memory type
> information)
> +  ## SOMETIMES_CONSUMES ## Variable:L"MemoryTypeInformation."
> +  ## SOMETIMES_PRODUCES ## Variable:L"MemoryTypeInformation."
> +  gEfiMemoryTypeInformationGuid
> +
> +  ## SOMETIMES_PRODUCES ## Variable:L"BootCurrent" (The boot option
> of current boot)
> +  ## SOMETIMES_CONSUMES ## Variable:L"BootXX" (Boot option variable)
> +  ## SOMETIMES_CONSUMES ## Variable:L"BootOrder" (The boot option
> array)
> +  ## SOMETIMES_CONSUMES ## Variable:L"DriverOrder" (The driver order
> list)
> +  ## SOMETIMES_CONSUMES ## Variable:L"ConIn" (The device path of
> console in device)
> +  ## SOMETIMES_CONSUMES ## Variable:L"ConOut" (The device path of
> console out device)
> +  ## SOMETIMES_CONSUMES ## Variable:L"ErrOut" (The device path of
> error out device)
> +  gEfiGlobalVariableGuid
> +
>    gPerformanceProtocolGuid                      ## SOMETIMES_CONSUMES ##
> Variable:L"PerfDataMemAddr" (The ACPI address of performance data)
>    gEdkiiStatusCodeDataTypeVariableGuid          ## SOMETIMES_CONSUMES
> ## GUID
>    gEfiDiskInfoAhciInterfaceGuid                 ## SOMETIMES_CONSUMES ##
> GUID
> @@ -90,26 +94,26 @@
> 
>  [Protocols]
>    gEfiPciRootBridgeIoProtocolGuid               ## CONSUMES
> -  gEfiSimpleFileSystemProtocolGuid              ## CONSUMES
> -  gEfiLoadFileProtocolGuid                      ## CONSUMES
> -  gEfiSimpleTextOutProtocolGuid                 ## CONSUMES
> -  gEfiPciIoProtocolGuid                         ## CONSUMES
> +  gEfiSimpleFileSystemProtocolGuid              ## SOMETIMES_CONSUMES
> +  gEfiLoadFileProtocolGuid                      ## SOMETIMES_CONSUMES
> +  gEfiSimpleTextOutProtocolGuid                 ## SOMETIMES_CONSUMES
> +  gEfiPciIoProtocolGuid                         ## SOMETIMES_CONSUMES
>    gEfiLoadedImageProtocolGuid                   ## CONSUMES
> -  gEfiSimpleNetworkProtocolGuid                 ## CONSUMES
> -  gEfiSimpleTextInProtocolGuid                  ## CONSUMES
> -  gEfiBlockIoProtocolGuid                       ## CONSUMES
> -  gEfiFirmwareVolume2ProtocolGuid               ## CONSUMES
> -  gEfiDevicePathProtocolGuid                    ## CONSUMES
> -  gEfiBootLogoProtocolGuid                      ## CONSUMES
> -  gEfiSimpleTextInputExProtocolGuid             ## CONSUMES
> -  gEdkiiVariableLockProtocolGuid                ## CONSUMES
> +  gEfiSimpleNetworkProtocolGuid                 ## SOMETIMES_CONSUMES
> +  gEfiSimpleTextInProtocolGuid                  ## SOMETIMES_CONSUMES
> +  gEfiBlockIoProtocolGuid                       ## SOMETIMES_CONSUMES
> +  gEfiFirmwareVolume2ProtocolGuid               ## SOMETIMES_CONSUMES
> +  gEfiDevicePathProtocolGuid                    ## SOMETIMES_CONSUMES
> +  gEfiBootLogoProtocolGuid                      ## SOMETIMES_CONSUMES
> +  gEfiSimpleTextInputExProtocolGuid             ## SOMETIMES_CONSUMES
> +  gEdkiiVariableLockProtocolGuid                ## SOMETIMES_CONSUMES
>    gEfiGraphicsOutputProtocolGuid                ## SOMETIMES_CONSUMES
>    gEfiUsbIoProtocolGuid                         ## SOMETIMES_CONSUMES
>    gEfiDiskInfoProtocolGuid                      ## SOMETIMES_CONSUMES
>    gEfiDriverHealthProtocolGuid                  ## SOMETIMES_CONSUMES
>    gEfiFormBrowser2ProtocolGuid                  ## SOMETIMES_CONSUMES
>    gEfiRamDiskProtocolGuid                       ## SOMETIMES_CONSUMES
> -  gEfiDeferredImageLoadProtocolGuid             ## CONSUMES
> +  gEfiDeferredImageLoadProtocolGuid             ## SOMETIMES_CONSUMES
> 
>  [Pcd]
> 
> gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationC
> hange      ## SOMETIMES_CONSUMES
> --
> 2.8.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel