Sort the library class dependencies in the #include directives and in the INF file. Remove the DpcLib class from the #include directives -- it is not listed in the INF file, and IScsiDxe doesn't call either DpcLib API (QueueDpc(), DispatchDpc()). No functional changes.
Cc: Jiaxin Wu <jiaxin...@intel.com> Cc: Maciej Rabeda <maciej.rab...@linux.intel.com> Cc: Philippe Mathieu-Daudé <phi...@redhat.com> Cc: Siyuan Fu <siyuan...@intel.com> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3356 Signed-off-by: Laszlo Ersek <ler...@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com> Reviewed-by: Maciej Rabeda <maciej.rab...@linux.intel.com> --- NetworkPkg/IScsiDxe/IScsiDxe.inf | 6 +++--- NetworkPkg/IScsiDxe/IScsiImpl.h | 17 ++++++++--------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/NetworkPkg/IScsiDxe/IScsiDxe.inf b/NetworkPkg/IScsiDxe/IScsiDxe.inf index 0ffb340ce05e..543c4083026a 100644 --- a/NetworkPkg/IScsiDxe/IScsiDxe.inf +++ b/NetworkPkg/IScsiDxe/IScsiDxe.inf @@ -49,53 +49,53 @@ [Sources] IScsiDriver.c IScsiDriver.h IScsiExtScsiPassThru.c IScsiIbft.c IScsiIbft.h IScsiInitiatorName.c IScsiImpl.h IScsiMisc.c IScsiMisc.h IScsiProto.c IScsiProto.h [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec CryptoPkg/CryptoPkg.dec NetworkPkg/NetworkPkg.dec [LibraryClasses] + BaseCryptLib BaseLib BaseMemoryLib DebugLib DevicePathLib HiiLib MemoryAllocationLib NetLib - TcpIoLib PrintLib + TcpIoLib UefiBootServicesTableLib UefiDriverEntryPoint + UefiHiiServicesLib UefiLib UefiRuntimeServicesTableLib - UefiHiiServicesLib - BaseCryptLib [Protocols] gEfiAcpiTableProtocolGuid ## SOMETIMES_CONSUMES ## SystemTable gEfiDriverBindingProtocolGuid ## SOMETIMES_PRODUCES gEfiPciIoProtocolGuid ## SOMETIMES_CONSUMES gEfiDhcp4ProtocolGuid ## SOMETIMES_CONSUMES gEfiDhcp6ProtocolGuid ## SOMETIMES_CONSUMES gEfiDhcp4ServiceBindingProtocolGuid ## SOMETIMES_CONSUMES gEfiDhcp6ServiceBindingProtocolGuid ## SOMETIMES_CONSUMES gEfiDns4ServiceBindingProtocolGuid ## SOMETIMES_CONSUMES gEfiDns4ProtocolGuid ## SOMETIMES_CONSUMES gEfiDns6ServiceBindingProtocolGuid ## SOMETIMES_CONSUMES gEfiDns6ProtocolGuid ## SOMETIMES_CONSUMES gEfiIp4Config2ProtocolGuid ## SOMETIMES_CONSUMES gEfiIp6ConfigProtocolGuid ## SOMETIMES_CONSUMES gEfiTcp4ProtocolGuid ## TO_START gEfiTcp6ProtocolGuid ## TO_START gEfiTcp4ServiceBindingProtocolGuid ## TO_START gEfiTcp6ServiceBindingProtocolGuid ## TO_START diff --git a/NetworkPkg/IScsiDxe/IScsiImpl.h b/NetworkPkg/IScsiDxe/IScsiImpl.h index 387ab9765e9e..d895c7feb947 100644 --- a/NetworkPkg/IScsiDxe/IScsiImpl.h +++ b/NetworkPkg/IScsiDxe/IScsiImpl.h @@ -19,53 +19,52 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include <Protocol/DevicePath.h> #include <Protocol/HiiConfigAccess.h> #include <Protocol/Ip6.h> #include <Protocol/Dhcp4.h> #include <Protocol/Dhcp6.h> #include <Protocol/Dns4.h> #include <Protocol/Dns6.h> #include <Protocol/Tcp4.h> #include <Protocol/Tcp6.h> #include <Protocol/Ip4Config2.h> #include <Protocol/Ip6Config.h> #include <Protocol/AuthenticationInfo.h> #include <Protocol/IScsiInitiatorName.h> #include <Protocol/ScsiPassThruExt.h> #include <Protocol/AdapterInformation.h> #include <Protocol/NetworkInterfaceIdentifier.h> -#include <Library/HiiLib.h> -#include <Library/UefiHiiServicesLib.h> -#include <Library/DevicePathLib.h> -#include <Library/DebugLib.h> +#include <Library/BaseCryptLib.h> #include <Library/BaseLib.h> #include <Library/BaseMemoryLib.h> +#include <Library/DebugLib.h> +#include <Library/DevicePathLib.h> +#include <Library/HiiLib.h> #include <Library/MemoryAllocationLib.h> +#include <Library/NetLib.h> #include <Library/PrintLib.h> +#include <Library/TcpIoLib.h> #include <Library/UefiBootServicesTableLib.h> -#include <Library/UefiRuntimeServicesTableLib.h> +#include <Library/UefiHiiServicesLib.h> #include <Library/UefiLib.h> -#include <Library/DpcLib.h> -#include <Library/NetLib.h> -#include <Library/TcpIoLib.h> -#include <Library/BaseCryptLib.h> +#include <Library/UefiRuntimeServicesTableLib.h> #include <Guid/MdeModuleHii.h> #include <Guid/EventGroup.h> #include <Guid/Acpi.h> #include "IScsiConfigNVDataStruc.h" #include "IScsiDriver.h" #include "IScsiProto.h" #include "IScsiCHAP.h" #include "IScsiDhcp.h" #include "IScsiDhcp6.h" #include "IScsiIbft.h" #include "IScsiMisc.h" #include "IScsiDns.h" #include "IScsiConfig.h" #define ISCSI_AUTH_INITIAL 0 -- 2.19.1.3.g30247aa5d201 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#76203): https://edk2.groups.io/g/devel/message/76203 Mute This Topic: https://groups.io/mt/83394113/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
