\r
#include "IScsiImpl.h"\r
\r
-CHAR16 mVendorStorageName[] = L"ISCSI_CONFIG_IFR_NVDATA";\r
-ISCSI_FORM_CALLBACK_INFO *mCallbackInfo = NULL;\r
+CHAR16 mVendorStorageName[] = L"ISCSI_CONFIG_IFR_NVDATA";\r
+ISCSI_FORM_CALLBACK_INFO *mCallbackInfo = NULL;\r
\r
HII_VENDOR_DEVICE_PATH mIScsiHiiVendorDevicePath = {\r
{\r
HARDWARE_DEVICE_PATH,\r
HW_VENDOR_DP,\r
{\r
- (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
- (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
+ (UINT8)(sizeof (VENDOR_DEVICE_PATH)),\r
+ (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
}\r
},\r
ISCSI_CONFIG_GUID\r
END_DEVICE_PATH_TYPE,\r
END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
{\r
- (UINT8) (END_DEVICE_PATH_LENGTH),\r
- (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
+ (UINT8)(END_DEVICE_PATH_LENGTH),\r
+ (UINT8)((END_DEVICE_PATH_LENGTH) >> 8)\r
}\r
}\r
};\r
\r
-\r
/**\r
Convert the IP address into a dotted string.\r
\r
**/\r
VOID\r
IScsiIpToStr (\r
- IN EFI_IP_ADDRESS *Ip,\r
- IN BOOLEAN Ipv6Flag,\r
- OUT CHAR16 *Str\r
+ IN EFI_IP_ADDRESS *Ip,\r
+ IN BOOLEAN Ipv6Flag,\r
+ OUT CHAR16 *Str\r
)\r
{\r
- EFI_IPv4_ADDRESS *Ip4;\r
- EFI_IPv6_ADDRESS *Ip6;\r
- UINTN Index;\r
- BOOLEAN Short;\r
- UINTN Number;\r
- CHAR16 FormatString[8];\r
+ EFI_IPv4_ADDRESS *Ip4;\r
+ EFI_IPv6_ADDRESS *Ip6;\r
+ UINTN Index;\r
+ BOOLEAN Short;\r
+ UINTN Number;\r
+ CHAR16 FormatString[8];\r
\r
if (!Ipv6Flag) {\r
Ip4 = &Ip->v4;\r
\r
UnicodeSPrint (\r
Str,\r
- (UINTN) 2 * IP4_STR_MAX_SIZE,\r
+ (UINTN)2 * IP4_STR_MAX_SIZE,\r
L"%d.%d.%d.%d",\r
- (UINTN) Ip4->Addr[0],\r
- (UINTN) Ip4->Addr[1],\r
- (UINTN) Ip4->Addr[2],\r
- (UINTN) Ip4->Addr[3]\r
+ (UINTN)Ip4->Addr[0],\r
+ (UINTN)Ip4->Addr[1],\r
+ (UINTN)Ip4->Addr[2],\r
+ (UINTN)Ip4->Addr[3]\r
);\r
\r
- return ;\r
+ return;\r
}\r
\r
Ip6 = &Ip->v6;\r
\r
for (Index = 0; Index < 15; Index = Index + 2) {\r
if (!Short &&\r
- Index % 2 == 0 &&\r
- Ip6->Addr[Index] == 0 &&\r
- Ip6->Addr[Index + 1] == 0\r
- ) {\r
+ (Index % 2 == 0) &&\r
+ (Ip6->Addr[Index] == 0) &&\r
+ (Ip6->Addr[Index + 1] == 0)\r
+ )\r
+ {\r
//\r
// Deal with the case of ::.\r
//\r
*(Str + 1) = L':';\r
Str = Str + 2;\r
} else {\r
- *Str = L':';\r
- Str = Str + 1;\r
+ *Str = L':';\r
+ Str = Str + 1;\r
}\r
\r
while ((Index < 15) && (Ip6->Addr[Index] == 0) && (Ip6->Addr[Index + 1] == 0)) {\r
ASSERT (Index < 15);\r
\r
if (Ip6->Addr[Index] == 0) {\r
- Number = UnicodeSPrint (Str, 2 * IP_STR_MAX_SIZE, L"%x:", (UINTN) Ip6->Addr[Index + 1]);\r
+ Number = UnicodeSPrint (Str, 2 * IP_STR_MAX_SIZE, L"%x:", (UINTN)Ip6->Addr[Index + 1]);\r
} else {\r
if (Ip6->Addr[Index + 1] < 0x10) {\r
CopyMem (FormatString, L"%x0%x:", StrSize (L"%x0%x:"));\r
Number = UnicodeSPrint (\r
Str,\r
2 * IP_STR_MAX_SIZE,\r
- (CONST CHAR16 *) FormatString,\r
- (UINTN) Ip6->Addr[Index],\r
- (UINTN) Ip6->Addr[Index + 1]\r
+ (CONST CHAR16 *)FormatString,\r
+ (UINTN)Ip6->Addr[Index],\r
+ (UINTN)Ip6->Addr[Index + 1]\r
);\r
}\r
\r
**/\r
BOOLEAN\r
IpIsUnicast (\r
- IN EFI_IP_ADDRESS *Ip,\r
+ IN EFI_IP_ADDRESS *Ip,\r
IN UINT8 IpMode\r
)\r
{\r
if (IpMode == IP_MODE_IP4) {\r
- if (IP4_IS_UNSPECIFIED (NTOHL (Ip->Addr[0])) || IP4_IS_LOCAL_BROADCAST (NTOHL (Ip->Addr[0]))) {\r
+ if (IP4_IS_UNSPECIFIED (NTOHL (Ip->Addr[0])) || IP4_IS_LOCAL_BROADCAST (NTOHL (Ip->Addr[0]))) {\r
return FALSE;\r
}\r
+\r
return TRUE;\r
} else if (IpMode == IP_MODE_IP6) {\r
return NetIp6IsValidUnicast (&Ip->v6);\r
**/\r
EFI_STATUS\r
IScsiParseIsIdFromString (\r
- IN CONST CHAR16 *String,\r
- IN OUT UINT8 *IsId\r
+ IN CONST CHAR16 *String,\r
+ IN OUT UINT8 *IsId\r
)\r
{\r
- UINT8 Index;\r
- CHAR16 *IsIdStr;\r
- CHAR16 TempStr[3];\r
- UINTN NodeVal;\r
- CHAR16 PortString[ISCSI_NAME_IFR_MAX_SIZE];\r
- EFI_INPUT_KEY Key;\r
+ UINT8 Index;\r
+ CHAR16 *IsIdStr;\r
+ CHAR16 TempStr[3];\r
+ UINTN NodeVal;\r
+ CHAR16 PortString[ISCSI_NAME_IFR_MAX_SIZE];\r
+ EFI_INPUT_KEY Key;\r
\r
if ((String == NULL) || (IsId == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- IsIdStr = (CHAR16 *) String;\r
+ IsIdStr = (CHAR16 *)String;\r
\r
- if (StrLen (IsIdStr) != 6 && StrLen (IsIdStr) != 12) {\r
+ if ((StrLen (IsIdStr) != 6) && (StrLen (IsIdStr) != 12)) {\r
UnicodeSPrint (\r
PortString,\r
- (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+ (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
L"Error! Only last 3 bytes are configurable, please input 6 hex numbers for last 3 bytes only or 12 hex numbers for full SSID!\n"\r
);\r
\r
//\r
NodeVal = StrHexToUintn (TempStr);\r
\r
- IsId[Index] = (UINT8) NodeVal;\r
+ IsId[Index] = (UINT8)NodeVal;\r
\r
IsIdStr = IsIdStr + 2;\r
}\r
**/\r
EFI_STATUS\r
IScsiConvertIsIdToString (\r
- OUT CHAR16 *String,\r
- IN UINT8 *IsId\r
+ OUT CHAR16 *String,\r
+ IN UINT8 *IsId\r
)\r
{\r
- UINT8 Index;\r
- UINTN Number;\r
+ UINT8 Index;\r
+ UINTN Number;\r
\r
if ((String == NULL) || (IsId == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
String,\r
2 * ISID_CONFIGURABLE_STORAGE,\r
L"0%X",\r
- (UINTN) IsId[Index]\r
+ (UINTN)IsId[Index]\r
);\r
} else {\r
Number = UnicodeSPrint (\r
String,\r
2 * ISID_CONFIGURABLE_STORAGE,\r
L"%X",\r
- (UINTN) IsId[Index]\r
+ (UINTN)IsId[Index]\r
);\r
-\r
}\r
\r
String = String + Number;\r
**/\r
EFI_STATUS\r
IScsiGetValue (\r
- IN CONST EFI_STRING Configuration,\r
- IN CHAR16 *String,\r
- OUT UINTN *Value\r
+ IN CONST EFI_STRING Configuration,\r
+ IN CHAR16 *String,\r
+ OUT UINTN *Value\r
)\r
{\r
- CHAR16 *StringPtr;\r
- CHAR16 *TmpPtr;\r
- CHAR16 *Str;\r
- CHAR16 TmpStr[2];\r
- UINTN Length;\r
- UINTN Len;\r
- UINTN Index;\r
- UINT8 *Buf;\r
- UINT8 DigitUint8;\r
- EFI_STATUS Status;\r
+ CHAR16 *StringPtr;\r
+ CHAR16 *TmpPtr;\r
+ CHAR16 *Str;\r
+ CHAR16 TmpStr[2];\r
+ UINTN Length;\r
+ UINTN Len;\r
+ UINTN Index;\r
+ UINT8 *Buf;\r
+ UINT8 DigitUint8;\r
+ EFI_STATUS Status;\r
\r
//\r
// Get Value.\r
//\r
- Buf = NULL;\r
+ Buf = NULL;\r
StringPtr = StrStr (Configuration, String);\r
- ASSERT(StringPtr != NULL);\r
+ ASSERT (StringPtr != NULL);\r
StringPtr += StrLen (String);\r
- TmpPtr = StringPtr;\r
+ TmpPtr = StringPtr;\r
\r
while (*StringPtr != L'\0' && *StringPtr != L'&') {\r
- StringPtr ++;\r
+ StringPtr++;\r
}\r
+\r
Length = StringPtr - TmpPtr;\r
- Len = Length + 1;\r
+ Len = Length + 1;\r
\r
Str = AllocateZeroPool (Len * sizeof (CHAR16));\r
if (Str == NULL) {\r
*(Str + Length) = L'\0';\r
\r
Len = (Len + 1) / 2;\r
- Buf = (UINT8 *) AllocateZeroPool (Len);\r
+ Buf = (UINT8 *)AllocateZeroPool (Len);\r
if (Buf == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Exit;\r
}\r
\r
ZeroMem (TmpStr, sizeof (TmpStr));\r
- for (Index = 0; Index < Length; Index ++) {\r
- TmpStr[0] = Str[Length - Index - 1];\r
- DigitUint8 = (UINT8) StrHexToUint64 (TmpStr);\r
+ for (Index = 0; Index < Length; Index++) {\r
+ TmpStr[0] = Str[Length - Index - 1];\r
+ DigitUint8 = (UINT8)StrHexToUint64 (TmpStr);\r
if ((Index & 1) == 0) {\r
- Buf [Index/2] = DigitUint8;\r
+ Buf[Index/2] = DigitUint8;\r
} else {\r
- Buf [Index/2] = (UINT8) ((DigitUint8 << 4) + Buf [Index/2]);\r
+ Buf[Index/2] = (UINT8)((DigitUint8 << 4) + Buf[Index/2]);\r
}\r
}\r
\r
**/\r
ISCSI_ATTEMPT_CONFIG_NVDATA *\r
IScsiConfigGetAttemptByConfigIndex (\r
- IN UINT8 AttemptConfigIndex\r
+ IN UINT8 AttemptConfigIndex\r
)\r
{\r
LIST_ENTRY *Entry;\r
return NULL;\r
}\r
\r
-\r
/**\r
Get the existing attempt config data from global structure by the NicIndex.\r
\r
**/\r
ISCSI_ATTEMPT_CONFIG_NVDATA *\r
IScsiConfigGetAttemptByNic (\r
- IN ISCSI_ATTEMPT_CONFIG_NVDATA *NewAttempt,\r
- IN UINT8 IScsiMode\r
+ IN ISCSI_ATTEMPT_CONFIG_NVDATA *NewAttempt,\r
+ IN UINT8 IScsiMode\r
)\r
{\r
LIST_ENTRY *Entry;\r
\r
NET_LIST_FOR_EACH (Entry, &mPrivate->AttemptConfigs) {\r
Attempt = NET_LIST_USER_STRUCT (Entry, ISCSI_ATTEMPT_CONFIG_NVDATA, Link);\r
- if (Attempt != NewAttempt && Attempt->NicIndex == NewAttempt->NicIndex &&\r
- Attempt->SessionConfigData.Enabled == IScsiMode) {\r
+ if ((Attempt != NewAttempt) && (Attempt->NicIndex == NewAttempt->NicIndex) &&\r
+ (Attempt->SessionConfigData.Enabled == IScsiMode))\r
+ {\r
return Attempt;\r
}\r
}\r
**/\r
EFI_STATUS\r
IScsiGetAttemptIndexList (\r
- IN CHAR16 *AttemptNameList,\r
- OUT UINT8 *AttemptIndexList,\r
- IN BOOLEAN IsAddAttempts\r
-)\r
+ IN CHAR16 *AttemptNameList,\r
+ OUT UINT8 *AttemptIndexList,\r
+ IN BOOLEAN IsAddAttempts\r
+ )\r
{\r
- ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
- CHAR16 *AttemptStr;\r
- UINT8 AttemptIndex;\r
- UINTN Len;\r
- UINTN Index;\r
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
+ CHAR16 *AttemptStr;\r
+ UINT8 AttemptIndex;\r
+ UINTN Len;\r
+ UINTN Index;\r
\r
Index = 0;\r
\r
}\r
\r
AttemptStr = AttemptNameList;\r
- Len = StrLen (L"attempt:");\r
+ Len = StrLen (L"attempt:");\r
\r
while (*AttemptStr != L'\0') {\r
AttemptStr = StrStr (AttemptStr, L"attempt:");\r
if (AttemptStr == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
- AttemptStr += Len;\r
- AttemptIndex = (UINT8)(*AttemptStr - L'0');\r
- AttemptConfigData = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+\r
+ AttemptStr += Len;\r
+ AttemptIndex = (UINT8)(*AttemptStr - L'0');\r
+ AttemptConfigData = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
if (IsAddAttempts) {\r
if ((AttemptConfigData != NULL) || ((AttemptIndex) > PcdGet8 (PcdMaxIScsiAttemptNumber))) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
AttemptIndexList[Index] = AttemptIndex;\r
- Index ++;\r
+ Index++;\r
AttemptStr += 2;\r
}\r
+\r
return EFI_SUCCESS;\r
}\r
\r
IN OUT ISCSI_CONFIG_IFR_NVDATA *IfrNvData\r
)\r
{\r
- ISCSI_SESSION_CONFIG_NVDATA *SessionConfigData;\r
- ISCSI_CHAP_AUTH_CONFIG_NVDATA *AuthConfigData;\r
- EFI_IP_ADDRESS Ip;\r
- BOOLEAN DnsMode;\r
+ ISCSI_SESSION_CONFIG_NVDATA *SessionConfigData;\r
+ ISCSI_CHAP_AUTH_CONFIG_NVDATA *AuthConfigData;\r
+ EFI_IP_ADDRESS Ip;\r
+ BOOLEAN DnsMode;\r
\r
//\r
// Normal session configuration parameters.\r
//\r
- SessionConfigData = &Attempt->SessionConfigData;\r
- IfrNvData->Enabled = SessionConfigData->Enabled;\r
- IfrNvData->IpMode = SessionConfigData->IpMode;\r
- DnsMode = SessionConfigData->DnsMode;\r
+ SessionConfigData = &Attempt->SessionConfigData;\r
+ IfrNvData->Enabled = SessionConfigData->Enabled;\r
+ IfrNvData->IpMode = SessionConfigData->IpMode;\r
+ DnsMode = SessionConfigData->DnsMode;\r
\r
- IfrNvData->InitiatorInfoFromDhcp = SessionConfigData->InitiatorInfoFromDhcp;\r
- IfrNvData->TargetInfoFromDhcp = SessionConfigData->TargetInfoFromDhcp;\r
- IfrNvData->TargetPort = SessionConfigData->TargetPort;\r
+ IfrNvData->InitiatorInfoFromDhcp = SessionConfigData->InitiatorInfoFromDhcp;\r
+ IfrNvData->TargetInfoFromDhcp = SessionConfigData->TargetInfoFromDhcp;\r
+ IfrNvData->TargetPort = SessionConfigData->TargetPort;\r
\r
if (IfrNvData->IpMode == IP_MODE_IP4) {\r
CopyMem (&Ip.v4, &SessionConfigData->LocalIp, sizeof (EFI_IPv4_ADDRESS));\r
CopyMem (&Ip.v4, &SessionConfigData->TargetIp, sizeof (EFI_IPv4_ADDRESS));\r
IScsiIpToStr (&Ip, FALSE, IfrNvData->TargetIp);\r
}\r
-\r
} else if (IfrNvData->IpMode == IP_MODE_IP6) {\r
ZeroMem (IfrNvData->TargetIp, sizeof (IfrNvData->TargetIp));\r
if (SessionConfigData->TargetIp.v6.Addr[0] != '\0') {\r
IN OUT ISCSI_CONFIG_IFR_NVDATA *IfrNvData\r
)\r
{\r
- LIST_ENTRY *Entry;\r
- ISCSI_ATTEMPT_CONFIG_NVDATA *Attempt;\r
- ISCSI_SESSION_CONFIG_NVDATA *SessionConfigData;\r
- ISCSI_CHAP_AUTH_CONFIG_NVDATA *AuthConfigData;\r
- CHAR16 AttemptNameList[ATTEMPT_NAME_LIST_SIZE];\r
- ISCSI_NIC_INFO *NicInfo;\r
- CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];\r
- EFI_IP_ADDRESS Ip;\r
- UINTN Index;\r
- UINTN StringLen;\r
+ LIST_ENTRY *Entry;\r
+ ISCSI_ATTEMPT_CONFIG_NVDATA *Attempt;\r
+ ISCSI_SESSION_CONFIG_NVDATA *SessionConfigData;\r
+ ISCSI_CHAP_AUTH_CONFIG_NVDATA *AuthConfigData;\r
+ CHAR16 AttemptNameList[ATTEMPT_NAME_LIST_SIZE];\r
+ ISCSI_NIC_INFO *NicInfo;\r
+ CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];\r
+ EFI_IP_ADDRESS Ip;\r
+ UINTN Index;\r
+ UINTN StringLen;\r
\r
NicInfo = NULL;\r
ZeroMem (AttemptNameList, sizeof (AttemptNameList));\r
//\r
// Normal session configuration parameters.\r
//\r
- SessionConfigData = &Attempt->SessionConfigData;\r
+ SessionConfigData = &Attempt->SessionConfigData;\r
\r
ASSERT ((Attempt->AttemptConfigIndex > 0) && (Attempt->AttemptConfigIndex <= FixedPcdGet8 (PcdMaxIScsiAttemptNumber)));\r
- Index = Attempt->AttemptConfigIndex - 1;\r
+ Index = Attempt->AttemptConfigIndex - 1;\r
\r
//\r
// Save the attempt to AttemptNameList as Attempt:1 Attempt:2\r
Attempt->AttemptName,\r
AttemptNameList + StrLen (AttemptNameList),\r
ATTEMPT_NAME_LIST_SIZE - StrLen (AttemptNameList)\r
- );\r
+ );\r
\r
StringLen = StrLen (AttemptNameList);\r
ASSERT (StringLen > 2);\r
Attempt->AttemptName,\r
IfrNvData->ISCSIAttemptName + ATTEMPT_NAME_SIZE * Index,\r
ATTEMPT_NAME_LIST_SIZE - ATTEMPT_NAME_SIZE * Index\r
- );\r
+ );\r
\r
- IfrNvData->ISCSIBootEnableList[Index] = SessionConfigData->Enabled;\r
- IfrNvData->ISCSIIpAddressTypeList[Index] = SessionConfigData->IpMode;\r
+ IfrNvData->ISCSIBootEnableList[Index] = SessionConfigData->Enabled;\r
+ IfrNvData->ISCSIIpAddressTypeList[Index] = SessionConfigData->IpMode;\r
\r
- IfrNvData->ISCSIInitiatorInfoViaDHCP[Index] = SessionConfigData->InitiatorInfoFromDhcp;\r
- IfrNvData->ISCSITargetInfoViaDHCP[Index] = SessionConfigData->TargetInfoFromDhcp;\r
- IfrNvData->ISCSIConnectRetry[Index] = SessionConfigData->ConnectRetryCount;\r
- IfrNvData->ISCSIConnectTimeout[Index] = SessionConfigData->ConnectTimeout;\r
- IfrNvData->ISCSITargetTcpPort[Index] = SessionConfigData->TargetPort;\r
+ IfrNvData->ISCSIInitiatorInfoViaDHCP[Index] = SessionConfigData->InitiatorInfoFromDhcp;\r
+ IfrNvData->ISCSITargetInfoViaDHCP[Index] = SessionConfigData->TargetInfoFromDhcp;\r
+ IfrNvData->ISCSIConnectRetry[Index] = SessionConfigData->ConnectRetryCount;\r
+ IfrNvData->ISCSIConnectTimeout[Index] = SessionConfigData->ConnectTimeout;\r
+ IfrNvData->ISCSITargetTcpPort[Index] = SessionConfigData->TargetPort;\r
\r
if (SessionConfigData->IpMode == IP_MODE_IP4) {\r
CopyMem (&Ip.v4, &SessionConfigData->LocalIp, sizeof (EFI_IPv4_ADDRESS));\r
IScsiLunToUnicodeStr (SessionConfigData->BootLun, IfrNvData->Keyword[Index].ISCSILun);\r
IScsiConvertIsIdToString (IfrNvData->Keyword[Index].ISCSIIsId, SessionConfigData->IsId);\r
\r
- IfrNvData->ISCSIAuthenticationMethod[Index] = Attempt->AuthenticationType;\r
+ IfrNvData->ISCSIAuthenticationMethod[Index] = Attempt->AuthenticationType;\r
\r
if (Attempt->AuthenticationType == ISCSI_AUTH_TYPE_CHAP) {\r
- AuthConfigData = &Attempt->AuthConfigData.CHAP;\r
+ AuthConfigData = &Attempt->AuthConfigData.CHAP;\r
IfrNvData->ISCSIChapType[Index] = AuthConfigData->CHAPType;\r
AsciiStrToUnicodeStrS (\r
AuthConfigData->CHAPName,\r
);\r
}\r
}\r
- CopyMem(IfrNvData->ISCSIDisplayAttemptList, AttemptNameList, ATTEMPT_NAME_LIST_SIZE);\r
+ CopyMem (IfrNvData->ISCSIDisplayAttemptList, AttemptNameList, ATTEMPT_NAME_LIST_SIZE);\r
\r
ZeroMem (IfrNvData->ISCSIMacAddr, sizeof (IfrNvData->ISCSIMacAddr));\r
NET_LIST_FOR_EACH (Entry, &mPrivate->NicInfoList) {\r
IN OUT ISCSI_ATTEMPT_CONFIG_NVDATA *Attempt\r
)\r
{\r
- EFI_IP_ADDRESS HostIp;\r
- EFI_IP_ADDRESS SubnetMask;\r
- EFI_IP_ADDRESS Gateway;\r
- CHAR16 *MacString;\r
- CHAR16 *AttemptName1;\r
- CHAR16 *AttemptName2;\r
- ISCSI_ATTEMPT_CONFIG_NVDATA *ExistAttempt;\r
- ISCSI_ATTEMPT_CONFIG_NVDATA *SameNicAttempt;\r
- CHAR16 IScsiMode[64];\r
- CHAR16 IpMode[64];\r
- ISCSI_NIC_INFO *NicInfo;\r
- EFI_INPUT_KEY Key;\r
- UINT8 *AttemptConfigOrder;\r
- UINTN AttemptConfigOrderSize;\r
- UINT8 *AttemptOrderTmp;\r
- UINTN TotalNumber;\r
- EFI_STATUS Status;\r
-\r
- if (IfrNvData == NULL || Attempt == NULL) {\r
+ EFI_IP_ADDRESS HostIp;\r
+ EFI_IP_ADDRESS SubnetMask;\r
+ EFI_IP_ADDRESS Gateway;\r
+ CHAR16 *MacString;\r
+ CHAR16 *AttemptName1;\r
+ CHAR16 *AttemptName2;\r
+ ISCSI_ATTEMPT_CONFIG_NVDATA *ExistAttempt;\r
+ ISCSI_ATTEMPT_CONFIG_NVDATA *SameNicAttempt;\r
+ CHAR16 IScsiMode[64];\r
+ CHAR16 IpMode[64];\r
+ ISCSI_NIC_INFO *NicInfo;\r
+ EFI_INPUT_KEY Key;\r
+ UINT8 *AttemptConfigOrder;\r
+ UINTN AttemptConfigOrderSize;\r
+ UINT8 *AttemptOrderTmp;\r
+ UINTN TotalNumber;\r
+ EFI_STATUS Status;\r
+\r
+ if ((IfrNvData == NULL) || (Attempt == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
//\r
// Update those fields which don't have INTERACTIVE attribute.\r
//\r
- Attempt->SessionConfigData.ConnectRetryCount = IfrNvData->ConnectRetryCount;\r
- Attempt->SessionConfigData.ConnectTimeout = IfrNvData->ConnectTimeout;\r
- Attempt->SessionConfigData.IpMode = IfrNvData->IpMode;\r
+ Attempt->SessionConfigData.ConnectRetryCount = IfrNvData->ConnectRetryCount;\r
+ Attempt->SessionConfigData.ConnectTimeout = IfrNvData->ConnectTimeout;\r
+ Attempt->SessionConfigData.IpMode = IfrNvData->IpMode;\r
\r
if (IfrNvData->IpMode < IP_MODE_AUTOCONFIG) {\r
Attempt->SessionConfigData.InitiatorInfoFromDhcp = IfrNvData->InitiatorInfoFromDhcp;\r
}\r
}\r
}\r
+\r
//\r
// Validate target configuration if DHCP isn't deployed.\r
//\r
- if (!Attempt->SessionConfigData.TargetInfoFromDhcp && Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG) {\r
+ if (!Attempt->SessionConfigData.TargetInfoFromDhcp && (Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG)) {\r
if (!Attempt->SessionConfigData.DnsMode) {\r
if (!IpIsUnicast (&Attempt->SessionConfigData.TargetIp, IfrNvData->IpMode)) {\r
CreatePopUp (\r
\r
if ((IfrNvData->CHAPType == ISCSI_CHAP_MUTUAL) &&\r
((IfrNvData->ReverseCHAPName[0] == '\0') || (IfrNvData->ReverseCHAPSecret[0] == '\0'))\r
- ) {\r
+ )\r
+ {\r
CreatePopUp (\r
EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
&Key,\r
//\r
SameNicAttempt = IScsiConfigGetAttemptByNic (Attempt, IfrNvData->Enabled);\r
if (SameNicAttempt != NULL) {\r
- AttemptName1 = (CHAR16 *) AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));\r
+ AttemptName1 = (CHAR16 *)AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));\r
if (AttemptName1 == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
- AttemptName2 = (CHAR16 *) AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));\r
+ AttemptName2 = (CHAR16 *)AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));\r
if (AttemptName2 == NULL) {\r
FreePool (AttemptName1);\r
return EFI_OUT_OF_RESOURCES;\r
\r
UnicodeSPrint (\r
mPrivate->PortString,\r
- (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+ (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
L"Warning! Attempt \"%s\" uses same NIC as Attempt \"%s\".",\r
AttemptName1,\r
AttemptName2\r
return EFI_NOT_FOUND;\r
}\r
\r
- MacString = (CHAR16 *) AllocateZeroPool (ISCSI_MAX_MAC_STRING_LEN * sizeof (CHAR16));\r
+ MacString = (CHAR16 *)AllocateZeroPool (ISCSI_MAX_MAC_STRING_LEN * sizeof (CHAR16));\r
if (MacString == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
UnicodeSPrint (\r
mPrivate->PortString,\r
- (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+ (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
L"MAC: %s, PFA: Bus %d | Dev %d | Func %d, iSCSI mode: %s, IP version: %s",\r
MacString,\r
NicInfo->BusNumber,\r
if (ExistAttempt != NULL) {\r
ASSERT (ExistAttempt == Attempt);\r
\r
- if (IfrNvData->Enabled == ISCSI_DISABLED &&\r
- Attempt->SessionConfigData.Enabled != ISCSI_DISABLED) {\r
-\r
+ if ((IfrNvData->Enabled == ISCSI_DISABLED) &&\r
+ (Attempt->SessionConfigData.Enabled != ISCSI_DISABLED))\r
+ {\r
//\r
// User updates the Attempt from "Enabled"/"Enabled for MPIO" to "Disabled".\r
//\r
if (mPrivate->SinglePathCount < 1) {\r
return EFI_ABORTED;\r
}\r
+\r
mPrivate->SinglePathCount--;\r
}\r
-\r
- } else if (IfrNvData->Enabled == ISCSI_ENABLED_FOR_MPIO &&\r
- Attempt->SessionConfigData.Enabled == ISCSI_ENABLED) {\r
+ } else if ((IfrNvData->Enabled == ISCSI_ENABLED_FOR_MPIO) &&\r
+ (Attempt->SessionConfigData.Enabled == ISCSI_ENABLED))\r
+ {\r
//\r
// User updates the Attempt from "Enabled" to "Enabled for MPIO".\r
//\r
mPrivate->EnableMpio = TRUE;\r
mPrivate->MpioCount++;\r
mPrivate->SinglePathCount--;\r
-\r
- } else if (IfrNvData->Enabled == ISCSI_ENABLED &&\r
- Attempt->SessionConfigData.Enabled == ISCSI_ENABLED_FOR_MPIO) {\r
+ } else if ((IfrNvData->Enabled == ISCSI_ENABLED) &&\r
+ (Attempt->SessionConfigData.Enabled == ISCSI_ENABLED_FOR_MPIO))\r
+ {\r
//\r
// User updates the Attempt from "Enabled for MPIO" to "Enabled".\r
//\r
if (--mPrivate->MpioCount == 0) {\r
mPrivate->EnableMpio = FALSE;\r
}\r
- mPrivate->SinglePathCount++;\r
\r
- } else if (IfrNvData->Enabled != ISCSI_DISABLED &&\r
- Attempt->SessionConfigData.Enabled == ISCSI_DISABLED) {\r
+ mPrivate->SinglePathCount++;\r
+ } else if ((IfrNvData->Enabled != ISCSI_DISABLED) &&\r
+ (Attempt->SessionConfigData.Enabled == ISCSI_DISABLED))\r
+ {\r
//\r
// User updates the Attempt from "Disabled" to "Enabled"/"Enabled for MPIO".\r
//\r
if (IfrNvData->Enabled == ISCSI_ENABLED_FOR_MPIO) {\r
mPrivate->EnableMpio = TRUE;\r
mPrivate->MpioCount++;\r
-\r
} else if (IfrNvData->Enabled == ISCSI_ENABLED) {\r
mPrivate->SinglePathCount++;\r
}\r
}\r
-\r
} else if (ExistAttempt == NULL) {\r
//\r
// When a new attempt is created, pointer of the attempt is saved to\r
if (AttemptConfigOrder != NULL) {\r
FreePool (AttemptConfigOrder);\r
}\r
+\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
\r
IScsiConfigUpdateAttempt ();\r
}\r
+\r
Attempt->SessionConfigData.Enabled = IfrNvData->Enabled;\r
\r
//\r
// Record the user configuration information in NVR.\r
//\r
- UnicodeSPrint (mPrivate->PortString, (UINTN) ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", Attempt->AttemptConfigIndex);\r
+ UnicodeSPrint (mPrivate->PortString, (UINTN)ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", Attempt->AttemptConfigIndex);\r
\r
FreePool (MacString);\r
\r
**/\r
EFI_STATUS\r
IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (\r
- IN ISCSI_CONFIG_IFR_NVDATA *IfrNvData,\r
- IN UINTN OffSet\r
+ IN ISCSI_CONFIG_IFR_NVDATA *IfrNvData,\r
+ IN UINTN OffSet\r
)\r
{\r
- ISCSI_ATTEMPT_CONFIG_NVDATA *Attempt;\r
- UINT8 AttemptIndex;\r
- UINT8 Index;\r
- UINT8 ChapSecretLen;\r
- UINT8 ReverseChapSecretLen;\r
- CHAR16 *AttemptName1;\r
- CHAR16 *AttemptName2;\r
- ISCSI_ATTEMPT_CONFIG_NVDATA *SameNicAttempt;\r
- CHAR8 LunString[ISCSI_LUN_STR_MAX_LEN];\r
- CHAR8 IScsiName[ISCSI_NAME_MAX_SIZE];\r
- CHAR8 IpString[IP_STR_MAX_SIZE];\r
- EFI_IP_ADDRESS HostIp;\r
- EFI_IP_ADDRESS SubnetMask;\r
- EFI_IP_ADDRESS Gateway;\r
- EFI_INPUT_KEY Key;\r
- UINT64 Lun;\r
- EFI_STATUS Status;\r
+ ISCSI_ATTEMPT_CONFIG_NVDATA *Attempt;\r
+ UINT8 AttemptIndex;\r
+ UINT8 Index;\r
+ UINT8 ChapSecretLen;\r
+ UINT8 ReverseChapSecretLen;\r
+ CHAR16 *AttemptName1;\r
+ CHAR16 *AttemptName2;\r
+ ISCSI_ATTEMPT_CONFIG_NVDATA *SameNicAttempt;\r
+ CHAR8 LunString[ISCSI_LUN_STR_MAX_LEN];\r
+ CHAR8 IScsiName[ISCSI_NAME_MAX_SIZE];\r
+ CHAR8 IpString[IP_STR_MAX_SIZE];\r
+ EFI_IP_ADDRESS HostIp;\r
+ EFI_IP_ADDRESS SubnetMask;\r
+ EFI_IP_ADDRESS Gateway;\r
+ EFI_INPUT_KEY Key;\r
+ UINT64 Lun;\r
+ EFI_STATUS Status;\r
\r
Attempt = NULL;\r
ZeroMem (IScsiName, sizeof (IScsiName));\r
\r
if (OffSet < ATTEMPT_BOOTENABLE_VAR_OFFSET) {\r
return EFI_SUCCESS;\r
-\r
} else if ((OffSet >= ATTEMPT_BOOTENABLE_VAR_OFFSET) && (OffSet < ATTEMPT_ADDRESS_TYPE_VAR_OFFSET)) {\r
- AttemptIndex = (UINT8) ((OffSet - ATTEMPT_BOOTENABLE_VAR_OFFSET) + 1);\r
- Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+ AttemptIndex = (UINT8)((OffSet - ATTEMPT_BOOTENABLE_VAR_OFFSET) + 1);\r
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
if (Attempt == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
+\r
IfrNvData->Enabled = IfrNvData->ISCSIBootEnableList[AttemptIndex - 1];\r
//\r
// Validate the configuration of attempt.\r
//\r
SameNicAttempt = IScsiConfigGetAttemptByNic (Attempt, IfrNvData->Enabled);\r
if (SameNicAttempt != NULL) {\r
- AttemptName1 = (CHAR16 *) AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));\r
+ AttemptName1 = (CHAR16 *)AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));\r
if (AttemptName1 == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
- AttemptName2 = (CHAR16 *) AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));\r
+ AttemptName2 = (CHAR16 *)AllocateZeroPool (ATTEMPT_NAME_SIZE * sizeof (CHAR16));\r
if (AttemptName2 == NULL) {\r
FreePool (AttemptName1);\r
return EFI_OUT_OF_RESOURCES;\r
\r
UnicodeSPrint (\r
mPrivate->PortString,\r
- (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+ (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
L"Warning! \"%s\" uses same NIC as Attempt \"%s\".",\r
AttemptName1,\r
AttemptName2\r
}\r
}\r
\r
- if (IfrNvData->Enabled == ISCSI_DISABLED &&\r
- Attempt->SessionConfigData.Enabled != ISCSI_DISABLED) {\r
-\r
+ if ((IfrNvData->Enabled == ISCSI_DISABLED) &&\r
+ (Attempt->SessionConfigData.Enabled != ISCSI_DISABLED))\r
+ {\r
//\r
// User updates the Attempt from "Enabled"/"Enabled for MPIO" to "Disabled".\r
//\r
if (mPrivate->SinglePathCount < 1) {\r
return EFI_ABORTED;\r
}\r
+\r
mPrivate->SinglePathCount--;\r
}\r
-\r
- } else if (IfrNvData->Enabled == ISCSI_ENABLED_FOR_MPIO &&\r
- Attempt->SessionConfigData.Enabled == ISCSI_ENABLED) {\r
+ } else if ((IfrNvData->Enabled == ISCSI_ENABLED_FOR_MPIO) &&\r
+ (Attempt->SessionConfigData.Enabled == ISCSI_ENABLED))\r
+ {\r
//\r
// User updates the Attempt from "Enabled" to "Enabled for MPIO".\r
//\r
mPrivate->EnableMpio = TRUE;\r
mPrivate->MpioCount++;\r
mPrivate->SinglePathCount--;\r
-\r
- } else if (IfrNvData->Enabled == ISCSI_ENABLED &&\r
- Attempt->SessionConfigData.Enabled == ISCSI_ENABLED_FOR_MPIO) {\r
+ } else if ((IfrNvData->Enabled == ISCSI_ENABLED) &&\r
+ (Attempt->SessionConfigData.Enabled == ISCSI_ENABLED_FOR_MPIO))\r
+ {\r
//\r
// User updates the Attempt from "Enabled for MPIO" to "Enabled".\r
//\r
if (--mPrivate->MpioCount == 0) {\r
mPrivate->EnableMpio = FALSE;\r
}\r
- mPrivate->SinglePathCount++;\r
\r
- } else if (IfrNvData->Enabled != ISCSI_DISABLED &&\r
- Attempt->SessionConfigData.Enabled == ISCSI_DISABLED) {\r
+ mPrivate->SinglePathCount++;\r
+ } else if ((IfrNvData->Enabled != ISCSI_DISABLED) &&\r
+ (Attempt->SessionConfigData.Enabled == ISCSI_DISABLED))\r
+ {\r
//\r
// User updates the Attempt from "Disabled" to "Enabled"/"Enabled for MPIO".\r
//\r
if (IfrNvData->Enabled == ISCSI_ENABLED_FOR_MPIO) {\r
mPrivate->EnableMpio = TRUE;\r
mPrivate->MpioCount++;\r
-\r
} else if (IfrNvData->Enabled == ISCSI_ENABLED) {\r
mPrivate->SinglePathCount++;\r
}\r
}\r
- Attempt->SessionConfigData.Enabled = IfrNvData->Enabled;\r
\r
+ Attempt->SessionConfigData.Enabled = IfrNvData->Enabled;\r
} else if ((OffSet >= ATTEMPT_ADDRESS_TYPE_VAR_OFFSET) && (OffSet < ATTEMPT_CONNECT_RETRY_VAR_OFFSET)) {\r
- AttemptIndex = (UINT8) ((OffSet - ATTEMPT_ADDRESS_TYPE_VAR_OFFSET) + 1);\r
- Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+ AttemptIndex = (UINT8)((OffSet - ATTEMPT_ADDRESS_TYPE_VAR_OFFSET) + 1);\r
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
if (Attempt == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
+\r
Attempt->SessionConfigData.IpMode = IfrNvData->ISCSIIpAddressTypeList[AttemptIndex - 1];\r
if (Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG) {\r
Attempt->AutoConfigureMode = 0;\r
}\r
-\r
} else if ((OffSet >= ATTEMPT_CONNECT_RETRY_VAR_OFFSET) && (OffSet < ATTEMPT_CONNECT_TIMEOUT_VAR_OFFSET)) {\r
- AttemptIndex = (UINT8) ((OffSet - ATTEMPT_CONNECT_RETRY_VAR_OFFSET) + 1);\r
- Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+ AttemptIndex = (UINT8)((OffSet - ATTEMPT_CONNECT_RETRY_VAR_OFFSET) + 1);\r
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
if (Attempt == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
if (IfrNvData->ISCSIConnectRetry[AttemptIndex - 1] > CONNECT_MAX_RETRY) {\r
CreatePopUp (\r
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
- &Key,\r
- L"The minimum value is 0 and the maximum is 16. 0 means no retry.",\r
- NULL\r
- );\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"The minimum value is 0 and the maximum is 16. 0 means no retry.",\r
+ NULL\r
+ );\r
return EFI_INVALID_PARAMETER;\r
}\r
- Attempt->SessionConfigData.ConnectRetryCount = IfrNvData->ISCSIConnectRetry[AttemptIndex - 1];\r
\r
+ Attempt->SessionConfigData.ConnectRetryCount = IfrNvData->ISCSIConnectRetry[AttemptIndex - 1];\r
} else if ((OffSet >= ATTEMPT_CONNECT_TIMEOUT_VAR_OFFSET) && (OffSet < ATTEMPT_INITIATOR_VIA_DHCP_VAR_OFFSET)) {\r
- AttemptIndex = (UINT8) ((OffSet - ATTEMPT_CONNECT_TIMEOUT_VAR_OFFSET) / 2 + 1);\r
- Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+ AttemptIndex = (UINT8)((OffSet - ATTEMPT_CONNECT_TIMEOUT_VAR_OFFSET) / 2 + 1);\r
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
if (Attempt == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
if ((IfrNvData->ISCSIConnectTimeout[AttemptIndex - 1] < CONNECT_MIN_TIMEOUT) ||\r
- (IfrNvData->ISCSIConnectTimeout[AttemptIndex - 1] > CONNECT_MAX_TIMEOUT)) {\r
+ (IfrNvData->ISCSIConnectTimeout[AttemptIndex - 1] > CONNECT_MAX_TIMEOUT))\r
+ {\r
CreatePopUp (\r
EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
&Key,\r
if (Attempt->SessionConfigData.ConnectTimeout == 0) {\r
Attempt->SessionConfigData.ConnectTimeout = CONNECT_DEFAULT_TIMEOUT;\r
}\r
-\r
} else if ((OffSet >= ATTEMPT_INITIATOR_VIA_DHCP_VAR_OFFSET) && (OffSet < ATTEMPT_TARGET_VIA_DHCP_VAR_OFFSET)) {\r
- AttemptIndex = (UINT8) ((OffSet - ATTEMPT_INITIATOR_VIA_DHCP_VAR_OFFSET) + 1);\r
- Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+ AttemptIndex = (UINT8)((OffSet - ATTEMPT_INITIATOR_VIA_DHCP_VAR_OFFSET) + 1);\r
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
if (Attempt == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
- Attempt->SessionConfigData.InitiatorInfoFromDhcp = IfrNvData->ISCSIInitiatorInfoViaDHCP[AttemptIndex - 1];\r
\r
+ Attempt->SessionConfigData.InitiatorInfoFromDhcp = IfrNvData->ISCSIInitiatorInfoViaDHCP[AttemptIndex - 1];\r
} else if ((OffSet >= ATTEMPT_TARGET_VIA_DHCP_VAR_OFFSET) && (OffSet < ATTEMPT_TARGET_TCP_PORT_VAR_OFFSET)) {\r
- AttemptIndex = (UINT8) ((OffSet - ATTEMPT_TARGET_VIA_DHCP_VAR_OFFSET) + 1);\r
- Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+ AttemptIndex = (UINT8)((OffSet - ATTEMPT_TARGET_VIA_DHCP_VAR_OFFSET) + 1);\r
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
if (Attempt == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
);\r
return EFI_INVALID_PARAMETER;\r
}\r
-\r
} else if ((OffSet >= ATTEMPT_TARGET_TCP_PORT_VAR_OFFSET) && (OffSet < ATTEMPT_AUTHENTICATION_METHOD_VAR_OFFSET)) {\r
- AttemptIndex = (UINT8) ((OffSet - ATTEMPT_TARGET_TCP_PORT_VAR_OFFSET) / 2 + 1);\r
- Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+ AttemptIndex = (UINT8)((OffSet - ATTEMPT_TARGET_TCP_PORT_VAR_OFFSET) / 2 + 1);\r
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
if (Attempt == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
+\r
if ((Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG) && (!Attempt->SessionConfigData.TargetInfoFromDhcp)) {\r
Attempt->SessionConfigData.TargetPort = IfrNvData->ISCSITargetTcpPort[AttemptIndex - 1];\r
if (Attempt->SessionConfigData.TargetPort == 0) {\r
);\r
return EFI_INVALID_PARAMETER;\r
}\r
-\r
} else if ((OffSet >= ATTEMPT_AUTHENTICATION_METHOD_VAR_OFFSET) && (OffSet < ATTEMPT_CHARTYPE_VAR_OFFSET)) {\r
- AttemptIndex = (UINT8) ((OffSet - ATTEMPT_AUTHENTICATION_METHOD_VAR_OFFSET) + 1);\r
- Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+ AttemptIndex = (UINT8)((OffSet - ATTEMPT_AUTHENTICATION_METHOD_VAR_OFFSET) + 1);\r
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
if (Attempt == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
Attempt->AuthenticationType = IfrNvData->ISCSIAuthenticationMethod[AttemptIndex - 1];\r
-\r
} else if ((OffSet >= ATTEMPT_CHARTYPE_VAR_OFFSET) && (OffSet < ATTEMPT_ISID_VAR_OFFSET)) {\r
- AttemptIndex = (UINT8) ((OffSet - ATTEMPT_CHARTYPE_VAR_OFFSET) + 1);\r
- Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+ AttemptIndex = (UINT8)((OffSet - ATTEMPT_CHARTYPE_VAR_OFFSET) + 1);\r
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
if (Attempt == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
+\r
if (Attempt->AuthenticationType == ISCSI_AUTH_TYPE_CHAP) {\r
Attempt->AuthConfigData.CHAP.CHAPType = IfrNvData->ISCSIChapType[AttemptIndex - 1];\r
}\r
-\r
} else if (OffSet >= ATTEMPT_ISID_VAR_OFFSET) {\r
- Index = (UINT8) ((OffSet - ATTEMPT_ISID_VAR_OFFSET) / sizeof (KEYWORD_STR));\r
+ Index = (UINT8)((OffSet - ATTEMPT_ISID_VAR_OFFSET) / sizeof (KEYWORD_STR));\r
AttemptIndex = Index + 1;\r
- Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
+ Attempt = IScsiConfigGetAttemptByConfigIndex (AttemptIndex);\r
if (Attempt == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
if ((OffSet >= ATTEMPT_ISID_VAR_OFFSET) && (OffSet < ATTEMPT_INITIATOR_IP_ADDRESS_VAR_OFFSET)) {\r
IScsiParseIsIdFromString (IfrNvData->Keyword[Index].ISCSIIsId, Attempt->SessionConfigData.IsId);\r
-\r
- } else if ((OffSet >= ATTEMPT_INITIATOR_IP_ADDRESS_VAR_OFFSET) && (OffSet < ATTEMPT_INITIATOR_NET_MASK_VAR_OFFSET)) {\r
+ } else if ((OffSet >= ATTEMPT_INITIATOR_IP_ADDRESS_VAR_OFFSET) && (OffSet < ATTEMPT_INITIATOR_NET_MASK_VAR_OFFSET)) {\r
if ((Attempt->SessionConfigData.IpMode == IP_MODE_IP4) && (!Attempt->SessionConfigData.InitiatorInfoFromDhcp)) {\r
//\r
// Config Local ip\r
//\r
Status = NetLibStrToIp4 (IfrNvData->Keyword[Index].ISCSIInitiatorIpAddress, &HostIp.v4);\r
if (EFI_ERROR (Status) || ((Attempt->SessionConfigData.SubnetMask.Addr[0] != 0) &&\r
- !NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), NTOHL(*(UINT32*)Attempt->SessionConfigData.SubnetMask.Addr)))) {\r
+ !NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), NTOHL (*(UINT32 *)Attempt->SessionConfigData.SubnetMask.Addr))))\r
+ {\r
CreatePopUp (\r
EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
&Key,\r
);\r
return EFI_INVALID_PARAMETER;\r
}\r
-\r
} else if ((OffSet >= ATTEMPT_INITIATOR_NET_MASK_VAR_OFFSET) && (OffSet < ATTEMPT_INITIATOR_GATE_WAY_VAR_OFFSET)) {\r
if ((Attempt->SessionConfigData.IpMode == IP_MODE_IP4) && (!Attempt->SessionConfigData.InitiatorInfoFromDhcp)) {\r
Status = NetLibStrToIp4 (IfrNvData->Keyword[Index].ISCSIInitiatorNetmask, &SubnetMask.v4);\r
);\r
return EFI_INVALID_PARAMETER;\r
}\r
-\r
} else if ((OffSet >= ATTEMPT_INITIATOR_GATE_WAY_VAR_OFFSET) && (OffSet < ATTEMPT_TARGET_NAME_VAR_OFFSET)) {\r
if ((Attempt->SessionConfigData.IpMode == IP_MODE_IP4) && (!Attempt->SessionConfigData.InitiatorInfoFromDhcp)) {\r
Status = NetLibStrToIp4 (IfrNvData->Keyword[Index].ISCSIInitiatorGateway, &Gateway.v4);\r
if (EFI_ERROR (Status) ||\r
- ((Gateway.Addr[0] != 0) && (Attempt->SessionConfigData.SubnetMask.Addr[0] != 0) &&\r
- !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), NTOHL(*(UINT32*)Attempt->SessionConfigData.SubnetMask.Addr)))) {\r
+ ((Gateway.Addr[0] != 0) && (Attempt->SessionConfigData.SubnetMask.Addr[0] != 0) &&\r
+ !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), NTOHL (*(UINT32 *)Attempt->SessionConfigData.SubnetMask.Addr))))\r
+ {\r
CreatePopUp (\r
EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
&Key,\r
);\r
return EFI_INVALID_PARAMETER;\r
}\r
-\r
} else if ((OffSet >= ATTEMPT_TARGET_NAME_VAR_OFFSET) && (OffSet < ATTEMPT_TARGET_IP_ADDRESS_VAR_OFFSET)) {\r
if ((Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG) && (!Attempt->SessionConfigData.TargetInfoFromDhcp)) {\r
UnicodeStrToAsciiStrS (IfrNvData->Keyword[Index].ISCSITargetName, IScsiName, ISCSI_NAME_MAX_SIZE);\r
} else {\r
AsciiStrCpyS (Attempt->SessionConfigData.TargetName, ISCSI_NAME_MAX_SIZE, IScsiName);\r
}\r
+\r
if (Attempt->SessionConfigData.Enabled != ISCSI_DISABLED) {\r
if (Attempt->SessionConfigData.TargetName[0] == L'\0') {\r
CreatePopUp (\r
);\r
return EFI_INVALID_PARAMETER;\r
}\r
-\r
} else if ((OffSet >= ATTEMPT_TARGET_IP_ADDRESS_VAR_OFFSET) && (OffSet < ATTEMPT_LUN_VAR_OFFSET)) {\r
if ((Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG) && (!Attempt->SessionConfigData.TargetInfoFromDhcp)) {\r
UnicodeStrToAsciiStrS (IfrNvData->Keyword[Index].ISCSITargetIpAddress, IpString, sizeof (IpString));\r
);\r
return EFI_INVALID_PARAMETER;\r
}\r
-\r
} else if ((OffSet >= ATTEMPT_LUN_VAR_OFFSET) && (OffSet < ATTEMPT_CHAR_USER_NAME_VAR_OFFSET)) {\r
if ((Attempt->SessionConfigData.IpMode < IP_MODE_AUTOCONFIG) && (Attempt->SessionConfigData.TargetInfoFromDhcp == 0)) {\r
//\r
// Config LUN.\r
//\r
UnicodeStrToAsciiStrS (IfrNvData->Keyword[Index].ISCSILun, LunString, ISCSI_LUN_STR_MAX_LEN);\r
- Status = IScsiAsciiStrToLun (LunString, (UINT8 *) &Lun);\r
+ Status = IScsiAsciiStrToLun (LunString, (UINT8 *)&Lun);\r
if (EFI_ERROR (Status)) {\r
CreatePopUp (\r
EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
);\r
return EFI_INVALID_PARAMETER;\r
}\r
-\r
} else if ((OffSet >= ATTEMPT_CHAR_USER_NAME_VAR_OFFSET) && (OffSet < ATTEMPT_CHAR_SECRET_VAR_OFFSET)) {\r
if (Attempt->AuthenticationType == ISCSI_AUTH_TYPE_CHAP) {\r
UnicodeStrToAsciiStrS (\r
);\r
return EFI_INVALID_PARAMETER;\r
}\r
-\r
} else if ((OffSet >= ATTEMPT_CHAR_SECRET_VAR_OFFSET) && (OffSet < ATTEMPT_CHAR_REVERSE_USER_NAME_VAR_OFFSET)) {\r
if (Attempt->AuthenticationType == ISCSI_AUTH_TYPE_CHAP) {\r
ChapSecretLen = (UINT8)StrLen (IfrNvData->Keyword[Index].ISCSIChapSecret);\r
);\r
return EFI_INVALID_PARAMETER;\r
}\r
-\r
} else if ((OffSet >= ATTEMPT_CHAR_REVERSE_USER_NAME_VAR_OFFSET) && (OffSet < ATTEMPT_CHAR_REVERSE_SECRET_VAR_OFFSET)) {\r
if (Attempt->AuthConfigData.CHAP.CHAPType == ISCSI_CHAP_MUTUAL) {\r
UnicodeStrToAsciiStrS (\r
);\r
return EFI_INVALID_PARAMETER;\r
}\r
-\r
} else if (OffSet >= ATTEMPT_CHAR_REVERSE_SECRET_VAR_OFFSET) {\r
if (Attempt->AuthConfigData.CHAP.CHAPType == ISCSI_CHAP_MUTUAL) {\r
ReverseChapSecretLen = (UINT8)StrLen (IfrNvData->Keyword[Index].ISCSIReverseChapSecret);\r
}\r
}\r
\r
-\r
-\r
//\r
// Record the user configuration information in NVR.\r
//\r
ASSERT (Attempt != NULL);\r
- UnicodeSPrint (mPrivate->PortString, (UINTN) ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", Attempt->AttemptConfigIndex);\r
+ UnicodeSPrint (mPrivate->PortString, (UINTN)ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", Attempt->AttemptConfigIndex);\r
return gRT->SetVariable (\r
mPrivate->PortString,\r
&gEfiIScsiInitiatorNameProtocolGuid,\r
sizeof (ISCSI_ATTEMPT_CONFIG_NVDATA),\r
Attempt\r
);\r
-\r
}\r
\r
/**\r
**/\r
EFI_STATUS\r
IScsiCreateOpCode (\r
- IN UINT16 StartLabelNumber,\r
- OUT VOID **StartOpCodeHandle,\r
- OUT EFI_IFR_GUID_LABEL **StartLabel,\r
- OUT VOID **EndOpCodeHandle,\r
- OUT EFI_IFR_GUID_LABEL **EndLabel\r
+ IN UINT16 StartLabelNumber,\r
+ OUT VOID **StartOpCodeHandle,\r
+ OUT EFI_IFR_GUID_LABEL **StartLabel,\r
+ OUT VOID **EndOpCodeHandle,\r
+ OUT EFI_IFR_GUID_LABEL **EndLabel\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_IFR_GUID_LABEL *InternalStartLabel;\r
- EFI_IFR_GUID_LABEL *InternalEndLabel;\r
+ EFI_STATUS Status;\r
+ EFI_IFR_GUID_LABEL *InternalStartLabel;\r
+ EFI_IFR_GUID_LABEL *InternalEndLabel;\r
\r
- if (StartOpCodeHandle == NULL || StartLabel == NULL || EndOpCodeHandle == NULL || EndLabel == NULL) {\r
+ if ((StartOpCodeHandle == NULL) || (StartLabel == NULL) || (EndOpCodeHandle == NULL) || (EndLabel == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
//\r
// Create Hii Extend Label OpCode as the start opcode.\r
//\r
- InternalStartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
- *StartOpCodeHandle,\r
- &gEfiIfrTianoGuid,\r
- NULL,\r
- sizeof (EFI_IFR_GUID_LABEL)\r
- );\r
+ InternalStartLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (\r
+ *StartOpCodeHandle,\r
+ &gEfiIfrTianoGuid,\r
+ NULL,\r
+ sizeof (EFI_IFR_GUID_LABEL)\r
+ );\r
if (InternalStartLabel == NULL) {\r
goto Exit;\r
}\r
//\r
// Create Hii Extend Label OpCode as the end opcode.\r
//\r
- InternalEndLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
- *EndOpCodeHandle,\r
- &gEfiIfrTianoGuid,\r
- NULL,\r
- sizeof (EFI_IFR_GUID_LABEL)\r
- );\r
+ InternalEndLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (\r
+ *EndOpCodeHandle,\r
+ &gEfiIfrTianoGuid,\r
+ NULL,\r
+ sizeof (EFI_IFR_GUID_LABEL)\r
+ );\r
if (InternalEndLabel == NULL) {\r
goto Exit;\r
}\r
if (*EndOpCodeHandle != NULL) {\r
HiiFreeOpCodeHandle (*EndOpCodeHandle);\r
}\r
+\r
return Status;\r
}\r
\r
VOID\r
)\r
{\r
- LIST_ENTRY *Entry;\r
- ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
- VOID *StartOpCodeHandle;\r
- EFI_IFR_GUID_LABEL *StartLabel;\r
- VOID *EndOpCodeHandle;\r
- EFI_IFR_GUID_LABEL *EndLabel;\r
- EFI_STATUS Status;\r
+ LIST_ENTRY *Entry;\r
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
+ VOID *StartOpCodeHandle;\r
+ EFI_IFR_GUID_LABEL *StartLabel;\r
+ VOID *EndOpCodeHandle;\r
+ EFI_IFR_GUID_LABEL *EndLabel;\r
+ EFI_STATUS Status;\r
\r
Status = IScsiCreateOpCode (\r
ATTEMPT_ENTRY_LABEL,\r
&EndLabel\r
);\r
if (EFI_ERROR (Status)) {\r
- return ;\r
+ return;\r
}\r
\r
NET_LIST_FOR_EACH (Entry, &mPrivate->AttemptConfigs) {\r
//\r
// Update Attempt Help Info.\r
//\r
- UnicodeSPrint (mPrivate->PortString, (UINTN) ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", (UINTN) AttemptConfigData->AttemptConfigIndex);\r
+ UnicodeSPrint (mPrivate->PortString, (UINTN)ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", (UINTN)AttemptConfigData->AttemptConfigIndex);\r
AttemptConfigData->AttemptTitleToken = HiiSetString (\r
mCallbackInfo->RegisteredHandle,\r
0,\r
NULL\r
);\r
if (AttemptConfigData->AttemptTitleToken == 0) {\r
- return ;\r
+ return;\r
}\r
\r
HiiCreateGotoOpCode (\r
- StartOpCodeHandle, // Container for dynamic created opcodes\r
- FORMID_ATTEMPT_FORM, // Form ID\r
- AttemptConfigData->AttemptTitleToken, // Prompt text\r
- AttemptConfigData->AttemptTitleHelpToken, // Help text\r
- EFI_IFR_FLAG_CALLBACK, // Question flag\r
- (UINT16) (KEY_ATTEMPT_ENTRY_BASE + AttemptConfigData->AttemptConfigIndex) // Question ID\r
+ StartOpCodeHandle, // Container for dynamic created opcodes\r
+ FORMID_ATTEMPT_FORM, // Form ID\r
+ AttemptConfigData->AttemptTitleToken, // Prompt text\r
+ AttemptConfigData->AttemptTitleHelpToken, // Help text\r
+ EFI_IFR_FLAG_CALLBACK, // Question flag\r
+ (UINT16)(KEY_ATTEMPT_ENTRY_BASE + AttemptConfigData->AttemptConfigIndex) // Question ID\r
);\r
}\r
}\r
FORMID_MAIN_FORM, // Form ID\r
StartOpCodeHandle, // Label for where to insert opcodes\r
EndOpCodeHandle // Replace data\r
- );\r
+ );\r
\r
HiiFreeOpCodeHandle (StartOpCodeHandle);\r
HiiFreeOpCodeHandle (EndOpCodeHandle);\r
VOID\r
)\r
{\r
- LIST_ENTRY *Entry;\r
- ISCSI_NIC_INFO *NicInfo;\r
- EFI_STRING_ID PortTitleToken;\r
- EFI_STRING_ID PortTitleHelpToken;\r
- CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];\r
- EFI_STATUS Status;\r
- VOID *StartOpCodeHandle;\r
- EFI_IFR_GUID_LABEL *StartLabel;\r
- VOID *EndOpCodeHandle;\r
- EFI_IFR_GUID_LABEL *EndLabel;\r
+ LIST_ENTRY *Entry;\r
+ ISCSI_NIC_INFO *NicInfo;\r
+ EFI_STRING_ID PortTitleToken;\r
+ EFI_STRING_ID PortTitleHelpToken;\r
+ CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];\r
+ EFI_STATUS Status;\r
+ VOID *StartOpCodeHandle;\r
+ EFI_IFR_GUID_LABEL *StartLabel;\r
+ VOID *EndOpCodeHandle;\r
+ EFI_IFR_GUID_LABEL *EndLabel;\r
\r
Status = IScsiCreateOpCode (\r
MAC_ENTRY_LABEL,\r
MacString\r
);\r
\r
- UnicodeSPrint (mPrivate->PortString, (UINTN) ISCSI_NAME_IFR_MAX_SIZE, L"MAC %s", MacString);\r
+ UnicodeSPrint (mPrivate->PortString, (UINTN)ISCSI_NAME_IFR_MAX_SIZE, L"MAC %s", MacString);\r
PortTitleToken = HiiSetString (\r
mCallbackInfo->RegisteredHandle,\r
0,\r
\r
UnicodeSPrint (\r
mPrivate->PortString,\r
- (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+ (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
L"PFA: Bus %d | Dev %d | Func %d",\r
NicInfo->BusNumber,\r
NicInfo->DeviceNumber,\r
PortTitleToken,\r
PortTitleHelpToken,\r
EFI_IFR_FLAG_CALLBACK, // Question flag\r
- (UINT16) (KEY_MAC_ENTRY_BASE + NicInfo->NicIndex)\r
+ (UINT16)(KEY_MAC_ENTRY_BASE + NicInfo->NicIndex)\r
);\r
}\r
\r
**/\r
EFI_STATUS\r
IScsiConfigAddAttemptsByKeywords (\r
- IN UINT8 *AttemptList\r
+ IN UINT8 *AttemptList\r
)\r
{\r
- UINT8 Index;\r
- UINT8 Number;\r
- UINTN TotalNumber;\r
- UINT8 Nic;\r
- UINT8 *AttemptConfigOrder;\r
- UINTN AttemptConfigOrderSize;\r
- UINT8 *AttemptConfigOrderTmp;\r
- ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
- ISCSI_NIC_INFO *NicInfo;\r
- CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];\r
- CHAR16 IScsiMode[64];\r
- CHAR16 IpMode[64];\r
- EFI_STATUS Status;\r
-\r
- Nic = mPrivate->CurrentNic;\r
+ UINT8 Index;\r
+ UINT8 Number;\r
+ UINTN TotalNumber;\r
+ UINT8 Nic;\r
+ UINT8 *AttemptConfigOrder;\r
+ UINTN AttemptConfigOrderSize;\r
+ UINT8 *AttemptConfigOrderTmp;\r
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
+ ISCSI_NIC_INFO *NicInfo;\r
+ CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];\r
+ CHAR16 IScsiMode[64];\r
+ CHAR16 IpMode[64];\r
+ EFI_STATUS Status;\r
+\r
+ Nic = mPrivate->CurrentNic;\r
NicInfo = IScsiGetNicInfoByIndex (Nic);\r
if (NicInfo == NULL) {\r
return EFI_NOT_FOUND;\r
\r
UnicodeSPrint (\r
mPrivate->PortString,\r
- (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+ (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
L"Attempt %d",\r
Number\r
);\r
\r
GetVariable2 (\r
- mPrivate->PortString,\r
- &gEfiIScsiInitiatorNameProtocolGuid,\r
- (VOID**)&AttemptConfigData,\r
- NULL\r
- );\r
- if (AttemptConfigData == NULL || AttemptConfigData->Actived == ISCSI_ACTIVE_ENABLED) {\r
+ mPrivate->PortString,\r
+ &gEfiIScsiInitiatorNameProtocolGuid,\r
+ (VOID **)&AttemptConfigData,\r
+ NULL\r
+ );\r
+ if ((AttemptConfigData == NULL) || (AttemptConfigData->Actived == ISCSI_ACTIVE_ENABLED)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- AttemptConfigData->Actived = ISCSI_ACTIVE_ENABLED;\r
+ AttemptConfigData->Actived = ISCSI_ACTIVE_ENABLED;\r
AttemptConfigData->NicIndex = NicInfo->NicIndex;\r
UnicodeStrToAsciiStrS (MacString, AttemptConfigData->MacString, ISCSI_MAX_MAC_STRING_LEN);\r
\r
//\r
CopyMem (AttemptConfigData->SessionConfigData.IsId, &NicInfo->PermanentAddress, 6);\r
AttemptConfigData->SessionConfigData.IsId[0] =\r
- (UINT8) (AttemptConfigData->SessionConfigData.IsId[0] & 0x3F);\r
+ (UINT8)(AttemptConfigData->SessionConfigData.IsId[0] & 0x3F);\r
\r
//\r
// Configure the iSCSI Mode and IpMode to default.\r
UnicodeSPrint (IpMode, 64, L"IP4");\r
UnicodeSPrint (\r
mPrivate->PortString,\r
- (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+ (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
L"MAC: %s, PFA: Bus %d | Dev %d | Func %d, iSCSI mode: %s, IP version: %s",\r
MacString,\r
NicInfo->BusNumber,\r
if (AttemptConfigOrder != NULL) {\r
FreePool (AttemptConfigOrder);\r
}\r
+\r
return EFI_OUT_OF_RESOURCES;\r
}\r
+\r
if (AttemptConfigOrder != NULL) {\r
CopyMem (AttemptConfigOrderTmp, AttemptConfigOrder, AttemptConfigOrderSize);\r
FreePool (AttemptConfigOrder);\r
}\r
\r
AttemptConfigOrderTmp[TotalNumber - 1] = Number;\r
- AttemptConfigOrder = AttemptConfigOrderTmp;\r
- AttemptConfigOrderSize = TotalNumber * sizeof (UINT8);\r
+ AttemptConfigOrder = AttemptConfigOrderTmp;\r
+ AttemptConfigOrderSize = TotalNumber * sizeof (UINT8);\r
\r
Status = gRT->SetVariable (\r
L"AttemptOrder",\r
//\r
InsertTailList (&mPrivate->AttemptConfigs, &AttemptConfigData->Link);\r
mPrivate->AttemptCount++;\r
- UnicodeSPrint (mPrivate->PortString, (UINTN) ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", AttemptConfigData->AttemptConfigIndex);\r
+ UnicodeSPrint (mPrivate->PortString, (UINTN)ISCSI_NAME_IFR_MAX_SIZE, L"Attempt %d", AttemptConfigData->AttemptConfigIndex);\r
gRT->SetVariable (\r
mPrivate->PortString,\r
&gEfiIScsiInitiatorNameProtocolGuid,\r
sizeof (ISCSI_ATTEMPT_CONFIG_NVDATA),\r
AttemptConfigData\r
);\r
-\r
}\r
\r
return EFI_SUCCESS;\r
IN ISCSI_CONFIG_IFR_NVDATA *IfrNvData\r
)\r
{\r
- EFI_STATUS Status;\r
- UINTN Index;\r
- UINTN NewIndex;\r
- ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
- UINT8 *AttemptConfigOrder;\r
- UINTN AttemptConfigOrderSize;\r
- UINT8 *AttemptNewOrder;\r
- UINT8 AttemptConfigIndex;\r
- UINT32 Attribute;\r
- UINTN Total;\r
- UINTN NewTotal;\r
- LIST_ENTRY *Entry;\r
- LIST_ENTRY *NextEntry;\r
- ISCSI_SESSION_CONFIG_NVDATA *ConfigData;\r
-\r
- Index = 0;\r
+ EFI_STATUS Status;\r
+ UINTN Index;\r
+ UINTN NewIndex;\r
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
+ UINT8 *AttemptConfigOrder;\r
+ UINTN AttemptConfigOrderSize;\r
+ UINT8 *AttemptNewOrder;\r
+ UINT8 AttemptConfigIndex;\r
+ UINT32 Attribute;\r
+ UINTN Total;\r
+ UINTN NewTotal;\r
+ LIST_ENTRY *Entry;\r
+ LIST_ENTRY *NextEntry;\r
+ ISCSI_SESSION_CONFIG_NVDATA *ConfigData;\r
+\r
+ Index = 0;\r
\r
AttemptConfigOrder = IScsiGetVariableAndSize (\r
L"AttemptOrder",\r
if (AttemptConfigData == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
+\r
ConfigData = &AttemptConfigData->SessionConfigData;\r
ConfigData->TargetPort = ISCSI_WELL_KNOWN_PORT;\r
ConfigData->ConnectTimeout = CONNECT_DEFAULT_TIMEOUT;\r
//\r
UnicodeSPrint (\r
mPrivate->PortString,\r
- (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+ (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
L"Attempt %d",\r
- (UINTN) AttemptConfigData->AttemptConfigIndex\r
+ (UINTN)AttemptConfigData->AttemptConfigIndex\r
);\r
UnicodeStrToAsciiStrS (mPrivate->PortString, AttemptConfigData->AttemptName, ATTEMPT_NAME_SIZE);\r
gRT->SetVariable (\r
if (mCallbackInfo->Current == AttemptConfigData) {\r
mCallbackInfo->Current = NULL;\r
}\r
+\r
FreePool (AttemptConfigData);\r
\r
//\r
return Status;\r
}\r
\r
-\r
/**\r
Callback function when user presses "Delete Attempts".\r
\r
IN ISCSI_CONFIG_IFR_NVDATA *IfrNvData\r
)\r
{\r
-\r
- UINT8 *AttemptConfigOrder;\r
- UINTN AttemptConfigOrderSize;\r
- LIST_ENTRY *Entry;\r
- ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
- UINT8 Index;\r
- VOID *StartOpCodeHandle;\r
- EFI_IFR_GUID_LABEL *StartLabel;\r
- VOID *EndOpCodeHandle;\r
- EFI_IFR_GUID_LABEL *EndLabel;\r
- EFI_STATUS Status;\r
+ UINT8 *AttemptConfigOrder;\r
+ UINTN AttemptConfigOrderSize;\r
+ LIST_ENTRY *Entry;\r
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
+ UINT8 Index;\r
+ VOID *StartOpCodeHandle;\r
+ EFI_IFR_GUID_LABEL *StartLabel;\r
+ VOID *EndOpCodeHandle;\r
+ EFI_IFR_GUID_LABEL *EndLabel;\r
+ EFI_STATUS Status;\r
\r
Status = IScsiCreateOpCode (\r
DELETE_ENTRY_LABEL,\r
Index = 0;\r
\r
NET_LIST_FOR_EACH (Entry, &mPrivate->AttemptConfigs) {\r
- AttemptConfigData = NET_LIST_USER_STRUCT (Entry, ISCSI_ATTEMPT_CONFIG_NVDATA, Link);\r
+ AttemptConfigData = NET_LIST_USER_STRUCT (Entry, ISCSI_ATTEMPT_CONFIG_NVDATA, Link);\r
IfrNvData->DeleteAttemptList[Index] = 0x00;\r
\r
- HiiCreateCheckBoxOpCode(\r
+ HiiCreateCheckBoxOpCode (\r
StartOpCodeHandle,\r
- (EFI_QUESTION_ID) (ATTEMPT_DEL_QUESTION_ID + Index),\r
+ (EFI_QUESTION_ID)(ATTEMPT_DEL_QUESTION_ID + Index),\r
CONFIGURATION_VARSTORE_ID,\r
- (UINT16) (ATTEMPT_DEL_VAR_OFFSET + Index),\r
+ (UINT16)(ATTEMPT_DEL_VAR_OFFSET + Index),\r
AttemptConfigData->AttemptTitleToken,\r
AttemptConfigData->AttemptTitleHelpToken,\r
0,\r
return Status;\r
}\r
\r
-\r
/**\r
Callback function when user presses "Change Attempt Order".\r
\r
VOID\r
)\r
{\r
- EFI_STATUS Status;\r
- UINT8 Index;\r
- LIST_ENTRY *Entry;\r
- ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
- VOID *StartOpCodeHandle;\r
- EFI_IFR_GUID_LABEL *StartLabel;\r
- VOID *EndOpCodeHandle;\r
- EFI_IFR_GUID_LABEL *EndLabel;\r
- VOID *OptionsOpCodeHandle;\r
+ EFI_STATUS Status;\r
+ UINT8 Index;\r
+ LIST_ENTRY *Entry;\r
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
+ VOID *StartOpCodeHandle;\r
+ EFI_IFR_GUID_LABEL *StartLabel;\r
+ VOID *EndOpCodeHandle;\r
+ EFI_IFR_GUID_LABEL *EndLabel;\r
+ VOID *OptionsOpCodeHandle;\r
\r
Status = IScsiCreateOpCode (\r
ORDER_ENTRY_LABEL,\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
+\r
ASSERT (StartOpCodeHandle != NULL);\r
\r
OptionsOpCodeHandle = NULL;\r
IN ISCSI_CONFIG_IFR_NVDATA *IfrNvData\r
)\r
{\r
- EFI_STATUS Status;\r
- UINTN Index;\r
- UINTN Indexj;\r
- UINT8 AttemptConfigIndex;\r
- ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
- UINT8 *AttemptConfigOrder;\r
- UINT8 *AttemptConfigOrderTmp;\r
- UINTN AttemptConfigOrderSize;\r
+ EFI_STATUS Status;\r
+ UINTN Index;\r
+ UINTN Indexj;\r
+ UINT8 AttemptConfigIndex;\r
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
+ UINT8 *AttemptConfigOrder;\r
+ UINT8 *AttemptConfigOrderTmp;\r
+ UINTN AttemptConfigOrderSize;\r
\r
AttemptConfigOrder = IScsiGetVariableAndSize (\r
L"AttemptOrder",\r
//\r
// Adjust the attempt order in NVR.\r
//\r
- for (; Index < AttemptConfigOrderSize / sizeof (UINT8); Index++) {\r
+ for ( ; Index < AttemptConfigOrderSize / sizeof (UINT8); Index++) {\r
for (Indexj = 0; Indexj < AttemptConfigOrderSize / sizeof (UINT8); Indexj++) {\r
if (AttemptConfigOrder[Indexj] != 0) {\r
AttemptConfigOrderTmp[Index] = AttemptConfigOrder[Indexj];\r
return Status;\r
}\r
\r
-\r
/**\r
Callback function when a user presses "Attempt *" or when a user selects a NIC to\r
create the new attempt.\r
**/\r
EFI_STATUS\r
IScsiConfigProcessDefault (\r
- IN EFI_QUESTION_ID KeyValue,\r
- IN ISCSI_CONFIG_IFR_NVDATA *IfrNvData\r
+ IN EFI_QUESTION_ID KeyValue,\r
+ IN ISCSI_CONFIG_IFR_NVDATA *IfrNvData\r
)\r
{\r
- BOOLEAN NewAttempt;\r
- ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
- UINT8 CurrentAttemptConfigIndex;\r
- ISCSI_NIC_INFO *NicInfo;\r
- UINT8 NicIndex;\r
- CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];\r
- UINT8 *AttemptConfigOrder;\r
- UINTN AttemptConfigOrderSize;\r
- UINTN Index;\r
- EFI_INPUT_KEY Key;\r
+ BOOLEAN NewAttempt;\r
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
+ UINT8 CurrentAttemptConfigIndex;\r
+ ISCSI_NIC_INFO *NicInfo;\r
+ UINT8 NicIndex;\r
+ CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];\r
+ UINT8 *AttemptConfigOrder;\r
+ UINTN AttemptConfigOrderSize;\r
+ UINTN Index;\r
+ EFI_INPUT_KEY Key;\r
\r
AttemptConfigData = NULL;\r
//\r
NewAttempt = FALSE;\r
\r
if ((KeyValue >= KEY_MAC_ENTRY_BASE) &&\r
- (KeyValue <= (UINT16) (mPrivate->MaxNic + KEY_MAC_ENTRY_BASE))) {\r
+ (KeyValue <= (UINT16)(mPrivate->MaxNic + KEY_MAC_ENTRY_BASE)))\r
+ {\r
//\r
// User has pressed "Add an Attempt" and then selects a NIC.\r
//\r
NewAttempt = TRUE;\r
} else if ((KeyValue >= KEY_ATTEMPT_ENTRY_BASE) &&\r
- (KeyValue < (ISCSI_MAX_ATTEMPTS_NUM + KEY_ATTEMPT_ENTRY_BASE))) {\r
-\r
+ (KeyValue < (ISCSI_MAX_ATTEMPTS_NUM + KEY_ATTEMPT_ENTRY_BASE)))\r
+ {\r
//\r
// User has pressed "Attempt *".\r
//\r
//\r
// Determine which NIC user has selected for the new created attempt.\r
//\r
- NicIndex = (UINT8) (KeyValue - KEY_MAC_ENTRY_BASE);\r
- NicInfo = IScsiGetNicInfoByIndex (NicIndex);\r
+ NicIndex = (UINT8)(KeyValue - KEY_MAC_ENTRY_BASE);\r
+ NicInfo = IScsiGetNicInfoByIndex (NicIndex);\r
if (NicInfo == NULL) {\r
return EFI_NOT_FOUND;\r
}\r
for (Index = 0; Index < AttemptConfigOrderSize / sizeof (UINT8); Index++) {\r
UnicodeSPrint (\r
mPrivate->PortString,\r
- (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+ (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
L"Attempt %d",\r
- (UINTN) AttemptConfigOrder[Index]\r
+ (UINTN)AttemptConfigOrder[Index]\r
);\r
GetVariable2 (\r
- mPrivate->PortString,\r
- &gEfiIScsiInitiatorNameProtocolGuid,\r
- (VOID**)&AttemptConfigData,\r
- NULL\r
- );\r
- if (AttemptConfigData == NULL || AttemptConfigData->Actived == ISCSI_ACTIVE_ENABLED) {\r
+ mPrivate->PortString,\r
+ &gEfiIScsiInitiatorNameProtocolGuid,\r
+ (VOID **)&AttemptConfigData,\r
+ NULL\r
+ );\r
+ if ((AttemptConfigData == NULL) || (AttemptConfigData->Actived == ISCSI_ACTIVE_ENABLED)) {\r
continue;\r
}\r
\r
ASSERT (AttemptConfigData != NULL);\r
UnicodeStrToAsciiStrS (MacString, AttemptConfigData->MacString, sizeof (AttemptConfigData->MacString));\r
AttemptConfigData->NicIndex = NicIndex;\r
- AttemptConfigData->Actived = ISCSI_ACTIVE_ENABLED;\r
+ AttemptConfigData->Actived = ISCSI_ACTIVE_ENABLED;\r
\r
//\r
// Generate OUI-format ISID based on MAC address.\r
//\r
CopyMem (AttemptConfigData->SessionConfigData.IsId, &NicInfo->PermanentAddress, 6);\r
AttemptConfigData->SessionConfigData.IsId[0] =\r
- (UINT8) (AttemptConfigData->SessionConfigData.IsId[0] & 0x3F);\r
+ (UINT8)(AttemptConfigData->SessionConfigData.IsId[0] & 0x3F);\r
\r
//\r
// Add the help info for the new attempt.\r
//\r
UnicodeSPrint (\r
mPrivate->PortString,\r
- (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+ (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
L"MAC: %s, PFA: Bus %d | Dev %d | Func %d",\r
MacString,\r
NicInfo->BusNumber,\r
NicInfo->FunctionNumber\r
);\r
\r
- AttemptConfigData->AttemptTitleHelpToken = HiiSetString (\r
- mCallbackInfo->RegisteredHandle,\r
- 0,\r
- mPrivate->PortString,\r
- NULL\r
- );\r
+ AttemptConfigData->AttemptTitleHelpToken = HiiSetString (\r
+ mCallbackInfo->RegisteredHandle,\r
+ 0,\r
+ mPrivate->PortString,\r
+ NULL\r
+ );\r
if (AttemptConfigData->AttemptTitleHelpToken == 0) {\r
FreePool (AttemptConfigData);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
-\r
} else {\r
//\r
// Determine which Attempt user has selected to configure.\r
// Get the attempt configuration data.\r
//\r
- CurrentAttemptConfigIndex = (UINT8) (KeyValue - KEY_ATTEMPT_ENTRY_BASE);\r
+ CurrentAttemptConfigIndex = (UINT8)(KeyValue - KEY_ATTEMPT_ENTRY_BASE);\r
\r
AttemptConfigData = IScsiConfigGetAttemptByConfigIndex (CurrentAttemptConfigIndex);\r
if (AttemptConfigData == NULL) {\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
\r
This function allows the caller to request the current\r
EFI_STATUS\r
EFIAPI\r
IScsiFormExtractConfig (\r
- IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This,\r
- IN CONST EFI_STRING Request,\r
- OUT EFI_STRING *Progress,\r
- OUT EFI_STRING *Results\r
+ IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This,\r
+ IN CONST EFI_STRING Request,\r
+ OUT EFI_STRING *Progress,\r
+ OUT EFI_STRING *Results\r
)\r
{\r
- EFI_STATUS Status;\r
- CHAR8 *InitiatorName;\r
- UINTN BufferSize;\r
- ISCSI_CONFIG_IFR_NVDATA *IfrNvData;\r
- ISCSI_FORM_CALLBACK_INFO *Private;\r
- EFI_STRING ConfigRequestHdr;\r
- EFI_STRING ConfigRequest;\r
- BOOLEAN AllocatedRequest;\r
- UINTN Size;\r
-\r
- if (This == NULL || Progress == NULL || Results == NULL) {\r
+ EFI_STATUS Status;\r
+ CHAR8 *InitiatorName;\r
+ UINTN BufferSize;\r
+ ISCSI_CONFIG_IFR_NVDATA *IfrNvData;\r
+ ISCSI_FORM_CALLBACK_INFO *Private;\r
+ EFI_STRING ConfigRequestHdr;\r
+ EFI_STRING ConfigRequest;\r
+ BOOLEAN AllocatedRequest;\r
+ UINTN Size;\r
+\r
+ if ((This == NULL) || (Progress == NULL) || (Results == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
AllocatedRequest = FALSE;\r
Size = 0;\r
\r
- Private = ISCSI_FORM_CALLBACK_INFO_FROM_FORM_CALLBACK (This);\r
+ Private = ISCSI_FORM_CALLBACK_INFO_FROM_FORM_CALLBACK (This);\r
IfrNvData = AllocateZeroPool (sizeof (ISCSI_CONFIG_IFR_NVDATA));\r
if (IfrNvData == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
-\r
- if (Private->Current!= NULL) {\r
+ if (Private->Current != NULL) {\r
IScsiConvertAttemptConfigDataToIfrNvData (Private->Current, IfrNvData);\r
}\r
\r
IScsiConvertAttemptConfigDataToIfrNvDataByKeyword (IfrNvData);\r
\r
BufferSize = ISCSI_NAME_MAX_SIZE;\r
- InitiatorName = (CHAR8 *) AllocateZeroPool (BufferSize);\r
+ InitiatorName = (CHAR8 *)AllocateZeroPool (BufferSize);\r
if (InitiatorName == NULL) {\r
FreePool (IfrNvData);\r
return EFI_OUT_OF_RESOURCES;\r
//\r
// Convert buffer data to <ConfigResp> by helper function BlockToConfig().\r
//\r
- BufferSize = sizeof (ISCSI_CONFIG_IFR_NVDATA);\r
+ BufferSize = sizeof (ISCSI_CONFIG_IFR_NVDATA);\r
ConfigRequest = Request;\r
if ((Request == NULL) || (StrStr (Request, L"OFFSET") == NULL)) {\r
//\r
// followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
//\r
ConfigRequestHdr = HiiConstructConfigHdr (&gIScsiConfigGuid, mVendorStorageName, Private->DriverHandle);\r
- Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
- ConfigRequest = AllocateZeroPool (Size);\r
+ Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
+ ConfigRequest = AllocateZeroPool (Size);\r
if (ConfigRequest == NULL) {\r
FreePool (IfrNvData);\r
FreePool (InitiatorName);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
+\r
AllocatedRequest = TRUE;\r
UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize);\r
FreePool (ConfigRequestHdr);\r
Status = gHiiConfigRouting->BlockToConfig (\r
gHiiConfigRouting,\r
ConfigRequest,\r
- (UINT8 *) IfrNvData,\r
+ (UINT8 *)IfrNvData,\r
BufferSize,\r
Results,\r
Progress\r
FreePool (ConfigRequest);\r
ConfigRequest = NULL;\r
}\r
+\r
//\r
// Set Progress string to the original request string.\r
//\r
return Status;\r
}\r
\r
-\r
/**\r
\r
This function applies changes in a driver's configuration.\r
EFI_STATUS\r
EFIAPI\r
IScsiFormRouteConfig (\r
- IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This,\r
- IN CONST EFI_STRING Configuration,\r
- OUT EFI_STRING *Progress\r
+ IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This,\r
+ IN CONST EFI_STRING Configuration,\r
+ OUT EFI_STRING *Progress\r
)\r
{\r
- EFI_STATUS Status;\r
- ISCSI_CONFIG_IFR_NVDATA *IfrNvData;\r
- ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
- LIST_ENTRY *Entry;\r
- LIST_ENTRY *NextEntry;\r
- ISCSI_NIC_INFO *NicInfo;\r
- EFI_INPUT_KEY Key;\r
- CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];\r
- CHAR8 *InitiatorName;\r
- UINT8 *AttemptList;\r
- UINTN BufferSize;\r
- UINTN OffSet;\r
- UINTN Index;\r
- UINTN Index2;\r
-\r
- Index = 0;\r
- Index2 = 0;\r
- NicInfo = NULL;\r
+ EFI_STATUS Status;\r
+ ISCSI_CONFIG_IFR_NVDATA *IfrNvData;\r
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
+ LIST_ENTRY *Entry;\r
+ LIST_ENTRY *NextEntry;\r
+ ISCSI_NIC_INFO *NicInfo;\r
+ EFI_INPUT_KEY Key;\r
+ CHAR16 MacString[ISCSI_MAX_MAC_STRING_LEN];\r
+ CHAR8 *InitiatorName;\r
+ UINT8 *AttemptList;\r
+ UINTN BufferSize;\r
+ UINTN OffSet;\r
+ UINTN Index;\r
+ UINTN Index2;\r
+\r
+ Index = 0;\r
+ Index2 = 0;\r
+ NicInfo = NULL;\r
AttemptList = NULL;\r
- Status = EFI_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
\r
- if (This == NULL || Configuration == NULL || Progress == NULL) {\r
+ if ((This == NULL) || (Configuration == NULL) || (Progress == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
}\r
\r
BufferSize = ISCSI_NAME_MAX_SIZE;\r
- InitiatorName = (CHAR8 *) AllocateZeroPool (BufferSize);\r
+ InitiatorName = (CHAR8 *)AllocateZeroPool (BufferSize);\r
if (InitiatorName == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Exit;\r
// Convert <ConfigResp> to buffer data by helper function ConfigToBlock().\r
//\r
BufferSize = sizeof (ISCSI_CONFIG_IFR_NVDATA);\r
- Status = gHiiConfigRouting->ConfigToBlock (\r
- gHiiConfigRouting,\r
- Configuration,\r
- (UINT8 *) IfrNvData,\r
- &BufferSize,\r
- Progress\r
- );\r
+ Status = gHiiConfigRouting->ConfigToBlock (\r
+ gHiiConfigRouting,\r
+ Configuration,\r
+ (UINT8 *)IfrNvData,\r
+ &BufferSize,\r
+ Progress\r
+ );\r
if (EFI_ERROR (Status)) {\r
goto Exit;\r
}\r
\r
if (IfrNvData->InitiatorName[0] != L'\0') {\r
UnicodeStrToAsciiStrS (IfrNvData->InitiatorName, InitiatorName, ISCSI_NAME_MAX_SIZE);\r
- BufferSize = AsciiStrSize (InitiatorName);\r
+ BufferSize = AsciiStrSize (InitiatorName);\r
\r
- Status = gIScsiInitiatorName.Set (&gIScsiInitiatorName, &BufferSize, InitiatorName);\r
+ Status = gIScsiInitiatorName.Set (&gIScsiInitiatorName, &BufferSize, InitiatorName);\r
if (EFI_ERROR (Status)) {\r
CreatePopUp (\r
EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
}\r
\r
if (IfrNvData->ISCSIAddAttemptList[0] != L'\0') {\r
- Status =IScsiGetAttemptIndexList (IfrNvData->ISCSIAddAttemptList, IfrNvData->AddAttemptList, TRUE);\r
+ Status = IScsiGetAttemptIndexList (IfrNvData->ISCSIAddAttemptList, IfrNvData->AddAttemptList, TRUE);\r
if (EFI_ERROR (Status)) {\r
- CreatePopUp (\r
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
- &Key,\r
- L"Error: The add attempt list is invalid",\r
- NULL\r
- );\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Error: The add attempt list is invalid",\r
+ NULL\r
+ );\r
goto Exit;\r
}\r
\r
if (EFI_ERROR (Status)) {\r
goto Exit;\r
}\r
-\r
} else if (IfrNvData->ISCSIDeleteAttemptList[0] != L'\0') {\r
- AttemptList =(UINT8 *) AllocateZeroPool ((ISCSI_MAX_ATTEMPTS_NUM + 1) * sizeof (UINT8));\r
+ AttemptList = (UINT8 *)AllocateZeroPool ((ISCSI_MAX_ATTEMPTS_NUM + 1) * sizeof (UINT8));\r
if (AttemptList == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Exit;\r
}\r
+\r
Status = IScsiGetAttemptIndexList (IfrNvData->ISCSIDeleteAttemptList, AttemptList, FALSE);\r
if (EFI_ERROR (Status)) {\r
- CreatePopUp (\r
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
- &Key,\r
- L"Error: The delete attempt list is invalid",\r
- NULL\r
- );\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Error: The delete attempt list is invalid",\r
+ NULL\r
+ );\r
goto Exit;\r
}\r
\r
IfrNvData->DeleteAttemptList[Index2] = 1;\r
break;\r
}\r
- Index ++;\r
+\r
+ Index++;\r
}\r
- Index2 ++;\r
+\r
+ Index2++;\r
Index = 0;\r
}\r
\r
}\r
\r
FreePool (AttemptList);\r
-\r
} else if (IfrNvData->ISCSIAttemptOrder[0] != L'\0') {\r
Status = IScsiGetAttemptIndexList (IfrNvData->ISCSIAttemptOrder, IfrNvData->DynamicOrderedList, FALSE);\r
if (EFI_ERROR (Status)) {\r
- CreatePopUp (\r
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
- &Key,\r
- L"Error: The new attempt order list is invalid",\r
- NULL\r
- );\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Error: The new attempt order list is invalid",\r
+ NULL\r
+ );\r
goto Exit;\r
}\r
\r
if (EFI_ERROR (Status)) {\r
goto Exit;\r
}\r
-\r
} else if (IfrNvData->ISCSIMacAddr[0] != L'\0') {\r
NET_LIST_FOR_EACH (Entry, &mPrivate->NicInfoList) {\r
NicInfo = NET_LIST_USER_STRUCT (Entry, ISCSI_NIC_INFO, Link);\r
IScsiMacAddrToStr (\r
- &NicInfo->PermanentAddress,\r
- NicInfo->HwAddressSize,\r
- NicInfo->VlanId,\r
- MacString\r
- );\r
- if (!StrCmp(MacString, IfrNvData->ISCSIMacAddr)) {\r
+ &NicInfo->PermanentAddress,\r
+ NicInfo->HwAddressSize,\r
+ NicInfo->VlanId,\r
+ MacString\r
+ );\r
+ if (!StrCmp (MacString, IfrNvData->ISCSIMacAddr)) {\r
mPrivate->CurrentNic = NicInfo->NicIndex;\r
break;\r
}\r
Status = EFI_NOT_FOUND;\r
goto Exit;\r
}\r
-\r
} else {\r
Status = IScsiConvertlfrNvDataToAttemptConfigDataByKeyword (IfrNvData, OffSet);\r
if (EFI_ERROR (Status)) {\r
EFI_STATUS\r
EFIAPI\r
IScsiFormCallback (\r
- IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This,\r
- IN EFI_BROWSER_ACTION Action,\r
- IN EFI_QUESTION_ID QuestionId,\r
- IN UINT8 Type,\r
- IN OUT EFI_IFR_TYPE_VALUE *Value,\r
- OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest\r
+ IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This,\r
+ IN EFI_BROWSER_ACTION Action,\r
+ IN EFI_QUESTION_ID QuestionId,\r
+ IN UINT8 Type,\r
+ IN OUT EFI_IFR_TYPE_VALUE *Value,\r
+ OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest\r
)\r
{\r
- ISCSI_FORM_CALLBACK_INFO *Private;\r
- UINTN BufferSize;\r
- CHAR8 *IScsiName;\r
- CHAR8 IpString[ISCSI_NAME_MAX_SIZE];\r
- CHAR8 LunString[ISCSI_LUN_STR_MAX_LEN];\r
- UINT64 Lun;\r
- EFI_IP_ADDRESS HostIp;\r
- EFI_IP_ADDRESS SubnetMask;\r
- EFI_IP_ADDRESS Gateway;\r
- ISCSI_CONFIG_IFR_NVDATA *IfrNvData;\r
- ISCSI_CONFIG_IFR_NVDATA OldIfrNvData;\r
- EFI_STATUS Status;\r
- EFI_INPUT_KEY Key;\r
- ISCSI_NIC_INFO *NicInfo;\r
+ ISCSI_FORM_CALLBACK_INFO *Private;\r
+ UINTN BufferSize;\r
+ CHAR8 *IScsiName;\r
+ CHAR8 IpString[ISCSI_NAME_MAX_SIZE];\r
+ CHAR8 LunString[ISCSI_LUN_STR_MAX_LEN];\r
+ UINT64 Lun;\r
+ EFI_IP_ADDRESS HostIp;\r
+ EFI_IP_ADDRESS SubnetMask;\r
+ EFI_IP_ADDRESS Gateway;\r
+ ISCSI_CONFIG_IFR_NVDATA *IfrNvData;\r
+ ISCSI_CONFIG_IFR_NVDATA OldIfrNvData;\r
+ EFI_STATUS Status;\r
+ EFI_INPUT_KEY Key;\r
+ ISCSI_NIC_INFO *NicInfo;\r
\r
NicInfo = NULL;\r
\r
//\r
\r
BufferSize = sizeof (ISCSI_CONFIG_IFR_NVDATA);\r
- IfrNvData = AllocateZeroPool (BufferSize);\r
+ IfrNvData = AllocateZeroPool (BufferSize);\r
if (IfrNvData == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
- IScsiName = (CHAR8 *) AllocateZeroPool (ISCSI_NAME_MAX_SIZE);\r
+ IScsiName = (CHAR8 *)AllocateZeroPool (ISCSI_NAME_MAX_SIZE);\r
if (IScsiName == NULL) {\r
FreePool (IfrNvData);\r
return EFI_OUT_OF_RESOURCES;\r
\r
ZeroMem (&OldIfrNvData, BufferSize);\r
\r
- HiiGetBrowserData (NULL, NULL, BufferSize, (UINT8 *) IfrNvData);\r
+ HiiGetBrowserData (NULL, NULL, BufferSize, (UINT8 *)IfrNvData);\r
\r
CopyMem (&OldIfrNvData, IfrNvData, BufferSize);\r
\r
if (Action == EFI_BROWSER_ACTION_CHANGING) {\r
switch (QuestionId) {\r
- case KEY_ADD_ATTEMPT:\r
- //\r
- // Check whether iSCSI initiator name is configured already.\r
- //\r
- mPrivate->InitiatorNameLength = ISCSI_NAME_MAX_SIZE;\r
- Status = gIScsiInitiatorName.Get (\r
- &gIScsiInitiatorName,\r
- &mPrivate->InitiatorNameLength,\r
- mPrivate->InitiatorName\r
- );\r
- if (EFI_ERROR (Status)) {\r
- CreatePopUp (\r
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
- &Key,\r
- L"Error: please configure iSCSI initiator name first!",\r
- NULL\r
- );\r
- break;\r
- }\r
+ case KEY_ADD_ATTEMPT:\r
+ //\r
+ // Check whether iSCSI initiator name is configured already.\r
+ //\r
+ mPrivate->InitiatorNameLength = ISCSI_NAME_MAX_SIZE;\r
+ Status = gIScsiInitiatorName.Get (\r
+ &gIScsiInitiatorName,\r
+ &mPrivate->InitiatorNameLength,\r
+ mPrivate->InitiatorName\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Error: please configure iSCSI initiator name first!",\r
+ NULL\r
+ );\r
+ break;\r
+ }\r
\r
- Status = IScsiConfigAddAttempt ();\r
- break;\r
+ Status = IScsiConfigAddAttempt ();\r
+ break;\r
\r
- case KEY_DELETE_ATTEMPT:\r
- CopyMem (\r
- OldIfrNvData.DeleteAttemptList,\r
- IfrNvData->DeleteAttemptList,\r
- sizeof (IfrNvData->DeleteAttemptList)\r
- );\r
- Status = IScsiConfigDisplayDeleteAttempts (IfrNvData);\r
- break;\r
+ case KEY_DELETE_ATTEMPT:\r
+ CopyMem (\r
+ OldIfrNvData.DeleteAttemptList,\r
+ IfrNvData->DeleteAttemptList,\r
+ sizeof (IfrNvData->DeleteAttemptList)\r
+ );\r
+ Status = IScsiConfigDisplayDeleteAttempts (IfrNvData);\r
+ break;\r
\r
- case KEY_ORDER_ATTEMPT_CONFIG:\r
- //\r
- // Order the attempt according to user input.\r
- //\r
- CopyMem (\r
- OldIfrNvData.DynamicOrderedList,\r
- IfrNvData->DynamicOrderedList,\r
- sizeof (IfrNvData->DynamicOrderedList)\r
- );\r
- IScsiConfigDisplayOrderAttempts ();\r
- break;\r
+ case KEY_ORDER_ATTEMPT_CONFIG:\r
+ //\r
+ // Order the attempt according to user input.\r
+ //\r
+ CopyMem (\r
+ OldIfrNvData.DynamicOrderedList,\r
+ IfrNvData->DynamicOrderedList,\r
+ sizeof (IfrNvData->DynamicOrderedList)\r
+ );\r
+ IScsiConfigDisplayOrderAttempts ();\r
+ break;\r
\r
- default:\r
- Status = IScsiConfigProcessDefault (QuestionId, IfrNvData);\r
- break;\r
+ default:\r
+ Status = IScsiConfigProcessDefault (QuestionId, IfrNvData);\r
+ break;\r
}\r
} else if (Action == EFI_BROWSER_ACTION_CHANGED) {\r
switch (QuestionId) {\r
- case KEY_INITIATOR_NAME:\r
- UnicodeStrToAsciiStrS (IfrNvData->InitiatorName, IScsiName, ISCSI_NAME_MAX_SIZE);\r
- BufferSize = AsciiStrSize (IScsiName);\r
+ case KEY_INITIATOR_NAME:\r
+ UnicodeStrToAsciiStrS (IfrNvData->InitiatorName, IScsiName, ISCSI_NAME_MAX_SIZE);\r
+ BufferSize = AsciiStrSize (IScsiName);\r
\r
- Status = gIScsiInitiatorName.Set (&gIScsiInitiatorName, &BufferSize, IScsiName);\r
- if (EFI_ERROR (Status)) {\r
- CreatePopUp (\r
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
- &Key,\r
- L"Invalid iSCSI Name!",\r
- NULL\r
- );\r
- }\r
+ Status = gIScsiInitiatorName.Set (&gIScsiInitiatorName, &BufferSize, IScsiName);\r
+ if (EFI_ERROR (Status)) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Invalid iSCSI Name!",\r
+ NULL\r
+ );\r
+ }\r
\r
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
- break;\r
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
+ break;\r
\r
- case KEY_SAVE_ATTEMPT_CONFIG:\r
- Status = IScsiConvertIfrNvDataToAttemptConfigData (IfrNvData, Private->Current);\r
- if (EFI_ERROR (Status)) {\r
+ case KEY_SAVE_ATTEMPT_CONFIG:\r
+ Status = IScsiConvertIfrNvDataToAttemptConfigData (IfrNvData, Private->Current);\r
+ if (EFI_ERROR (Status)) {\r
+ break;\r
+ }\r
+\r
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
break;\r
- }\r
\r
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
- break;\r
+ case KEY_SAVE_ORDER_CHANGES:\r
+ //\r
+ // Sync the Attempt Order to NVR.\r
+ //\r
+ Status = IScsiConfigOrderAttempts (IfrNvData);\r
+ if (EFI_ERROR (Status)) {\r
+ break;\r
+ }\r
\r
- case KEY_SAVE_ORDER_CHANGES:\r
- //\r
- // Sync the Attempt Order to NVR.\r
- //\r
- Status = IScsiConfigOrderAttempts (IfrNvData);\r
- if (EFI_ERROR (Status)) {\r
+ IScsiConfigUpdateAttempt ();\r
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
break;\r
- }\r
\r
- IScsiConfigUpdateAttempt ();\r
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
- break;\r
+ case KEY_IGNORE_ORDER_CHANGES:\r
+ CopyMem (\r
+ IfrNvData->DynamicOrderedList,\r
+ OldIfrNvData.DynamicOrderedList,\r
+ sizeof (IfrNvData->DynamicOrderedList)\r
+ );\r
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
+ break;\r
\r
- case KEY_IGNORE_ORDER_CHANGES:\r
- CopyMem (\r
- IfrNvData->DynamicOrderedList,\r
- OldIfrNvData.DynamicOrderedList,\r
- sizeof (IfrNvData->DynamicOrderedList)\r
- );\r
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
- break;\r
+ case KEY_SAVE_DELETE_ATTEMPT:\r
+ //\r
+ // Delete the Attempt Order from NVR\r
+ //\r
+ Status = IScsiConfigDeleteAttempts (IfrNvData);\r
+ if (EFI_ERROR (Status)) {\r
+ break;\r
+ }\r
\r
- case KEY_SAVE_DELETE_ATTEMPT:\r
- //\r
- // Delete the Attempt Order from NVR\r
- //\r
- Status = IScsiConfigDeleteAttempts (IfrNvData);\r
- if (EFI_ERROR (Status)) {\r
+ IScsiConfigUpdateAttempt ();\r
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
break;\r
- }\r
\r
- IScsiConfigUpdateAttempt ();\r
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
- break;\r
+ case KEY_IGNORE_DELETE_ATTEMPT:\r
+ CopyMem (\r
+ IfrNvData->DeleteAttemptList,\r
+ OldIfrNvData.DeleteAttemptList,\r
+ sizeof (IfrNvData->DeleteAttemptList)\r
+ );\r
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
+ break;\r
\r
- case KEY_IGNORE_DELETE_ATTEMPT:\r
- CopyMem (\r
- IfrNvData->DeleteAttemptList,\r
- OldIfrNvData.DeleteAttemptList,\r
- sizeof (IfrNvData->DeleteAttemptList)\r
- );\r
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
- break;\r
+ case KEY_IP_MODE:\r
+ switch (Value->u8) {\r
+ case IP_MODE_IP6:\r
+ NicInfo = IScsiGetNicInfoByIndex (Private->Current->NicIndex);\r
+ if (NicInfo == NULL) {\r
+ break;\r
+ }\r
+\r
+ if (!NicInfo->Ipv6Available) {\r
+ //\r
+ // Current NIC doesn't Support IPv6, hence use IPv4.\r
+ //\r
+ IfrNvData->IpMode = IP_MODE_IP4;\r
+\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Current NIC doesn't Support IPv6!",\r
+ NULL\r
+ );\r
+ }\r
+\r
+ case IP_MODE_IP4:\r
+ ZeroMem (IfrNvData->LocalIp, sizeof (IfrNvData->LocalIp));\r
+ ZeroMem (IfrNvData->SubnetMask, sizeof (IfrNvData->SubnetMask));\r
+ ZeroMem (IfrNvData->Gateway, sizeof (IfrNvData->Gateway));\r
+ ZeroMem (IfrNvData->TargetIp, sizeof (IfrNvData->TargetIp));\r
+ Private->Current->AutoConfigureMode = 0;\r
+ ZeroMem (&Private->Current->SessionConfigData.LocalIp, sizeof (EFI_IP_ADDRESS));\r
+ ZeroMem (&Private->Current->SessionConfigData.SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
+ ZeroMem (&Private->Current->SessionConfigData.Gateway, sizeof (EFI_IP_ADDRESS));\r
+ ZeroMem (&Private->Current->SessionConfigData.TargetIp, sizeof (EFI_IP_ADDRESS));\r
\r
- case KEY_IP_MODE:\r
- switch (Value->u8) {\r
- case IP_MODE_IP6:\r
- NicInfo = IScsiGetNicInfoByIndex (Private->Current->NicIndex);\r
- if(NicInfo == NULL) {\r
- break;\r
+ break;\r
}\r
\r
- if(!NicInfo->Ipv6Available) {\r
- //\r
- // Current NIC doesn't Support IPv6, hence use IPv4.\r
- //\r
- IfrNvData->IpMode = IP_MODE_IP4;\r
+ break;\r
\r
+ case KEY_LOCAL_IP:\r
+ Status = NetLibStrToIp4 (IfrNvData->LocalIp, &HostIp.v4);\r
+ if (EFI_ERROR (Status) ||\r
+ ((Private->Current->SessionConfigData.SubnetMask.Addr[0] != 0) &&\r
+ !NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), NTOHL (*(UINT32 *)Private->Current->SessionConfigData.SubnetMask.Addr))))\r
+ {\r
CreatePopUp (\r
EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
&Key,\r
- L"Current NIC doesn't Support IPv6!",\r
+ L"Invalid IP address!",\r
NULL\r
);\r
- }\r
\r
- case IP_MODE_IP4:\r
- ZeroMem (IfrNvData->LocalIp, sizeof (IfrNvData->LocalIp));\r
- ZeroMem (IfrNvData->SubnetMask, sizeof (IfrNvData->SubnetMask));\r
- ZeroMem (IfrNvData->Gateway, sizeof (IfrNvData->Gateway));\r
- ZeroMem (IfrNvData->TargetIp, sizeof (IfrNvData->TargetIp));\r
- Private->Current->AutoConfigureMode = 0;\r
- ZeroMem (&Private->Current->SessionConfigData.LocalIp, sizeof (EFI_IP_ADDRESS));\r
- ZeroMem (&Private->Current->SessionConfigData.SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
- ZeroMem (&Private->Current->SessionConfigData.Gateway, sizeof (EFI_IP_ADDRESS));\r
- ZeroMem (&Private->Current->SessionConfigData.TargetIp, sizeof (EFI_IP_ADDRESS));\r
+ Status = EFI_INVALID_PARAMETER;\r
+ } else {\r
+ CopyMem (&Private->Current->SessionConfigData.LocalIp, &HostIp.v4, sizeof (HostIp.v4));\r
+ }\r
\r
break;\r
- }\r
\r
- break;\r
+ case KEY_SUBNET_MASK:\r
+ Status = NetLibStrToIp4 (IfrNvData->SubnetMask, &SubnetMask.v4);\r
+ if (EFI_ERROR (Status) || ((SubnetMask.Addr[0] != 0) && (IScsiGetSubnetMaskPrefixLength (&SubnetMask.v4) == 0))) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Invalid Subnet Mask!",\r
+ NULL\r
+ );\r
\r
- case KEY_LOCAL_IP:\r
- Status = NetLibStrToIp4 (IfrNvData->LocalIp, &HostIp.v4);\r
- if (EFI_ERROR (Status) ||\r
- ((Private->Current->SessionConfigData.SubnetMask.Addr[0] != 0) &&\r
- !NetIp4IsUnicast (NTOHL (HostIp.Addr[0]), NTOHL(*(UINT32*)Private->Current->SessionConfigData.SubnetMask.Addr)))) {\r
- CreatePopUp (\r
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
- &Key,\r
- L"Invalid IP address!",\r
- NULL\r
- );\r
+ Status = EFI_INVALID_PARAMETER;\r
+ } else {\r
+ CopyMem (&Private->Current->SessionConfigData.SubnetMask, &SubnetMask.v4, sizeof (SubnetMask.v4));\r
+ }\r
\r
- Status = EFI_INVALID_PARAMETER;\r
- } else {\r
- CopyMem (&Private->Current->SessionConfigData.LocalIp, &HostIp.v4, sizeof (HostIp.v4));\r
- }\r
+ break;\r
\r
- break;\r
+ case KEY_GATE_WAY:\r
+ Status = NetLibStrToIp4 (IfrNvData->Gateway, &Gateway.v4);\r
+ if (EFI_ERROR (Status) ||\r
+ ((Gateway.Addr[0] != 0) &&\r
+ (Private->Current->SessionConfigData.SubnetMask.Addr[0] != 0) &&\r
+ !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), NTOHL (*(UINT32 *)Private->Current->SessionConfigData.SubnetMask.Addr))))\r
+ {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Invalid Gateway!",\r
+ NULL\r
+ );\r
+ Status = EFI_INVALID_PARAMETER;\r
+ } else {\r
+ CopyMem (&Private->Current->SessionConfigData.Gateway, &Gateway.v4, sizeof (Gateway.v4));\r
+ }\r
\r
- case KEY_SUBNET_MASK:\r
- Status = NetLibStrToIp4 (IfrNvData->SubnetMask, &SubnetMask.v4);\r
- if (EFI_ERROR (Status) || ((SubnetMask.Addr[0] != 0) && (IScsiGetSubnetMaskPrefixLength (&SubnetMask.v4) == 0))) {\r
- CreatePopUp (\r
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
- &Key,\r
- L"Invalid Subnet Mask!",\r
- NULL\r
- );\r
+ break;\r
\r
- Status = EFI_INVALID_PARAMETER;\r
- } else {\r
- CopyMem (&Private->Current->SessionConfigData.SubnetMask, &SubnetMask.v4, sizeof (SubnetMask.v4));\r
- }\r
+ case KEY_TARGET_IP:\r
+ UnicodeStrToAsciiStrS (IfrNvData->TargetIp, IpString, sizeof (IpString));\r
+ Status = IScsiAsciiStrToIp (IpString, IfrNvData->IpMode, &HostIp);\r
+ if (EFI_ERROR (Status) || !IpIsUnicast (&HostIp, IfrNvData->IpMode)) {\r
+ //\r
+ // The target is expressed in URL format or an invalid Ip address, just save.\r
+ //\r
+ Private->Current->SessionConfigData.DnsMode = TRUE;\r
+ ZeroMem (&Private->Current->SessionConfigData.TargetIp, sizeof (Private->Current->SessionConfigData.TargetIp));\r
+ UnicodeStrToAsciiStrS (IfrNvData->TargetIp, Private->Current->SessionConfigData.TargetUrl, ISCSI_NAME_MAX_SIZE);\r
+ } else {\r
+ Private->Current->SessionConfigData.DnsMode = FALSE;\r
+ CopyMem (&Private->Current->SessionConfigData.TargetIp, &HostIp, sizeof (HostIp));\r
+ }\r
\r
- break;\r
+ break;\r
\r
- case KEY_GATE_WAY:\r
- Status = NetLibStrToIp4 (IfrNvData->Gateway, &Gateway.v4);\r
- if (EFI_ERROR (Status) ||\r
- ((Gateway.Addr[0] != 0) &&\r
- (Private->Current->SessionConfigData.SubnetMask.Addr[0] != 0) &&\r
- !NetIp4IsUnicast (NTOHL (Gateway.Addr[0]), NTOHL(*(UINT32*)Private->Current->SessionConfigData.SubnetMask.Addr)))) {\r
- CreatePopUp (\r
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
- &Key,\r
- L"Invalid Gateway!",\r
- NULL\r
- );\r
- Status = EFI_INVALID_PARAMETER;\r
- } else {\r
- CopyMem (&Private->Current->SessionConfigData.Gateway, &Gateway.v4, sizeof (Gateway.v4));\r
- }\r
+ case KEY_TARGET_NAME:\r
+ UnicodeStrToAsciiStrS (IfrNvData->TargetName, IScsiName, ISCSI_NAME_MAX_SIZE);\r
+ Status = IScsiNormalizeName (IScsiName, AsciiStrLen (IScsiName));\r
+ if (EFI_ERROR (Status)) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Invalid iSCSI Name!",\r
+ NULL\r
+ );\r
+ } else {\r
+ AsciiStrCpyS (Private->Current->SessionConfigData.TargetName, ISCSI_NAME_MAX_SIZE, IScsiName);\r
+ }\r
\r
- break;\r
+ break;\r
\r
- case KEY_TARGET_IP:\r
- UnicodeStrToAsciiStrS (IfrNvData->TargetIp, IpString, sizeof (IpString));\r
- Status = IScsiAsciiStrToIp (IpString, IfrNvData->IpMode, &HostIp);\r
- if (EFI_ERROR (Status) || !IpIsUnicast (&HostIp, IfrNvData->IpMode)) {\r
- //\r
- // The target is expressed in URL format or an invalid Ip address, just save.\r
- //\r
- Private->Current->SessionConfigData.DnsMode = TRUE;\r
- ZeroMem (&Private->Current->SessionConfigData.TargetIp, sizeof (Private->Current->SessionConfigData.TargetIp));\r
- UnicodeStrToAsciiStrS (IfrNvData->TargetIp, Private->Current->SessionConfigData.TargetUrl, ISCSI_NAME_MAX_SIZE);\r
- } else {\r
- Private->Current->SessionConfigData.DnsMode = FALSE;\r
- CopyMem (&Private->Current->SessionConfigData.TargetIp, &HostIp, sizeof (HostIp));\r
- }\r
+ case KEY_DHCP_ENABLE:\r
+ if (IfrNvData->InitiatorInfoFromDhcp == 0) {\r
+ IfrNvData->TargetInfoFromDhcp = 0;\r
+ }\r
\r
- break;\r
+ break;\r
\r
- case KEY_TARGET_NAME:\r
- UnicodeStrToAsciiStrS (IfrNvData->TargetName, IScsiName, ISCSI_NAME_MAX_SIZE);\r
- Status = IScsiNormalizeName (IScsiName, AsciiStrLen (IScsiName));\r
- if (EFI_ERROR (Status)) {\r
- CreatePopUp (\r
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
- &Key,\r
- L"Invalid iSCSI Name!",\r
- NULL\r
- );\r
- } else {\r
- AsciiStrCpyS (Private->Current->SessionConfigData.TargetName, ISCSI_NAME_MAX_SIZE, IScsiName);\r
- }\r
+ case KEY_BOOT_LUN:\r
+ UnicodeStrToAsciiStrS (IfrNvData->BootLun, LunString, sizeof (LunString));\r
+ Status = IScsiAsciiStrToLun (LunString, (UINT8 *)&Lun);\r
+ if (EFI_ERROR (Status)) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"Invalid LUN string!",\r
+ NULL\r
+ );\r
+ } else {\r
+ CopyMem (Private->Current->SessionConfigData.BootLun, &Lun, sizeof (Lun));\r
+ }\r
\r
- break;\r
+ break;\r
\r
- case KEY_DHCP_ENABLE:\r
- if (IfrNvData->InitiatorInfoFromDhcp == 0) {\r
- IfrNvData->TargetInfoFromDhcp = 0;\r
- }\r
+ case KEY_AUTH_TYPE:\r
+ switch (Value->u8) {\r
+ case ISCSI_AUTH_TYPE_CHAP:\r
+ IfrNvData->CHAPType = ISCSI_CHAP_UNI;\r
+ break;\r
+ default:\r
+ break;\r
+ }\r
\r
- break;\r
+ break;\r
\r
- case KEY_BOOT_LUN:\r
- UnicodeStrToAsciiStrS (IfrNvData->BootLun, LunString, sizeof (LunString));\r
- Status = IScsiAsciiStrToLun (LunString, (UINT8 *) &Lun);\r
- if (EFI_ERROR (Status)) {\r
- CreatePopUp (\r
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
- &Key,\r
- L"Invalid LUN string!",\r
- NULL\r
+ case KEY_CHAP_NAME:\r
+ UnicodeStrToAsciiStrS (\r
+ IfrNvData->CHAPName,\r
+ Private->Current->AuthConfigData.CHAP.CHAPName,\r
+ sizeof (Private->Current->AuthConfigData.CHAP.CHAPName)\r
);\r
- } else {\r
- CopyMem (Private->Current->SessionConfigData.BootLun, &Lun, sizeof (Lun));\r
- }\r
-\r
- break;\r
-\r
- case KEY_AUTH_TYPE:\r
- switch (Value->u8) {\r
- case ISCSI_AUTH_TYPE_CHAP:\r
- IfrNvData->CHAPType = ISCSI_CHAP_UNI;\r
- break;\r
- default:\r
break;\r
- }\r
-\r
- break;\r
\r
- case KEY_CHAP_NAME:\r
- UnicodeStrToAsciiStrS (\r
- IfrNvData->CHAPName,\r
- Private->Current->AuthConfigData.CHAP.CHAPName,\r
- sizeof (Private->Current->AuthConfigData.CHAP.CHAPName)\r
- );\r
- break;\r
-\r
- case KEY_CHAP_SECRET:\r
- UnicodeStrToAsciiStrS (\r
- IfrNvData->CHAPSecret,\r
- Private->Current->AuthConfigData.CHAP.CHAPSecret,\r
- sizeof (Private->Current->AuthConfigData.CHAP.CHAPSecret)\r
- );\r
- break;\r
+ case KEY_CHAP_SECRET:\r
+ UnicodeStrToAsciiStrS (\r
+ IfrNvData->CHAPSecret,\r
+ Private->Current->AuthConfigData.CHAP.CHAPSecret,\r
+ sizeof (Private->Current->AuthConfigData.CHAP.CHAPSecret)\r
+ );\r
+ break;\r
\r
- case KEY_REVERSE_CHAP_NAME:\r
- UnicodeStrToAsciiStrS (\r
- IfrNvData->ReverseCHAPName,\r
- Private->Current->AuthConfigData.CHAP.ReverseCHAPName,\r
- sizeof (Private->Current->AuthConfigData.CHAP.ReverseCHAPName)\r
- );\r
- break;\r
+ case KEY_REVERSE_CHAP_NAME:\r
+ UnicodeStrToAsciiStrS (\r
+ IfrNvData->ReverseCHAPName,\r
+ Private->Current->AuthConfigData.CHAP.ReverseCHAPName,\r
+ sizeof (Private->Current->AuthConfigData.CHAP.ReverseCHAPName)\r
+ );\r
+ break;\r
\r
- case KEY_REVERSE_CHAP_SECRET:\r
- UnicodeStrToAsciiStrS (\r
- IfrNvData->ReverseCHAPSecret,\r
- Private->Current->AuthConfigData.CHAP.ReverseCHAPSecret,\r
- sizeof (Private->Current->AuthConfigData.CHAP.ReverseCHAPSecret)\r
- );\r
- break;\r
+ case KEY_REVERSE_CHAP_SECRET:\r
+ UnicodeStrToAsciiStrS (\r
+ IfrNvData->ReverseCHAPSecret,\r
+ Private->Current->AuthConfigData.CHAP.ReverseCHAPSecret,\r
+ sizeof (Private->Current->AuthConfigData.CHAP.ReverseCHAPSecret)\r
+ );\r
+ break;\r
\r
- case KEY_CONFIG_ISID:\r
- IScsiParseIsIdFromString (IfrNvData->IsId, Private->Current->SessionConfigData.IsId);\r
- IScsiConvertIsIdToString (IfrNvData->IsId, Private->Current->SessionConfigData.IsId);\r
+ case KEY_CONFIG_ISID:\r
+ IScsiParseIsIdFromString (IfrNvData->IsId, Private->Current->SessionConfigData.IsId);\r
+ IScsiConvertIsIdToString (IfrNvData->IsId, Private->Current->SessionConfigData.IsId);\r
\r
- break;\r
+ break;\r
\r
- default:\r
- break;\r
+ default:\r
+ break;\r
}\r
}\r
\r
// Pass changed uncommitted data back to Form Browser.\r
//\r
BufferSize = sizeof (ISCSI_CONFIG_IFR_NVDATA);\r
- HiiSetBrowserData (NULL, NULL, BufferSize, (UINT8 *) IfrNvData, NULL);\r
+ HiiSetBrowserData (NULL, NULL, BufferSize, (UINT8 *)IfrNvData, NULL);\r
}\r
\r
FreePool (IfrNvData);\r
return Status;\r
}\r
\r
-\r
/**\r
Initialize the iSCSI configuration form.\r
\r
IN EFI_HANDLE DriverBindingHandle\r
)\r
{\r
- EFI_STATUS Status;\r
- ISCSI_FORM_CALLBACK_INFO *CallbackInfo;\r
+ EFI_STATUS Status;\r
+ ISCSI_FORM_CALLBACK_INFO *CallbackInfo;\r
\r
- CallbackInfo = (ISCSI_FORM_CALLBACK_INFO *) AllocateZeroPool (sizeof (ISCSI_FORM_CALLBACK_INFO));\r
+ CallbackInfo = (ISCSI_FORM_CALLBACK_INFO *)AllocateZeroPool (sizeof (ISCSI_FORM_CALLBACK_INFO));\r
if (CallbackInfo == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
- CallbackInfo->Signature = ISCSI_FORM_CALLBACK_INFO_SIGNATURE;\r
- CallbackInfo->Current = NULL;\r
+ CallbackInfo->Signature = ISCSI_FORM_CALLBACK_INFO_SIGNATURE;\r
+ CallbackInfo->Current = NULL;\r
\r
CallbackInfo->ConfigAccess.ExtractConfig = IScsiFormExtractConfig;\r
CallbackInfo->ConfigAccess.RouteConfig = IScsiFormRouteConfig;\r
&CallbackInfo->ConfigAccess,\r
NULL\r
);\r
- FreePool(CallbackInfo);\r
+ FreePool (CallbackInfo);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
Unload the iSCSI configuration form, this includes: delete all the iSCSI\r
configuration entries, uninstall the form callback protocol, and\r
IN EFI_HANDLE DriverBindingHandle\r
)\r
{\r
- ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
- ISCSI_NIC_INFO *NicInfo;\r
- LIST_ENTRY *Entry;\r
- EFI_STATUS Status;\r
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
+ ISCSI_NIC_INFO *NicInfo;\r
+ LIST_ENTRY *Entry;\r
+ EFI_STATUS Status;\r
\r
while (!IsListEmpty (&mPrivate->AttemptConfigs)) {\r
- Entry = NetListRemoveHead (&mPrivate->AttemptConfigs);\r
+ Entry = NetListRemoveHead (&mPrivate->AttemptConfigs);\r
AttemptConfigData = NET_LIST_USER_STRUCT (Entry, ISCSI_ATTEMPT_CONFIG_NVDATA, Link);\r
FreePool (AttemptConfigData);\r
mPrivate->AttemptCount--;\r
ASSERT (mPrivate->AttemptCount == 0);\r
\r
while (!IsListEmpty (&mPrivate->NicInfoList)) {\r
- Entry = NetListRemoveHead (&mPrivate->NicInfoList);\r
+ Entry = NetListRemoveHead (&mPrivate->NicInfoList);\r
NicInfo = NET_LIST_USER_STRUCT (Entry, ISCSI_NIC_INFO, Link);\r
FreePool (NicInfo);\r
mPrivate->NicCount--;\r
projects / mirror_edk2.git / blobdiff