/** @file\r
DevicePathToText protocol as defined in the UEFI 2.0 specification.\r
\r
-Copyright (c) 2006 - 2008, Intel Corporation. <BR>\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
http://opensource.org/licenses/bsd-license.php\r
\r
#include "DevicePath.h"\r
\r
-/**\r
- Function unpacks a device path data structure so that all the nodes of a device path\r
- are naturally aligned.\r
-\r
- @param DevPath A pointer to a device path data structure\r
-\r
- @return If the memory for the device path is successfully allocated, then a pointer to the\r
- new device path is returned. Otherwise, NULL is returned.\r
-\r
-**/\r
-EFI_DEVICE_PATH_PROTOCOL *\r
-UnpackDevicePath (\r
- IN CONST EFI_DEVICE_PATH_PROTOCOL *DevPath\r
- )\r
-{\r
- CONST EFI_DEVICE_PATH_PROTOCOL *Src;\r
- EFI_DEVICE_PATH_PROTOCOL *Dest;\r
- EFI_DEVICE_PATH_PROTOCOL *NewPath;\r
- UINTN Size;\r
-\r
- if (DevPath == NULL) {\r
- return NULL;\r
- }\r
- //\r
- // Walk device path and round sizes to valid boundries\r
- //\r
- Src = DevPath;\r
- Size = 0;\r
- for (;;) {\r
- Size += DevicePathNodeLength (Src);\r
- Size += ALIGN_SIZE (Size);\r
-\r
- if (IsDevicePathEnd (Src)) {\r
- break;\r
- }\r
-\r
- Src = (EFI_DEVICE_PATH_PROTOCOL *) NextDevicePathNode (Src);\r
- }\r
- //\r
- // Allocate space for the unpacked path\r
- //\r
- NewPath = AllocateZeroPool (Size);\r
- if (NewPath != NULL) {\r
-\r
- ASSERT (((UINTN) NewPath) % MIN_ALIGNMENT_SIZE == 0);\r
-\r
- //\r
- // Copy each node\r
- //\r
- Src = DevPath;\r
- Dest = NewPath;\r
- for (;;) {\r
- Size = DevicePathNodeLength (Src);\r
- CopyMem (Dest, Src, Size);\r
- Size += ALIGN_SIZE (Size);\r
- SetDevicePathNodeLength (Dest, Size);\r
- Dest->Type |= EFI_DP_TYPE_UNPACKED;\r
- Dest = (EFI_DEVICE_PATH_PROTOCOL *) (((UINT8 *) Dest) + Size);\r
-\r
- if (IsDevicePathEnd (Src)) {\r
- break;\r
- }\r
-\r
- Src = (EFI_DEVICE_PATH_PROTOCOL *) NextDevicePathNode (Src);\r
- }\r
- }\r
-\r
- return NewPath;\r
-}\r
-\r
-/**\r
- Adjusts the size of a previously allocated buffer.\r
-\r
- @param OldPool A pointer to the buffer whose size is being adjusted.\r
- @param OldSize The size of the current buffer.\r
- @param NewSize The size of the new buffer.\r
-\r
- @return A pointer to the new buffer or NULL if allocation fails.\r
-\r
-**/\r
-VOID *\r
-ReallocatePool (\r
- IN VOID *OldPool,\r
- IN UINTN OldSize,\r
- IN UINTN NewSize\r
- )\r
-{\r
- VOID *NewPool;\r
-\r
- NewPool = NULL;\r
- if (NewSize != 0) {\r
- NewPool = AllocateZeroPool (NewSize);\r
- }\r
-\r
- if (OldPool != NULL) {\r
- if (NewPool != NULL) {\r
- CopyMem (NewPool, OldPool, OldSize < NewSize ? OldSize : NewSize);\r
- }\r
-\r
- FreePool (OldPool);\r
- }\r
-\r
- return NewPool;\r
-}\r
-\r
/**\r
Concatenates a formatted unicode string to allocated pool. The caller must\r
free the resulting buffer.\r
\r
**/\r
CHAR16 *\r
+EFIAPI\r
CatPrint (\r
IN OUT POOL_PRINT *Str,\r
IN CHAR16 *Fmt,\r
)\r
{\r
UINT16 *AppendStr;\r
+ UINTN AppendCount;\r
VA_LIST Args;\r
- UINTN Size;\r
\r
AppendStr = AllocateZeroPool (0x1000);\r
- if (AppendStr == NULL) {\r
- return Str->Str;\r
- }\r
+ ASSERT (AppendStr != NULL);\r
\r
VA_START (Args, Fmt);\r
- UnicodeVSPrint (AppendStr, 0x1000, Fmt, Args);\r
+ AppendCount = UnicodeVSPrint (AppendStr, 0x1000, Fmt, Args);\r
VA_END (Args);\r
- if (NULL == Str->Str) {\r
- Size = StrSize (AppendStr);\r
- Str->Str = AllocateZeroPool (Size);\r
- ASSERT (Str->Str != NULL);\r
- } else {\r
- Size = StrSize (AppendStr) - sizeof (UINT16);\r
- Size = Size + StrSize (Str->Str);\r
+\r
+ if (Str->Length + AppendCount * sizeof (CHAR16) > Str->Capacity) {\r
+ Str->Capacity = Str->Length + (AppendCount + 1) * sizeof (CHAR16) * 2;\r
Str->Str = ReallocatePool (\r
- Str->Str,\r
- StrSize (Str->Str),\r
- Size\r
- );\r
+ Str->Length,\r
+ Str->Capacity,\r
+ Str->Str\r
+ );\r
ASSERT (Str->Str != NULL);\r
}\r
\r
- Str->MaxLen = MAX_CHAR * sizeof (UINT16);\r
- if (Size < Str->MaxLen) {\r
+ if (Str->Length == 0) {\r
+ StrCpy (Str->Str, AppendStr);\r
+ Str->Length = (AppendCount + 1) * sizeof (CHAR16);\r
+ } else {\r
StrCat (Str->Str, AppendStr);\r
- Str->Len = Size - sizeof (UINT16);\r
+ Str->Length += AppendCount * sizeof (CHAR16);\r
}\r
\r
FreePool (AppendStr);\r
}\r
\r
/**\r
- Converts a PCI device path structure to its string representive.\r
+ Converts a PCI device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
}\r
\r
/**\r
- Converts a PC Card device path structure to its string representive.\r
+ Converts a PC Card device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
}\r
\r
/**\r
- Converts a Memory Map device path structure to its string representive.\r
+ Converts a Memory Map device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
}\r
\r
/**\r
- Converts a Vendor device path structure to its string representive.\r
+ Converts a Vendor device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
} else if (CompareGuid (&Vendor->Guid, &gEfiVTUTF8Guid)) {\r
CatPrint (Str, L"VenUft8()");\r
return ;\r
- } else if (CompareGuid (&Vendor->Guid, &mEfiDevicePathMessagingUartFlowControlGuid)) {\r
+ } else if (CompareGuid (&Vendor->Guid, &gEfiUartDevicePathGuid)) {\r
FlowControlMap = (((UART_FLOW_CONTROL_DEVICE_PATH *) Vendor)->FlowControlMap);\r
switch (FlowControlMap & 0x00000003) {\r
case 0:\r
}\r
\r
return ;\r
- } else if (CompareGuid (&Vendor->Guid, &mEfiDevicePathMessagingSASGuid)) {\r
+ } else if (CompareGuid (&Vendor->Guid, &gEfiSasDevicePathGuid)) {\r
CatPrint (\r
Str,\r
L"SAS(0x%lx,0x%lx,0x%x,",\r
}\r
\r
/**\r
- Converts a Controller device path structure to its string representive.\r
+ Converts a Controller device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
}\r
\r
/**\r
- Converts a ACPI device path structure to its string representive.\r
+ Converts a ACPI device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
CatPrint (Str, L"PciRoot(0x%x)", Acpi->UID);\r
break;\r
\r
+ case 0x0a08:\r
+ CatPrint (Str, L"PcieRoot(0x%x)", Acpi->UID);\r
+ break;\r
+\r
case 0x0604:\r
CatPrint (Str, L"Floppy(0x%x)", Acpi->UID);\r
break;\r
}\r
\r
/**\r
- Converts a ACPI extended HID device path structure to its string representive.\r
+ Converts a ACPI extended HID device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
}\r
\r
/**\r
- Converts a ACPI address device path structure to its string representive.\r
+ Converts a ACPI address device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
}\r
\r
/**\r
- Converts a ATAPI device path structure to its string representive.\r
+ Converts a ATAPI device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
CatPrint (\r
Str,\r
L"Ata(%s,%s,0x%x)",\r
- Atapi->PrimarySecondary ? L"Secondary" : L"Primary",\r
- Atapi->SlaveMaster ? L"Slave" : L"Master",\r
+ (Atapi->PrimarySecondary == 1) ? L"Secondary" : L"Primary",\r
+ (Atapi->SlaveMaster == 1) ? L"Slave" : L"Master",\r
Atapi->Lun\r
);\r
}\r
}\r
\r
/**\r
- Converts a SCSI device path structure to its string representive.\r
+ Converts a SCSI device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
}\r
\r
/**\r
- Converts a Fibre device path structure to its string representive.\r
+ Converts a Fibre device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
}\r
\r
/**\r
- Converts a 1394 device path structure to its string representive.\r
+ Converts a FibreEx device path structure to its string representative.\r
+\r
+ @param Str The string representative of input device.\r
+ @param DevPath The input device path structure.\r
+ @param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
+ of the display node is used, where applicable. If DisplayOnly\r
+ is FALSE, then the longer text representation of the display node\r
+ is used.\r
+ @param AllowShortcuts If AllowShortcuts is TRUE, then the shortcut forms of text\r
+ representation for a device node can be used, where applicable.\r
+\r
+**/\r
+VOID\r
+DevPathToTextFibreEx (\r
+ IN OUT POOL_PRINT *Str,\r
+ IN VOID *DevPath,\r
+ IN BOOLEAN DisplayOnly,\r
+ IN BOOLEAN AllowShortcuts\r
+ )\r
+{\r
+ FIBRECHANNELEX_DEVICE_PATH *FibreEx;\r
+ UINTN Index;\r
+\r
+ FibreEx = DevPath;\r
+ CatPrint (Str, L"FibreEx(0x");\r
+ for (Index = 0; Index < sizeof (FibreEx->WWN) / sizeof (FibreEx->WWN[0]); Index++) {\r
+ CatPrint (Str, L"%02x", FibreEx->WWN[Index]);\r
+ }\r
+ CatPrint (Str, L",0x");\r
+ for (Index = 0; Index < sizeof (FibreEx->Lun) / sizeof (FibreEx->Lun[0]); Index++) {\r
+ CatPrint (Str, L"%02x", FibreEx->Lun[Index]);\r
+ }\r
+ CatPrint (Str, L")");\r
+}\r
+\r
+/**\r
+ Converts a 1394 device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
}\r
\r
/**\r
- Converts a USB device path structure to its string representive.\r
+ Converts a USB device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
}\r
\r
/**\r
- Converts a USB WWID device path structure to its string representive.\r
+ Converts a USB WWID device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
// In case no NULL terminator in SerialNumber, create a new one with NULL terminator\r
//\r
NewStr = AllocateCopyPool ((Length + 1) * sizeof (CHAR16), SerialNumberStr);\r
+ ASSERT (NewStr != NULL);\r
NewStr [Length] = 0;\r
SerialNumberStr = NewStr;\r
}\r
}\r
\r
/**\r
- Converts a Logic Unit device path structure to its string representive.\r
+ Converts a Logic Unit device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
}\r
\r
/**\r
- Converts a USB class device path structure to its string representive.\r
+ Converts a USB class device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
}\r
\r
/**\r
- Converts a SATA device path structure to its string representive.\r
+ Converts a SATA device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
SATA_DEVICE_PATH *Sata;\r
\r
Sata = DevPath;\r
- CatPrint (\r
- Str,\r
- L"Sata(0x%x,0x%x,0x%x)",\r
- (UINTN) Sata->HBAPortNumber,\r
- (UINTN) Sata->PortMultiplierPortNumber,\r
- (UINTN) Sata->Lun\r
- );\r
+ if ((Sata->PortMultiplierPortNumber & SATA_HBA_DIRECT_CONNECT_FLAG) != 0) {\r
+ CatPrint (\r
+ Str,\r
+ L"Sata(0x%x,0x%x)",\r
+ Sata->HBAPortNumber,\r
+ Sata->Lun\r
+ );\r
+ } else {\r
+ CatPrint (\r
+ Str,\r
+ L"Sata(0x%x,0x%x,0x%x)",\r
+ Sata->HBAPortNumber,\r
+ Sata->PortMultiplierPortNumber,\r
+ Sata->Lun\r
+ );\r
+ }\r
}\r
\r
/**\r
- Converts a I20 device path structure to its string representive.\r
+ Converts a I20 device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
}\r
\r
/**\r
- Converts a MAC address device path structure to its string representive.\r
+ Converts a MAC address device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
}\r
\r
/**\r
- Converts a IPv4 device path structure to its string representive.\r
+ Converts network protocol string to its text representation.\r
+\r
+ @param Str The string representative of input device.\r
+ @param Protocol The network protocol ID.\r
+\r
+**/\r
+VOID\r
+CatNetworkProtocol (\r
+ IN OUT POOL_PRINT *Str,\r
+ IN UINT16 Protocol\r
+ )\r
+{\r
+ if (Protocol == RFC_1700_TCP_PROTOCOL) {\r
+ CatPrint (Str, L"TCP");\r
+ } else if (Protocol == RFC_1700_UDP_PROTOCOL) {\r
+ CatPrint (Str, L"UDP");\r
+ } else {\r
+ CatPrint (Str, L"0x%x", Protocol);\r
+ }\r
+}\r
+\r
+/**\r
+ Converts a IPv4 device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
\r
CatPrint (\r
Str,\r
- L"IPv4(%d.%d.%d.%d,%s,%s,%d.%d.%d.%d)",\r
+ L"IPv4(%d.%d.%d.%d,",\r
IPDevPath->RemoteIpAddress.Addr[0],\r
IPDevPath->RemoteIpAddress.Addr[1],\r
IPDevPath->RemoteIpAddress.Addr[2],\r
- IPDevPath->RemoteIpAddress.Addr[3],\r
- IPDevPath->Protocol ? L"TCP" : L"UDP",\r
- (IPDevPath->StaticIpAddress == TRUE) ? L"Static" : L"DHCP",\r
+ IPDevPath->RemoteIpAddress.Addr[3]\r
+ );\r
+\r
+ CatNetworkProtocol (\r
+ Str,\r
+ IPDevPath->Protocol\r
+ );\r
+\r
+ CatPrint (\r
+ Str,\r
+ L",%s,%d.%d.%d.%d",\r
+ IPDevPath->StaticIpAddress ? L"Static" : L"DHCP",\r
IPDevPath->LocalIpAddress.Addr[0],\r
IPDevPath->LocalIpAddress.Addr[1],\r
IPDevPath->LocalIpAddress.Addr[2],\r
IPDevPath->LocalIpAddress.Addr[3]\r
);\r
+ if (DevicePathNodeLength (IPDevPath) == sizeof (IPv4_DEVICE_PATH)) {\r
+ CatPrint (\r
+ Str,\r
+ L",%d.%d.%d.%d,%d.%d.%d.%d",\r
+ IPDevPath->GatewayIpAddress.Addr[0],\r
+ IPDevPath->GatewayIpAddress.Addr[1],\r
+ IPDevPath->GatewayIpAddress.Addr[2],\r
+ IPDevPath->GatewayIpAddress.Addr[3],\r
+ IPDevPath->SubnetMask.Addr[0],\r
+ IPDevPath->SubnetMask.Addr[1],\r
+ IPDevPath->SubnetMask.Addr[2],\r
+ IPDevPath->SubnetMask.Addr[3]\r
+ );\r
+ }\r
+ CatPrint (Str, L")");\r
}\r
\r
/**\r
- Converts a IPv6 device path structure to its string representive.\r
+ Converts a IPv6 device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
\r
CatPrint (\r
Str,\r
- L"IPv6(%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x,%s,%s,%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x)",\r
+ L"IPv6(%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x,",\r
IPDevPath->RemoteIpAddress.Addr[0],\r
IPDevPath->RemoteIpAddress.Addr[1],\r
IPDevPath->RemoteIpAddress.Addr[2],\r
IPDevPath->RemoteIpAddress.Addr[12],\r
IPDevPath->RemoteIpAddress.Addr[13],\r
IPDevPath->RemoteIpAddress.Addr[14],\r
- IPDevPath->RemoteIpAddress.Addr[15],\r
- IPDevPath->Protocol ? L"TCP" : L"UDP",\r
- (IPDevPath->StaticIpAddress == TRUE) ? L"Static" : L"DHCP",\r
+ IPDevPath->RemoteIpAddress.Addr[15]\r
+ );\r
+ \r
+ CatNetworkProtocol (\r
+ Str,\r
+ IPDevPath->Protocol\r
+ );\r
+\r
+ CatPrint (\r
+ Str,\r
+ L",%s,%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x)",\r
+ IPDevPath->StaticIpAddress ? L"Static" : L"DHCP",\r
IPDevPath->LocalIpAddress.Addr[0],\r
IPDevPath->LocalIpAddress.Addr[1],\r
IPDevPath->LocalIpAddress.Addr[2],\r
}\r
\r
/**\r
- Converts an Infini Band device path structure to its string representive.\r
+ Converts an Infini Band device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
}\r
\r
/**\r
- Converts a UART device path structure to its string representive.\r
+ Converts a UART device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
}\r
\r
/**\r
- Converts an iSCSI device path structure to its string representive.\r
+ Converts an iSCSI device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
CatPrint (\r
Str,\r
L"iSCSI(%a,0x%x,0x%lx,",\r
- ISCSIDevPath->iSCSITargetName,\r
+ ISCSIDevPath->TargetName,\r
ISCSIDevPath->TargetPortalGroupTag,\r
ISCSIDevPath->Lun\r
);\r
}\r
\r
/**\r
- Converts a Hard drive device path structure to its string representive.\r
+ Converts a VLAN device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
+ @param DevPath The input device path structure.\r
+ @param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
+ of the display node is used, where applicable. If DisplayOnly\r
+ is FALSE, then the longer text representation of the display node\r
+ is used.\r
+ @param AllowShortcuts If AllowShortcuts is TRUE, then the shortcut forms of text\r
+ representation for a device node can be used, where applicable.\r
+\r
+**/\r
+VOID\r
+DevPathToTextVlan (\r
+ IN OUT POOL_PRINT *Str,\r
+ IN VOID *DevPath,\r
+ IN BOOLEAN DisplayOnly,\r
+ IN BOOLEAN AllowShortcuts\r
+ )\r
+{\r
+ VLAN_DEVICE_PATH *Vlan;\r
+\r
+ Vlan = DevPath;\r
+ CatPrint (Str, L"Vlan(%d)", Vlan->VlanId);\r
+}\r
+\r
+/**\r
+ Converts a Hard drive device path structure to its string representative.\r
+\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
}\r
\r
/**\r
- Converts a CDROM device path structure to its string representive.\r
+ Converts a CDROM device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
}\r
\r
/**\r
- Converts a File device path structure to its string representive.\r
+ Converts a File device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
}\r
\r
/**\r
- Converts a Media protocol device path structure to its string representive.\r
+ Converts a Media protocol device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
}\r
\r
/**\r
- Converts a Firmware Volume device path structure to its string representive.\r
+ Converts a Firmware Volume device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
}\r
\r
/**\r
- Converts a Firmware Volume File device path structure to its string representive.\r
+ Converts a Firmware Volume File device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
}\r
\r
/**\r
- Converts a BIOS Boot Specification device path structure to its string representive.\r
+ Converts a Relative Offset device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
+ @param DevPath The input device path structure.\r
+ @param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
+ of the display node is used, where applicable. If DisplayOnly\r
+ is FALSE, then the longer text representation of the display node\r
+ is used.\r
+ @param AllowShortcuts If AllowShortcuts is TRUE, then the shortcut forms of text\r
+ representation for a device node can be used, where applicable.\r
+\r
+**/\r
+VOID\r
+DevPathRelativeOffsetRange (\r
+ IN OUT POOL_PRINT *Str,\r
+ IN VOID *DevPath,\r
+ IN BOOLEAN DisplayOnly,\r
+ IN BOOLEAN AllowShortcuts\r
+ )\r
+{\r
+ MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH *Offset;\r
+\r
+ Offset = DevPath;\r
+ CatPrint (\r
+ Str,\r
+ L"Offset(0x%lx,0x%lx)",\r
+ Offset->StartingOffset,\r
+ Offset->EndingOffset\r
+ );\r
+}\r
+\r
+/**\r
+ Converts a BIOS Boot Specification device path structure to its string representative.\r
+\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
}\r
\r
/**\r
- Converts an End-of-Device-Path structure to its string representive.\r
+ Converts an End-of-Device-Path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
}\r
\r
/**\r
- Converts an unknown device path structure to its string representive.\r
+ Converts an unknown device path structure to its string representative.\r
\r
- @param Str The string representive of input device.\r
+ @param Str The string representative of input device.\r
@param DevPath The input device path structure.\r
@param DisplayOnly If DisplayOnly is TRUE, then the shorter text representation\r
of the display node is used, where applicable. If DisplayOnly\r
{MESSAGING_DEVICE_PATH, MSG_ATAPI_DP, DevPathToTextAtapi},\r
{MESSAGING_DEVICE_PATH, MSG_SCSI_DP, DevPathToTextScsi},\r
{MESSAGING_DEVICE_PATH, MSG_FIBRECHANNEL_DP, DevPathToTextFibre},\r
+ {MESSAGING_DEVICE_PATH, MSG_FIBRECHANNELEX_DP, DevPathToTextFibreEx},\r
{MESSAGING_DEVICE_PATH, MSG_1394_DP, DevPathToText1394},\r
{MESSAGING_DEVICE_PATH, MSG_USB_DP, DevPathToTextUsb},\r
{MESSAGING_DEVICE_PATH, MSG_USB_WWID_DP, DevPathToTextUsbWWID},\r
{MESSAGING_DEVICE_PATH, MSG_UART_DP, DevPathToTextUart},\r
{MESSAGING_DEVICE_PATH, MSG_VENDOR_DP, DevPathToTextVendor},\r
{MESSAGING_DEVICE_PATH, MSG_ISCSI_DP, DevPathToTextiSCSI},\r
+ {MESSAGING_DEVICE_PATH, MSG_VLAN_DP, DevPathToTextVlan},\r
{MEDIA_DEVICE_PATH, MEDIA_HARDDRIVE_DP, DevPathToTextHardDrive},\r
{MEDIA_DEVICE_PATH, MEDIA_CDROM_DP, DevPathToTextCDROM},\r
{MEDIA_DEVICE_PATH, MEDIA_VENDOR_DP, DevPathToTextVendor},\r
- {MEDIA_DEVICE_PATH, MEDIA_FILEPATH_DP, DevPathToTextFilePath},\r
{MEDIA_DEVICE_PATH, MEDIA_PROTOCOL_DP, DevPathToTextMediaProtocol},\r
{MEDIA_DEVICE_PATH, MEDIA_FILEPATH_DP, DevPathToTextFilePath},\r
{MEDIA_DEVICE_PATH, MEDIA_PIWG_FW_VOL_DP, DevPathToTextFv},\r
{MEDIA_DEVICE_PATH, MEDIA_PIWG_FW_FILE_DP, DevPathToTextFvFile},\r
+ {MEDIA_DEVICE_PATH, MEDIA_RELATIVE_OFFSET_RANGE_DP, DevPathRelativeOffsetRange},\r
{BBS_DEVICE_PATH, BBS_BBS_DP, DevPathToTextBBS},\r
{END_DEVICE_PATH_TYPE, END_INSTANCE_DEVICE_PATH_SUBTYPE, DevPathToTextEndInstance},\r
{0, 0, NULL}\r
{\r
POOL_PRINT Str;\r
UINTN Index;\r
- UINTN NewSize;\r
VOID (*DumpNode)(POOL_PRINT *, VOID *, BOOLEAN, BOOLEAN);\r
\r
if (DeviceNode == NULL) {\r
//\r
DumpNode (&Str, (VOID *) DeviceNode, DisplayOnly, AllowShortcuts);\r
\r
- //\r
- // Shrink pool used for string allocation\r
- //\r
- NewSize = (Str.Len + 1) * sizeof (CHAR16);\r
- Str.Str = ReallocatePool (Str.Str, NewSize, NewSize);\r
ASSERT (Str.Str != NULL);\r
- Str.Str[Str.Len] = 0;\r
return Str.Str;\r
}\r
\r
{\r
POOL_PRINT Str;\r
EFI_DEVICE_PATH_PROTOCOL *DevPathNode;\r
- EFI_DEVICE_PATH_PROTOCOL *UnpackDevPath;\r
+ EFI_DEVICE_PATH_PROTOCOL *AlignedDevPathNode;\r
UINTN Index;\r
- UINTN NewSize;\r
VOID (*DumpNode) (POOL_PRINT *, VOID *, BOOLEAN, BOOLEAN);\r
\r
if (DevicePath == NULL) {\r
\r
ZeroMem (&Str, sizeof (Str));\r
\r
- //\r
- // Unpacked the device path\r
- //\r
- UnpackDevPath = UnpackDevicePath ((EFI_DEVICE_PATH_PROTOCOL *) DevicePath);\r
- ASSERT (UnpackDevPath != NULL);\r
-\r
//\r
// Process each device path node\r
//\r
- DevPathNode = UnpackDevPath;\r
+ DevPathNode = (EFI_DEVICE_PATH_PROTOCOL *) DevicePath;\r
while (!IsDevicePathEnd (DevPathNode)) {\r
//\r
// Find the handler to dump this device path node\r
//\r
DumpNode = NULL;\r
- for (Index = 0; DevPathToTextTable[Index].Function; Index += 1) {\r
+ for (Index = 0; DevPathToTextTable[Index].Function != NULL; Index += 1) {\r
\r
if (DevicePathType (DevPathNode) == DevPathToTextTable[Index].Type &&\r
DevicePathSubType (DevPathNode) == DevPathToTextTable[Index].SubType\r
DumpNode = DevPathToTextNodeUnknown;\r
}\r
//\r
- // Put a path seperator in if needed\r
+ // Put a path separator in if needed\r
//\r
- if ((Str.Len != 0) && DumpNode != DevPathToTextEndInstance) {\r
- if (*(Str.Str + Str.Len / sizeof (CHAR16) - 1) != L',') {\r
+ if ((Str.Length != 0) && (DumpNode != DevPathToTextEndInstance)) {\r
+ if (*(Str.Str + Str.Length / sizeof (CHAR16) - 1) != L',') {\r
CatPrint (&Str, L"/");\r
}\r
}\r
+ \r
+ AlignedDevPathNode = AllocateCopyPool (DevicePathNodeLength (DevPathNode), DevPathNode);\r
//\r
// Print this node of the device path\r
//\r
- DumpNode (&Str, DevPathNode, DisplayOnly, AllowShortcuts);\r
-\r
+ DumpNode (&Str, AlignedDevPathNode, DisplayOnly, AllowShortcuts);\r
+ FreePool (AlignedDevPathNode);\r
+ \r
//\r
// Next device path node\r
//\r
DevPathNode = NextDevicePathNode (DevPathNode);\r
}\r
- //\r
- // Shrink pool used for string allocation\r
- //\r
- FreePool (UnpackDevPath);\r
\r
- NewSize = (Str.Len + 1) * sizeof (CHAR16);\r
- Str.Str = ReallocatePool (Str.Str, NewSize, NewSize);\r
- ASSERT (Str.Str != NULL);\r
- Str.Str[Str.Len] = 0;\r
- return Str.Str;\r
+ if (Str.Str == NULL) {\r
+ return AllocateZeroPool (sizeof (CHAR16));\r
+ } else {\r
+ return Str.Str;\r
+ }\r
}\r
projects / mirror_edk2.git / blobdiff