1. Add UEFI 2.2 VLAN device path definition to MdePkg

2. Update DevicePathDxe to support VLAN device path node
3. Update GenericBdsLib function DevicePathToStr() to support VLAN device path node

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9421 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 59 insertions, 2 deletions

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c
index 73ec7a7f4a..3da549f156 100644
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c
@@ -1,7 +1,7 @@
 /** @file

   DevicePathFromText protocol as defined in the UEFI 2.0 specification.

 

-Copyright (c) 2006 - 2008, Intel Corporation. <BR>

+Copyright (c) 2006 - 2009, Intel Corporation. <BR>

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -2350,6 +2350,34 @@ DevPathFromTextiSCSI (
 }

 

 /**

+  Converts a text device path node to VLAN device path structure.

+

+  @param TextDeviceNode  The input Text device path node.

+

+  @return A pointer to the newly-created VLAN device path structure.

+

+**/

+EFI_DEVICE_PATH_PROTOCOL *

+DevPathFromTextVlan (

+  IN CHAR16 *TextDeviceNode

+  )

+{

+  CHAR16            *VlanStr;

+  VLAN_DEVICE_PATH  *Vlan;

+

+  VlanStr = GetNextParamStr (&TextDeviceNode);

+  Vlan    = (VLAN_DEVICE_PATH *) CreateDeviceNode (

+                                   MESSAGING_DEVICE_PATH,

+                                   MSG_VLAN_DP,

+                                   sizeof (VLAN_DEVICE_PATH)

+                                   );

+

+  Vlan->VlanId = (UINT16) Strtoi (VlanStr);

+

+  return (EFI_DEVICE_PATH_PROTOCOL *) Vlan;

+}

+

+/**

   Converts a text device path node to HD device path structure.

 

   @param TextDeviceNode  The input Text device path node.

@@ -2753,6 +2781,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED DEVICE_PATH_FROM_TEXT_TABLE DevPathFromTextTable[]
   {L"UsbWwid", DevPathFromTextUsbWwid},

   {L"Unit", DevPathFromTextUnit},

   {L"iSCSI", DevPathFromTextiSCSI},

+  {L"Vlan", DevPathFromTextVlan},

   {L"HD", DevPathFromTextHD},

   {L"CDROM", DevPathFromTextCDROM},

   {L"VenMEDIA", DevPathFromTextVenMEDIA},

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c
index fec342f113..43b0e0b8f6 100644
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c
@@ -1,7 +1,7 @@
 /** @file

   DevicePathToText protocol as defined in the UEFI 2.0 specification.

 

-Copyright (c) 2006 - 2008, Intel Corporation. <BR>

+Copyright (c) 2006 - 2009, Intel Corporation. <BR>

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -1312,6 +1312,33 @@ DevPathToTextiSCSI (
 }

 

 /**

+  Converts a VLAN device path structure to its string representative.

+

+  @param Str             The string representative of input device.

+  @param DevPath         The input device path structure.

+  @param DisplayOnly     If DisplayOnly is TRUE, then the shorter text representation

+                         of the display node is used, where applicable. If DisplayOnly

+                         is FALSE, then the longer text representation of the display node

+                         is used.

+  @param AllowShortcuts  If AllowShortcuts is TRUE, then the shortcut forms of text

+                         representation for a device node can be used, where applicable.

+

+**/

+VOID

+DevPathToTextVlan (

+  IN OUT POOL_PRINT  *Str,

+  IN VOID            *DevPath,

+  IN BOOLEAN         DisplayOnly,

+  IN BOOLEAN         AllowShortcuts

+  )

+{

+  VLAN_DEVICE_PATH  *Vlan;

+

+  Vlan = DevPath;

+  CatPrint (Str, L"Vlan(%d)", (UINTN) Vlan->VlanId);

+}

+

+/**

   Converts a Hard drive device path structure to its string representative.

 

   @param Str             The string representative of input device.

@@ -1684,6 +1711,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED const DEVICE_PATH_TO_TEXT_TABLE DevPathToTextTable
   {MESSAGING_DEVICE_PATH, MSG_UART_DP, DevPathToTextUart},

   {MESSAGING_DEVICE_PATH, MSG_VENDOR_DP, DevPathToTextVendor},

   {MESSAGING_DEVICE_PATH, MSG_ISCSI_DP, DevPathToTextiSCSI},

+  {MESSAGING_DEVICE_PATH, MSG_VLAN_DP, DevPathToTextVlan},

   {MEDIA_DEVICE_PATH, MEDIA_HARDDRIVE_DP, DevPathToTextHardDrive},

   {MEDIA_DEVICE_PATH, MEDIA_CDROM_DP, DevPathToTextCDROM},

   {MEDIA_DEVICE_PATH, MEDIA_VENDOR_DP, DevPathToTextVendor},