* [PATCH] MdeModulePKg/BDS: Build meaningful description for Wi-Fi boot option
@ 2017-04-20 3:23 Ruiyu Ni
2017-04-25 5:17 ` Ni, Ruiyu
2017-04-25 8:05 ` Wu, Jiaxin
0 siblings, 2 replies; 3+ messages in thread
From: Ruiyu Ni @ 2017-04-20 3:23 UTC (permalink / raw)
To: edk2-devel; +Cc: Fan Wang, Jiaxin Wu
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Fan Wang <fan.wang@intel.com>
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
---
.../Library/UefiBootManagerLib/BmBootDescription.c | 28 ++++++++++++++++++----
1 file changed, 23 insertions(+), 5 deletions(-)
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c b/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c
index 501a0cc255..6e69a1540a 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c
@@ -382,13 +382,13 @@ BmGetNetworkDescription (
//
// The PXE device path is like:
- // ....../Mac(...)[/Vlan(...)]
- // ....../Mac(...)[/Vlan(...)]/IPv4(...)
- // ....../Mac(...)[/Vlan(...)]/IPv6(...)
+ // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)]
+ // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)]/IPv4(...)
+ // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)]/IPv6(...)
//
// The HTTP device path is like:
- // ....../Mac(...)[/Vlan(...)]/IPv4(...)/Uri(...)
- // ....../Mac(...)[/Vlan(...)]/IPv6(...)/Uri(...)
+ // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)]/IPv4(...)/Uri(...)
+ // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)]/IPv6(...)/Uri(...)
//
while (!IsDevicePathEnd (DevicePath) &&
((DevicePathType (DevicePath) != MESSAGING_DEVICE_PATH) ||
@@ -404,6 +404,9 @@ BmGetNetworkDescription (
Mac = (MAC_ADDR_DEVICE_PATH *) DevicePath;
DevicePath = NextDevicePathNode (DevicePath);
+ //
+ // Locate the optional Vlan node
+ //
if ((DevicePathType (DevicePath) == MESSAGING_DEVICE_PATH) &&
(DevicePathSubType (DevicePath) == MSG_VLAN_DP)
) {
@@ -413,6 +416,18 @@ BmGetNetworkDescription (
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) &&
((DevicePathSubType (DevicePath) == MSG_IPv4_DP) ||
(DevicePathSubType (DevicePath) == MSG_IPv6_DP))
@@ -423,6 +438,9 @@ BmGetNetworkDescription (
Ip = NULL;
}
+ //
+ // Locate the URI node
+ //
if ((DevicePathType (DevicePath) == MESSAGING_DEVICE_PATH) &&
(DevicePathSubType (DevicePath) == MSG_URI_DP)
) {
--
2.12.2.windows.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] MdeModulePKg/BDS: Build meaningful description for Wi-Fi boot option
2017-04-20 3:23 [PATCH] MdeModulePKg/BDS: Build meaningful description for Wi-Fi boot option Ruiyu Ni
@ 2017-04-25 5:17 ` Ni, Ruiyu
2017-04-25 8:05 ` Wu, Jiaxin
1 sibling, 0 replies; 3+ messages in thread
From: Ni, Ruiyu @ 2017-04-25 5:17 UTC (permalink / raw)
To: Ni, Ruiyu, edk2-devel@lists.01.org; +Cc: Wang, Fan, Wu, Jiaxin
Fan, Jiaxin,
Any comments?
Thanks/Ray
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Ruiyu Ni
> Sent: Thursday, April 20, 2017 11:23 AM
> To: edk2-devel@lists.01.org
> Cc: Wang, Fan <fan.wang@intel.com>; Wu, Jiaxin <jiaxin.wu@intel.com>
> Subject: [edk2] [PATCH] MdeModulePKg/BDS: Build meaningful description
> for Wi-Fi boot option
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Fan Wang <fan.wang@intel.com>
> Cc: Jiaxin Wu <jiaxin.wu@intel.com>
> ---
> .../Library/UefiBootManagerLib/BmBootDescription.c | 28
> ++++++++++++++++++----
> 1 file changed, 23 insertions(+), 5 deletions(-)
>
> diff --git
> a/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c
> b/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c
> index 501a0cc255..6e69a1540a 100644
> --- a/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c
> +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c
> @@ -382,13 +382,13 @@ BmGetNetworkDescription (
>
> //
> // The PXE device path is like:
> - // ....../Mac(...)[/Vlan(...)]
> - // ....../Mac(...)[/Vlan(...)]/IPv4(...)
> - // ....../Mac(...)[/Vlan(...)]/IPv6(...)
> + // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)]
> + // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)]/IPv4(...)
> + // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)]/IPv6(...)
> //
> // The HTTP device path is like:
> - // ....../Mac(...)[/Vlan(...)]/IPv4(...)/Uri(...)
> - // ....../Mac(...)[/Vlan(...)]/IPv6(...)/Uri(...)
> + // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)]/IPv4(...)/Uri(...)
> + // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)]/IPv6(...)/Uri(...)
> //
> while (!IsDevicePathEnd (DevicePath) &&
> ((DevicePathType (DevicePath) != MESSAGING_DEVICE_PATH) || @@ -
> 404,6 +404,9 @@ BmGetNetworkDescription (
> Mac = (MAC_ADDR_DEVICE_PATH *) DevicePath;
> DevicePath = NextDevicePathNode (DevicePath);
>
> + //
> + // Locate the optional Vlan node
> + //
> if ((DevicePathType (DevicePath) == MESSAGING_DEVICE_PATH) &&
> (DevicePathSubType (DevicePath) == MSG_VLAN_DP)
> ) {
> @@ -413,6 +416,18 @@ BmGetNetworkDescription (
> 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) &&
> ((DevicePathSubType (DevicePath) == MSG_IPv4_DP) ||
> (DevicePathSubType (DevicePath) == MSG_IPv6_DP)) @@ -423,6 +438,9
> @@ BmGetNetworkDescription (
> Ip = NULL;
> }
>
> + //
> + // Locate the URI node
> + //
> if ((DevicePathType (DevicePath) == MESSAGING_DEVICE_PATH) &&
> (DevicePathSubType (DevicePath) == MSG_URI_DP)
> ) {
> --
> 2.12.2.windows.2
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] MdeModulePKg/BDS: Build meaningful description for Wi-Fi boot option
2017-04-20 3:23 [PATCH] MdeModulePKg/BDS: Build meaningful description for Wi-Fi boot option Ruiyu Ni
2017-04-25 5:17 ` Ni, Ruiyu
@ 2017-04-25 8:05 ` Wu, Jiaxin
1 sibling, 0 replies; 3+ messages in thread
From: Wu, Jiaxin @ 2017-04-25 8:05 UTC (permalink / raw)
To: Ni, Ruiyu, edk2-devel@lists.01.org; +Cc: Wang, Fan
Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>
Thanks,
Jiaxin
> -----Original Message-----
> From: Ni, Ruiyu
> Sent: Thursday, April 20, 2017 11:23 AM
> To: edk2-devel@lists.01.org
> Cc: Wang, Fan <fan.wang@intel.com>; Wu, Jiaxin <jiaxin.wu@intel.com>
> Subject: [PATCH] MdeModulePKg/BDS: Build meaningful description for Wi-
> Fi boot option
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Fan Wang <fan.wang@intel.com>
> Cc: Jiaxin Wu <jiaxin.wu@intel.com>
> ---
> .../Library/UefiBootManagerLib/BmBootDescription.c | 28
> ++++++++++++++++++----
> 1 file changed, 23 insertions(+), 5 deletions(-)
>
> diff --git
> a/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c
> b/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c
> index 501a0cc255..6e69a1540a 100644
> --- a/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c
> +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBootDescription.c
> @@ -382,13 +382,13 @@ BmGetNetworkDescription (
>
> //
> // The PXE device path is like:
> - // ....../Mac(...)[/Vlan(...)]
> - // ....../Mac(...)[/Vlan(...)]/IPv4(...)
> - // ....../Mac(...)[/Vlan(...)]/IPv6(...)
> + // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)]
> + // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)]/IPv4(...)
> + // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)]/IPv6(...)
> //
> // The HTTP device path is like:
> - // ....../Mac(...)[/Vlan(...)]/IPv4(...)/Uri(...)
> - // ....../Mac(...)[/Vlan(...)]/IPv6(...)/Uri(...)
> + // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)]/IPv4(...)/Uri(...)
> + // ....../Mac(...)[/Vlan(...)][/Wi-Fi(...)]/IPv6(...)/Uri(...)
> //
> while (!IsDevicePathEnd (DevicePath) &&
> ((DevicePathType (DevicePath) != MESSAGING_DEVICE_PATH) ||
> @@ -404,6 +404,9 @@ BmGetNetworkDescription (
> Mac = (MAC_ADDR_DEVICE_PATH *) DevicePath;
> DevicePath = NextDevicePathNode (DevicePath);
>
> + //
> + // Locate the optional Vlan node
> + //
> if ((DevicePathType (DevicePath) == MESSAGING_DEVICE_PATH) &&
> (DevicePathSubType (DevicePath) == MSG_VLAN_DP)
> ) {
> @@ -413,6 +416,18 @@ BmGetNetworkDescription (
> 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) &&
> ((DevicePathSubType (DevicePath) == MSG_IPv4_DP) ||
> (DevicePathSubType (DevicePath) == MSG_IPv6_DP))
> @@ -423,6 +438,9 @@ BmGetNetworkDescription (
> Ip = NULL;
> }
>
> + //
> + // Locate the URI node
> + //
> if ((DevicePathType (DevicePath) == MESSAGING_DEVICE_PATH) &&
> (DevicePathSubType (DevicePath) == MSG_URI_DP)
> ) {
> --
> 2.12.2.windows.2
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-04-25 8:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-20 3:23 [PATCH] MdeModulePKg/BDS: Build meaningful description for Wi-Fi boot option Ruiyu Ni
2017-04-25 5:17 ` Ni, Ruiyu
2017-04-25 8:05 ` Wu, Jiaxin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox