From e492d1bb207a4fa1d9dba3c926dbd4fd578c9b33 Mon Sep 17 00:00:00 2001 From: ywu21 Date: Sun, 7 Dec 2008 04:45:45 +0000 Subject: [PATCH] git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6892 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Universal/Network/IScsiDxe/IScsiDriver.h | 77 +++++++++++++++ .../Universal/Network/IScsiDxe/IScsiDxe.inf | 1 - .../Universal/Network/IScsiDxe/IScsiImpl.h | 1 - .../Network/IScsiDxe/IScsiInitiatorName.h | 97 ------------------- 4 files changed, 77 insertions(+), 99 deletions(-) delete mode 100644 MdeModulePkg/Universal/Network/IScsiDxe/IScsiInitiatorName.h diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h index edfb17ba4c..334c87c96b 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h @@ -40,6 +40,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. extern EFI_COMPONENT_NAME2_PROTOCOL gIScsiComponentName2; extern EFI_COMPONENT_NAME_PROTOCOL gIScsiComponentName; +extern EFI_ISCSI_INITIATOR_NAME_PROTOCOL gIScsiInitiatorName; + extern EFI_GUID mIScsiPrivateGuid; @@ -257,5 +259,80 @@ IScsiComponentNameGetControllerName ( IN CHAR8 *Language, OUT CHAR16 **ControllerName ); + +// +// EFI IScsi Initiator Name Protocol for IScsi driver. +// +/** + Retrieves the current set value of iSCSI Initiator Name. + + @param This[in] Pointer to the EFI_ISCSI_INITIATOR_NAME_PROTOCOL instance. + + @param BufferSize[in][out] Size of the buffer in bytes pointed to by Buffer / Actual + size of the variable data buffer. + + @param Buffer[out] Pointer to the buffer for data to be read. + + @retval EFI_SUCCESS Data was successfully retrieved into the provided + buffer and the BufferSize was sufficient to handle the + iSCSI initiator name. + @retval EFI_BUFFER_TOO_SMALL BufferSize is too small for the result. BufferSize will + be updated with the size required to complete the request. + Buffer will not be affected. + + @retval EFI_INVALID_PARAMETER BufferSize is NULL. BufferSize and Buffer will not be + affected. + + @retval EFI_INVALID_PARAMETER Buffer is NULL. BufferSize and Buffer will not be + affected. + + @retval EFI_DEVICE_ERROR The iSCSI initiator name could not be retrieved due to + a hardware error. + +**/ +EFI_STATUS +EFIAPI +IScsiGetInitiatorName ( + IN EFI_ISCSI_INITIATOR_NAME_PROTOCOL *This, + IN OUT UINTN *BufferSize, + OUT VOID *Buffer + ); + +/** + Sets the iSCSI Initiator Name. + + @param This[in] Pointer to the EFI_ISCSI_INITIATOR_NAME_PROTOCOL instance. + + @param BufferSize[in][out] Size of the buffer in bytes pointed to by Buffer. + + @param Buffer[out] Pointer to the buffer for data to be written. + + @retval EFI_SUCCESS Data was successfully stored by the protocol. + + @retval EFI_UNSUPPORTED Platform policies do not allow for data to be written. + + @retval EFI_INVALID_PARAMETER BufferSize exceeds the maximum allowed limit. + BufferSize will be updated with the maximum size + required to complete the request. + + @retval EFI_INVALID_PARAMETER Buffersize is NULL. BufferSize and Buffer will not be + affected. + + @retval EFI_INVALID_PARAMETER Buffer is NULL. BufferSize and Buffer will not be affected. + + @retval EFI_DEVICE_ERROR The data could not be stored due to a hardware error. + + @retval EFI_OUT_OF_RESOURCES Not enough storage is available to hold the data. + + @retval EFI_PROTOCOL_ERROR Input iSCSI initiator name does not adhere to RFC 3720. + +**/ +EFI_STATUS +EFIAPI +IScsiSetInitiatorName ( + IN EFI_ISCSI_INITIATOR_NAME_PROTOCOL *This, + IN OUT UINTN *BufferSize, + IN VOID *Buffer + ); #endif diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf index 4fcc6e309d..1dfa222a16 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf @@ -38,7 +38,6 @@ IScsiMisc.h IScsiIbft.h IScsiExtScsiPassThru.h - IScsiInitiatorName.h IScsiDriver.h IScsiDhcp.h IScsiCommon.h diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h index 22d823af7b..94ae9fe63f 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h @@ -38,7 +38,6 @@ Abstract: #include "IScsiIbft.h" #include "IScsiMisc.h" #include "IScsiConfig.h" -#include "IScsiInitiatorName.h" #define ISCSI_SESSION_SIGNATURE EFI_SIGNATURE_32 ('I', 'S', 'S', 'N') diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiInitiatorName.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiInitiatorName.h deleted file mode 100644 index 6e0eda2158..0000000000 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiInitiatorName.h +++ /dev/null @@ -1,97 +0,0 @@ -/** @file - The header file of IScsi initiator name protocol. - -Copyright (c) 2004 - 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 _ISCSI_INITIATORNAME_H_ -#define _ISCSI_INITIATORNAME_H_ - -#include - -extern EFI_ISCSI_INITIATOR_NAME_PROTOCOL gIScsiInitiatorName; - -// -// EFI IScsi Initiator Name Protocol for IScsi driver. -// -/** - Retrieves the current set value of iSCSI Initiator Name. - - @param This[in] Pointer to the EFI_ISCSI_INITIATOR_NAME_PROTOCOL instance. - - @param BufferSize[in][out] Size of the buffer in bytes pointed to by Buffer / Actual - size of the variable data buffer. - - @param Buffer[out] Pointer to the buffer for data to be read. - - @retval EFI_SUCCESS Data was successfully retrieved into the provided - buffer and the BufferSize was sufficient to handle the - iSCSI initiator name. - @retval EFI_BUFFER_TOO_SMALL BufferSize is too small for the result. BufferSize will - be updated with the size required to complete the request. - Buffer will not be affected. - - @retval EFI_INVALID_PARAMETER BufferSize is NULL. BufferSize and Buffer will not be - affected. - - @retval EFI_INVALID_PARAMETER Buffer is NULL. BufferSize and Buffer will not be - affected. - - @retval EFI_DEVICE_ERROR The iSCSI initiator name could not be retrieved due to - a hardware error. - -**/ -EFI_STATUS -EFIAPI -IScsiGetInitiatorName ( - IN EFI_ISCSI_INITIATOR_NAME_PROTOCOL *This, - IN OUT UINTN *BufferSize, - OUT VOID *Buffer - ); - -/** - Sets the iSCSI Initiator Name. - - @param This[in] Pointer to the EFI_ISCSI_INITIATOR_NAME_PROTOCOL instance. - - @param BufferSize[in][out] Size of the buffer in bytes pointed to by Buffer. - - @param Buffer[out] Pointer to the buffer for data to be written. - - @retval EFI_SUCCESS Data was successfully stored by the protocol. - - @retval EFI_UNSUPPORTED Platform policies do not allow for data to be written. - - @retval EFI_INVALID_PARAMETER BufferSize exceeds the maximum allowed limit. - BufferSize will be updated with the maximum size - required to complete the request. - - @retval EFI_INVALID_PARAMETER Buffersize is NULL. BufferSize and Buffer will not be - affected. - - @retval EFI_INVALID_PARAMETER Buffer is NULL. BufferSize and Buffer will not be affected. - - @retval EFI_DEVICE_ERROR The data could not be stored due to a hardware error. - - @retval EFI_OUT_OF_RESOURCES Not enough storage is available to hold the data. - - @retval EFI_PROTOCOL_ERROR Input iSCSI initiator name does not adhere to RFC 3720. - -**/ -EFI_STATUS -EFIAPI -IScsiSetInitiatorName ( - IN EFI_ISCSI_INITIATOR_NAME_PROTOCOL *This, - IN OUT UINTN *BufferSize, - OUT VOID *Buffer - ); - -#endif \ No newline at end of file -- 2.39.2