diff options
Diffstat (limited to 'MdeModulePkg/Universal/Network/IScsiDxe')
24 files changed, 297 insertions, 297 deletions
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.c b/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.c index 063b372..3f561e9 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.c @@ -1,7 +1,7 @@ /** @file
UEFI Component Name(2) protocol implementation for iSCSI.
-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -33,7 +33,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL gIScsiComponentNam };
GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE mIScsiDriverNameTable[] = {
- {"eng;en", L"iSCSI Driver"},
+ {"eng;en", L"iSCSI Driver"},
{NULL, NULL}
};
@@ -48,7 +48,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE *mIScsiControllerNameTab returned in DriverName, and EFI_SUCCESS is returned. If the driver specified
by This does not support the language specified by Language,
then EFI_UNSUPPORTED is returned.
-
+
@param[in] This A pointer to the EFI_COMPONENT_NAME_PROTOCOL instance.
@param[in] Language A pointer to a three character ISO 639-2 language identifier.
This is the language of the driver name that that the caller
@@ -88,11 +88,11 @@ IScsiComponentNameGetDriverName ( Update the component name for the iSCSI instance.
@param[in] IScsiExtScsiPassThru A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.
-
+
@retval EFI_SUCCESS Update the ControllerNameTable of this instance successfully.
@retval EFI_INVALID_PARAMETER The input parameter is invalid.
@retval EFI_UNSUPPORTED Can't get the corresponding NIC info from the Controller handle.
-
+
**/
EFI_STATUS
UpdateName (
@@ -110,7 +110,7 @@ UpdateName ( if (IScsiExtScsiPassThru == NULL) {
return EFI_INVALID_PARAMETER;
}
-
+
Private = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (IScsiExtScsiPassThru);
//
@@ -122,7 +122,7 @@ UpdateName ( }
VlanId = NetLibGetVlanId (Private->Controller);
IScsiMacAddrToStr (&MacAddress, (UINT32) HwAddressSize, VlanId, MacString);
-
+
UnicodeSPrint (
HandleName,
sizeof (HandleName),
@@ -183,7 +183,7 @@ UpdateName ( @retval EFI_SUCCESS The Unicode string for the user readable name in the
language specified by Language for the driver
- specified by This was returned in DriverName.
+ specified by This was returned in DriverName.
@retval EFI_INVALID_PARAMETER ControllerHandle is NULL.
@retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid EFI_HANDLE.
@retval EFI_INVALID_PARAMETER Language is NULL.
@@ -271,7 +271,7 @@ IScsiComponentNameGetControllerName ( return Status;
}
}
-
+
return LookupUnicodeString2 (
Language,
This->SupportedLanguages,
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.h b/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.h index b400aba..ee371d2 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/ComponentName.h @@ -1,7 +1,7 @@ /** @file
The header file of UEFI Component Name(2) protocol.
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -34,7 +34,7 @@ extern EFI_COMPONENT_NAME_PROTOCOL gIScsiComponentName; returned in DriverName, and EFI_SUCCESS is returned. If the driver specified
by This does not support the language specified by Language,
then EFI_UNSUPPORTED is returned.
-
+
@param[in] This A pointer to the EFI_COMPONENT_NAME_PROTOCOL instance.
@param[in] Language A pointer to a three characters ISO 639-2 language identifier.
This is the language of the driver name that that the caller
@@ -89,7 +89,7 @@ IScsiComponentNameGetDriverName ( @retval EFI_SUCCESS The Unicode string for the user readable name in the
language specified by Language for the driver
- specified by This was returned in DriverName.
+ specified by This was returned in DriverName.
@retval EFI_INVALID_PARAMETER ControllerHandle is NULL.
@retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid EFI_HANDLE.
@retval EFI_INVALID_PARAMETER Language is NULL.
@@ -109,7 +109,7 @@ IScsiComponentNameGetControllerName ( IN CHAR8 *Language,
OUT CHAR16 **ControllerName
);
-
+
//
// EFI iSCSI Initiator Name Protocol for IScsi driver.
//
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4Dxe.uni b/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4Dxe.uni index 80bdc2c..d3c020e 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4Dxe.uni +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4Dxe.uni @@ -6,13 +6,13 @@ // data over TCP/IP. It installs EFI HII Configuration Access Protocol to provide
// one way to configurate the iSCSI setting.
//
-// Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
//
// 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.
//
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4DxeExtra.uni b/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4DxeExtra.uni index 9b717d4..5ec7582 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4DxeExtra.uni +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsi4DxeExtra.uni @@ -1,7 +1,7 @@ // /** @file
// IScsi4Dxe Localized Strings and Content
//
-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.<BR>
//
// This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License
@@ -13,8 +13,8 @@ //
// **/
-#string STR_PROPERTIES_MODULE_NAME
-#language en-US
+#string STR_PROPERTIES_MODULE_NAME
+#language en-US
"iSCSI DXE Driver"
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h index f6a64e5..14a5658 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiCHAP.h @@ -1,7 +1,7 @@ /** @file
The header file of CHAP configuration.
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -29,9 +29,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. ///
/// MD5_HASHSIZE
///
-#define ISCSI_CHAP_RSP_LEN 16
+#define ISCSI_CHAP_RSP_LEN 16
-#define ISCSI_CHAP_INITIAL 0
+#define ISCSI_CHAP_INITIAL 0
#define ISCSI_CHAP_STEP_ONE 1
#define ISCSI_CHAP_STEP_TWO 2
#define ISCSI_CHAP_STEP_THREE 3
@@ -73,7 +73,7 @@ typedef struct _ISCSI_CHAP_AUTH_DATA { /**
This function checks the received iSCSI Login Response during the security
negotiation stage.
-
+
@param[in] Conn The iSCSI connection.
@retval EFI_SUCCESS The Login Response passed the CHAP validation.
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c index ea727af..cb1eff1 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c @@ -1,7 +1,7 @@ /** @file
Helper functions for configuring or getting the parameters relating to iSCSI.
-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -39,7 +39,7 @@ HII_VENDOR_DEVICE_PATH mIScsiHiiVendorDevicePath = { {
END_DEVICE_PATH_TYPE,
END_ENTIRE_DEVICE_PATH_SUBTYPE,
- {
+ {
(UINT8) (END_DEVICE_PATH_LENGTH),
(UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)
}
@@ -180,7 +180,7 @@ IScsiConvertIsIdToString ( Update the list of iSCSI devices the iSCSI driver is controlling.
@retval EFI_SUCCESS The callback successfully handled the action.
- @retval Others Other errors as indicated.
+ @retval Others Other errors as indicated.
**/
EFI_STATUS
IScsiUpdateDeviceList (
@@ -445,7 +445,7 @@ IScsiConvertDeviceConfigDataToIfrNvData ( would result in this type of
error. In this case, the
Progress parameter would be
- set to NULL.
+ set to NULL.
@retval EFI_NOT_FOUND Routing data doesn't match any
known driver. Progress set to the
first character in the routing header.
@@ -579,7 +579,7 @@ IScsiFormExtractConfig ( @param[in] This Points to the EFI_HII_CONFIG_ACCESS_PROTOCOL.
@param[in] Configuration A null-terminated Unicode string in
- <ConfigString> format.
+ <ConfigString> format.
@param[out] Progress A pointer to a string filled in with the
offset of the most recent '&' before the
first failing name / value pair (or the
@@ -589,7 +589,7 @@ IScsiFormExtractConfig ( successful.
@retval EFI_SUCCESS The results have been distributed or are
- awaiting distribution.
+ awaiting distribution.
@retval EFI_OUT_OF_RESOURCES Not enough memory to store the
parts of the results that must be
stored awaiting possible future
@@ -634,7 +634,7 @@ IScsiFormRouteConfig ( @param[in] Action Specifies the type of action taken by the browser.
@param[in] QuestionId A unique value which is sent to the original
exporting driver so that it can identify the type
- of data to expect. The format of the data tends to
+ of data to expect. The format of the data tends to
vary based on the opcode that enerated the callback.
@param[in] Type The type of value for the question.
@param[in] Value A pointer to the data being sent to the original
@@ -648,8 +648,8 @@ IScsiFormRouteConfig ( @retval EFI_DEVICE_ERROR The variable could not be saved.
@retval EFI_UNSUPPORTED The specified Action is not supported by the
callback.Currently not implemented.
- @retval EFI_INVALID_PARAMETERS Passing in wrong parameter.
- @retval Others Other errors as indicated.
+ @retval EFI_INVALID_PARAMETERS Passing in wrong parameter.
+ @retval Others Other errors as indicated.
**/
EFI_STATUS
EFIAPI
@@ -711,7 +711,7 @@ IScsiFormCallback ( Private->Current = ConfigFormEntry;
}
} else if (Action == EFI_BROWSER_ACTION_CHANGED) {
- switch (QuestionId) {
+ switch (QuestionId) {
case KEY_INITIATOR_NAME:
IScsiUnicodeStrToAsciiStr (IfrNvData->InitiatorName, IScsiName);
BufferSize = AsciiStrSize (IScsiName);
@@ -727,8 +727,8 @@ IScsiFormCallback ( case KEY_LOCAL_IP:
IScsiUnicodeStrToAsciiStr (IfrNvData->LocalIp, Ip4String);
Status = IScsiAsciiStrToIp (Ip4String, &HostIp.v4);
- if (EFI_ERROR (Status) ||
- ((Private->Current->SessionConfigData.SubnetMask.Addr[0] != 0) &&
+ if (EFI_ERROR (Status) ||
+ ((Private->Current->SessionConfigData.SubnetMask.Addr[0] != 0) &&
!NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), NTOHL(*(UINT32*)Private->Current->SessionConfigData.SubnetMask.Addr)))) {
CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid IP address!", NULL);
Status = EFI_INVALID_PARAMETER;
@@ -753,9 +753,9 @@ IScsiFormCallback ( case KEY_GATE_WAY:
IScsiUnicodeStrToAsciiStr (IfrNvData->Gateway, Ip4String);
Status = IScsiAsciiStrToIp (Ip4String, &Gateway.v4);
- if (EFI_ERROR (Status) ||
- ((Gateway.Addr[0] != 0) &&
- (Private->Current->SessionConfigData.SubnetMask.Addr[0] != 0) &&
+ if (EFI_ERROR (Status) ||
+ ((Gateway.Addr[0] != 0) &&
+ (Private->Current->SessionConfigData.SubnetMask.Addr[0] != 0) &&
!NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), NTOHL(*(UINT32*)Private->Current->SessionConfigData.SubnetMask.Addr)))) {
CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Invalid Gateway!", NULL);
Status = EFI_INVALID_PARAMETER;
@@ -944,9 +944,9 @@ IScsiFormCallback ( //
HiiSetBrowserData (&gIp4IScsiConfigGuid, mVendorStorageName, sizeof (ISCSI_CONFIG_IFR_NVDATA), (UINT8 *) IfrNvData, NULL);
}
-
+
FreePool (IfrNvData);
-
+
return Status;
}
@@ -1033,12 +1033,12 @@ IScsiConfigUpdateForm ( );
if (EFI_ERROR (Status)) {
ZeroMem (&ConfigFormEntry->SessionConfigData, sizeof (ConfigFormEntry->SessionConfigData));
-
+
//
// Generate OUI-format ISID based on MAC address.
//
CopyMem (ConfigFormEntry->SessionConfigData.IsId, &MacAddress, 6);
- ConfigFormEntry->SessionConfigData.IsId[0] =
+ ConfigFormEntry->SessionConfigData.IsId[0] =
(UINT8) (ConfigFormEntry->SessionConfigData.IsId[0] & 0x3F);
}
//
@@ -1189,7 +1189,7 @@ IScsiConfigFormInit ( NULL
);
ASSERT_EFI_ERROR (Status);
-
+
//
// Publish our HII data
//
@@ -1216,7 +1216,7 @@ IScsiConfigFormInit ( free the resources used.
@param[in] DriverBindingHandle The iSCSI driverbinding handle.
-
+
@retval EFI_SUCCESS The iSCSI configuration form is unloaded.
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory.
**/
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h index ef881d8..c3d07f6 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h @@ -1,7 +1,7 @@ /** @file
The header file of IScsiConfig.c.
-Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -35,23 +35,23 @@ extern UINT8 IScsi4DxeStrings[]; /**
- If the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is clear,
+ If the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is clear,
then this macro return a pointer to a data structure ISCSI_FORM_CALLBACK_INFO.
- If the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is set,
- The Signature field of the data structure ISCSI_FORM_CALLBACK_INFO
- is compared to TestSignature. If the signatures match, then a pointer
- to the pointer to a data structure ISCSI_FORM_CALLBACK_INFO is returned.
- If the signatures do not match, then DebugAssert() is called with a description
- of "CR has a bad signature" and Callback is returned.
+ If the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is set,
+ The Signature field of the data structure ISCSI_FORM_CALLBACK_INFO
+ is compared to TestSignature. If the signatures match, then a pointer
+ to the pointer to a data structure ISCSI_FORM_CALLBACK_INFO is returned.
+ If the signatures do not match, then DebugAssert() is called with a description
+ of "CR has a bad signature" and Callback is returned.
If the data type ISCSI_FORM_CALLBACK_INFO_SIGNATURE does not contain the field
specified by Callback, then the module will not compile.
- If ISCSI_FORM_CALLBACK_INFO_SIGNATURE does not contain a field called Signature,
+ If ISCSI_FORM_CALLBACK_INFO_SIGNATURE does not contain a field called Signature,
then the module will not compile.
- @param Callback Pointer to the specified field within the data
+ @param Callback Pointer to the specified field within the data
structure ISCSI_FORM_CALLBACK_INFO.
@return A pointer to the pointer to a data structure ISCSI_FORM_CALLBACK_INFO.
@retval Others Some unexpected error happened.
@@ -154,7 +154,7 @@ IScsiConfigFormInit ( free the resources used.
@param[in] DriverBindingHandle The iSCSI driverbinding handle.
-
+
@retval EFI_SUCCESS The iSCSI configuration form is unloaded.
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory.
**/
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr index 2456c51..9e28d81 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr @@ -1,7 +1,7 @@ /** @file
Vfr file for iSCSI config.
-
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "IScsiConfigNVDataStruc.h"
#define EFI_NETWORK_DEVICE_CLASS 0x04
-formset
+formset
guid = IP4_ISCSI_CONFIG_GUID,
title = STRING_TOKEN(STR_ISCSI_CONFIG_FORM_TITLE),
help = STRING_TOKEN(STR_ISCSI_CONFIG_FORM_HELP),
@@ -27,7 +27,7 @@ formset form formid = FORMID_MAIN_FORM,
title = STRING_TOKEN(STR_ISCSI_MAIN_FORM_TITLE);
- string varid = ISCSI_CONFIG_IFR_NVDATA.InitiatorName,
+ string varid = ISCSI_CONFIG_IFR_NVDATA.InitiatorName,
prompt = STRING_TOKEN(STR_ISCSI_CONFIG_INIT_NAME),
help = STRING_TOKEN(STR_ISCSI_CONFIG_INIT_NAME_HELP),
flags = INTERACTIVE,
@@ -57,8 +57,8 @@ formset key = KEY_DHCP_ENABLE,
endcheckbox;
- suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.InitiatorInfoFromDhcp == 0x01;
- string varid = ISCSI_CONFIG_IFR_NVDATA.LocalIp,
+ suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.InitiatorInfoFromDhcp == 0x01;
+ string varid = ISCSI_CONFIG_IFR_NVDATA.LocalIp,
prompt = STRING_TOKEN(STR_ISCSI_LOCAL_IP_ADDRESS),
help = STRING_TOKEN(STR_ISCSI_IP_ADDRESS_HELP),
flags = INTERACTIVE,
@@ -67,7 +67,7 @@ formset maxsize = IP_MAX_SIZE,
endstring;
- string varid = ISCSI_CONFIG_IFR_NVDATA.SubnetMask,
+ string varid = ISCSI_CONFIG_IFR_NVDATA.SubnetMask,
prompt = STRING_TOKEN(STR_ISCSI_LOCAL_MASK),
help = STRING_TOKEN(STR_ISCSI_IP_ADDRESS_HELP),
flags = INTERACTIVE,
@@ -76,7 +76,7 @@ formset maxsize = IP_MAX_SIZE,
endstring;
- string varid = ISCSI_CONFIG_IFR_NVDATA.Gateway,
+ string varid = ISCSI_CONFIG_IFR_NVDATA.Gateway,
prompt = STRING_TOKEN(STR_ISCSI_LOCAL_GATEWAY),
help = STRING_TOKEN(STR_ISCSI_IP_ADDRESS_HELP),
flags = INTERACTIVE,
@@ -86,19 +86,19 @@ formset endstring;
endif;
- subtitle text = STRING_TOKEN(STR_NULL);
+ subtitle text = STRING_TOKEN(STR_NULL);
- suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.InitiatorInfoFromDhcp == 0x00;
+ suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.InitiatorInfoFromDhcp == 0x00;
checkbox varid = ISCSI_CONFIG_IFR_NVDATA.TargetInfoFromDhcp,
prompt = STRING_TOKEN(STR_ISCSI_ENABLE_DHCP_ON_TARGET),
help = STRING_TOKEN(STR_ISCSI_ENABLE_DHCP_ON_TARGET),
flags = 0,
endcheckbox;
endif;
-
- suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.TargetInfoFromDhcp == 0x01;
- string varid = ISCSI_CONFIG_IFR_NVDATA.TargetName,
+ suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.TargetInfoFromDhcp == 0x01;
+
+ string varid = ISCSI_CONFIG_IFR_NVDATA.TargetName,
prompt = STRING_TOKEN(STR_ISCSI_TARGET_NAME),
help = STRING_TOKEN(STR_ISCSI_TARGET_NAME),
flags = INTERACTIVE,
@@ -107,7 +107,7 @@ formset maxsize = ISCSI_NAME_IFR_MAX_SIZE,
endstring;
- string varid = ISCSI_CONFIG_IFR_NVDATA.TargetIp,
+ string varid = ISCSI_CONFIG_IFR_NVDATA.TargetIp,
prompt = STRING_TOKEN(STR_ISCSI_TARGET_IP_ADDRESS),
help = STRING_TOKEN(STR_ISCSI_IP_ADDRESS_HELP),
flags = INTERACTIVE,
@@ -115,17 +115,17 @@ formset minsize = IP_MIN_SIZE,
maxsize = IP_MAX_SIZE,
endstring;
-
- numeric varid = ISCSI_CONFIG_IFR_NVDATA.TargetPort,
+
+ numeric varid = ISCSI_CONFIG_IFR_NVDATA.TargetPort,
prompt = STRING_TOKEN(STR_ISCSI_TARGET_PORT),
help = STRING_TOKEN(STR_ISCSI_TARGET_PORT),
flags = 0,
minimum = TARGET_PORT_MIN_NUM,
- maximum = TARGET_PORT_MAX_NUM,
+ maximum = TARGET_PORT_MAX_NUM,
step = 0,
endnumeric;
-
- string varid = ISCSI_CONFIG_IFR_NVDATA.BootLun,
+
+ string varid = ISCSI_CONFIG_IFR_NVDATA.BootLun,
prompt = STRING_TOKEN(STR_ISCSI_BOOT_LUN),
help = STRING_TOKEN(STR_ISCSI_BOOT_LUN_HELP),
flags = INTERACTIVE,
@@ -135,19 +135,19 @@ formset endstring;
endif;
- subtitle text = STRING_TOKEN(STR_NULL);
+ subtitle text = STRING_TOKEN(STR_NULL);
oneof varid = ISCSI_CONFIG_IFR_NVDATA.CHAPType,
prompt = STRING_TOKEN(STR_CHAP_TYPE_PROMPT),
- help = STRING_TOKEN(STR_CHAP_TYPE_HELP),
+ help = STRING_TOKEN(STR_CHAP_TYPE_HELP),
option text = STRING_TOKEN(STR_CHAP_TYPE_NONE), value = ISCSI_CHAP_NONE, flags = DEFAULT;
option text = STRING_TOKEN(STR_CHAP_TYPE_UNI), value = ISCSI_CHAP_UNI, flags = 0;
option text = STRING_TOKEN(STR_CHAP_TYPE_MUTUAL), value = ISCSI_CHAP_MUTUAL, flags = 0;
endoneof;
- suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.CHAPType == ISCSI_CHAP_NONE;
+ suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.CHAPType == ISCSI_CHAP_NONE;
- string varid = ISCSI_CONFIG_IFR_NVDATA.CHAPName,
+ string varid = ISCSI_CONFIG_IFR_NVDATA.CHAPName,
prompt = STRING_TOKEN(STR_ISCSI_CHAP_NAME),
help = STRING_TOKEN(STR_ISCSI_CHAP_NAME),
flags = INTERACTIVE,
@@ -156,7 +156,7 @@ formset maxsize = ISCSI_CHAP_NAME_MAX_LEN,
endstring;
- string varid = ISCSI_CONFIG_IFR_NVDATA.CHAPSecret,
+ string varid = ISCSI_CONFIG_IFR_NVDATA.CHAPSecret,
prompt = STRING_TOKEN(STR_ISCSI_CHAP_SECRET),
help = STRING_TOKEN(STR_ISCSI_CHAP_SECRET_HELP),
flags = INTERACTIVE,
@@ -169,7 +169,7 @@ formset suppressif NOT ideqval ISCSI_CONFIG_IFR_NVDATA.CHAPType == ISCSI_CHAP_MUTUAL;
- string varid = ISCSI_CONFIG_IFR_NVDATA.ReverseCHAPName,
+ string varid = ISCSI_CONFIG_IFR_NVDATA.ReverseCHAPName,
prompt = STRING_TOKEN(STR_ISCSI_REVERSE_CHAP_NAME),
help = STRING_TOKEN(STR_ISCSI_REVERSE_CHAP_NAME),
flags = INTERACTIVE,
@@ -178,7 +178,7 @@ formset maxsize = ISCSI_CHAP_NAME_MAX_LEN,
endstring;
- string varid = ISCSI_CONFIG_IFR_NVDATA.ReverseCHAPSecret,
+ string varid = ISCSI_CONFIG_IFR_NVDATA.ReverseCHAPSecret,
prompt = STRING_TOKEN(STR_ISCSI_REVERSE_CHAP_SECRET),
help = STRING_TOKEN(STR_ISCSI_CHAP_SECRET_HELP),
flags = INTERACTIVE,
@@ -189,9 +189,9 @@ formset endif;
- subtitle text = STRING_TOKEN(STR_NULL);
+ subtitle text = STRING_TOKEN(STR_NULL);
- string varid = ISCSI_CONFIG_IFR_NVDATA.IsId,
+ string varid = ISCSI_CONFIG_IFR_NVDATA.IsId,
prompt = STRING_TOKEN(STR_ISCSI_CONFIG_ISID),
help = STRING_TOKEN(STR_ISCSI_CONFIG_ISID_HELP),
flags = INTERACTIVE,
@@ -200,16 +200,16 @@ formset maxsize = ISID_CONFIGURABLE_MAX_LEN,
endstring;
- subtitle text = STRING_TOKEN(STR_NULL);
+ subtitle text = STRING_TOKEN(STR_NULL);
text
help = STRING_TOKEN (STR_SAVE_CHANGES),
text = STRING_TOKEN (STR_SAVE_CHANGES),
flags = INTERACTIVE,
key = KEY_SAVE_CHANGES;
-
- goto FORMID_MAIN_FORM,
- prompt = STRING_TOKEN (STR_RETURN_MAIN_FORM),
+
+ goto FORMID_MAIN_FORM,
+ prompt = STRING_TOKEN (STR_RETURN_MAIN_FORM),
help = STRING_TOKEN (STR_RETURN_MAIN_FORM),
flags = 0;
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxeStrings.uni b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxeStrings.uni index 6acf139..729c74e 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxeStrings.uni +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxeStrings.uni @@ -1,6 +1,6 @@ // *++
//
-// Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
// 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
@@ -12,13 +12,13 @@ // Module Name:
//
// IScsiConfigStrings.uni
-//
+//
// Abstract:
-//
+//
// String definitions for iSCSI configuration.
-//
+//
// Revision History:
-//
+//
// --*/
@@ -26,23 +26,23 @@ #langdef en-US "English"
-#string STR_ISCSI_CONFIG_FORM_TITLE #language en-US "iSCSI Configuration"
-#string STR_ISCSI_CONFIG_FORM_HELP #language en-US "Configure the iSCSI parameters."
+#string STR_ISCSI_CONFIG_FORM_TITLE #language en-US "iSCSI Configuration"
+#string STR_ISCSI_CONFIG_FORM_HELP #language en-US "Configure the iSCSI parameters."
#string STR_ISCSI_MAIN_FORM_TITLE #language en-US "iSCSI Configuration"
#string STR_ISCSI_CONFIG_INIT_NAME #language en-US "iSCSI Initiator Name"
#string STR_ISCSI_CONFIG_INIT_NAME_HELP #language en-US "The worldwide unique name of the initiator. Only iqn. format is accepted."
#string STR_ISCSI_DEVICE_FORM_TITLE #language en-US ""
#string STR_ISCSI_DEVICE_ENABLE #language en-US "Enable iSCSI"
#string STR_ISCSI_LOCAL_IP_ADDRESS #language en-US " Initiator IP Address"
-#string STR_ISCSI_LOCAL_MASK #language en-US " Initiator Subnet Mask"
+#string STR_ISCSI_LOCAL_MASK #language en-US " Initiator Subnet Mask"
#string STR_ISCSI_LOCAL_GATEWAY #language en-US " Gateway"
-#string STR_ISCSI_IP_ADDRESS_HELP #language en-US "Enter IP address in dotted-decimal notation."
-#string STR_ISCSI_TARGET_NAME #language en-US " Target Name"
-#string STR_ISCSI_TARGET_IP_ADDRESS #language en-US " Target IP Address"
-#string STR_ISCSI_TARGET_PORT #language en-US " Target Port"
+#string STR_ISCSI_IP_ADDRESS_HELP #language en-US "Enter IP address in dotted-decimal notation."
+#string STR_ISCSI_TARGET_NAME #language en-US " Target Name"
+#string STR_ISCSI_TARGET_IP_ADDRESS #language en-US " Target IP Address"
+#string STR_ISCSI_TARGET_PORT #language en-US " Target Port"
#string STR_ISCSI_BOOT_LUN #language en-US " Boot LUN"
#string STR_ISCSI_BOOT_LUN_HELP #language en-US "Hexadecimal representation of the LU number. Examples are: 4752-3A4F-6b7e-2F99, 6734-9-156f-127, 4186-9"
-#string STR_ISCSI_ENABLE_DHCP #language en-US "Enable DHCP"
+#string STR_ISCSI_ENABLE_DHCP #language en-US "Enable DHCP"
#string STR_ISCSI_ENABLE_DHCP_ON_TARGET #language en-US "Get target info via DHCP"
#string STR_CHAP_TYPE_PROMPT #language en-US "CHAP Type"
#string STR_CHAP_TYPE_HELP #language en-US "None, One way CHAP or mutual CHAP"
@@ -57,6 +57,6 @@ #string STR_ISCSI_CONFIG_ISID #language en-US "ISID"
#string STR_ISCSI_CONFIG_ISID_HELP #language en-US "OUI-format ISID in 6 bytes, default value are derived from MAC address. Only last 3 bytes are configurable. Example: update 0ABBCCDDEEFF to 0ABBCCF07901 by input F07901."
#string STR_RETURN_MAIN_FORM #language en-US "Back to Previous Page"
-#string STR_SAVE_CHANGES #language en-US "Save Changes"
+#string STR_SAVE_CHANGES #language en-US "Save Changes"
#string STR_NULL #language en-US ""
-
\ No newline at end of file +
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c index 976fe5d..6a876c8 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c @@ -1,7 +1,7 @@ /** @file
iSCSI DHCP related configuration routines.
-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -95,7 +95,7 @@ IScsiDhcpExtractRootPath ( Status = EFI_INVALID_PARAMETER;
goto ON_EXIT;
}
-
+
if ((Fields[RP_FIELD_IDX_SERVERNAME].Str == NULL) ||
(Fields[RP_FIELD_IDX_TARGETNAME].Str == NULL) ||
(Fields[RP_FIELD_IDX_PROTOCOL].Len > 1)
@@ -170,14 +170,14 @@ ON_EXIT: /**
The callback function registerd to the DHCP4 instance which is used to select
the qualified DHCP OFFER.
-
+
@param[in] This The DHCP4 protocol.
@param[in] Context The context set when configuring the DHCP4 protocol.
@param[in] CurrentState The current state of the DHCP4 protocol.
@param[in] Dhcp4Event The event occurs in the current state.
- @param[in] Packet The DHCP packet that is to be sent or already received.
+ @param[in] Packet The DHCP packet that is to be sent or already received.
@param[out] NewPacket The packet used to replace the above Packet.
-
+
@retval EFI_SUCCESS Either the DHCP OFFER is qualified or we're not intereseted
in the Dhcp4Event.
@retval EFI_NOT_READY The DHCP OFFER packet doesn't match our requirements.
@@ -337,7 +337,7 @@ IScsiParseDhcpAck ( /**
Parse the DHCP ACK to get the address configuration and DNS information.
-
+
@param[in] Image The handle of the driver image.
@param[in] Controller The handle of the controller;
@param[in, out] ConfigData The session configuration data.
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.h index 59f8672..4c4dcaa 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.h @@ -1,7 +1,7 @@ /** @file
The header file of IScsiDhcp.
-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -34,7 +34,7 @@ typedef struct _ISCSI_ROOT_PATH_FIELD { /**
Parse the DHCP ACK to get the address configuration and DNS information.
-
+
@param[in] Image The handle of the driver image.
@param[in] Controller The handle of the controller;
@param[in, out] ConfigData The session configuration data.
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c index 5295d34..730f3e5 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c @@ -1,7 +1,7 @@ /** @file
The entry point of IScsi driver.
-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -24,14 +24,14 @@ EFI_DRIVER_BINDING_PROTOCOL gIScsiDriverBinding = { };
/**
- Tests to see if this driver supports the RemainingDevicePath.
-
- @param[in] RemainingDevicePath A pointer to the remaining portion of a device path. This
- parameter is ignored by device drivers, and is optional for bus
- drivers. For bus drivers, if this parameter is not NULL, then
- the bus driver must determine if the bus controller specified
- by ControllerHandle and the child controller specified
- by RemainingDevicePath are both supported by this
+ Tests to see if this driver supports the RemainingDevicePath.
+
+ @param[in] RemainingDevicePath A pointer to the remaining portion of a device path. This
+ parameter is ignored by device drivers, and is optional for bus
+ drivers. For bus drivers, if this parameter is not NULL, then
+ the bus driver must determine if the bus controller specified
+ by ControllerHandle and the child controller specified
+ by RemainingDevicePath are both supported by this
bus driver.
@retval EFI_SUCCESS The RemainingDevicePath is supported or NULL.
@@ -62,14 +62,14 @@ IScsiIsDevicePathSupported ( }
/**
- Tests to see if this driver supports a given controller. If a child device is provided,
+ Tests to see if this driver supports a given controller. If a child device is provided,
it further tests to see if this driver supports creating a handle for the specified child device.
@param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
- @param[in] ControllerHandle The handle of the controller to test. This handle
- must support a protocol interface that supplies
+ @param[in] ControllerHandle The handle of the controller to test. This handle
+ must support a protocol interface that supplies
an I/O abstraction to the driver.
- @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
+ @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
This parameter is ignored by device drivers, and is optional for bus drivers.
@@ -142,23 +142,23 @@ IScsiDriverBindingSupported ( }
/**
- Start this driver on ControllerHandle.
-
- The Start() function is designed to be invoked from the EFI boot service ConnectController().
- As a result, much of the error checking on the parameters to Start() has been moved into this
- common boot service. It is legal to call Start() from other locations, but the following calling
+ Start this driver on ControllerHandle.
+
+ The Start() function is designed to be invoked from the EFI boot service ConnectController().
+ As a result, much of the error checking on the parameters to Start() has been moved into this
+ common boot service. It is legal to call Start() from other locations, but the following calling
restrictions must be followed or the system behavior will not be deterministic.
1. ControllerHandle must be a valid EFI_HANDLE.
2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally aligned
EFI_DEVICE_PATH_PROTOCOL.
3. Prior to calling Start(), the Supported() function for the driver specified by This must
- have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS.
+ have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS.
@param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
- @param[in] ControllerHandle The handle of the controller to start. This handle
- must support a protocol interface that supplies
+ @param[in] ControllerHandle The handle of the controller to start. This handle
+ must support a protocol interface that supplies
an I/O abstraction to the driver.
- @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
+ @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
This parameter is ignored by device drivers, and is optional for bus drivers.
@retval EFI_SUCCESS The device was started.
@@ -214,7 +214,7 @@ IScsiDriverBindingStart ( }
//
- // Always install private protocol no matter what happens later. We need to
+ // Always install private protocol no matter what happens later. We need to
// keep the relationship between ControllerHandle and ChildHandle.
//
Status = gBS->InstallProtocolInterface (
@@ -286,7 +286,7 @@ IScsiDriverBindingStart ( This->DriverBindingHandle,
Private->ExtScsiPassThruHandle,
EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER
- );
+ );
if (EFI_ERROR (Status)) {
gBS->UninstallMultipleProtocolInterfaces (
Private->ExtScsiPassThruHandle,
@@ -296,7 +296,7 @@ IScsiDriverBindingStart ( Private->DevicePath,
NULL
);
-
+
goto ON_ERROR;
}
@@ -315,12 +315,12 @@ ON_ERROR: }
/**
- Stop this driver on ControllerHandle.
-
+ Stop this driver on ControllerHandle.
+
Release the control of this controller and remove the IScsi functions. The Stop()
- function is designed to be invoked from the EFI boot service DisconnectController().
- As a result, much of the error checking on the parameters to Stop() has been moved
- into this common boot service. It is legal to call Stop() from other locations,
+ function is designed to be invoked from the EFI boot service DisconnectController().
+ As a result, much of the error checking on the parameters to Stop() has been moved
+ into this common boot service. It is legal to call Stop() from other locations,
but the following calling restrictions must be followed or the system behavior will not be deterministic.
1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this
same driver's Start() function.
@@ -328,13 +328,13 @@ ON_ERROR: EFI_HANDLE. In addition, all of these handles must have been created in this driver's
Start() function, and the Start() function must have called OpenProtocol() on
ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.
-
+
@param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
- @param[in] ControllerHandle A handle to the device being stopped. The handle must
- support a bus specific I/O protocol for the driver
+ @param[in] ControllerHandle A handle to the device being stopped. The handle must
+ support a bus specific I/O protocol for the driver
to use to stop the device.
@param[in] NumberOfChildren The number of child device handles in ChildHandleBuffer.Not used.
- @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL
+ @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL
if NumberOfChildren is 0.Not used.
@retval EFI_SUCCESS The device was stopped.
@@ -390,7 +390,7 @@ IScsiDriverBindingStop ( Private->Image,
Private->ExtScsiPassThruHandle
);
-
+
gBS->CloseProtocol (
Conn->Tcp4Io.Handle,
&gEfiTcp4ProtocolGuid,
@@ -515,7 +515,7 @@ EfiIScsiUnload ( if (EFI_ERROR (Status)) {
goto ON_EXIT;
}
- }
+ }
//
// Unload the iSCSI configuration form.
@@ -545,7 +545,7 @@ EfiIScsiUnload ( goto ON_EXIT;
}
}
-
+
Status = gBS->HandleProtocol (
gIScsiDriverBinding.DriverBindingHandle,
&gEfiComponentName2ProtocolGuid,
@@ -576,14 +576,14 @@ ON_EXIT: if (DeviceHandleBuffer != NULL) {
FreePool (DeviceHandleBuffer);
}
-
+
return Status;
}
/**
This is the declaration of an EFI image entry point. This entry point is
the same for UEFI Applications, UEFI OS Loaders, and UEFI Drivers including
- both device drivers and bus drivers. It initialize the global variables and
+ both device drivers and bus drivers. It initialize the global variables and
publish the driver binding protocol.
@param[in] ImageHandle The firmware allocated handle for the UEFI image.
@@ -651,7 +651,7 @@ IScsiDriverEntryPoint ( );
return Status;
}
-
+
//
// Initialize the configuration form of iSCSI.
//
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h index 14f6404..d6a619f 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.h @@ -1,7 +1,7 @@ /** @file
The header file of IScsiDriver.c.
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -38,14 +38,14 @@ typedef struct _ISCSI_PRIVATE_PROTOCOL { //
/**
- Tests to see if this driver supports a given controller. If a child device is provided,
+ Tests to see if this driver supports a given controller. If a child device is provided,
it further tests to see if this driver supports creating a handle for the specified child device.
@param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
- @param[in] ControllerHandle The handle of the controller to test. This handle
- must support a protocol interface that supplies
+ @param[in] ControllerHandle The handle of the controller to test. This handle
+ must support a protocol interface that supplies
an I/O abstraction to the driver.
- @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
+ @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
This parameter is ignored by device drivers, and is optional for bus drivers.
@@ -70,22 +70,22 @@ IScsiDriverBindingSupported ( );
/**
- Start this driver on ControllerHandle. The Start() function is designed to be
- invoked from the EFI boot service ConnectController(). As a result, much of
- the error checking on the parameters to Start() has been moved into this
- common boot service. It is legal to call Start() from other locations,
+ Start this driver on ControllerHandle. The Start() function is designed to be
+ invoked from the EFI boot service ConnectController(). As a result, much of
+ the error checking on the parameters to Start() has been moved into this
+ common boot service. It is legal to call Start() from other locations,
but the following calling restrictions must be followed or the system behavior will not be deterministic.
1. ControllerHandle must be a valid EFI_HANDLE.
2. If RemainingDevicePath is not NULL, then it must be a pointer to a naturally aligned
EFI_DEVICE_PATH_PROTOCOL.
3. Prior to calling Start(), the Supported() function for the driver specified by This must
- have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS.
+ have been called with the same calling parameters, and Supported() must have returned EFI_SUCCESS.
@param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
- @param[in] ControllerHandle The handle of the controller to start. This handle
- must support a protocol interface that supplies
+ @param[in] ControllerHandle The handle of the controller to start. This handle
+ must support a protocol interface that supplies
an I/O abstraction to the driver.
- @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
+ @param[in] RemainingDevicePath A pointer to the remaining portion of a device path.
This parameter is ignored by device drivers, and is optional for bus drivers.
@retval EFI_SUCCESS The device was started.
@@ -103,12 +103,12 @@ IScsiDriverBindingStart ( );
/**
- Stop this driver on ControllerHandle.
-
+ Stop this driver on ControllerHandle.
+
Release the control of this controller and remove the IScsi functions. The Stop()
- function is designed to be invoked from the EFI boot service DisconnectController().
- As a result, much of the error checking on the parameters to Stop() has been moved
- into this common boot service. It is legal to call Stop() from other locations,
+ function is designed to be invoked from the EFI boot service DisconnectController().
+ As a result, much of the error checking on the parameters to Stop() has been moved
+ into this common boot service. It is legal to call Stop() from other locations,
but the following calling restrictions must be followed or the system behavior will not be deterministic.
1. ControllerHandle must be a valid EFI_HANDLE that was used on a previous call to this
same driver's Start() function.
@@ -116,13 +116,13 @@ IScsiDriverBindingStart ( EFI_HANDLE. In addition, all of these handles must have been created in this driver's
Start() function, and the Start() function must have called OpenProtocol() on
ControllerHandle with an Attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.
-
+
@param[in] This A pointer to the EFI_DRIVER_BINDING_PROTOCOL instance.
- @param[in] ControllerHandle A handle to the device being stopped. The handle must
- support a bus specific I/O protocol for the driver
+ @param[in] ControllerHandle A handle to the device being stopped. The handle must
+ support a bus specific I/O protocol for the driver
to use to stop the device.
@param[in] NumberOfChildren The number of child device handles in ChildHandleBuffer.Not used.
- @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL
+ @param[in] ChildHandleBuffer An array of child handles to be freed. May be NULL
if NumberOfChildren is 0.Not used.
@retval EFI_SUCCESS The device was stopped.
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf index 4fd2a62..dce3968 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf @@ -6,7 +6,7 @@ # data over TCP/IP. It installs EFI HII Configuration Access Protocol to provide
# one way to configurate the iSCSI setting.
#
-# Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
# 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
@@ -122,4 +122,4 @@ gIScsiCHAPAuthInfoGuid
[UserExtensions.TianoCore."ExtraFiles"]
- IScsi4DxeExtra.uni
\ No newline at end of file + IScsi4DxeExtra.uni
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c index e9e37b7..db2d6d1 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c @@ -1,7 +1,7 @@ /** @file
The IScsi's EFI_EXT_SCSI_PASS_THRU_PROTOCOL driver.
-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -15,9 +15,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "IScsiImpl.h"
/**
- Sends a SCSI Request Packet to a SCSI device that is attached to the SCSI channel. This function
+ Sends a SCSI Request Packet to a SCSI device that is attached to the SCSI channel. This function
supports both blocking I/O and nonblocking I/O. The blocking I/O functionality is required, and the
- nonblocking I/O functionality is optional.
+ nonblocking I/O functionality is optional.
@param[in] This A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.
@param[in] Target The Target is an array of size TARGET_MAX_BYTES and it represents
@@ -42,18 +42,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. @retval EFI_BAD_BUFFER_SIZE The SCSI Request Packet was not executed. The number of bytes that
could be transferred is returned in InTransferLength. For write
and bi-directional commands, OutTransferLength bytes were
- transferred by OutDataBuffer. Currently not implemeted.
+ transferred by OutDataBuffer. Currently not implemeted.
@retval EFI_NOT_READY The SCSI Request Packet could not be sent because there are too many
- SCSI Request Packets already queued. The caller may retry again later.
+ SCSI Request Packets already queued. The caller may retry again later.
@retval EFI_DEVICE_ERROR A device error occurred while attempting to send the SCSI Request
- Packet.
+ Packet.
@retval EFI_INVALID_PARAMETER Target, Lun, or the contents of ScsiRequestPacket are invalid.
@retval EFI_UNSUPPORTED The command described by the SCSI Request Packet is not supported
by the host adapter. This includes the case of Bi-directional SCSI
commands not supported by the implementation. The SCSI Request
Packet was not sent, so no additional status information is available.
Currently not implemeted.
- @retval EFI_TIMEOUT A timeout occurred while waiting for the SCSI Request Packet to execute.
+ @retval EFI_TIMEOUT A timeout occurred while waiting for the SCSI Request Packet to execute.
**/
EFI_STATUS
EFIAPI
@@ -67,7 +67,7 @@ IScsiExtScsiPassThruFunction ( {
ISCSI_DRIVER_DATA *Private;
ISCSI_SESSION_CONFIG_NVDATA *ConfigNvData;
- EFI_STATUS Status;
+ EFI_STATUS Status;
Private = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (This);
ConfigNvData = &Private->Session.ConfigData.NvData;
@@ -96,11 +96,11 @@ IScsiExtScsiPassThruFunction ( }
/**
- Used to retrieve the list of legal Target IDs and LUNs for SCSI devices on a SCSI channel. These
+ Used to retrieve the list of legal Target IDs and LUNs for SCSI devices on a SCSI channel. These
can either be the list SCSI devices that are actually present on the SCSI channel, or the list of legal
- Target Ids and LUNs for the SCSI channel. Regardless, the caller of this function must probe the
- Target ID and LUN returned to see if a SCSI device is actually present at that location on the SCSI
- channel.
+ Target Ids and LUNs for the SCSI channel. Regardless, the caller of this function must probe the
+ Target ID and LUN returned to see if a SCSI device is actually present at that location on the SCSI
+ channel.
@param[in] This A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.
@param[in, out] Target On input, a pointer to the Target ID (an array of size
@@ -310,7 +310,7 @@ IScsiExtScsiPassThruGetTargetLun ( /**
Resets a SCSI channel. This operation resets all the SCSI devices connected to the SCSI channel.
Currently not implemented.
-
+
@param[in] This A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.
@retval EFI_SUCCESS The SCSI channel was reset.
@@ -358,10 +358,10 @@ IScsiExtScsiPassThruResetTargetLun ( }
/**
- Used to retrieve the list of legal Target IDs for SCSI devices on a SCSI channel. These can either
+ Used to retrieve the list of legal Target IDs for SCSI devices on a SCSI channel. These can either
be the list SCSI devices that are actually present on the SCSI channel, or the list of legal Target IDs
- for the SCSI channel. Regardless, the caller of this function must probe the Target ID returned to
- see if a SCSI device is actually present at that location on the SCSI channel.
+ for the SCSI channel. Regardless, the caller of this function must probe the Target ID returned to
+ see if a SCSI device is actually present at that location on the SCSI channel.
@param[in] This A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.
@param[in, out] Target (TARGET_MAX_BYTES) of a SCSI device present on the SCSI channel.
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c index 45d89a6..58c5447 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiIbft.c @@ -1,7 +1,7 @@ /** @file
Implementation for iSCSI Boot Firmware Table publication.
-Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -19,7 +19,7 @@ UINTN mTableKey; /**
Initialize the header of the iSCSI Boot Firmware Table.
-
+
@param[out] Header The header of the iSCSI Boot Firmware Table.
@param[in] OemId The OEM ID.
@param[in] OemTableId The OEM table ID for the iBFT.
@@ -37,14 +37,14 @@ IScsiInitIbfTableHeader ( Header->Length = IBFT_HEAP_OFFSET;
Header->Revision = EFI_ACPI_ISCSI_BOOT_FIRMWARE_TABLE_REVISION;
Header->Checksum = 0;
-
+
CopyMem (Header->OemId, OemId, sizeof (Header->OemId));
CopyMem (&Header->OemTableId, OemTableId, sizeof (UINT64));
}
/**
Initialize the control section of the iSCSI Boot Firmware Table.
-
+
@param[in] Table The ACPI table.
@param[in] HandleCount The number of the handles associated with iSCSI sessions, it's
equal to the number of iSCSI sessions.
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c index 19577ff..d924a8b 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c @@ -19,8 +19,8 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 IScsiHexString[] = "0123456789ABCDEFa /**
Removes (trims) specified leading and trailing characters from a string.
- @param[in, out] Str Pointer to the null-terminated string to be trimmed. On return,
- Str will hold the trimmed string.
+ @param[in, out] Str Pointer to the null-terminated string to be trimmed. On return,
+ Str will hold the trimmed string.
@param[in] CharC Character will be trimmed from str.
**/
@@ -32,18 +32,18 @@ StrTrim ( {
CHAR16 *Pointer1;
CHAR16 *Pointer2;
-
+
if (*Str == 0) {
return;
}
-
+
//
// Trim off the leading and trailing characters c
//
for (Pointer1 = Str; (*Pointer1 != 0) && (*Pointer1 == CharC); Pointer1++) {
;
}
-
+
Pointer2 = Str;
if (Pointer2 == Pointer1) {
while (*Pointer1 != 0) {
@@ -51,19 +51,19 @@ StrTrim ( Pointer1++;
}
} else {
- while (*Pointer1 != 0) {
- *Pointer2 = *Pointer1;
+ while (*Pointer1 != 0) {
+ *Pointer2 = *Pointer1;
Pointer1++;
Pointer2++;
}
*Pointer2 = 0;
}
-
-
+
+
for (Pointer1 = Str + StrLen(Str) - 1; Pointer1 >= Str && *Pointer1 == CharC; Pointer1--) {
;
}
- if (Pointer1 != Str + StrLen(Str) - 1) {
+ if (Pointer1 != Str + StrLen(Str) - 1) {
*(Pointer1 + 1) = 0;
}
}
@@ -109,7 +109,7 @@ IScsiGetSubnetMaskPrefixLength ( }
/**
- Convert the hexadecimal encoded LUN string into the 64-bit LUN.
+ Convert the hexadecimal encoded LUN string into the 64-bit LUN.
@param[in] Str The hexadecimal encoded LUN string.
@param[out] Lun Storage to return the 64-bit LUN.
@@ -127,11 +127,11 @@ IScsiAsciiStrToLun ( CHAR8 TemStr[2];
UINT8 TemValue;
UINT16 Value[4];
-
+
ZeroMem (Lun, 8);
ZeroMem (TemStr, 2);
ZeroMem ((UINT8 *) Value, sizeof (Value));
- SizeStr = AsciiStrLen (Str);
+ SizeStr = AsciiStrLen (Str);
IndexValue = 0;
IndexNum = 0;
@@ -146,7 +146,7 @@ IScsiAsciiStrToLun ( return EFI_INVALID_PARAMETER;
}
}
-
+
if ((TemValue == 0) && (TemStr[0] == '-')) {
//
// Next Lun value
@@ -163,24 +163,24 @@ IScsiAsciiStrToLun ( IndexNum = 0;
continue;
}
-
+
if (++IndexNum > 4) {
- //
+ //
// Each Lun Str can't exceed size 4, because it will be as UINT16 value
//
return EFI_INVALID_PARAMETER;
}
-
+
//
// Combine UINT16 value
//
Value[IndexValue] = (UINT16) ((Value[IndexValue] << 4) + TemValue);
}
-
+
for (Index = 0; Index <= IndexValue; Index ++) {
*((UINT16 *) &Lun[Index * 2]) = HTONS (Value[Index]);
}
-
+
return EFI_SUCCESS;
}
@@ -392,7 +392,7 @@ IScsiMacAddrToStr ( @param[in, out] HexStr Pointer to the string.
@param[in, out] HexLength The length of the string.
- @retval EFI_SUCCESS The binary data is converted to the hexadecimal string
+ @retval EFI_SUCCESS The binary data is converted to the hexadecimal string
and the length of the string is updated.
@retval EFI_BUFFER_TOO_SMALL The string is too small.
@retval EFI_INVALID_PARAMETER The IP string is malformatted.
@@ -455,7 +455,7 @@ IScsiHexToBin ( UINTN Length;
UINT8 Digit;
CHAR8 TemStr[2];
-
+
ZeroMem (TemStr, sizeof (TemStr));
//
@@ -464,7 +464,7 @@ IScsiHexToBin ( if ((HexStr[0] == '0') && ((HexStr[1] == 'x') || (HexStr[1] == 'X'))) {
HexStr += 2;
}
-
+
Length = AsciiStrLen (HexStr);
for (Index = 0; Index < Length; Index ++) {
@@ -482,7 +482,7 @@ IScsiHexToBin ( BinBuffer [Index/2] = (UINT8) ((BinBuffer [Index/2] << 4) + Digit);
}
}
-
+
*BinLength = (UINT32) ((Index + 1)/2);
return EFI_SUCCESS;
@@ -601,7 +601,7 @@ IScsiCleanDriverData ( EFI_STATUS Status;
Status = EFI_SUCCESS;
-
+
if (Private->DevicePath != NULL) {
Status = gBS->UninstallProtocolInterface (
Private->ExtScsiPassThruHandle,
@@ -627,7 +627,7 @@ EXIT: if (Private->ExitBootServiceEvent != NULL) {
gBS->CloseEvent (Private->ExitBootServiceEvent);
}
-
+
FreePool (Private);
return Status;
}
@@ -636,10 +636,10 @@ EXIT: Check wheather the Controller is configured to use DHCP protocol.
@param[in] Controller The handle of the controller.
-
+
@retval TRUE The handle of the controller need the Dhcp protocol.
@retval FALSE The handle of the controller does not need the Dhcp protocol.
-
+
**/
BOOLEAN
IScsiDhcpIsConfigured (
@@ -826,7 +826,7 @@ IScsiGetTcpConnDevicePath ( ) {
DPathNode->Ipv4.LocalPort = 0;
- DPathNode->Ipv4.StaticIpAddress =
+ DPathNode->Ipv4.StaticIpAddress =
(BOOLEAN) (!Session->ConfigData.NvData.InitiatorInfoFromDhcp);
//
@@ -835,7 +835,7 @@ IScsiGetTcpConnDevicePath ( // do not exist.
// In new version of IPv4_DEVICE_PATH, structcure length is 27.
//
- if (DevicePathNodeLength (&DPathNode->Ipv4) == IP4_NODE_LEN_NEW_VERSIONS) {
+ if (DevicePathNodeLength (&DPathNode->Ipv4) == IP4_NODE_LEN_NEW_VERSIONS) {
IP4_COPY_ADDRESS (
&DPathNode->Ipv4.GatewayIpAddress,
@@ -873,7 +873,7 @@ IScsiOnExitBootService ( ISCSI_DRIVER_DATA *Private;
Private = (ISCSI_DRIVER_DATA *) Context;
-
+
gBS->CloseEvent (Private->ExitBootServiceEvent);
Private->ExitBootServiceEvent = NULL;
@@ -887,7 +887,7 @@ IScsiOnExitBootService ( currently managing the controller specified by ControllerHandle. This test
is performed by evaluating if the the protocol specified by ProtocolGuid is
present on ControllerHandle and is was opened by DriverBindingHandle and Nic
- Device handle with an attribute of EFI_OPEN_PROTOCOL_BY_DRIVER.
+ Device handle with an attribute of EFI_OPEN_PROTOCOL_BY_DRIVER.
If ProtocolGuid is NULL, then ASSERT().
@param ControllerHandle A handle for a controller to test.
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h index 0ab44d0..500e003 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h @@ -1,7 +1,7 @@ /** @file
Miscellaneous definitions for iSCSI driver.
-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -65,7 +65,7 @@ IScsiGetSubnetMaskPrefixLength ( );
/**
- Convert the hexadecimal encoded LUN string into the 64-bit LUN.
+ Convert the hexadecimal encoded LUN string into the 64-bit LUN.
@param[in] Str The hexadecimal encoded LUN string.
@param[out] Lun Storage to return the 64-bit LUN.
@@ -158,7 +158,7 @@ IScsiAsciiStrToIp ( @param[in, out] HexStr Pointer to the string.
@param[in, out] HexLength The length of the string.
- @retval EFI_SUCCESS The binary data is converted to the hexadecimal string
+ @retval EFI_SUCCESS The binary data is converted to the hexadecimal string
and the length of the string is updated.
@retval EFI_BUFFER_TOO_SMALL The string is too small.
@retval EFI_INVALID_PARAMETER The IP string is malformatted.
@@ -233,10 +233,10 @@ IScsiCleanDriverData ( Check wheather the Controller is configured to use DHCP protocol.
@param[in] Controller The handle of the controller.
-
+
@retval TRUE The handle of the controller need the Dhcp protocol.
@retval FALSE The handle of the controller does not need the Dhcp protocol.
-
+
**/
BOOLEAN
IScsiDhcpIsConfigured (
@@ -290,7 +290,7 @@ IScsiOnExitBootService ( currently managing the controller specified by ControllerHandle. This test
is performed by evaluating if the the protocol specified by ProtocolGuid is
present on ControllerHandle and is was opened by DriverBindingHandle and Nic
- Device handle with an attribute of EFI_OPEN_PROTOCOL_BY_DRIVER.
+ Device handle with an attribute of EFI_OPEN_PROTOCOL_BY_DRIVER.
If ProtocolGuid is NULL, then ASSERT().
@param ControllerHandle A handle for a controller to test.
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c index 4317de2..9fb8480 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c @@ -1,7 +1,7 @@ /** @file
The implementation of iSCSI protocol based on RFC3720.
-Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. UINT32 mDataSegPad = 0;
/**
- Attach the iSCSI connection to the iSCSI session.
+ Attach the iSCSI connection to the iSCSI session.
@param[in, out] Session The iSCSI session.
@param[in, out] Conn The iSCSI connection.
@@ -34,7 +34,7 @@ IScsiAttatchConnection ( }
/**
- Detach the iSCSI connection from the session it belongs to.
+ Detach the iSCSI connection from the session it belongs to.
@param[in, out] Conn The iSCSI connection.
**/
@@ -49,7 +49,7 @@ IScsiDetatchConnection ( }
/**
- Check the sequence number according to RFC3720.
+ Check the sequence number according to RFC3720.
@param[in, out] ExpSN The currently expected sequence number.
@param[in] NewSN The sequence number to check.
@@ -116,7 +116,7 @@ IScsiUpdateCmdSN ( @retval EFI_SUCCESS The iSCSI connection is logged into the iSCSI target.
@retval EFI_TIMEOUT Timeout happened during the login procedure.
- @retval Others Other errors as indicated.
+ @retval Others Other errors as indicated.
**/
EFI_STATUS
IScsiConnLogin (
@@ -381,7 +381,7 @@ IScsiSendLoginReq ( Receive and process the iSCSI login response.
@param[in] Conn The connection in the iSCSI login phase.
-
+
@retval EFI_SUCCESS The iSCSI login response PDU is received and processed.
@retval Others Other errors as indicated.
**/
@@ -807,7 +807,7 @@ IScsiProcessLoginRsp ( @param[in] Data The data segment which should contain the
TargetAddress key-value list.
@param[in] Len Length of the data.
-
+
@retval EFI_SUCCESS The target address is updated.
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory.
@retval EFI_NOT_FOUND The TargetAddress key is not found.
@@ -1866,7 +1866,7 @@ IScsiNewScsiCmdPdu ( if (ScsiCmd == NULL) {
NetbufFree (PduHeader);
return NULL;
- }
+ }
Header = (ISCSI_ADDITIONAL_HEADER *) (ScsiCmd + 1);
ZeroMem (ScsiCmd, Length);
@@ -2522,8 +2522,8 @@ IScsiOnNopInRcvd ( @param[in] Lun The LUN.
@param[in, out] Packet The request packet containing IO request, SCSI command
buffer and buffers to read/write.
-
- @retval EFI_SUCCES The SCSI command is executed and the result is updated to
+
+ @retval EFI_SUCCES The SCSI command is executed and the result is updated to
the Packet.
@retval EFI_DEVICE_ERROR Session state was not as required.
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory.
@@ -2640,7 +2640,7 @@ IScsiExecuteScsiCommand ( if (EFI_ERROR (Status)) {
goto ON_EXIT;
}
- TimeoutEvent = Conn->TimeoutEvent;
+ TimeoutEvent = Conn->TimeoutEvent;
}
//
// try to receive PDU from target.
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h index 2f95323..6469df0 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h @@ -1,7 +1,7 @@ /** @file
The header file of iSCSI Protocol that defines many specific data structures.
-Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -624,7 +624,7 @@ typedef struct _ISCSI_KEY_VALUE_PAIR { } ISCSI_KEY_VALUE_PAIR;
/**
- Attach the iSCSI connection to the iSCSI session.
+ Attach the iSCSI connection to the iSCSI session.
@param[in, out] Session The iSCSI session.
@param[in, out] Conn The iSCSI connection.
@@ -636,7 +636,7 @@ IScsiAttatchConnection ( );
/**
- Detach the iSCSI connection from the session it belongs to.
+ Detach the iSCSI connection from the session it belongs to.
@param[in, out] Conn The iSCSI connection.
**/
@@ -652,7 +652,7 @@ IScsiDetatchConnection ( @retval EFI_SUCCESS The iSCSI connection is logged into the iSCSI target.
@retval EFI_TIMEOUT Timeout happened during the login procedure.
- @retval Others Other errors as indicated.
+ @retval Others Other errors as indicated.
**/
EFI_STATUS
IScsiConnLogin (
@@ -719,7 +719,7 @@ IScsiSendLoginReq ( Receive and process the iSCSI login response.
@param[in] Conn The connection in the iSCSI login phase.
-
+
@retval EFI_SUCCESS The iSCSI login response PDU is received and processed.
@retval Others Other errors as indicated.
**/
@@ -788,7 +788,7 @@ IScsiProcessLoginRsp ( @param[in] Data The data segment which should contain the
TargetAddress key-value list.
@param[in] Len Length of the data.
-
+
@retval EFI_SUCCESS The target address is updated.
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory.
@retval EFI_NOT_FOUND The TargetAddress key is not found.
@@ -948,8 +948,8 @@ IScsiNormalizeName ( @param[in] Lun The LUN.
@param[in, out] Packet The request packet containing IO request, SCSI command
buffer and buffers to read/write.
-
- @retval EFI_SUCCES The SCSI command is executed and the result is updated to
+
+ @retval EFI_SUCCES The SCSI command is executed and the result is updated to
the Packet.
@retval EFI_DEVICE_ERROR Session state was not as required.
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory.
@@ -988,7 +988,7 @@ IScsiSessionInit ( IN OUT ISCSI_SESSION *Session,
IN BOOLEAN Recovery
);
-
+
/**
Abort the iSCSI session, that is, reset all the connection and free the
resources.
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c index e73a6dd..901b38e 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c @@ -1,7 +1,7 @@ /** @file
The wrap of TCP/IP Socket interface.
-Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "IScsiImpl.h"
/**
- The common notify function associated with various Tcp4Io events.
+ The common notify function associated with various Tcp4Io events.
@param[in] Event The event signaled.
@param[in] Context The context.
@@ -31,13 +31,13 @@ Tcp4IoCommonNotify ( }
/**
- Create a TCP socket with the specified configuration data.
+ Create a TCP socket with the specified configuration data.
@param[in] Image The handle of the driver image.
@param[in] Controller The handle of the controller.
@param[in] ConfigData The Tcp4 configuration data.
@param[in] Tcp4Io The Tcp4Io.
-
+
@retval EFI_SUCCESS The TCP socket is created and configured.
@retval Others Failed to create the TCP socket or configure it.
**/
@@ -230,7 +230,7 @@ ON_ERROR: }
/**
- Destroy the socket.
+ Destroy the socket.
@param[in] Tcp4Io The Tcp4Io which wraps the socket to be destroyeds.
**/
@@ -269,7 +269,7 @@ Tcp4IoDestroySocket ( @param[in, out] Tcp4Io The Tcp4Io wrapping the TCP socket.
@param[in] Timeout The time to wait for connection done.
-
+
@retval EFI_SUCCESS Connect to the other endpoint of the TCP socket successfully.
@retval EFI_TIMEOUT Failed to connect to the other endpoint of the TCP socket in the specified time period.
@retval Others Other errors as indicated.
@@ -335,7 +335,7 @@ Tcp4IoReset ( @param[in] Tcp4Io The Tcp4Io wrapping the TCP socket.
@param[in] Packet The packet to transmit.
-
+
@retval EFI_SUCCESS The packet is trasmitted.
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory.
@retval Others Other errors as indicated.
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.h index 2b3c0b7..9e0f1e0 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.h @@ -1,7 +1,7 @@ /** @file
iSCSI Tcp4 IO related definitions.
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -46,13 +46,13 @@ typedef struct _TCP4_IO { } TCP4_IO;
/**
- Create a TCP socket with the specified configuration data.
+ Create a TCP socket with the specified configuration data.
@param[in] Image The handle of the driver image.
@param[in] Controller The handle of the controller.
@param[in] ConfigData The Tcp4 configuration data.
@param[in] Tcp4Io The Tcp4Io.
-
+
@retval EFI_SUCCESS The TCP socket is created and configured.
@retval Others Failed to create the TCP socket or configure it.
**/
@@ -65,7 +65,7 @@ Tcp4IoCreateSocket ( );
/**
- Destroy the socket.
+ Destroy the socket.
@param[in] Tcp4Io The Tcp4Io which wraps the socket to be destroyeds.
**/
@@ -79,7 +79,7 @@ Tcp4IoDestroySocket ( @param[in, out] Tcp4Io The Tcp4Io wrapping the TCP socket.
@param[in] Timeout The time to wait for connection done.
-
+
@retval EFI_SUCCESS Connect to the other endpoint of the TCP socket successfully.
@retval EFI_TIMEOUT Failed to connect to the other endpoint of the TCP socket in the specified time period.
@retval Others Other errors as indicated.
@@ -105,7 +105,7 @@ Tcp4IoReset ( @param[in] Tcp4Io The Tcp4Io wrapping the TCP socket.
@param[in] Packet The packet to transmit.
-
+
@retval EFI_SUCCESS The packet is trasmitted.
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory.
@retval Others Other errors as indicated.
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c b/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c index 5dc7d99..3555f1a 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/Md5.c @@ -1,7 +1,7 @@ /** @file
Implementation of MD5 algorithm.
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -57,14 +57,14 @@ CONST UINT8 Md5HashPadding[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
//
@@ -79,18 +79,18 @@ CONST UINT8 Md5HashPadding[] = /**
Tf1 is one basic MD5 transform function.
-
+
@param[in] A A 32-bit quantity.
- @param[in] B A 32-bit quantity.
+ @param[in] B A 32-bit quantity.
@param[in] C A 32-bit quantity.
@return Output was produced as a 32-bit quantity based on the
- three 32-bit input quantity.
+ three 32-bit input quantity.
**/
-UINT32
+UINT32
Tf1 (
- IN UINT32 A,
- IN UINT32 B,
+ IN UINT32 A,
+ IN UINT32 B,
IN UINT32 C
)
{
@@ -99,18 +99,18 @@ Tf1 ( /**
Tf2 is one basic MD5 transform function.
-
+
@param[in] A A 32-bit quantity.
- @param[in] B A 32-bit quantity.
+ @param[in] B A 32-bit quantity.
@param[in] C A 32-bit quantity.
@return Output was produced as a 32-bit quantity based on the
- three 32-bit input quantity.
+ three 32-bit input quantity.
**/
-UINT32
+UINT32
Tf2 (
- IN UINT32 A,
- IN UINT32 B,
+ IN UINT32 A,
+ IN UINT32 B,
IN UINT32 C
)
{
@@ -119,18 +119,18 @@ Tf2 ( /**
Tf3 is one basic MD5 transform function.
-
+
@param[in] A A 32-bit quantity.
- @param[in] B A 32-bit quantity.
+ @param[in] B A 32-bit quantity.
@param[in] C A 32-bit quantity.
@return Output was produced as a 32-bit quantity based on the
- three 32-bit input quantity.
+ three 32-bit input quantity.
**/
-UINT32
+UINT32
Tf3 (
- IN UINT32 A,
- IN UINT32 B,
+ IN UINT32 A,
+ IN UINT32 B,
IN UINT32 C
)
{
@@ -139,18 +139,18 @@ Tf3 ( /**
Tf4 is one basic MD5 transform function.
-
+
@param[in] A A 32-bit quantity.
- @param[in] B A 32-bit quantity.
+ @param[in] B A 32-bit quantity.
@param[in] C A 32-bit quantity.
@return Output was produced as a 32-bit quantity based on the
- three 32-bit input quantity.
+ three 32-bit input quantity.
**/
-UINT32
+UINT32
Tf4 (
- IN UINT32 A,
- IN UINT32 B,
+ IN UINT32 A,
+ IN UINT32 B,
IN UINT32 C
)
{
@@ -220,7 +220,7 @@ MD5Transform ( Copy data segment into the M field of MD5_CTX structure for later transform.
If the length of data segment is larger than 64 bytes, then does the transform
immediately and the generated Md5 code is stored in the States field of MD5_CTX
- data struct for later accumulation.
+ data struct for later accumulation.
All of Md5 code generated for the sequential 64-bytes data segaments are be
accumulated in MD5Final() function.
@@ -241,7 +241,7 @@ MD5UpdateBlock ( for (Limit = 64 - Md5Ctx->Count; DataLen >= 64 - Md5Ctx->Count; Limit = 64) {
CopyMem (Md5Ctx->M + Md5Ctx->Count, (VOID *)Data, Limit);
MD5Transform (Md5Ctx);
-
+
Md5Ctx->Count = 0;
Data += Limit;
DataLen -= Limit;
@@ -271,7 +271,7 @@ MD5Init ( Md5Ctx->States[0] = 0x67452301;
Md5Ctx->States[1] = 0xefcdab89;
Md5Ctx->States[2] = 0x98badcfe;
- Md5Ctx->States[3] = 0x10325476;
+ Md5Ctx->States[3] = 0x10325476;
return EFI_SUCCESS;
}
@@ -328,7 +328,7 @@ MD5Final ( //
CopyMem (HashVal, (UINT8 *) Md5Ctx->States, MD5_HASHSIZE);
ZeroMem ((UINT8 *)Md5Ctx, sizeof (*Md5Ctx));
-
+
return EFI_SUCCESS;
}
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/Md5.h b/MdeModulePkg/Universal/Network/IScsiDxe/Md5.h index 8de4e86..1541b2d 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/Md5.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/Md5.h @@ -1,7 +1,7 @@ /** @file
Header file for Md5.
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
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
@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Library/BaseLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/NetLib.h>
-
+
#define MD5_HASHSIZE 16
typedef struct _MD5_CTX {
@@ -77,4 +77,4 @@ MD5Final ( OUT UINT8 *HashVal
);
-#endif
+#endif
|