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
WIFI_CONNECTION_MANAGER_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
// HII Config Access Protocol instance\r
//\r
GLOBAL_REMOVE_IF_UNREFERENCED\r
-EFI_HII_CONFIG_ACCESS_PROTOCOL gWifiMgrDxeHiiConfigAccess = {\r
+EFI_HII_CONFIG_ACCESS_PROTOCOL gWifiMgrDxeHiiConfigAccess = {\r
WifiMgrDxeHiiConfigAccessExtractConfig,\r
WifiMgrDxeHiiConfigAccessRouteConfig,\r
WifiMgrDxeHiiConfigAccessCallback\r
};\r
\r
-CHAR16* mSecurityType[] = {\r
+CHAR16 *mSecurityType[] = {\r
L"OPEN ",\r
L"WPA-Enterprise ",\r
L"WPA2-Enterprise",\r
L"UnKnown "\r
};\r
\r
-CHAR16* mSignalStrengthBar[] = {\r
+CHAR16 *mSignalStrengthBar[] = {\r
L"[-----]",\r
L"[*----]",\r
L"[**---]",\r
#define NET_LIST_FOR_EACH_FROM_NODE(Entry, Node, ListHead) \\r
for(Entry = Node->ForwardLink; Entry != (ListHead); Entry = Entry->ForwardLink)\r
\r
-extern EFI_GUID gWifiConfigFormSetGuid;\r
+extern EFI_GUID gWifiConfigFormSetGuid;\r
\r
/**\r
Create Hii Extend Label OpCode as the start opcode and end opcode.\r
**/\r
EFI_STATUS\r
WifiMgrCreateOpCode (\r
- IN UINT16 StartLabelNumber,\r
- OUT VOID **StartOpCodeHandle,\r
- OUT VOID **EndOpCodeHandle\r
+ IN UINT16 StartLabelNumber,\r
+ OUT VOID **StartOpCodeHandle,\r
+ OUT VOID **EndOpCodeHandle\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 || EndOpCodeHandle == NULL) {\r
+ if ((StartOpCodeHandle == NULL) || (EndOpCodeHandle == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
if (*StartOpCodeHandle == NULL) {\r
goto Exit;\r
}\r
+\r
*EndOpCodeHandle = HiiAllocateOpCodeHandle ();\r
if (*EndOpCodeHandle == NULL) {\r
goto Exit;\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
InternalStartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
InternalStartLabel->Number = StartLabelNumber;\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
+\r
InternalEndLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
InternalEndLabel->Number = LABEL_END;\r
\r
if (*StartOpCodeHandle != NULL) {\r
HiiFreeOpCodeHandle (*StartOpCodeHandle);\r
}\r
+\r
if (*EndOpCodeHandle != NULL) {\r
HiiFreeOpCodeHandle (*EndOpCodeHandle);\r
}\r
+\r
return Status;\r
}\r
\r
**/\r
EFI_STATUS\r
WifiMgrShowNicList (\r
- IN WIFI_MGR_PRIVATE_DATA *Private\r
-)\r
+ IN WIFI_MGR_PRIVATE_DATA *Private\r
+ )\r
{\r
- EFI_STATUS Status;\r
- CHAR16 MacString[WIFI_MGR_MAX_MAC_STRING_LEN];\r
- CHAR16 PortString[WIFI_STR_MAX_SIZE];\r
- EFI_STRING_ID PortTitleToken;\r
- EFI_STRING_ID PortTitleHelpToken;\r
- WIFI_MGR_DEVICE_DATA *Nic;\r
- LIST_ENTRY *Entry;\r
- VOID *StartOpCodeHandle;\r
- VOID *EndOpCodeHandle;\r
+ EFI_STATUS Status;\r
+ CHAR16 MacString[WIFI_MGR_MAX_MAC_STRING_LEN];\r
+ CHAR16 PortString[WIFI_STR_MAX_SIZE];\r
+ EFI_STRING_ID PortTitleToken;\r
+ EFI_STRING_ID PortTitleHelpToken;\r
+ WIFI_MGR_DEVICE_DATA *Nic;\r
+ LIST_ENTRY *Entry;\r
+ VOID *StartOpCodeHandle;\r
+ VOID *EndOpCodeHandle;\r
\r
if (Private == NULL) {\r
return EFI_INVALID_PARAMETER;\r
PortTitleToken,\r
PortTitleHelpToken,\r
EFI_IFR_FLAG_CALLBACK,\r
- (UINT16) (KEY_MAC_ENTRY_BASE + Nic->NicIndex)\r
+ (UINT16)(KEY_MAC_ENTRY_BASE + Nic->NicIndex)\r
);\r
}\r
\r
@return the unicode string of AKM suite list or "None".\r
\r
**/\r
-CHAR16*\r
+CHAR16 *\r
WifiMgrGetStrAKMList (\r
- IN WIFI_MGR_NETWORK_PROFILE *Profile\r
-)\r
+ IN WIFI_MGR_NETWORK_PROFILE *Profile\r
+ )\r
{\r
- UINT8 Index;\r
- UINT16 AKMSuiteCount;\r
- CHAR16 *AKMListDisplay;\r
+ UINT8 Index;\r
+ UINT16 AKMSuiteCount;\r
+ CHAR16 *AKMListDisplay;\r
\r
AKMListDisplay = NULL;\r
- if (Profile == NULL || Profile->Network.AKMSuite == NULL) {\r
+ if ((Profile == NULL) || (Profile->Network.AKMSuite == NULL)) {\r
goto Exit;\r
}\r
\r
AKMSuiteCount = Profile->Network.AKMSuite->AKMSuiteCount;\r
if (AKMSuiteCount != 0) {\r
-\r
//\r
// Current AKM Suite is between 1-9\r
//\r
- AKMListDisplay = (CHAR16 *) AllocateZeroPool(sizeof (CHAR16) * AKMSuiteCount * 2);\r
+ AKMListDisplay = (CHAR16 *)AllocateZeroPool (sizeof (CHAR16) * AKMSuiteCount * 2);\r
if (AKMListDisplay != NULL) {\r
- for (Index = 0; Index < AKMSuiteCount; Index ++) {\r
+ for (Index = 0; Index < AKMSuiteCount; Index++) {\r
UnicodeSPrint (\r
AKMListDisplay + (Index * 2),\r
sizeof (CHAR16) * 2,\r
if (AKMListDisplay == NULL) {\r
AKMListDisplay = AllocateCopyPool (sizeof (L"None"), L"None");\r
}\r
+\r
return AKMListDisplay;\r
}\r
\r
@return the unicode string of Cipher suite list or "None".\r
\r
**/\r
-CHAR16*\r
+CHAR16 *\r
WifiMgrGetStrCipherList (\r
- IN WIFI_MGR_NETWORK_PROFILE *Profile\r
-)\r
+ IN WIFI_MGR_NETWORK_PROFILE *Profile\r
+ )\r
{\r
- UINT8 Index;\r
- UINT16 CipherSuiteCount;\r
- CHAR16 *CipherListDisplay;\r
+ UINT8 Index;\r
+ UINT16 CipherSuiteCount;\r
+ CHAR16 *CipherListDisplay;\r
\r
CipherListDisplay = NULL;\r
- if (Profile == NULL || Profile->Network.CipherSuite == NULL) {\r
+ if ((Profile == NULL) || (Profile->Network.CipherSuite == NULL)) {\r
goto Exit;\r
}\r
\r
- CipherSuiteCount = Profile->Network.CipherSuite->CipherSuiteCount;\r
+ CipherSuiteCount = Profile->Network.CipherSuite->CipherSuiteCount;\r
if (CipherSuiteCount != 0) {\r
-\r
//\r
// Current Cipher Suite is between 1-9\r
//\r
- CipherListDisplay = (CHAR16 *) AllocateZeroPool(sizeof (CHAR16) * CipherSuiteCount * 2);\r
+ CipherListDisplay = (CHAR16 *)AllocateZeroPool (sizeof (CHAR16) * CipherSuiteCount * 2);\r
if (CipherListDisplay != NULL) {\r
- for (Index = 0; Index < CipherSuiteCount; Index ++) {\r
+ for (Index = 0; Index < CipherSuiteCount; Index++) {\r
UnicodeSPrint (\r
CipherListDisplay + (Index * 2),\r
sizeof (CHAR16) * 2,\r
if (CipherListDisplay == NULL) {\r
CipherListDisplay = AllocateCopyPool (sizeof (L"None"), L"None");\r
}\r
+\r
return CipherListDisplay;\r
}\r
\r
**/\r
EFI_STATUS\r
WifiMgrRefreshNetworkList (\r
- IN WIFI_MGR_PRIVATE_DATA *Private,\r
- OUT WIFI_MANAGER_IFR_NVDATA *IfrNvData\r
+ IN WIFI_MGR_PRIVATE_DATA *Private,\r
+ OUT WIFI_MANAGER_IFR_NVDATA *IfrNvData\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_TPL OldTpl;\r
- UINT32 AvailableCount;\r
- EFI_STRING_ID PortPromptToken;\r
- EFI_STRING_ID PortTextToken;\r
- EFI_STRING_ID PortHelpToken;\r
- WIFI_MGR_NETWORK_PROFILE *Profile;\r
- LIST_ENTRY *Entry;\r
- VOID *StartOpCodeHandle;\r
- VOID *EndOpCodeHandle;\r
- CHAR16 *AKMListDisplay;\r
- CHAR16 *CipherListDisplay;\r
- CHAR16 PortString[WIFI_STR_MAX_SIZE];\r
- UINTN PortStringSize;\r
- WIFI_MGR_NETWORK_PROFILE *ConnectedProfile;\r
+ EFI_STATUS Status;\r
+ EFI_TPL OldTpl;\r
+ UINT32 AvailableCount;\r
+ EFI_STRING_ID PortPromptToken;\r
+ EFI_STRING_ID PortTextToken;\r
+ EFI_STRING_ID PortHelpToken;\r
+ WIFI_MGR_NETWORK_PROFILE *Profile;\r
+ LIST_ENTRY *Entry;\r
+ VOID *StartOpCodeHandle;\r
+ VOID *EndOpCodeHandle;\r
+ CHAR16 *AKMListDisplay;\r
+ CHAR16 *CipherListDisplay;\r
+ CHAR16 PortString[WIFI_STR_MAX_SIZE];\r
+ UINTN PortStringSize;\r
+ WIFI_MGR_NETWORK_PROFILE *ConnectedProfile;\r
\r
if (Private->CurrentNic == NULL) {\r
return EFI_SUCCESS;\r
return Status;\r
}\r
\r
- OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
+ OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
AvailableCount = 0;\r
PortStringSize = sizeof (PortString);\r
ConnectedProfile = NULL;\r
CipherListDisplay = NULL;\r
\r
if (Private->CurrentNic->ConnectState == WifiMgrConnectedToAp) {\r
-\r
//\r
// Display the current connected network.\r
// Find the current operate network under connected status.\r
//\r
- if (Private->CurrentNic->CurrentOperateNetwork != NULL &&\r
- Private->CurrentNic->CurrentOperateNetwork->IsAvailable) {\r
-\r
+ if ((Private->CurrentNic->CurrentOperateNetwork != NULL) &&\r
+ Private->CurrentNic->CurrentOperateNetwork->IsAvailable)\r
+ {\r
Profile = Private->CurrentNic->CurrentOperateNetwork;\r
- AvailableCount ++;\r
+ AvailableCount++;\r
\r
AKMListDisplay = WifiMgrGetStrAKMList (Profile);\r
if (AKMListDisplay == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Exit;\r
}\r
- CipherListDisplay = WifiMgrGetStrCipherList(Profile);\r
+\r
+ CipherListDisplay = WifiMgrGetStrCipherList (Profile);\r
if (CipherListDisplay == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Exit;\r
UnicodeSPrint (PortString, PortStringSize, L"AKMSuite: %s CipherSuite: %s", AKMListDisplay, CipherListDisplay);\r
PortHelpToken = HiiSetString (Private->RegisteredHandle, 0, PortString, NULL);\r
}\r
+\r
FreePool (AKMListDisplay);\r
FreePool (CipherListDisplay);\r
AKMListDisplay = NULL;\r
PortPromptToken,\r
PortHelpToken,\r
EFI_IFR_FLAG_CALLBACK,\r
- (UINT16) (KEY_AVAILABLE_NETWORK_ENTRY_BASE + Profile->ProfileIndex)\r
+ (UINT16)(KEY_AVAILABLE_NETWORK_ENTRY_BASE + Profile->ProfileIndex)\r
);\r
\r
UnicodeSPrint (\r
L"%s %s %s",\r
(Profile->SecurityType != SECURITY_TYPE_NONE ? L"Secured" : L"Open "),\r
mSecurityType[Profile->SecurityType],\r
- RSSI_TO_SIGNAL_STRENGTH_BAR(Profile->NetworkQuality)\r
+ RSSI_TO_SIGNAL_STRENGTH_BAR (Profile->NetworkQuality)\r
);\r
PortTextToken = HiiSetString (Private->RegisteredHandle, 0, PortString, NULL);\r
\r
PortTextToken,\r
0,\r
0\r
- );\r
+ );\r
\r
ConnectedProfile = Profile;\r
} else {\r
// Display all supported available networks.\r
//\r
NET_LIST_FOR_EACH (Entry, &Private->CurrentNic->ProfileList) {\r
-\r
Profile = NET_LIST_USER_STRUCT_S (\r
Entry,\r
WIFI_MGR_NETWORK_PROFILE,\r
if (ConnectedProfile == Profile) {\r
continue;\r
}\r
- if (Profile->IsAvailable && Profile->CipherSuiteSupported) {\r
\r
- AvailableCount ++;\r
+ if (Profile->IsAvailable && Profile->CipherSuiteSupported) {\r
+ AvailableCount++;\r
\r
AKMListDisplay = WifiMgrGetStrAKMList (Profile);\r
if (AKMListDisplay == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Exit;\r
}\r
- CipherListDisplay = WifiMgrGetStrCipherList(Profile);\r
+\r
+ CipherListDisplay = WifiMgrGetStrCipherList (Profile);\r
if (CipherListDisplay == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Exit;\r
PortString,\r
PortStringSize,\r
L"AKMSuite: %s CipherSuite: %s",\r
- AKMListDisplay, CipherListDisplay\r
+ AKMListDisplay,\r
+ CipherListDisplay\r
);\r
PortHelpToken = HiiSetString (Private->RegisteredHandle, 0, PortString, NULL);\r
if (PortHelpToken == 0) {\r
goto Exit;\r
}\r
}\r
+\r
FreePool (AKMListDisplay);\r
FreePool (CipherListDisplay);\r
AKMListDisplay = NULL;\r
PortPromptToken,\r
PortHelpToken,\r
EFI_IFR_FLAG_CALLBACK,\r
- (UINT16) (KEY_AVAILABLE_NETWORK_ENTRY_BASE + Profile->ProfileIndex)\r
+ (UINT16)(KEY_AVAILABLE_NETWORK_ENTRY_BASE + Profile->ProfileIndex)\r
);\r
\r
UnicodeSPrint (\r
L"%s %s %s",\r
(Profile->SecurityType != SECURITY_TYPE_NONE ? L"Secured" : L"Open "),\r
mSecurityType[Profile->SecurityType],\r
- RSSI_TO_SIGNAL_STRENGTH_BAR(Profile->NetworkQuality)\r
+ RSSI_TO_SIGNAL_STRENGTH_BAR (Profile->NetworkQuality)\r
);\r
PortTextToken = HiiSetString (Private->RegisteredHandle, 0, PortString, NULL);\r
if (PortTextToken == 0) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Exit;\r
}\r
+\r
HiiCreateTextOpCode (\r
StartOpCodeHandle,\r
PortTextToken,\r
// Display all Unsupported available networks.\r
//\r
NET_LIST_FOR_EACH (Entry, &Private->CurrentNic->ProfileList) {\r
-\r
Profile = NET_LIST_USER_STRUCT_S (\r
Entry,\r
WIFI_MGR_NETWORK_PROFILE,\r
if (ConnectedProfile == Profile) {\r
continue;\r
}\r
- if (Profile->IsAvailable && !Profile->CipherSuiteSupported) {\r
\r
- AvailableCount ++;\r
+ if (Profile->IsAvailable && !Profile->CipherSuiteSupported) {\r
+ AvailableCount++;\r
\r
AKMListDisplay = WifiMgrGetStrAKMList (Profile);\r
if (AKMListDisplay == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Exit;\r
}\r
- CipherListDisplay = WifiMgrGetStrCipherList(Profile);\r
+\r
+ CipherListDisplay = WifiMgrGetStrCipherList (Profile);\r
if (CipherListDisplay == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Exit;\r
PortString,\r
PortStringSize,\r
L"AKMSuite: %s CipherSuite(UnSupported): %s",\r
- AKMListDisplay, CipherListDisplay\r
+ AKMListDisplay,\r
+ CipherListDisplay\r
);\r
} else {\r
UnicodeSPrint (\r
PortString,\r
PortStringSize,\r
L"AKMSuite(UnSupported): %s CipherSuite(UnSupported): %s",\r
- AKMListDisplay, CipherListDisplay\r
+ AKMListDisplay,\r
+ CipherListDisplay\r
);\r
}\r
+\r
FreePool (AKMListDisplay);\r
FreePool (CipherListDisplay);\r
AKMListDisplay = NULL;\r
PortPromptToken,\r
PortHelpToken,\r
EFI_IFR_FLAG_CALLBACK,\r
- (UINT16) (KEY_AVAILABLE_NETWORK_ENTRY_BASE + Profile->ProfileIndex)\r
+ (UINT16)(KEY_AVAILABLE_NETWORK_ENTRY_BASE + Profile->ProfileIndex)\r
);\r
\r
UnicodeSPrint (\r
L"%s %s %s",\r
L"UnSupported",\r
mSecurityType[Profile->SecurityType],\r
- RSSI_TO_SIGNAL_STRENGTH_BAR(Profile->NetworkQuality)\r
+ RSSI_TO_SIGNAL_STRENGTH_BAR (Profile->NetworkQuality)\r
);\r
PortTextToken = HiiSetString (Private->RegisteredHandle, 0, PortString, NULL);\r
\r
if (AKMListDisplay != NULL) {\r
FreePool (AKMListDisplay);\r
}\r
+\r
if (CipherListDisplay != NULL) {\r
FreePool (CipherListDisplay);\r
}\r
**/\r
EFI_STATUS\r
WifiMgrRefreshHiddenList (\r
- IN WIFI_MGR_PRIVATE_DATA *Private\r
+ IN WIFI_MGR_PRIVATE_DATA *Private\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_TPL OldTpl;\r
- UINTN Index;\r
- EFI_STRING_ID StringId;\r
- VOID *StartOpCodeHandle;\r
- VOID *EndOpCodeHandle;\r
- WIFI_HIDDEN_NETWORK_DATA *HiddenNetwork;\r
- LIST_ENTRY *Entry;\r
+ EFI_STATUS Status;\r
+ EFI_TPL OldTpl;\r
+ UINTN Index;\r
+ EFI_STRING_ID StringId;\r
+ VOID *StartOpCodeHandle;\r
+ VOID *EndOpCodeHandle;\r
+ WIFI_HIDDEN_NETWORK_DATA *HiddenNetwork;\r
+ LIST_ENTRY *Entry;\r
\r
if (Private == NULL) {\r
return EFI_SUCCESS;\r
Index = 0;\r
\r
NET_LIST_FOR_EACH (Entry, &Private->HiddenNetworkList) {\r
-\r
HiddenNetwork = NET_LIST_USER_STRUCT_S (\r
Entry,\r
WIFI_HIDDEN_NETWORK_DATA,\r
\r
HiiCreateCheckBoxOpCode (\r
StartOpCodeHandle,\r
- (EFI_QUESTION_ID) (KEY_HIDDEN_NETWORK_ENTRY_BASE + Index),\r
+ (EFI_QUESTION_ID)(KEY_HIDDEN_NETWORK_ENTRY_BASE + Index),\r
MANAGER_VARSTORE_ID,\r
- (UINT16) (HIDDEN_NETWORK_LIST_VAR_OFFSET + Index),\r
+ (UINT16)(HIDDEN_NETWORK_LIST_VAR_OFFSET + Index),\r
StringId,\r
0,\r
0,\r
0,\r
NULL\r
);\r
- Index ++;\r
+ Index++;\r
}\r
\r
Status = HiiUpdateForm (\r
return Status;\r
}\r
\r
-\r
/**\r
Callback function for user to select a Nic.\r
\r
**/\r
EFI_STATUS\r
WifiMgrSelectNic (\r
- IN WIFI_MGR_PRIVATE_DATA *Private,\r
- IN EFI_QUESTION_ID KeyValue\r
+ IN WIFI_MGR_PRIVATE_DATA *Private,\r
+ IN EFI_QUESTION_ID KeyValue\r
)\r
{\r
- WIFI_MGR_DEVICE_DATA *Nic;\r
- UINT32 NicIndex;\r
- CHAR16 MacString[WIFI_MGR_MAX_MAC_STRING_LEN];\r
+ WIFI_MGR_DEVICE_DATA *Nic;\r
+ UINT32 NicIndex;\r
+ CHAR16 MacString[WIFI_MGR_MAX_MAC_STRING_LEN];\r
\r
NicIndex = KeyValue - KEY_MAC_ENTRY_BASE;\r
Nic = WifiMgrGetNicByIndex (Private, NicIndex);\r
if (Nic == NULL) {\r
return EFI_NOT_FOUND;\r
}\r
+\r
Private->CurrentNic = Nic;\r
\r
WifiMgrMacAddrToStr (&Nic->MacAddress, sizeof (MacString), MacString);\r
- HiiSetString (Private->RegisteredHandle, STRING_TOKEN(STR_MAC_ADDRESS), MacString, NULL);\r
+ HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_MAC_ADDRESS), MacString, NULL);\r
return EFI_SUCCESS;\r
}\r
\r
**/\r
VOID\r
WifiMgrCleanUserInput (\r
- IN WIFI_MGR_PRIVATE_DATA *Private\r
+ IN WIFI_MGR_PRIVATE_DATA *Private\r
)\r
{\r
Private->SecurityType = SECURITY_TYPE_NONE;\r
\r
**/\r
EFI_STATUS\r
-WifiMgrUserSelectProfileToConnect(\r
- IN WIFI_MGR_PRIVATE_DATA *Private,\r
- IN UINT32 ProfileIndex\r
+WifiMgrUserSelectProfileToConnect (\r
+ IN WIFI_MGR_PRIVATE_DATA *Private,\r
+ IN UINT32 ProfileIndex\r
)\r
{\r
- WIFI_MGR_NETWORK_PROFILE *Profile;\r
- WIFI_MGR_DEVICE_DATA *Nic;\r
+ WIFI_MGR_NETWORK_PROFILE *Profile;\r
+ WIFI_MGR_DEVICE_DATA *Nic;\r
\r
Nic = Private->CurrentNic;\r
if (Nic == NULL) {\r
}\r
\r
//\r
- //Initialize the connection page\r
+ // Initialize the connection page\r
//\r
- WifiMgrCleanUserInput(Private);\r
+ WifiMgrCleanUserInput (Private);\r
\r
Profile = WifiMgrGetProfileByProfileIndex (ProfileIndex, &Nic->ProfileList);\r
if (Profile == NULL) {\r
return EFI_NOT_FOUND;\r
}\r
+\r
Private->CurrentNic->UserSelectedProfile = Profile;\r
\r
return EFI_SUCCESS;\r
**/\r
EFI_STATUS\r
WifiMgrRecordPassword (\r
- IN WIFI_MGR_PRIVATE_DATA *Private,\r
- IN EFI_STRING_ID StringId,\r
- IN CHAR16 *StringBuffer,\r
- IN UINTN StringBufferLen\r
+ IN WIFI_MGR_PRIVATE_DATA *Private,\r
+ IN EFI_STRING_ID StringId,\r
+ IN CHAR16 *StringBuffer,\r
+ IN UINTN StringBufferLen\r
)\r
{\r
- CHAR16 *Password;\r
+ CHAR16 *Password;\r
\r
- if (StringId == 0 || StringBuffer == NULL || StringBufferLen <= 0) {\r
+ if ((StringId == 0) || (StringBuffer == NULL) || (StringBufferLen <= 0)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
if (Password == NULL) {\r
return EFI_NOT_FOUND;\r
}\r
+\r
if (StrLen (Password) > StringBufferLen) {\r
FreePool (Password);\r
return EFI_NOT_FOUND;\r
}\r
+\r
StrnCpyS (StringBuffer, StringBufferLen, Password, StrLen (Password));\r
ZeroMem (Password, (StrLen (Password) + 1) * sizeof (CHAR16));\r
FreePool (Password);\r
**/\r
VOID\r
WifiMgrUpdateConnectMessage (\r
- IN WIFI_MGR_DEVICE_DATA *Nic,\r
- IN BOOLEAN ConnectStateChanged,\r
- IN EFI_STRING ConnectStatusMessage\r
+ IN WIFI_MGR_DEVICE_DATA *Nic,\r
+ IN BOOLEAN ConnectStateChanged,\r
+ IN EFI_STRING ConnectStatusMessage\r
)\r
{\r
- CHAR16 ConnectStatusStr[WIFI_STR_MAX_SIZE];\r
- WIFI_MGR_PRIVATE_DATA *Private;\r
+ CHAR16 ConnectStatusStr[WIFI_STR_MAX_SIZE];\r
+ WIFI_MGR_PRIVATE_DATA *Private;\r
\r
Private = Nic->Private;\r
- if (Private == NULL || Private->CurrentNic != Nic) {\r
+ if ((Private == NULL) || (Private->CurrentNic != Nic)) {\r
return;\r
}\r
\r
HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_CONNECT_STATUS), ConnectStatusMessage, NULL);\r
} else {\r
if (Nic->ConnectState == WifiMgrConnectedToAp) {\r
-\r
- UnicodeSPrint (ConnectStatusStr, sizeof (ConnectStatusStr), L"Connected to %s",\r
- Nic->CurrentOperateNetwork->SSId);\r
+ UnicodeSPrint (\r
+ ConnectStatusStr,\r
+ sizeof (ConnectStatusStr),\r
+ L"Connected to %s",\r
+ Nic->CurrentOperateNetwork->SSId\r
+ );\r
HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_CONNECT_STATUS), ConnectStatusStr, NULL);\r
} else if (Nic->ConnectState == WifiMgrDisconnected) {\r
-\r
HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_CONNECT_STATUS), L"Disconnected", NULL);\r
} else if (Nic->ConnectState == WifiMgrConnectingToAp) {\r
-\r
- UnicodeSPrint (ConnectStatusStr, sizeof (ConnectStatusStr), L"Connecting to %s ...",\r
- Nic->CurrentOperateNetwork->SSId);\r
+ UnicodeSPrint (\r
+ ConnectStatusStr,\r
+ sizeof (ConnectStatusStr),\r
+ L"Connecting to %s ...",\r
+ Nic->CurrentOperateNetwork->SSId\r
+ );\r
HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_CONNECT_STATUS), ConnectStatusStr, NULL);\r
} else if (Nic->ConnectState == WifiMgrDisconnectingToAp) {\r
-\r
- UnicodeSPrint (ConnectStatusStr, sizeof (ConnectStatusStr), L"Disconnecting from %s ...",\r
- Nic->CurrentOperateNetwork->SSId);\r
+ UnicodeSPrint (\r
+ ConnectStatusStr,\r
+ sizeof (ConnectStatusStr),\r
+ L"Disconnecting from %s ...",\r
+ Nic->CurrentOperateNetwork->SSId\r
+ );\r
HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_CONNECT_STATUS), ConnectStatusStr, NULL);\r
} else {\r
return;\r
//\r
// Update Connect Button\r
//\r
- if (Nic->ConnectState == WifiMgrConnectedToAp && Nic->UserSelectedProfile == Nic->CurrentOperateNetwork) {\r
-\r
- HiiSetString (Private->RegisteredHandle,\r
- STRING_TOKEN (STR_CONNECT_NOW), L"Disconnect from this Network", NULL);\r
+ if ((Nic->ConnectState == WifiMgrConnectedToAp) && (Nic->UserSelectedProfile == Nic->CurrentOperateNetwork)) {\r
+ HiiSetString (\r
+ Private->RegisteredHandle,\r
+ STRING_TOKEN (STR_CONNECT_NOW),\r
+ L"Disconnect from this Network",\r
+ NULL\r
+ );\r
} else {\r
HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_CONNECT_NOW), L"Connect to this Network", NULL);\r
}\r
+\r
gBS->SignalEvent (Private->ConnectFormRefreshEvent);\r
\r
//\r
// Update Main Page and Network List\r
//\r
if (ConnectStateChanged) {\r
-\r
if (Nic->ConnectState == WifiMgrConnectedToAp) {\r
-\r
HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_CONNECTION_INFO), L"Connected to", NULL);\r
- HiiSetString (Private->RegisteredHandle,\r
- STRING_TOKEN (STR_CONNECTED_SSID), Nic->CurrentOperateNetwork->SSId, NULL);\r
+ HiiSetString (\r
+ Private->RegisteredHandle,\r
+ STRING_TOKEN (STR_CONNECTED_SSID),\r
+ Nic->CurrentOperateNetwork->SSId,\r
+ NULL\r
+ );\r
} else {\r
HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_CONNECTION_INFO), L"Disconnected", NULL);\r
HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_CONNECTED_SSID), L"", NULL);\r
**/\r
EFI_STATUS\r
WifiMgrConvertConfigDataToIfrNvData (\r
- IN WIFI_MGR_PRIVATE_DATA *Private,\r
- OUT WIFI_MANAGER_IFR_NVDATA *IfrNvData\r
+ IN WIFI_MGR_PRIVATE_DATA *Private,\r
+ OUT WIFI_MANAGER_IFR_NVDATA *IfrNvData\r
)\r
{\r
//\r
**/\r
EFI_STATUS\r
WifiMgrConvertIfrNvDataToConfigData (\r
- IN WIFI_MGR_PRIVATE_DATA *Private,\r
- IN OUT WIFI_MANAGER_IFR_NVDATA *IfrNvData\r
+ IN WIFI_MGR_PRIVATE_DATA *Private,\r
+ IN OUT WIFI_MANAGER_IFR_NVDATA *IfrNvData\r
)\r
{\r
return EFI_SUCCESS;\r
OUT EFI_STRING *Results\r
)\r
{\r
- WIFI_MGR_PRIVATE_DATA *Private;\r
- WIFI_MANAGER_IFR_NVDATA *IfrNvData;\r
- EFI_STRING ConfigRequestHdr;\r
- EFI_STRING ConfigRequest;\r
- UINTN Size;\r
- BOOLEAN AllocatedRequest;\r
- UINTN BufferSize;\r
- EFI_STATUS Status;\r
-\r
- if (This == NULL || Progress == NULL || Results == NULL) {\r
+ WIFI_MGR_PRIVATE_DATA *Private;\r
+ WIFI_MANAGER_IFR_NVDATA *IfrNvData;\r
+ EFI_STRING ConfigRequestHdr;\r
+ EFI_STRING ConfigRequest;\r
+ UINTN Size;\r
+ BOOLEAN AllocatedRequest;\r
+ UINTN BufferSize;\r
+ EFI_STATUS Status;\r
+\r
+ if ((This == NULL) || (Progress == NULL) || (Results == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
*Progress = Request;\r
if ((Request != NULL) &&\r
- !HiiIsConfigHdrMatch (Request, &gWifiConfigFormSetGuid, mVendorStorageName)) {\r
+ !HiiIsConfigHdrMatch (Request, &gWifiConfigFormSetGuid, mVendorStorageName))\r
+ {\r
return EFI_NOT_FOUND;\r
}\r
\r
AllocatedRequest = FALSE;\r
Size = 0;\r
\r
- Private = WIFI_MGR_PRIVATE_DATA_FROM_CONFIG_ACCESS (This);\r
+ Private = WIFI_MGR_PRIVATE_DATA_FROM_CONFIG_ACCESS (This);\r
\r
BufferSize = sizeof (WIFI_MANAGER_IFR_NVDATA);\r
- IfrNvData = AllocateZeroPool (BufferSize);\r
+ IfrNvData = AllocateZeroPool (BufferSize);\r
if (IfrNvData == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
ConfigRequestHdr = HiiConstructConfigHdr (\r
&gWifiConfigFormSetGuid,\r
mVendorStorageName,\r
- Private->DriverHandle);\r
+ Private->DriverHandle\r
+ );\r
if (ConfigRequestHdr == NULL) {\r
FreePool (IfrNvData);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
- Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
+ Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
ConfigRequest = AllocateZeroPool (Size);\r
if (ConfigRequest == NULL) {\r
-\r
FreePool (IfrNvData);\r
FreePool (ConfigRequestHdr);\r
return EFI_OUT_OF_RESOURCES;\r
Size,\r
L"%s&OFFSET=0&WIDTH=%016LX",\r
ConfigRequestHdr,\r
- (UINT64) BufferSize\r
+ (UINT64)BufferSize\r
);\r
FreePool (ConfigRequestHdr);\r
}\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
OUT EFI_STRING *Progress\r
)\r
{\r
- EFI_STATUS Status;\r
- UINTN BufferSize;\r
- WIFI_MGR_PRIVATE_DATA *Private;\r
- WIFI_MANAGER_IFR_NVDATA *IfrNvData;\r
+ EFI_STATUS Status;\r
+ UINTN BufferSize;\r
+ WIFI_MGR_PRIVATE_DATA *Private;\r
+ WIFI_MANAGER_IFR_NVDATA *IfrNvData;\r
\r
- if (Configuration == NULL || Progress == NULL) {\r
+ if ((Configuration == NULL) || (Progress == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
Status = gHiiConfigRouting->ConfigToBlock (\r
gHiiConfigRouting,\r
Configuration,\r
- (UINT8*) IfrNvData,\r
+ (UINT8 *)IfrNvData,\r
&BufferSize,\r
Progress\r
);\r
EFI_STATUS\r
EFIAPI\r
WifiMgrDxeHiiConfigAccessCallback (\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
- EFI_STATUS Status;\r
- EFI_INPUT_KEY Key;\r
- UINTN BufferSize;\r
- WIFI_MGR_PRIVATE_DATA *Private;\r
- WIFI_MANAGER_IFR_NVDATA *IfrNvData;\r
- EFI_DEVICE_PATH_PROTOCOL *FilePath;\r
- WIFI_MGR_NETWORK_PROFILE *Profile;\r
- WIFI_MGR_NETWORK_PROFILE *ProfileToConnect;\r
- WIFI_HIDDEN_NETWORK_DATA *HiddenNetwork;\r
- UINTN TempDataSize;\r
- VOID *TempData;\r
- LIST_ENTRY *Entry;\r
- UINT32 Index;\r
- UINT32 RemoveCount;\r
- CHAR16 *TempPassword;\r
- CHAR16 *ErrorMessage;\r
-\r
- if (Action != EFI_BROWSER_ACTION_FORM_OPEN &&\r
- Action != EFI_BROWSER_ACTION_FORM_CLOSE &&\r
- Action != EFI_BROWSER_ACTION_CHANGING &&\r
- Action != EFI_BROWSER_ACTION_CHANGED &&\r
- Action != EFI_BROWSER_ACTION_RETRIEVE) {\r
-\r
+ EFI_STATUS Status;\r
+ EFI_INPUT_KEY Key;\r
+ UINTN BufferSize;\r
+ WIFI_MGR_PRIVATE_DATA *Private;\r
+ WIFI_MANAGER_IFR_NVDATA *IfrNvData;\r
+ EFI_DEVICE_PATH_PROTOCOL *FilePath;\r
+ WIFI_MGR_NETWORK_PROFILE *Profile;\r
+ WIFI_MGR_NETWORK_PROFILE *ProfileToConnect;\r
+ WIFI_HIDDEN_NETWORK_DATA *HiddenNetwork;\r
+ UINTN TempDataSize;\r
+ VOID *TempData;\r
+ LIST_ENTRY *Entry;\r
+ UINT32 Index;\r
+ UINT32 RemoveCount;\r
+ CHAR16 *TempPassword;\r
+ CHAR16 *ErrorMessage;\r
+\r
+ if ((Action != EFI_BROWSER_ACTION_FORM_OPEN) &&\r
+ (Action != EFI_BROWSER_ACTION_FORM_CLOSE) &&\r
+ (Action != EFI_BROWSER_ACTION_CHANGING) &&\r
+ (Action != EFI_BROWSER_ACTION_CHANGED) &&\r
+ (Action != EFI_BROWSER_ACTION_RETRIEVE))\r
+ {\r
return EFI_UNSUPPORTED;\r
}\r
+\r
if ((Value == NULL) || (ActionRequest == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
// Retrieve uncommitted data from Browser\r
//\r
BufferSize = sizeof (WIFI_MANAGER_IFR_NVDATA);\r
- IfrNvData = AllocateZeroPool (BufferSize);\r
+ IfrNvData = AllocateZeroPool (BufferSize);\r
if (IfrNvData == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
- HiiGetBrowserData (&gWifiConfigFormSetGuid, mVendorStorageName, BufferSize, (UINT8 *) IfrNvData);\r
+\r
+ HiiGetBrowserData (&gWifiConfigFormSetGuid, mVendorStorageName, BufferSize, (UINT8 *)IfrNvData);\r
\r
if (Action == EFI_BROWSER_ACTION_FORM_OPEN) {\r
switch (QuestionId) {\r
+ case KEY_MAC_LIST:\r
\r
- case KEY_MAC_LIST:\r
+ Status = WifiMgrShowNicList (Private);\r
+ break;\r
\r
- Status = WifiMgrShowNicList (Private);\r
- break;\r
+ case KEY_REFRESH_NETWORK_LIST:\r
\r
- case KEY_REFRESH_NETWORK_LIST:\r
+ if (Private->CurrentNic->UserSelectedProfile != NULL) {\r
+ Profile = Private->CurrentNic->UserSelectedProfile;\r
\r
- if (Private->CurrentNic->UserSelectedProfile != NULL) {\r
+ //\r
+ // Erase secrets since user has left Connection Page\r
+ // Connection Page may direct to Network List Page or Eap Configuration Page,\r
+ // secrets only need to be erased when head to Network List Page\r
+ //\r
+ WifiMgrCleanProfileSecrets (Profile);\r
+\r
+ Private->CurrentNic->UserSelectedProfile = NULL;\r
+ }\r
+\r
+ break;\r
+\r
+ case KEY_CONNECT_ACTION:\r
+\r
+ if (Private->CurrentNic->UserSelectedProfile == NULL) {\r
+ break;\r
+ }\r
\r
Profile = Private->CurrentNic->UserSelectedProfile;\r
\r
//\r
- // Erase secrets since user has left Connection Page\r
- // Connection Page may direct to Network List Page or Eap Configuration Page,\r
- // secrets only need to be erased when head to Network List Page\r
+ // Enter the network connection configuration page\r
+ // Recovery from restored data\r
//\r
- WifiMgrCleanProfileSecrets (Profile);\r
-\r
- Private->CurrentNic->UserSelectedProfile = NULL;\r
- }\r
+ if (HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_SSID), Profile->SSId, NULL) == 0) {\r
+ return EFI_OUT_OF_RESOURCES;\r
+ }\r
\r
- break;\r
+ IfrNvData->SecurityType = Profile->SecurityType;\r
+ if (HiiSetString (\r
+ Private->RegisteredHandle,\r
+ STRING_TOKEN (STR_SECURITY_TYPE),\r
+ mSecurityType[IfrNvData->SecurityType],\r
+ NULL\r
+ ) == 0)\r
+ {\r
+ return EFI_OUT_OF_RESOURCES;\r
+ }\r
\r
- case KEY_CONNECT_ACTION:\r
+ if (IfrNvData->SecurityType == SECURITY_TYPE_WPA2_ENTERPRISE) {\r
+ IfrNvData->EapAuthMethod = Profile->EapAuthMethod;\r
+ IfrNvData->EapSecondAuthMethod = Profile->EapSecondAuthMethod;\r
+ StrCpyS (IfrNvData->EapIdentity, EAP_IDENTITY_SIZE, Profile->EapIdentity);\r
+ }\r
\r
- if (Private->CurrentNic->UserSelectedProfile == NULL) {\r
break;\r
- }\r
- Profile = Private->CurrentNic->UserSelectedProfile;\r
-\r
- //\r
- //Enter the network connection configuration page\r
- //Recovery from restored data\r
- //\r
- if (HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_SSID), Profile->SSId, NULL) == 0) {\r
- return EFI_OUT_OF_RESOURCES;\r
- }\r
- IfrNvData->SecurityType = Profile->SecurityType;\r
- if (HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_SECURITY_TYPE),\r
- mSecurityType[IfrNvData->SecurityType], NULL) == 0) {\r
- return EFI_OUT_OF_RESOURCES;\r
- }\r
\r
- if (IfrNvData->SecurityType == SECURITY_TYPE_WPA2_ENTERPRISE) {\r
+ case KEY_ENROLLED_CERT_NAME:\r
\r
- IfrNvData->EapAuthMethod = Profile->EapAuthMethod;\r
- IfrNvData->EapSecondAuthMethod = Profile->EapSecondAuthMethod;\r
- StrCpyS (IfrNvData->EapIdentity, EAP_IDENTITY_SIZE, Profile->EapIdentity);\r
- }\r
+ if (Private->CurrentNic->UserSelectedProfile == NULL) {\r
+ break;\r
+ }\r
\r
- break;\r
+ Profile = Private->CurrentNic->UserSelectedProfile;\r
\r
- case KEY_ENROLLED_CERT_NAME:\r
+ //\r
+ // Enter the key enrollment page\r
+ // For TTLS and PEAP, only CA cert needs to be cared\r
+ //\r
+ if (Private->FileType == FileTypeCACert) {\r
+ if (Profile->CACertData != NULL) {\r
+ HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_EAP_ENROLLED_CERT_NAME), Profile->CACertName, NULL);\r
+ } else {\r
+ HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_EAP_ENROLLED_CERT_NAME), L"", NULL);\r
+ }\r
+ } else if (Private->FileType == FileTypeClientCert) {\r
+ if (Profile->ClientCertData != NULL) {\r
+ HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_EAP_ENROLLED_CERT_NAME), Profile->ClientCertName, NULL);\r
+ } else {\r
+ HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_EAP_ENROLLED_CERT_NAME), L"", NULL);\r
+ }\r
+ }\r
\r
- if (Private->CurrentNic->UserSelectedProfile == NULL) {\r
break;\r
- }\r
- Profile = Private->CurrentNic->UserSelectedProfile;\r
\r
- //\r
- //Enter the key enrollment page\r
- //For TTLS and PEAP, only CA cert needs to be cared\r
- //\r
- if (Private->FileType == FileTypeCACert) {\r
+ case KEY_ENROLLED_PRIVATE_KEY_NAME:\r
\r
- if (Profile->CACertData != NULL) {\r
- HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_EAP_ENROLLED_CERT_NAME), Profile->CACertName, NULL);\r
- } else {\r
- HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_EAP_ENROLLED_CERT_NAME), L"", NULL);\r
+ if (Private->CurrentNic->UserSelectedProfile == NULL) {\r
+ break;\r
}\r
- } else if (Private->FileType == FileTypeClientCert) {\r
\r
- if (Profile->ClientCertData != NULL) {\r
- HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_EAP_ENROLLED_CERT_NAME), Profile->ClientCertName, NULL);\r
+ Profile = Private->CurrentNic->UserSelectedProfile;\r
+\r
+ if (Profile->PrivateKeyData != NULL) {\r
+ HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_EAP_ENROLLED_PRIVATE_KEY_NAME), Profile->PrivateKeyName, NULL);\r
} else {\r
- HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_EAP_ENROLLED_CERT_NAME), L"", NULL);\r
+ HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_EAP_ENROLLED_PRIVATE_KEY_NAME), L"", NULL);\r
}\r
- }\r
- break;\r
\r
- case KEY_ENROLLED_PRIVATE_KEY_NAME:\r
-\r
- if (Private->CurrentNic->UserSelectedProfile == NULL) {\r
break;\r
- }\r
- Profile = Private->CurrentNic->UserSelectedProfile;\r
\r
- if (Profile->PrivateKeyData != NULL) {\r
- HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_EAP_ENROLLED_PRIVATE_KEY_NAME), Profile->PrivateKeyName, NULL);\r
- } else {\r
- HiiSetString (Private->RegisteredHandle, STRING_TOKEN (STR_EAP_ENROLLED_PRIVATE_KEY_NAME), L"", NULL);\r
- }\r
- break;\r
-\r
- default:\r
- break;\r
+ default:\r
+ break;\r
}\r
} else if (Action == EFI_BROWSER_ACTION_FORM_CLOSE) {\r
switch (QuestionId) {\r
+ case KEY_CONNECT_ACTION:\r
\r
- case KEY_CONNECT_ACTION:\r
+ if (Private->CurrentNic->UserSelectedProfile == NULL) {\r
+ break;\r
+ }\r
\r
- if (Private->CurrentNic->UserSelectedProfile == NULL) {\r
- break;\r
- }\r
- Profile = Private->CurrentNic->UserSelectedProfile;\r
+ Profile = Private->CurrentNic->UserSelectedProfile;\r
\r
- //\r
- //Restore User Config Data for Page recovery\r
- //\r
- if (IfrNvData->SecurityType == SECURITY_TYPE_WPA2_ENTERPRISE) {\r
+ //\r
+ // Restore User Config Data for Page recovery\r
+ //\r
+ if (IfrNvData->SecurityType == SECURITY_TYPE_WPA2_ENTERPRISE) {\r
+ Profile->EapAuthMethod = IfrNvData->EapAuthMethod;\r
+ Profile->EapSecondAuthMethod = IfrNvData->EapSecondAuthMethod;\r
+ StrCpyS (Profile->EapIdentity, EAP_IDENTITY_SIZE, IfrNvData->EapIdentity);\r
+ }\r
\r
- Profile->EapAuthMethod = IfrNvData->EapAuthMethod;\r
- Profile->EapSecondAuthMethod = IfrNvData->EapSecondAuthMethod;\r
- StrCpyS (Profile->EapIdentity, EAP_IDENTITY_SIZE, IfrNvData->EapIdentity);\r
- }\r
- break;\r
+ break;\r
\r
- default:\r
- break;\r
+ default:\r
+ break;\r
}\r
} else if (Action == EFI_BROWSER_ACTION_CHANGING) {\r
switch (QuestionId) {\r
+ case KEY_NETWORK_LIST:\r
\r
- case KEY_NETWORK_LIST:\r
-\r
- //\r
- //User triggered a scan process.\r
- //\r
- Private->CurrentNic->OneTimeScanRequest = TRUE;\r
- break;\r
-\r
- case KEY_PASSWORD_CONNECT_NETWORK:\r
- case KEY_EAP_PASSWORD_CONNECT_NETWORK:\r
- case KEY_PRIVATE_KEY_PASSWORD:\r
-\r
- if (Private->CurrentNic->UserSelectedProfile == NULL) {\r
- break;\r
- }\r
- Profile = Private->CurrentNic->UserSelectedProfile;\r
-\r
- if (QuestionId == KEY_PASSWORD_CONNECT_NETWORK) {\r
- TempPassword = Profile->Password;\r
- } else if (QuestionId == KEY_EAP_PASSWORD_CONNECT_NETWORK) {\r
- TempPassword = Profile->EapPassword;\r
- } else {\r
- TempPassword = Profile->PrivateKeyPassword;\r
- }\r
-\r
- Status = WifiMgrRecordPassword (Private, Value->string, TempPassword, PASSWORD_STORAGE_SIZE);\r
- if (EFI_ERROR (Status)) {\r
- DEBUG ((DEBUG_ERROR, "[WiFi Connection Manager] Error: Failed to input password!"));\r
+ //\r
+ // User triggered a scan process.\r
+ //\r
+ Private->CurrentNic->OneTimeScanRequest = TRUE;\r
break;\r
- }\r
\r
- //\r
- // This password is not a new created password, so no need to confirm.\r
- //\r
- Status = EFI_NOT_FOUND;\r
- break;\r
+ case KEY_PASSWORD_CONNECT_NETWORK:\r
+ case KEY_EAP_PASSWORD_CONNECT_NETWORK:\r
+ case KEY_PRIVATE_KEY_PASSWORD:\r
\r
- case KEY_CONNECT_ACTION:\r
+ if (Private->CurrentNic->UserSelectedProfile == NULL) {\r
+ break;\r
+ }\r
\r
- ErrorMessage = NULL;\r
- ProfileToConnect = NULL;\r
+ Profile = Private->CurrentNic->UserSelectedProfile;\r
\r
- if (Private->CurrentNic->UserSelectedProfile == NULL) {\r
- break;\r
- }\r
- Profile = Private->CurrentNic->UserSelectedProfile;\r
+ if (QuestionId == KEY_PASSWORD_CONNECT_NETWORK) {\r
+ TempPassword = Profile->Password;\r
+ } else if (QuestionId == KEY_EAP_PASSWORD_CONNECT_NETWORK) {\r
+ TempPassword = Profile->EapPassword;\r
+ } else {\r
+ TempPassword = Profile->PrivateKeyPassword;\r
+ }\r
\r
- if (Private->CurrentNic->ConnectState == WifiMgrDisconnected ||\r
- Profile != Private->CurrentNic->CurrentOperateNetwork) {\r
+ Status = WifiMgrRecordPassword (Private, Value->string, TempPassword, PASSWORD_STORAGE_SIZE);\r
+ if (EFI_ERROR (Status)) {\r
+ DEBUG ((DEBUG_ERROR, "[WiFi Connection Manager] Error: Failed to input password!"));\r
+ break;\r
+ }\r
\r
//\r
- // When this network is not currently connected, pend it to connect.\r
+ // This password is not a new created password, so no need to confirm.\r
//\r
- if (Profile->AKMSuiteSupported && Profile->CipherSuiteSupported) {\r
-\r
- if (Profile->SecurityType == SECURITY_TYPE_NONE || Profile->SecurityType == SECURITY_TYPE_WPA2_PERSONAL) {\r
+ Status = EFI_NOT_FOUND;\r
+ break;\r
\r
- //\r
- // For Open network, connect directly.\r
- //\r
- ProfileToConnect = Profile;\r
+ case KEY_CONNECT_ACTION:\r
\r
- } else if (Profile->SecurityType == SECURITY_TYPE_WPA2_ENTERPRISE) {\r
+ ErrorMessage = NULL;\r
+ ProfileToConnect = NULL;\r
\r
- //\r
- // For WPA/WPA2-Enterprise network, conduct eap configuration first.\r
- // Only EAP-TLS, TTLS and PEAP is supported now!\r
- //\r
- Profile->EapAuthMethod = IfrNvData->EapAuthMethod;\r
- StrCpyS (Profile->EapIdentity, EAP_IDENTITY_SIZE, IfrNvData->EapIdentity);\r
+ if (Private->CurrentNic->UserSelectedProfile == NULL) {\r
+ break;\r
+ }\r
\r
- if (IfrNvData->EapAuthMethod == EAP_AUTH_METHOD_TTLS || IfrNvData->EapAuthMethod == EAP_AUTH_METHOD_PEAP) {\r
+ Profile = Private->CurrentNic->UserSelectedProfile;\r
\r
- Profile->EapSecondAuthMethod = IfrNvData->EapSecondAuthMethod;\r
- ProfileToConnect = Profile;\r
- } else if (IfrNvData->EapAuthMethod == EAP_AUTH_METHOD_TLS) {\r
+ if ((Private->CurrentNic->ConnectState == WifiMgrDisconnected) ||\r
+ (Profile != Private->CurrentNic->CurrentOperateNetwork))\r
+ {\r
+ //\r
+ // When this network is not currently connected, pend it to connect.\r
+ //\r
+ if (Profile->AKMSuiteSupported && Profile->CipherSuiteSupported) {\r
+ if ((Profile->SecurityType == SECURITY_TYPE_NONE) || (Profile->SecurityType == SECURITY_TYPE_WPA2_PERSONAL)) {\r
+ //\r
+ // For Open network, connect directly.\r
+ //\r
ProfileToConnect = Profile;\r
+ } else if (Profile->SecurityType == SECURITY_TYPE_WPA2_ENTERPRISE) {\r
+ //\r
+ // For WPA/WPA2-Enterprise network, conduct eap configuration first.\r
+ // Only EAP-TLS, TTLS and PEAP is supported now!\r
+ //\r
+ Profile->EapAuthMethod = IfrNvData->EapAuthMethod;\r
+ StrCpyS (Profile->EapIdentity, EAP_IDENTITY_SIZE, IfrNvData->EapIdentity);\r
+\r
+ if ((IfrNvData->EapAuthMethod == EAP_AUTH_METHOD_TTLS) || (IfrNvData->EapAuthMethod == EAP_AUTH_METHOD_PEAP)) {\r
+ Profile->EapSecondAuthMethod = IfrNvData->EapSecondAuthMethod;\r
+ ProfileToConnect = Profile;\r
+ } else if (IfrNvData->EapAuthMethod == EAP_AUTH_METHOD_TLS) {\r
+ ProfileToConnect = Profile;\r
+ } else {\r
+ ErrorMessage = L"ERROR: Only EAP-TLS, TTLS or PEAP is supported now!";\r
+ }\r
} else {\r
- ErrorMessage = L"ERROR: Only EAP-TLS, TTLS or PEAP is supported now!";\r
+ ErrorMessage = L"ERROR: Can't connect to this network!";\r
}\r
} else {\r
- ErrorMessage = L"ERROR: Can't connect to this network!";\r
+ ErrorMessage = L"ERROR: This network is not supported!";\r
}\r
- } else {\r
- ErrorMessage = L"ERROR: This network is not supported!";\r
- }\r
-\r
- if (ErrorMessage != NULL) {\r
- CreatePopUp (\r
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
- &Key,\r
- ErrorMessage,\r
- NULL\r
- );\r
- }\r
\r
- if (ProfileToConnect != NULL) {\r
+ if (ErrorMessage != NULL) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ ErrorMessage,\r
+ NULL\r
+ );\r
+ }\r
\r
- Private->CurrentNic->OneTimeConnectRequest = TRUE;\r
- Private->CurrentNic->ConnectPendingNetwork = ProfileToConnect;\r
+ if (ProfileToConnect != NULL) {\r
+ Private->CurrentNic->OneTimeConnectRequest = TRUE;\r
+ Private->CurrentNic->ConnectPendingNetwork = ProfileToConnect;\r
+ }\r
+ } else if (Private->CurrentNic->ConnectState == WifiMgrConnectedToAp) {\r
+ //\r
+ // This network is currently connected, just disconnect from it.\r
+ //\r
+ Private->CurrentNic->OneTimeDisconnectRequest = TRUE;\r
+ Private->CurrentNic->HasDisconnectPendingNetwork = TRUE;\r
}\r
- } else if (Private->CurrentNic->ConnectState == WifiMgrConnectedToAp) {\r
\r
- //\r
- // This network is currently connected, just disconnect from it.\r
- //\r
- Private->CurrentNic->OneTimeDisconnectRequest = TRUE;\r
- Private->CurrentNic->HasDisconnectPendingNetwork = TRUE;\r
- }\r
- break;\r
-\r
- case KEY_ENROLL_CA_CERT_CONNECT_NETWORK:\r
-\r
- Private->FileType = FileTypeCACert;\r
- break;\r
-\r
- case KEY_ENROLL_CLIENT_CERT_CONNECT_NETWORK:\r
-\r
- Private->FileType = FileTypeClientCert;\r
- break;\r
-\r
- case KEY_EAP_ENROLL_PRIVATE_KEY_FROM_FILE:\r
+ break;\r
\r
- FilePath = NULL;\r
- ChooseFile (NULL, NULL, NULL, &FilePath);\r
+ case KEY_ENROLL_CA_CERT_CONNECT_NETWORK:\r
\r
- if (FilePath != NULL) {\r
+ Private->FileType = FileTypeCACert;\r
+ break;\r
\r
- UpdatePrivateKeyFromFile(Private, FilePath);\r
- FreePool (FilePath);\r
- }\r
- break;\r
+ case KEY_ENROLL_CLIENT_CERT_CONNECT_NETWORK:\r
\r
- case KEY_EAP_ENROLL_CERT_FROM_FILE:\r
+ Private->FileType = FileTypeClientCert;\r
+ break;\r
\r
- //\r
- //User will select a cert file from File Explore\r
- //\r
- FilePath = NULL;\r
- ChooseFile( NULL, NULL, NULL, &FilePath);\r
+ case KEY_EAP_ENROLL_PRIVATE_KEY_FROM_FILE:\r
\r
- if (FilePath != NULL) {\r
+ FilePath = NULL;\r
+ ChooseFile (NULL, NULL, NULL, &FilePath);\r
\r
- UpdateCAFromFile(Private, FilePath);\r
- FreePool (FilePath);\r
- }\r
- break;\r
+ if (FilePath != NULL) {\r
+ UpdatePrivateKeyFromFile (Private, FilePath);\r
+ FreePool (FilePath);\r
+ }\r
\r
- case KEY_SAVE_PRIVATE_KEY_TO_MEM:\r
+ break;\r
\r
- if (Private->FileContext != NULL && Private->FileContext->FHandle != NULL &&\r
- Private->CurrentNic->UserSelectedProfile != NULL) {\r
+ case KEY_EAP_ENROLL_CERT_FROM_FILE:\r
\r
//\r
- // Read Private Key file to Buffer\r
+ // User will select a cert file from File Explore\r
//\r
- Profile = Private->CurrentNic->UserSelectedProfile;\r
- if (Profile->PrivateKeyData != NULL) {\r
+ FilePath = NULL;\r
+ ChooseFile (NULL, NULL, NULL, &FilePath);\r
\r
- ZeroMem (Profile->PrivateKeyData, Profile->PrivateKeyDataSize);\r
- FreePool (Profile->PrivateKeyData);\r
- Profile->PrivateKeyData = NULL;\r
+ if (FilePath != NULL) {\r
+ UpdateCAFromFile (Private, FilePath);\r
+ FreePool (FilePath);\r
}\r
\r
- Status = WifiMgrReadFileToBuffer (\r
- Private->FileContext,\r
- &TempData,\r
- &TempDataSize\r
- );\r
- if (EFI_ERROR (Status)) {\r
- CreatePopUp (\r
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
- &Key,\r
- L"ERROR: Can't read this private key file!",\r
- NULL\r
- );\r
- } else {\r
-\r
- ASSERT (Private->FileContext->FileName != NULL);\r
-\r
- Profile->PrivateKeyData = TempData;\r
- Profile->PrivateKeyDataSize = TempDataSize;\r
- StrCpyS(Profile->PrivateKeyName, WIFI_FILENAME_STR_MAX_SIZE, Private->FileContext->FileName);\r
-\r
- DEBUG ((DEBUG_INFO, "[WiFi Connection Manager] Private Key: %s has been enrolled! Size: %d\n",\r
- Profile->PrivateKeyName, Profile->PrivateKeyDataSize));\r
- }\r
- }\r
- break;\r
-\r
- case KEY_SAVE_CERT_TO_MEM:\r
-\r
- if (Private->FileContext != NULL && Private->FileContext->FHandle != NULL &&\r
- Private->CurrentNic->UserSelectedProfile != NULL) {\r
-\r
- //\r
- // Read Cert file to Buffer\r
- //\r
- Profile = Private->CurrentNic->UserSelectedProfile;\r
-\r
- if (Private->FileType == FileTypeCACert) {\r
- if (Profile->CACertData != NULL) {\r
+ break;\r
\r
- ZeroMem (Profile->CACertData, Profile->CACertSize);\r
- FreePool (Profile->CACertData);\r
- Profile->CACertData = NULL;\r
+ case KEY_SAVE_PRIVATE_KEY_TO_MEM:\r
+\r
+ if ((Private->FileContext != NULL) && (Private->FileContext->FHandle != NULL) &&\r
+ (Private->CurrentNic->UserSelectedProfile != NULL))\r
+ {\r
+ //\r
+ // Read Private Key file to Buffer\r
+ //\r
+ Profile = Private->CurrentNic->UserSelectedProfile;\r
+ if (Profile->PrivateKeyData != NULL) {\r
+ ZeroMem (Profile->PrivateKeyData, Profile->PrivateKeyDataSize);\r
+ FreePool (Profile->PrivateKeyData);\r
+ Profile->PrivateKeyData = NULL;\r
}\r
- } else if (Private->FileType == FileTypeClientCert) {\r
- if (Profile->ClientCertData != NULL) {\r
\r
- ZeroMem (Profile->ClientCertData, Profile->ClientCertSize);\r
- FreePool (Profile->ClientCertData);\r
- Profile->ClientCertData = NULL;\r
+ Status = WifiMgrReadFileToBuffer (\r
+ Private->FileContext,\r
+ &TempData,\r
+ &TempDataSize\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"ERROR: Can't read this private key file!",\r
+ NULL\r
+ );\r
+ } else {\r
+ ASSERT (Private->FileContext->FileName != NULL);\r
+\r
+ Profile->PrivateKeyData = TempData;\r
+ Profile->PrivateKeyDataSize = TempDataSize;\r
+ StrCpyS (Profile->PrivateKeyName, WIFI_FILENAME_STR_MAX_SIZE, Private->FileContext->FileName);\r
+\r
+ DEBUG ((\r
+ DEBUG_INFO,\r
+ "[WiFi Connection Manager] Private Key: %s has been enrolled! Size: %d\n",\r
+ Profile->PrivateKeyName,\r
+ Profile->PrivateKeyDataSize\r
+ ));\r
}\r
- } else {\r
- break;\r
}\r
\r
- Status = WifiMgrReadFileToBuffer (\r
- Private->FileContext,\r
- &TempData,\r
- &TempDataSize\r
- );\r
- if (EFI_ERROR (Status)) {\r
- CreatePopUp (\r
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
- &Key,\r
- L"ERROR: Can't read this certificate file!",\r
- NULL\r
- );\r
- } else {\r
+ break;\r
\r
- ASSERT (Private->FileContext->FileName != NULL);\r
- if (Private->FileType == FileTypeCACert) {\r
+ case KEY_SAVE_CERT_TO_MEM:\r
+\r
+ if ((Private->FileContext != NULL) && (Private->FileContext->FHandle != NULL) &&\r
+ (Private->CurrentNic->UserSelectedProfile != NULL))\r
+ {\r
+ //\r
+ // Read Cert file to Buffer\r
+ //\r
+ Profile = Private->CurrentNic->UserSelectedProfile;\r
\r
- Profile->CACertData = TempData;\r
- Profile->CACertSize = TempDataSize;\r
- StrCpyS(Profile->CACertName, WIFI_FILENAME_STR_MAX_SIZE, Private->FileContext->FileName);\r
- DEBUG ((DEBUG_INFO, "[WiFi Connection Manager] CA Cert: %s has been enrolled! Size: %d\n",\r
- Profile->CACertName, Profile->CACertSize));\r
+ if (Private->FileType == FileTypeCACert) {\r
+ if (Profile->CACertData != NULL) {\r
+ ZeroMem (Profile->CACertData, Profile->CACertSize);\r
+ FreePool (Profile->CACertData);\r
+ Profile->CACertData = NULL;\r
+ }\r
+ } else if (Private->FileType == FileTypeClientCert) {\r
+ if (Profile->ClientCertData != NULL) {\r
+ ZeroMem (Profile->ClientCertData, Profile->ClientCertSize);\r
+ FreePool (Profile->ClientCertData);\r
+ Profile->ClientCertData = NULL;\r
+ }\r
} else {\r
+ break;\r
+ }\r
\r
- Profile->ClientCertData = TempData;\r
- Profile->ClientCertSize = TempDataSize;\r
- StrCpyS(Profile->ClientCertName, WIFI_FILENAME_STR_MAX_SIZE, Private->FileContext->FileName);\r
- DEBUG ((DEBUG_INFO, "[WiFi Connection Manager] Client Cert: %s has been enrolled! Size: %d\n",\r
- Profile->ClientCertName, Profile->ClientCertSize));\r
+ Status = WifiMgrReadFileToBuffer (\r
+ Private->FileContext,\r
+ &TempData,\r
+ &TempDataSize\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"ERROR: Can't read this certificate file!",\r
+ NULL\r
+ );\r
+ } else {\r
+ ASSERT (Private->FileContext->FileName != NULL);\r
+ if (Private->FileType == FileTypeCACert) {\r
+ Profile->CACertData = TempData;\r
+ Profile->CACertSize = TempDataSize;\r
+ StrCpyS (Profile->CACertName, WIFI_FILENAME_STR_MAX_SIZE, Private->FileContext->FileName);\r
+ DEBUG ((\r
+ DEBUG_INFO,\r
+ "[WiFi Connection Manager] CA Cert: %s has been enrolled! Size: %d\n",\r
+ Profile->CACertName,\r
+ Profile->CACertSize\r
+ ));\r
+ } else {\r
+ Profile->ClientCertData = TempData;\r
+ Profile->ClientCertSize = TempDataSize;\r
+ StrCpyS (Profile->ClientCertName, WIFI_FILENAME_STR_MAX_SIZE, Private->FileContext->FileName);\r
+ DEBUG ((\r
+ DEBUG_INFO,\r
+ "[WiFi Connection Manager] Client Cert: %s has been enrolled! Size: %d\n",\r
+ Profile->ClientCertName,\r
+ Profile->ClientCertSize\r
+ ));\r
+ }\r
}\r
}\r
- }\r
- break;\r
\r
- case KEY_ADD_HIDDEN_NETWORK:\r
-\r
- //\r
- // Add a Hidden Network\r
- //\r
- if (StrLen (IfrNvData->SSId) < SSID_MIN_LEN ||\r
- Private->HiddenNetworkCount >= HIDDEN_NETWORK_LIST_COUNT_MAX) {\r
-\r
- Status = EFI_ABORTED;\r
break;\r
- } else {\r
+\r
+ case KEY_ADD_HIDDEN_NETWORK:\r
\r
//\r
- // Check if this SSId is already in Hidden Network List\r
+ // Add a Hidden Network\r
//\r
- NET_LIST_FOR_EACH (Entry, &Private->HiddenNetworkList) {\r
-\r
- HiddenNetwork = NET_LIST_USER_STRUCT_S (Entry, WIFI_HIDDEN_NETWORK_DATA,\r
- Link, WIFI_MGR_HIDDEN_NETWORK_SIGNATURE);\r
- if (StrCmp (HiddenNetwork->SSId, IfrNvData->SSId) == 0) {\r
-\r
- Status = EFI_ABORTED;\r
- break;\r
+ if ((StrLen (IfrNvData->SSId) < SSID_MIN_LEN) ||\r
+ (Private->HiddenNetworkCount >= HIDDEN_NETWORK_LIST_COUNT_MAX))\r
+ {\r
+ Status = EFI_ABORTED;\r
+ break;\r
+ } else {\r
+ //\r
+ // Check if this SSId is already in Hidden Network List\r
+ //\r
+ NET_LIST_FOR_EACH (Entry, &Private->HiddenNetworkList) {\r
+ HiddenNetwork = NET_LIST_USER_STRUCT_S (\r
+ Entry,\r
+ WIFI_HIDDEN_NETWORK_DATA,\r
+ Link,\r
+ WIFI_MGR_HIDDEN_NETWORK_SIGNATURE\r
+ );\r
+ if (StrCmp (HiddenNetwork->SSId, IfrNvData->SSId) == 0) {\r
+ Status = EFI_ABORTED;\r
+ break;\r
+ }\r
}\r
}\r
- }\r
-\r
- HiddenNetwork = (WIFI_HIDDEN_NETWORK_DATA *) AllocateZeroPool (sizeof (WIFI_HIDDEN_NETWORK_DATA));\r
- if (HiddenNetwork == NULL) {\r
-\r
- Status = EFI_OUT_OF_RESOURCES;\r
- break;\r
- }\r
- HiddenNetwork->Signature = WIFI_MGR_HIDDEN_NETWORK_SIGNATURE;\r
- StrCpyS (HiddenNetwork->SSId, SSID_STORAGE_SIZE, IfrNvData->SSId);\r
-\r
- InsertTailList (&Private->HiddenNetworkList, &HiddenNetwork->Link);\r
- Private->HiddenNetworkCount ++;\r
\r
- WifiMgrRefreshHiddenList (Private);\r
- break;\r
-\r
- case KEY_REMOVE_HIDDEN_NETWORK:\r
-\r
- //\r
- // Remove Hidden Networks\r
- //\r
- Entry = GetFirstNode (&Private->HiddenNetworkList);\r
- RemoveCount = 0;\r
- for (Index = 0; Index < Private->HiddenNetworkCount; Index ++) {\r
- if (IfrNvData->HiddenNetworkList[Index] != 0) {\r
+ HiddenNetwork = (WIFI_HIDDEN_NETWORK_DATA *)AllocateZeroPool (sizeof (WIFI_HIDDEN_NETWORK_DATA));\r
+ if (HiddenNetwork == NULL) {\r
+ Status = EFI_OUT_OF_RESOURCES;\r
+ break;\r
+ }\r
\r
- HiddenNetwork = NET_LIST_USER_STRUCT_S (Entry, WIFI_HIDDEN_NETWORK_DATA, Link, WIFI_MGR_HIDDEN_NETWORK_SIGNATURE);\r
- Entry = RemoveEntryList (Entry);\r
- RemoveCount ++;\r
+ HiddenNetwork->Signature = WIFI_MGR_HIDDEN_NETWORK_SIGNATURE;\r
+ StrCpyS (HiddenNetwork->SSId, SSID_STORAGE_SIZE, IfrNvData->SSId);\r
\r
- FreePool (HiddenNetwork);\r
- } else {\r
- Entry = GetNextNode (&Private->HiddenNetworkList, Entry);\r
- }\r
- }\r
+ InsertTailList (&Private->HiddenNetworkList, &HiddenNetwork->Link);\r
+ Private->HiddenNetworkCount++;\r
\r
- Private->HiddenNetworkCount -= RemoveCount;\r
- WifiMgrRefreshHiddenList (Private);\r
- break;\r
+ WifiMgrRefreshHiddenList (Private);\r
+ break;\r
\r
- default:\r
+ case KEY_REMOVE_HIDDEN_NETWORK:\r
\r
- if (QuestionId >= KEY_MAC_ENTRY_BASE && QuestionId < KEY_MAC_ENTRY_BASE + Private->NicCount) {\r
//\r
- // User selects a wireless NIC.\r
+ // Remove Hidden Networks\r
//\r
- Status = WifiMgrSelectNic (Private, QuestionId);\r
- if (EFI_ERROR (Status)) {\r
- CreatePopUp (\r
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
- &Key,\r
- L"ERROR: Fail to operate the wireless NIC!",\r
- NULL\r
- );\r
+ Entry = GetFirstNode (&Private->HiddenNetworkList);\r
+ RemoveCount = 0;\r
+ for (Index = 0; Index < Private->HiddenNetworkCount; Index++) {\r
+ if (IfrNvData->HiddenNetworkList[Index] != 0) {\r
+ HiddenNetwork = NET_LIST_USER_STRUCT_S (Entry, WIFI_HIDDEN_NETWORK_DATA, Link, WIFI_MGR_HIDDEN_NETWORK_SIGNATURE);\r
+ Entry = RemoveEntryList (Entry);\r
+ RemoveCount++;\r
+\r
+ FreePool (HiddenNetwork);\r
+ } else {\r
+ Entry = GetNextNode (&Private->HiddenNetworkList, Entry);\r
+ }\r
}\r
- } else if (Private->CurrentNic != NULL) {\r
- if (QuestionId >= KEY_AVAILABLE_NETWORK_ENTRY_BASE &&\r
- QuestionId <= KEY_AVAILABLE_NETWORK_ENTRY_BASE + Private->CurrentNic->MaxProfileIndex) {\r
\r
- Status = WifiMgrUserSelectProfileToConnect (Private, QuestionId - KEY_AVAILABLE_NETWORK_ENTRY_BASE);\r
- if (!EFI_ERROR (Status)) {\r
- WifiMgrUpdateConnectMessage(Private->CurrentNic, FALSE, NULL);\r
+ Private->HiddenNetworkCount -= RemoveCount;\r
+ WifiMgrRefreshHiddenList (Private);\r
+ break;\r
+\r
+ default:\r
+\r
+ if ((QuestionId >= KEY_MAC_ENTRY_BASE) && (QuestionId < KEY_MAC_ENTRY_BASE + Private->NicCount)) {\r
+ //\r
+ // User selects a wireless NIC.\r
+ //\r
+ Status = WifiMgrSelectNic (Private, QuestionId);\r
+ if (EFI_ERROR (Status)) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"ERROR: Fail to operate the wireless NIC!",\r
+ NULL\r
+ );\r
+ }\r
+ } else if (Private->CurrentNic != NULL) {\r
+ if ((QuestionId >= KEY_AVAILABLE_NETWORK_ENTRY_BASE) &&\r
+ (QuestionId <= KEY_AVAILABLE_NETWORK_ENTRY_BASE + Private->CurrentNic->MaxProfileIndex))\r
+ {\r
+ Status = WifiMgrUserSelectProfileToConnect (Private, QuestionId - KEY_AVAILABLE_NETWORK_ENTRY_BASE);\r
+ if (!EFI_ERROR (Status)) {\r
+ WifiMgrUpdateConnectMessage (Private->CurrentNic, FALSE, NULL);\r
+ }\r
}\r
- }\r
\r
- if (EFI_ERROR (Status)) {\r
- CreatePopUp (\r
- EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
- &Key,\r
- L"ERROR: Fail to operate this profile!",\r
- NULL\r
- );\r
+ if (EFI_ERROR (Status)) {\r
+ CreatePopUp (\r
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
+ &Key,\r
+ L"ERROR: Fail to operate this profile!",\r
+ NULL\r
+ );\r
+ }\r
}\r
- }\r
\r
- break;\r
+ break;\r
}\r
} else if (Action == EFI_BROWSER_ACTION_CHANGED) {\r
switch (QuestionId) {\r
+ case KEY_SAVE_CERT_TO_MEM:\r
+ case KEY_SAVE_PRIVATE_KEY_TO_MEM:\r
\r
- case KEY_SAVE_CERT_TO_MEM:\r
- case KEY_SAVE_PRIVATE_KEY_TO_MEM:\r
-\r
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
- break;\r
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
+ break;\r
\r
- case KEY_NO_SAVE_CERT_TO_MEM:\r
- case KEY_NO_SAVE_PRIVATE_KEY_TO_MEM:\r
+ case KEY_NO_SAVE_CERT_TO_MEM:\r
+ case KEY_NO_SAVE_PRIVATE_KEY_TO_MEM:\r
\r
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
- break;\r
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
+ break;\r
\r
- default:\r
+ default:\r
\r
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
- break;\r
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;\r
+ break;\r
}\r
} else if (Action == EFI_BROWSER_ACTION_RETRIEVE) {\r
-\r
switch (QuestionId) {\r
+ case KEY_REFRESH_NETWORK_LIST:\r
\r
- case KEY_REFRESH_NETWORK_LIST:\r
-\r
- WifiMgrRefreshNetworkList (Private, IfrNvData);\r
- break;\r
+ WifiMgrRefreshNetworkList (Private, IfrNvData);\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 (WIFI_MANAGER_IFR_NVDATA);\r
- HiiSetBrowserData (&gWifiConfigFormSetGuid, mVendorStorageName, BufferSize, (UINT8 *) IfrNvData, NULL);\r
+ HiiSetBrowserData (&gWifiConfigFormSetGuid, mVendorStorageName, BufferSize, (UINT8 *)IfrNvData, NULL);\r
}\r
\r
ZeroMem (IfrNvData, sizeof (WIFI_MANAGER_IFR_NVDATA));\r
**/\r
EFI_STATUS\r
WifiMgrDxeConfigFormInit (\r
- WIFI_MGR_PRIVATE_DATA *Private\r
-)\r
+ WIFI_MGR_PRIVATE_DATA *Private\r
+ )\r
{\r
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
\r
if (Private == NULL) {\r
return EFI_INVALID_PARAMETER;\r
**/\r
EFI_STATUS\r
WifiMgrDxeConfigFormUnload (\r
- WIFI_MGR_PRIVATE_DATA *Private\r
-)\r
+ WIFI_MGR_PRIVATE_DATA *Private\r
+ )\r
{\r
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
\r
if (Private == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
if (Private->FileContext != NULL) {\r
-\r
if (Private->FileContext->FHandle != NULL) {\r
Private->FileContext->FHandle->Close (Private->FileContext->FHandle);\r
}\r
if (Private->FileContext->FileName != NULL) {\r
FreePool (Private->FileContext->FileName);\r
}\r
+\r
FreePool (Private->FileContext);\r
}\r
\r
- HiiRemovePackages(Private->RegisteredHandle);\r
+ HiiRemovePackages (Private->RegisteredHandle);\r
\r
Status = gBS->UninstallMultipleProtocolInterfaces (\r
- Private->DriverHandle,\r
- &gEfiDevicePathProtocolGuid,\r
- &mWifiMgrDxeHiiVendorDevicePath,\r
- &gEfiHiiConfigAccessProtocolGuid,\r
- &Private->ConfigAccess,\r
- NULL\r
- );\r
+ Private->DriverHandle,\r
+ &gEfiDevicePathProtocolGuid,\r
+ &mWifiMgrDxeHiiVendorDevicePath,\r
+ &gEfiHiiConfigAccessProtocolGuid,\r
+ &Private->ConfigAccess,\r
+ NULL\r
+ );\r
\r
return Status;\r
}\r
projects / mirror_edk2.git / blobdiff