/** @file\r
DevicePathToText protocol as defined in the UEFI 2.0 specification.\r
\r
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2013, 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
)\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
- StrSize (Str->Str),\r
- Size,\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
PCI_DEVICE_PATH *Pci;\r
\r
Pci = DevPath;\r
- CatPrint (Str, L"Pci(0x%x,0x%x)", (UINTN) Pci->Device, (UINTN) Pci->Function);\r
+ CatPrint (Str, L"Pci(0x%x,0x%x)", Pci->Device, Pci->Function);\r
}\r
\r
/**\r
PCCARD_DEVICE_PATH *Pccard;\r
\r
Pccard = DevPath;\r
- CatPrint (Str, L"PcCard(0x%x)", (UINTN) Pccard->FunctionNumber);\r
+ CatPrint (Str, L"PcCard(0x%x)", Pccard->FunctionNumber);\r
}\r
\r
/**\r
CatPrint (\r
Str,\r
L"MemoryMapped(0x%x,0x%lx,0x%lx)",\r
- (UINTN) MemMap->MemoryType,\r
+ MemMap->MemoryType,\r
MemMap->StartingAddress,\r
MemMap->EndingAddress\r
);\r
L"SAS(0x%lx,0x%lx,0x%x,",\r
((SAS_DEVICE_PATH *) Vendor)->SasAddress,\r
((SAS_DEVICE_PATH *) Vendor)->Lun,\r
- (UINTN) ((SAS_DEVICE_PATH *) Vendor)->RelativeTargetPort\r
+ ((SAS_DEVICE_PATH *) Vendor)->RelativeTargetPort\r
);\r
Info = (((SAS_DEVICE_PATH *) Vendor)->DeviceTopology);\r
- if ((Info & 0x0f) == 0) {\r
+ if (((Info & 0x0f) == 0) && ((Info & BIT7) == 0)) {\r
CatPrint (Str, L"NoTopology,0,0,0,");\r
- } else if (((Info & 0x0f) == 1) || ((Info & 0x0f) == 2)) {\r
+ } else if (((Info & 0x0f) <= 2) && ((Info & BIT7) == 0)) {\r
CatPrint (\r
Str,\r
L"%s,%s,%s,",\r
- ((Info & (0x1 << 4)) != 0) ? L"SATA" : L"SAS",\r
- ((Info & (0x1 << 5)) != 0) ? L"External" : L"Internal",\r
- ((Info & (0x1 << 6)) != 0) ? L"Expanded" : L"Direct"\r
+ ((Info & BIT4) != 0) ? L"SATA" : L"SAS",\r
+ ((Info & BIT5) != 0) ? L"External" : L"Internal",\r
+ ((Info & BIT6) != 0) ? L"Expanded" : L"Direct"\r
);\r
if ((Info & 0x0f) == 1) {\r
CatPrint (Str, L"0,");\r
} else {\r
- CatPrint (Str, L"0x%x,",(UINTN) (Info >> 8) & 0xff);\r
+ //\r
+ // Value 0x0 thru 0xFF -> Drive 1 thru Drive 256\r
+ //\r
+ CatPrint (Str, L"0x%x,", ((Info >> 8) & 0xff) + 1);\r
}\r
} else {\r
- CatPrint (Str, L"0,0,0,0,");\r
+ CatPrint (Str, L"0x%x,0,0,0,", Info);\r
}\r
\r
- CatPrint (Str, L"0x%x)", (UINTN) ((SAS_DEVICE_PATH *) Vendor)->Reserved);\r
+ CatPrint (Str, L"0x%x)", ((SAS_DEVICE_PATH *) Vendor)->Reserved);\r
return ;\r
} else if (CompareGuid (&Vendor->Guid, &gEfiDebugPortProtocolGuid)) {\r
CatPrint (Str, L"DebugPort()");\r
if (DataLength != 0) {\r
CatPrint (Str, L",");\r
for (Index = 0; Index < DataLength; Index++) {\r
- CatPrint (Str, L"%02x", (UINTN) ((VENDOR_DEVICE_PATH_WITH_DATA *) Vendor)->VendorDefinedData[Index]);\r
+ CatPrint (Str, L"%02x", ((VENDOR_DEVICE_PATH_WITH_DATA *) Vendor)->VendorDefinedData[Index]);\r
}\r
}\r
\r
CatPrint (\r
Str,\r
L"Ctrl(0x%x)",\r
- (UINTN) Controller->ControllerNumber\r
+ Controller->ControllerNumber\r
);\r
}\r
\r
if ((Acpi->HID & PNP_EISA_ID_MASK) == PNP_EISA_ID_CONST) {\r
switch (EISA_ID_TO_NUM (Acpi->HID)) {\r
case 0x0a03:\r
- CatPrint (Str, L"PciRoot(0x%x)", (UINTN) Acpi->UID);\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)", (UINTN) Acpi->UID);\r
+ CatPrint (Str, L"Floppy(0x%x)", Acpi->UID);\r
break;\r
\r
case 0x0301:\r
- CatPrint (Str, L"Keyboard(0x%x)", (UINTN) Acpi->UID);\r
+ CatPrint (Str, L"Keyboard(0x%x)", Acpi->UID);\r
break;\r
\r
case 0x0501:\r
- CatPrint (Str, L"Serial(0x%x)", (UINTN) Acpi->UID);\r
+ CatPrint (Str, L"Serial(0x%x)", Acpi->UID);\r
break;\r
\r
case 0x0401:\r
- CatPrint (Str, L"ParallelPort(0x%x)", (UINTN) Acpi->UID);\r
+ CatPrint (Str, L"ParallelPort(0x%x)", Acpi->UID);\r
break;\r
\r
default:\r
- CatPrint (Str, L"Acpi(PNP%04x,0x%x)", (UINTN) EISA_ID_TO_NUM (Acpi->HID), (UINTN) Acpi->UID);\r
+ CatPrint (Str, L"Acpi(PNP%04x,0x%x)", EISA_ID_TO_NUM (Acpi->HID), Acpi->UID);\r
break;\r
}\r
} else {\r
- CatPrint (Str, L"Acpi(0x%08x,0x%x)", (UINTN) Acpi->HID, (UINTN) Acpi->UID);\r
+ CatPrint (Str, L"Acpi(0x%08x,0x%x)", Acpi->HID, Acpi->UID);\r
}\r
}\r
\r
if (AcpiEx->UID == 0) {\r
CatPrint (Str, L"%a,", UIDStr);\r
} else {\r
- CatPrint (Str, L"0x%x,", (UINTN) AcpiEx->UID);\r
+ CatPrint (Str, L"0x%x,", AcpiEx->UID);\r
}\r
\r
if (AcpiEx->CID == 0) {\r
L"AcpiEx(%s,%s,0x%x,%a,%a,%a)",\r
HIDText,\r
CIDText,\r
- (UINTN) AcpiEx->UID,\r
+ AcpiEx->UID,\r
HIDStr,\r
CIDStr,\r
UIDStr\r
Length = (UINT16) DevicePathNodeLength ((EFI_DEVICE_PATH_PROTOCOL *) AcpiAdr);\r
AdditionalAdrCount = (UINT16) ((Length - 8) / 4);\r
\r
- CatPrint (Str, L"AcpiAdr(0x%x", (UINTN) AcpiAdr->ADR);\r
+ CatPrint (Str, L"AcpiAdr(0x%x", AcpiAdr->ADR);\r
for (Index = 0; Index < AdditionalAdrCount; Index++) {\r
- CatPrint (Str, L",0x%x", (UINTN) *(UINT32 *) ((UINT8 *) AcpiAdr + 8 + Index * 4));\r
+ CatPrint (Str, L",0x%x", *(UINT32 *) ((UINT8 *) AcpiAdr + 8 + Index * 4));\r
}\r
CatPrint (Str, L")");\r
}\r
Atapi = DevPath;\r
\r
if (DisplayOnly) {\r
- CatPrint (Str, L"Ata(0x%x)", (UINTN) Atapi->Lun);\r
+ CatPrint (Str, L"Ata(0x%x)", Atapi->Lun);\r
} else {\r
CatPrint (\r
Str,\r
L"Ata(%s,%s,0x%x)",\r
(Atapi->PrimarySecondary == 1) ? L"Secondary" : L"Primary",\r
(Atapi->SlaveMaster == 1) ? L"Slave" : L"Master",\r
- (UINTN) Atapi->Lun\r
+ Atapi->Lun\r
);\r
}\r
}\r
SCSI_DEVICE_PATH *Scsi;\r
\r
Scsi = DevPath;\r
- CatPrint (Str, L"Scsi(0x%x,0x%x)", (UINTN) Scsi->Pun, (UINTN) Scsi->Lun);\r
+ CatPrint (Str, L"Scsi(0x%x,0x%x)", Scsi->Pun, Scsi->Lun);\r
}\r
\r
/**\r
CatPrint (Str, L"Fibre(0x%lx,0x%lx)", Fibre->WWN, Fibre->Lun);\r
}\r
\r
+/**\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 Sas Ex 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
+DevPathToTextSasEx (\r
+ IN OUT POOL_PRINT *Str,\r
+ IN VOID *DevPath,\r
+ IN BOOLEAN DisplayOnly,\r
+ IN BOOLEAN AllowShortcuts\r
+ )\r
+{\r
+ SASEX_DEVICE_PATH *SasEx;\r
+ UINTN Index;\r
+\r
+ SasEx = DevPath;\r
+ CatPrint (Str, L"SasEx(0x");\r
+\r
+ for (Index = 0; Index < sizeof (SasEx->SasAddress) / sizeof (SasEx->SasAddress[0]); Index++) {\r
+ CatPrint (Str, L"%02x", SasEx->SasAddress[Index]);\r
+ }\r
+ CatPrint (Str, L",0x");\r
+ for (Index = 0; Index < sizeof (SasEx->Lun) / sizeof (SasEx->Lun[0]); Index++) {\r
+ CatPrint (Str, L"%02x", SasEx->Lun[Index]);\r
+ }\r
+ CatPrint (Str, L",0x%x,", SasEx->RelativeTargetPort);\r
+\r
+ if (((SasEx->DeviceTopology & 0x0f) == 0) && ((SasEx->DeviceTopology & BIT7) == 0)) {\r
+ CatPrint (Str, L"NoTopology,0,0,0");\r
+ } else if (((SasEx->DeviceTopology & 0x0f) <= 2) && ((SasEx->DeviceTopology & BIT7) == 0)) {\r
+ CatPrint (\r
+ Str,\r
+ L"%s,%s,%s,",\r
+ ((SasEx->DeviceTopology & BIT4) != 0) ? L"SATA" : L"SAS",\r
+ ((SasEx->DeviceTopology & BIT5) != 0) ? L"External" : L"Internal",\r
+ ((SasEx->DeviceTopology & BIT6) != 0) ? L"Expanded" : L"Direct"\r
+ );\r
+ if ((SasEx->DeviceTopology & 0x0f) == 1) {\r
+ CatPrint (Str, L"0");\r
+ } else {\r
+ //\r
+ // Value 0x0 thru 0xFF -> Drive 1 thru Drive 256\r
+ //\r
+ CatPrint (Str, L"0x%x", ((SasEx->DeviceTopology >> 8) & 0xff) + 1);\r
+ }\r
+ } else {\r
+ CatPrint (Str, L"0x%x,0,0,0", SasEx->DeviceTopology);\r
+ }\r
+\r
+ CatPrint (Str, L")");\r
+ return ;\r
+\r
+}\r
+\r
/**\r
Converts a 1394 device path structure to its string representative.\r
\r
CatPrint (\r
Str,\r
L"UsbWwid(0x%x,0x%x,0x%x,\"%s\")",\r
- (UINTN) UsbWWId->VendorId,\r
- (UINTN) UsbWWId->ProductId,\r
- (UINTN) UsbWWId->InterfaceNumber,\r
+ UsbWWId->VendorId,\r
+ UsbWWId->ProductId,\r
+ UsbWWId->InterfaceNumber,\r
SerialNumberStr\r
);\r
}\r
DEVICE_LOGICAL_UNIT_DEVICE_PATH *LogicalUnit;\r
\r
LogicalUnit = DevPath;\r
- CatPrint (Str, L"Unit(0x%x)", (UINTN) LogicalUnit->Lun);\r
+ CatPrint (Str, L"Unit(0x%x)", LogicalUnit->Lun);\r
}\r
\r
/**\r
CatPrint (\r
Str,\r
L"(0x%x,0x%x,0x%x,0x%x)",\r
- (UINTN) UsbClass->VendorId,\r
- (UINTN) UsbClass->ProductId,\r
- (UINTN) UsbClass->DeviceSubClass,\r
- (UINTN) UsbClass->DeviceProtocol\r
+ UsbClass->VendorId,\r
+ UsbClass->ProductId,\r
+ UsbClass->DeviceSubClass,\r
+ UsbClass->DeviceProtocol\r
);\r
return;\r
}\r
CatPrint (\r
Str,\r
L"UsbDeviceFirmwareUpdate(0x%x,0x%x,0x%x)",\r
- (UINTN) UsbClass->VendorId,\r
- (UINTN) UsbClass->ProductId,\r
- (UINTN) UsbClass->DeviceProtocol\r
+ UsbClass->VendorId,\r
+ UsbClass->ProductId,\r
+ UsbClass->DeviceProtocol\r
);\r
return;\r
} else if (UsbClass->DeviceSubClass == USB_SUBCLASS_IRDA_BRIDGE) {\r
CatPrint (\r
Str,\r
L"UsbIrdaBridge(0x%x,0x%x,0x%x)",\r
- (UINTN) UsbClass->VendorId,\r
- (UINTN) UsbClass->ProductId,\r
- (UINTN) UsbClass->DeviceProtocol\r
+ UsbClass->VendorId,\r
+ UsbClass->ProductId,\r
+ UsbClass->DeviceProtocol\r
);\r
return;\r
} else if (UsbClass->DeviceSubClass == USB_SUBCLASS_TEST) {\r
CatPrint (\r
Str,\r
L"UsbTestAndMeasurement(0x%x,0x%x,0x%x)",\r
- (UINTN) UsbClass->VendorId,\r
- (UINTN) UsbClass->ProductId,\r
- (UINTN) UsbClass->DeviceProtocol\r
+ UsbClass->VendorId,\r
+ UsbClass->ProductId,\r
+ UsbClass->DeviceProtocol\r
);\r
return;\r
}\r
CatPrint (\r
Str,\r
L"UsbClass(0x%x,0x%x,0x%x,0x%x,0x%x)",\r
- (UINTN) UsbClass->VendorId,\r
- (UINTN) UsbClass->ProductId,\r
- (UINTN) UsbClass->DeviceClass,\r
- (UINTN) UsbClass->DeviceSubClass,\r
- (UINTN) UsbClass->DeviceProtocol\r
+ UsbClass->VendorId,\r
+ UsbClass->ProductId,\r
+ UsbClass->DeviceClass,\r
+ UsbClass->DeviceSubClass,\r
+ UsbClass->DeviceProtocol\r
);\r
}\r
\r
CatPrint (\r
Str,\r
L"Sata(0x%x,0x%x)",\r
- (UINTN) Sata->HBAPortNumber,\r
- (UINTN) Sata->Lun\r
+ Sata->HBAPortNumber,\r
+ Sata->Lun\r
);\r
} else {\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
+ Sata->HBAPortNumber,\r
+ Sata->PortMultiplierPortNumber,\r
+ Sata->Lun\r
);\r
}\r
}\r
I2O_DEVICE_PATH *I2ODevPath;\r
\r
I2ODevPath = DevPath;\r
- CatPrint (Str, L"I2O(0x%x)", (UINTN) I2ODevPath->Tid);\r
+ CatPrint (Str, L"I2O(0x%x)", I2ODevPath->Tid);\r
}\r
\r
/**\r
CatPrint (Str, L"MAC(");\r
\r
for (Index = 0; Index < HwAddressSize; Index++) {\r
- CatPrint (Str, L"%02x", (UINTN) MacDevPath->MacAddress.Addr[Index]);\r
+ CatPrint (Str, L"%02x", MacDevPath->MacAddress.Addr[Index]);\r
}\r
\r
- CatPrint (Str, L",0x%x)", (UINTN) MacDevPath->IfType);\r
+ CatPrint (Str, L",0x%x)", MacDevPath->IfType);\r
}\r
\r
/**\r
CatPrint (\r
Str,\r
L"IPv4(%d.%d.%d.%d)",\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[0],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[1],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[2],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[3]\r
+ IPDevPath->RemoteIpAddress.Addr[0],\r
+ IPDevPath->RemoteIpAddress.Addr[1],\r
+ IPDevPath->RemoteIpAddress.Addr[2],\r
+ IPDevPath->RemoteIpAddress.Addr[3]\r
);\r
return ;\r
}\r
CatPrint (\r
Str,\r
L"IPv4(%d.%d.%d.%d,",\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[0],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[1],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[2],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[3]\r
+ IPDevPath->RemoteIpAddress.Addr[0],\r
+ IPDevPath->RemoteIpAddress.Addr[1],\r
+ IPDevPath->RemoteIpAddress.Addr[2],\r
+ IPDevPath->RemoteIpAddress.Addr[3]\r
);\r
\r
CatNetworkProtocol (\r
\r
CatPrint (\r
Str,\r
- L",%s,%d.%d.%d.%d)",\r
+ L",%s,%d.%d.%d.%d",\r
IPDevPath->StaticIpAddress ? L"Static" : L"DHCP",\r
- (UINTN) IPDevPath->LocalIpAddress.Addr[0],\r
- (UINTN) IPDevPath->LocalIpAddress.Addr[1],\r
- (UINTN) IPDevPath->LocalIpAddress.Addr[2],\r
- (UINTN) IPDevPath->LocalIpAddress.Addr[3]\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
CatPrint (\r
Str,\r
L"IPv6(%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x)",\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[0],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[1],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[2],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[3],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[4],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[5],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[6],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[7],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[8],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[9],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[10],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[11],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[12],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[13],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[14],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[15]\r
+ IPDevPath->RemoteIpAddress.Addr[0],\r
+ IPDevPath->RemoteIpAddress.Addr[1],\r
+ IPDevPath->RemoteIpAddress.Addr[2],\r
+ IPDevPath->RemoteIpAddress.Addr[3],\r
+ IPDevPath->RemoteIpAddress.Addr[4],\r
+ IPDevPath->RemoteIpAddress.Addr[5],\r
+ IPDevPath->RemoteIpAddress.Addr[6],\r
+ IPDevPath->RemoteIpAddress.Addr[7],\r
+ IPDevPath->RemoteIpAddress.Addr[8],\r
+ IPDevPath->RemoteIpAddress.Addr[9],\r
+ IPDevPath->RemoteIpAddress.Addr[10],\r
+ IPDevPath->RemoteIpAddress.Addr[11],\r
+ IPDevPath->RemoteIpAddress.Addr[12],\r
+ IPDevPath->RemoteIpAddress.Addr[13],\r
+ IPDevPath->RemoteIpAddress.Addr[14],\r
+ IPDevPath->RemoteIpAddress.Addr[15]\r
);\r
return ;\r
}\r
CatPrint (\r
Str,\r
L"IPv6(%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x,",\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[0],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[1],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[2],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[3],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[4],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[5],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[6],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[7],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[8],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[9],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[10],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[11],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[12],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[13],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[14],\r
- (UINTN) IPDevPath->RemoteIpAddress.Addr[15]\r
+ IPDevPath->RemoteIpAddress.Addr[0],\r
+ IPDevPath->RemoteIpAddress.Addr[1],\r
+ IPDevPath->RemoteIpAddress.Addr[2],\r
+ IPDevPath->RemoteIpAddress.Addr[3],\r
+ IPDevPath->RemoteIpAddress.Addr[4],\r
+ IPDevPath->RemoteIpAddress.Addr[5],\r
+ IPDevPath->RemoteIpAddress.Addr[6],\r
+ IPDevPath->RemoteIpAddress.Addr[7],\r
+ IPDevPath->RemoteIpAddress.Addr[8],\r
+ IPDevPath->RemoteIpAddress.Addr[9],\r
+ IPDevPath->RemoteIpAddress.Addr[10],\r
+ IPDevPath->RemoteIpAddress.Addr[11],\r
+ IPDevPath->RemoteIpAddress.Addr[12],\r
+ IPDevPath->RemoteIpAddress.Addr[13],\r
+ IPDevPath->RemoteIpAddress.Addr[14],\r
+ IPDevPath->RemoteIpAddress.Addr[15]\r
);\r
\r
CatNetworkProtocol (\r
IPDevPath->Protocol\r
);\r
\r
+ switch (IPDevPath->IpAddressOrigin) {\r
+ case 0:\r
+ CatPrint (Str, L",Static");\r
+ break;\r
+ case 1:\r
+ CatPrint (Str, L",StatelessAutoConfigure");\r
+ break;\r
+ default:\r
+ CatPrint (Str, L",StatefulAutoConfigure");\r
+ break;\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
- (UINTN) IPDevPath->LocalIpAddress.Addr[0],\r
- (UINTN) IPDevPath->LocalIpAddress.Addr[1],\r
- (UINTN) IPDevPath->LocalIpAddress.Addr[2],\r
- (UINTN) IPDevPath->LocalIpAddress.Addr[3],\r
- (UINTN) IPDevPath->LocalIpAddress.Addr[4],\r
- (UINTN) IPDevPath->LocalIpAddress.Addr[5],\r
- (UINTN) IPDevPath->LocalIpAddress.Addr[6],\r
- (UINTN) IPDevPath->LocalIpAddress.Addr[7],\r
- (UINTN) IPDevPath->LocalIpAddress.Addr[8],\r
- (UINTN) IPDevPath->LocalIpAddress.Addr[9],\r
- (UINTN) IPDevPath->LocalIpAddress.Addr[10],\r
- (UINTN) IPDevPath->LocalIpAddress.Addr[11],\r
- (UINTN) IPDevPath->LocalIpAddress.Addr[12],\r
- (UINTN) IPDevPath->LocalIpAddress.Addr[13],\r
- (UINTN) IPDevPath->LocalIpAddress.Addr[14],\r
- (UINTN) IPDevPath->LocalIpAddress.Addr[15]\r
+ L",%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x",\r
+ IPDevPath->LocalIpAddress.Addr[0],\r
+ IPDevPath->LocalIpAddress.Addr[1],\r
+ IPDevPath->LocalIpAddress.Addr[2],\r
+ IPDevPath->LocalIpAddress.Addr[3],\r
+ IPDevPath->LocalIpAddress.Addr[4],\r
+ IPDevPath->LocalIpAddress.Addr[5],\r
+ IPDevPath->LocalIpAddress.Addr[6],\r
+ IPDevPath->LocalIpAddress.Addr[7],\r
+ IPDevPath->LocalIpAddress.Addr[8],\r
+ IPDevPath->LocalIpAddress.Addr[9],\r
+ IPDevPath->LocalIpAddress.Addr[10],\r
+ IPDevPath->LocalIpAddress.Addr[11],\r
+ IPDevPath->LocalIpAddress.Addr[12],\r
+ IPDevPath->LocalIpAddress.Addr[13],\r
+ IPDevPath->LocalIpAddress.Addr[14],\r
+ IPDevPath->LocalIpAddress.Addr[15]\r
);\r
+\r
+ if (DevicePathNodeLength (IPDevPath) == sizeof (IPv6_DEVICE_PATH)) {\r
+ CatPrint (\r
+ Str,\r
+ L",0x%x,%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x",\r
+ IPDevPath->PrefixLength,\r
+ IPDevPath->GatewayIpAddress.Addr[0],\r
+ IPDevPath->GatewayIpAddress.Addr[1],\r
+ IPDevPath->GatewayIpAddress.Addr[2],\r
+ IPDevPath->GatewayIpAddress.Addr[3],\r
+ IPDevPath->GatewayIpAddress.Addr[4],\r
+ IPDevPath->GatewayIpAddress.Addr[5],\r
+ IPDevPath->GatewayIpAddress.Addr[6],\r
+ IPDevPath->GatewayIpAddress.Addr[7],\r
+ IPDevPath->GatewayIpAddress.Addr[8],\r
+ IPDevPath->GatewayIpAddress.Addr[9],\r
+ IPDevPath->GatewayIpAddress.Addr[10],\r
+ IPDevPath->GatewayIpAddress.Addr[11],\r
+ IPDevPath->GatewayIpAddress.Addr[12],\r
+ IPDevPath->GatewayIpAddress.Addr[13],\r
+ IPDevPath->GatewayIpAddress.Addr[14],\r
+ IPDevPath->GatewayIpAddress.Addr[15]\r
+ );\r
+ }\r
+ CatPrint (Str, L")");\r
}\r
\r
/**\r
CatPrint (\r
Str,\r
L"Infiniband(0x%x,%g,0x%lx,0x%lx,0x%lx)",\r
- (UINTN) InfiniBand->ResourceFlags,\r
+ InfiniBand->ResourceFlags,\r
InfiniBand->PortGid,\r
InfiniBand->ServiceId,\r
InfiniBand->TargetPortId,\r
if (Uart->DataBits == 0) {\r
CatPrint (Str, L"DEFAULT,");\r
} else {\r
- CatPrint (Str, L"%d,", (UINTN) Uart->DataBits);\r
+ CatPrint (Str, L"%d,", Uart->DataBits);\r
}\r
\r
CatPrint (Str, L"%c,", Parity);\r
Str,\r
L"iSCSI(%a,0x%x,0x%lx,",\r
ISCSIDevPath->TargetName,\r
- (UINTN) ISCSIDevPath->TargetPortalGroupTag,\r
+ ISCSIDevPath->TargetPortalGroupTag,\r
ISCSIDevPath->Lun\r
);\r
\r
VLAN_DEVICE_PATH *Vlan;\r
\r
Vlan = DevPath;\r
- CatPrint (Str, L"Vlan(%d)", (UINTN) Vlan->VlanId);\r
+ CatPrint (Str, L"Vlan(%d)", Vlan->VlanId);\r
}\r
\r
/**\r
CatPrint (\r
Str,\r
L"HD(%d,%s,0x%08x,",\r
- (UINTN) Hd->PartitionNumber,\r
+ Hd->PartitionNumber,\r
L"MBR",\r
- (UINTN) *((UINT32 *) (&(Hd->Signature[0])))\r
+ *((UINT32 *) (&(Hd->Signature[0])))\r
);\r
break;\r
\r
CatPrint (\r
Str,\r
L"HD(%d,%s,%g,",\r
- (UINTN) Hd->PartitionNumber,\r
+ Hd->PartitionNumber,\r
L"GPT",\r
(EFI_GUID *) &(Hd->Signature[0])\r
);\r
CatPrint (\r
Str,\r
L"HD(%d,%d,0,",\r
- (UINTN) Hd->PartitionNumber,\r
- (UINTN) Hd->SignatureType\r
+ Hd->PartitionNumber,\r
+ Hd->SignatureType\r
);\r
break;\r
}\r
\r
Cd = DevPath;\r
if (DisplayOnly) {\r
- CatPrint (Str, L"CDROM(0x%x)", (UINTN) Cd->BootEntry);\r
+ CatPrint (Str, L"CDROM(0x%x)", Cd->BootEntry);\r
return ;\r
}\r
\r
- CatPrint (Str, L"CDROM(0x%x,0x%lx,0x%lx)", (UINTN) Cd->BootEntry, Cd->PartitionStart, Cd->PartitionSize);\r
+ CatPrint (Str, L"CDROM(0x%x,0x%lx,0x%lx)", Cd->BootEntry, Cd->PartitionStart, Cd->PartitionSize);\r
}\r
\r
/**\r
if (Type != NULL) {\r
CatPrint (Str, L"BBS(%s,%a", Type, Bbs->String);\r
} else {\r
- CatPrint (Str, L"BBS(0x%x,%a", (UINTN) Bbs->DeviceType, Bbs->String);\r
+ CatPrint (Str, L"BBS(0x%x,%a", Bbs->DeviceType, Bbs->String);\r
}\r
\r
if (DisplayOnly) {\r
return ;\r
}\r
\r
- CatPrint (Str, L",0x%x)", (UINTN) Bbs->StatusFlag);\r
+ CatPrint (Str, L",0x%x)", Bbs->StatusFlag);\r
}\r
\r
/**\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_SASEX_DP, DevPathToTextSasEx},\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
{\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 (NewSize, NewSize, Str.Str);\r
ASSERT (Str.Str != NULL);\r
- Str.Str[Str.Len] = 0;\r
return Str.Str;\r
}\r
\r
EFI_DEVICE_PATH_PROTOCOL *DevPathNode;\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
// 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
DevPathNode = NextDevicePathNode (DevPathNode);\r
}\r
\r
- NewSize = (Str.Len + 1) * sizeof (CHAR16);\r
- Str.Str = ReallocatePool (NewSize, NewSize, Str.Str);\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