sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MdeModulePKg/BDS: Build meaningful description for Wi-Fi boot option

Browse Source 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Fan Wang <fan.wang@intel.com>
Reviewed-by: Jiaxin Wu <jiaxin.wu@intel.com>
(cherry picked from commit 6bbd4a8f5f)
This commit is contained in:
Ruiyu Ni
2017-04-20 11:22:35 +08:00
parent 0abf7713aa
commit 9b68006c93
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c
View File

@ -382,13 +382,13 @@ BmGetNetworkDescription (
// //
// The PXE device path is like: // The PXE device path is like:
// ....../Mac(...)[/Vlan(...)] // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)]
// ....../Mac(...)[/Vlan(...)]/IPv4(...) // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)]/IPv4(...)
// ....../Mac(...)[/Vlan(...)]/IPv6(...) // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)]/IPv6(...)
// //
// The HTTP device path is like: // The HTTP device path is like:
// ....../Mac(...)[/Vlan(...)]/IPv4(...)/Uri(...) // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)]/IPv4(...)/Uri(...)
// ....../Mac(...)[/Vlan(...)]/IPv6(...)/Uri(...) // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)]/IPv6(...)/Uri(...)
// //
while (!IsDevicePathEnd (DevicePath) && while (!IsDevicePathEnd (DevicePath) &&
((DevicePathType (DevicePath) != MESSAGING_DEVICE_PATH) || ((DevicePathType (DevicePath) != MESSAGING_DEVICE_PATH) ||
@ -404,6 +404,9 @@ BmGetNetworkDescription (
Mac = (MAC_ADDR_DEVICE_PATH *) DevicePath; Mac = (MAC_ADDR_DEVICE_PATH *) DevicePath;
DevicePath = NextDevicePathNode (DevicePath); DevicePath = NextDevicePathNode (DevicePath);
//
// Locate the optional Vlan node
//
if ((DevicePathType (DevicePath) == MESSAGING_DEVICE_PATH) && if ((DevicePathType (DevicePath) == MESSAGING_DEVICE_PATH) &&
(DevicePathSubType (DevicePath) == MSG_VLAN_DP) (DevicePathSubType (DevicePath) == MSG_VLAN_DP)
) { ) {
@ -413,6 +416,18 @@ BmGetNetworkDescription (
Vlan = NULL; Vlan = NULL;
} }
//
// Skip the optional Wi-Fi node
//
if ((DevicePathType (DevicePath) == MESSAGING_DEVICE_PATH) &&
(DevicePathSubType (DevicePath) == MSG_WIFI_DP)
) {
DevicePath = NextDevicePathNode (DevicePath);
}
//
// Locate the IP node
//
if ((DevicePathType (DevicePath) == MESSAGING_DEVICE_PATH) && if ((DevicePathType (DevicePath) == MESSAGING_DEVICE_PATH) &&
((DevicePathSubType (DevicePath) == MSG_IPv4_DP) || ((DevicePathSubType (DevicePath) == MSG_IPv4_DP) ||
(DevicePathSubType (DevicePath) == MSG_IPv6_DP)) (DevicePathSubType (DevicePath) == MSG_IPv6_DP))
@ -423,6 +438,9 @@ BmGetNetworkDescription (
Ip = NULL; Ip = NULL;
} }
//
// Locate the URI node
//
if ((DevicePathType (DevicePath) == MESSAGING_DEVICE_PATH) && if ((DevicePathType (DevicePath) == MESSAGING_DEVICE_PATH) &&
(DevicePathSubType (DevicePath) == MSG_URI_DP) (DevicePathSubType (DevicePath) == MSG_URI_DP)
) { ) {