/** @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 - 2010, 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
**/\r
CHAR16 *\r
+EFIAPI\r
CatPrint (\r
IN OUT POOL_PRINT *Str,\r
IN CHAR16 *Fmt,\r
PCI_DEVICE_PATH *Pci;\r
\r
Pci = DevPath;\r
- CatPrint (Str, L"Pci(0x%x,0x%x)", Pci->Device, Pci->Function);\r
+ CatPrint (Str, L"Pci(0x%x,0x%x)", (UINTN) Pci->Device, (UINTN) Pci->Function);\r
}\r
\r
/**\r
PCCARD_DEVICE_PATH *Pccard;\r
\r
Pccard = DevPath;\r
- CatPrint (Str, L"PcCard(0x%x)", Pccard->FunctionNumber);\r
+ CatPrint (Str, L"PcCard(0x%x)", (UINTN) Pccard->FunctionNumber);\r
}\r
\r
/**\r
CatPrint (\r
Str,\r
L"MemoryMapped(0x%x,0x%lx,0x%lx)",\r
- MemMap->MemoryType,\r
+ (UINTN) 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
- ((SAS_DEVICE_PATH *) Vendor)->RelativeTargetPort\r
+ (UINTN) ((SAS_DEVICE_PATH *) Vendor)->RelativeTargetPort\r
);\r
Info = (((SAS_DEVICE_PATH *) Vendor)->DeviceTopology);\r
if ((Info & 0x0f) == 0) {\r
if ((Info & 0x0f) == 1) {\r
CatPrint (Str, L"0,");\r
} else {\r
- CatPrint (Str, L"0x%x,", (Info >> 8) & 0xff);\r
+ CatPrint (Str, L"0x%x,",(UINTN) (Info >> 8) & 0xff);\r
}\r
} else {\r
CatPrint (Str, L"0,0,0,0,");\r
}\r
\r
- CatPrint (Str, L"0x%x)", ((SAS_DEVICE_PATH *) Vendor)->Reserved);\r
+ CatPrint (Str, L"0x%x)", (UINTN) ((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", ((VENDOR_DEVICE_PATH_WITH_DATA *) Vendor)->VendorDefinedData[Index]);\r
+ CatPrint (Str, L"%02x", (UINTN) ((VENDOR_DEVICE_PATH_WITH_DATA *) Vendor)->VendorDefinedData[Index]);\r
}\r
}\r
\r
CatPrint (\r
Str,\r
L"Ctrl(0x%x)",\r
- Controller->ControllerNumber\r
+ (UINTN) 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)", Acpi->UID);\r
+ CatPrint (Str, L"PciRoot(0x%x)", (UINTN) Acpi->UID);\r
break;\r
\r
case 0x0604:\r
- CatPrint (Str, L"Floppy(0x%x)", Acpi->UID);\r
+ CatPrint (Str, L"Floppy(0x%x)", (UINTN) Acpi->UID);\r
break;\r
\r
case 0x0301:\r
- CatPrint (Str, L"Keyboard(0x%x)", Acpi->UID);\r
+ CatPrint (Str, L"Keyboard(0x%x)", (UINTN) Acpi->UID);\r
break;\r
\r
case 0x0501:\r
- CatPrint (Str, L"Serial(0x%x)", Acpi->UID);\r
+ CatPrint (Str, L"Serial(0x%x)", (UINTN) Acpi->UID);\r
break;\r
\r
case 0x0401:\r
- CatPrint (Str, L"ParallelPort(0x%x)", Acpi->UID);\r
+ CatPrint (Str, L"ParallelPort(0x%x)", (UINTN) Acpi->UID);\r
break;\r
\r
default:\r
- CatPrint (Str, L"Acpi(PNP%04x,0x%x)", EISA_ID_TO_NUM (Acpi->HID), Acpi->UID);\r
+ CatPrint (Str, L"Acpi(PNP%04x,0x%x)", (UINTN) EISA_ID_TO_NUM (Acpi->HID), (UINTN) Acpi->UID);\r
break;\r
}\r
} else {\r
- CatPrint (Str, L"Acpi(0x%08x,0x%x)", Acpi->HID, Acpi->UID);\r
+ CatPrint (Str, L"Acpi(0x%08x,0x%x)", (UINTN) Acpi->HID, (UINTN) Acpi->UID);\r
}\r
}\r
\r
if (AcpiEx->UID == 0) {\r
CatPrint (Str, L"%a,", UIDStr);\r
} else {\r
- CatPrint (Str, L"0x%x,", AcpiEx->UID);\r
+ CatPrint (Str, L"0x%x,", (UINTN) AcpiEx->UID);\r
}\r
\r
if (AcpiEx->CID == 0) {\r
L"AcpiEx(%s,%s,0x%x,%a,%a,%a)",\r
HIDText,\r
CIDText,\r
- AcpiEx->UID,\r
+ (UINTN) 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", AcpiAdr->ADR);\r
+ CatPrint (Str, L"AcpiAdr(0x%x", (UINTN) AcpiAdr->ADR);\r
for (Index = 0; Index < AdditionalAdrCount; Index++) {\r
- CatPrint (Str, L",0x%x", *(UINT32 *) ((UINT8 *) AcpiAdr + 8 + Index * 4));\r
+ CatPrint (Str, L",0x%x", (UINTN) *(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)", Atapi->Lun);\r
+ CatPrint (Str, L"Ata(0x%x)", (UINTN) 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
- Atapi->Lun\r
+ (UINTN) Atapi->Lun\r
);\r
}\r
}\r
SCSI_DEVICE_PATH *Scsi;\r
\r
Scsi = DevPath;\r
- CatPrint (Str, L"Scsi(0x%x,0x%x)", Scsi->Pun, Scsi->Lun);\r
+ CatPrint (Str, L"Scsi(0x%x,0x%x)", (UINTN) Scsi->Pun, (UINTN) Scsi->Lun);\r
}\r
\r
/**\r
CatPrint (\r
Str,\r
L"UsbWwid(0x%x,0x%x,0x%x,\"%s\")",\r
- UsbWWId->VendorId,\r
- UsbWWId->ProductId,\r
- UsbWWId->InterfaceNumber,\r
+ (UINTN) UsbWWId->VendorId,\r
+ (UINTN) UsbWWId->ProductId,\r
+ (UINTN) UsbWWId->InterfaceNumber,\r
SerialNumberStr\r
);\r
}\r
DEVICE_LOGICAL_UNIT_DEVICE_PATH *LogicalUnit;\r
\r
LogicalUnit = DevPath;\r
- CatPrint (Str, L"Unit(0x%x)", LogicalUnit->Lun);\r
+ CatPrint (Str, L"Unit(0x%x)", (UINTN) LogicalUnit->Lun);\r
}\r
\r
/**\r
CatPrint (\r
Str,\r
L"(0x%x,0x%x,0x%x,0x%x)",\r
- UsbClass->VendorId,\r
- UsbClass->ProductId,\r
- UsbClass->DeviceSubClass,\r
- UsbClass->DeviceProtocol\r
+ (UINTN) UsbClass->VendorId,\r
+ (UINTN) UsbClass->ProductId,\r
+ (UINTN) UsbClass->DeviceSubClass,\r
+ (UINTN) UsbClass->DeviceProtocol\r
);\r
return;\r
}\r
CatPrint (\r
Str,\r
L"UsbDeviceFirmwareUpdate(0x%x,0x%x,0x%x)",\r
- UsbClass->VendorId,\r
- UsbClass->ProductId,\r
- UsbClass->DeviceProtocol\r
+ (UINTN) UsbClass->VendorId,\r
+ (UINTN) UsbClass->ProductId,\r
+ (UINTN) 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
- UsbClass->VendorId,\r
- UsbClass->ProductId,\r
- UsbClass->DeviceProtocol\r
+ (UINTN) UsbClass->VendorId,\r
+ (UINTN) UsbClass->ProductId,\r
+ (UINTN) 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
- UsbClass->VendorId,\r
- UsbClass->ProductId,\r
- UsbClass->DeviceProtocol\r
+ (UINTN) UsbClass->VendorId,\r
+ (UINTN) UsbClass->ProductId,\r
+ (UINTN) UsbClass->DeviceProtocol\r
);\r
return;\r
}\r
CatPrint (\r
Str,\r
L"UsbClass(0x%x,0x%x,0x%x,0x%x,0x%x)",\r
- UsbClass->VendorId,\r
- UsbClass->ProductId,\r
- UsbClass->DeviceClass,\r
- UsbClass->DeviceSubClass,\r
- UsbClass->DeviceProtocol\r
+ (UINTN) UsbClass->VendorId,\r
+ (UINTN) UsbClass->ProductId,\r
+ (UINTN) UsbClass->DeviceClass,\r
+ (UINTN) UsbClass->DeviceSubClass,\r
+ (UINTN) UsbClass->DeviceProtocol\r
);\r
}\r
\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
+ (UINTN) Sata->HBAPortNumber,\r
+ (UINTN) 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
+ );\r
+ }\r
}\r
\r
/**\r
I2O_DEVICE_PATH *I2ODevPath;\r
\r
I2ODevPath = DevPath;\r
- CatPrint (Str, L"I2O(0x%x)", I2ODevPath->Tid);\r
+ CatPrint (Str, L"I2O(0x%x)", (UINTN) I2ODevPath->Tid);\r
}\r
\r
/**\r
CatPrint (Str, L"MAC(");\r
\r
for (Index = 0; Index < HwAddressSize; Index++) {\r
- CatPrint (Str, L"%02x", MacDevPath->MacAddress.Addr[Index]);\r
+ CatPrint (Str, L"%02x", (UINTN) MacDevPath->MacAddress.Addr[Index]);\r
}\r
\r
- CatPrint (Str, L",0x%x)", MacDevPath->IfType);\r
+ CatPrint (Str, L",0x%x)", (UINTN) MacDevPath->IfType);\r
+}\r
+\r
+/**\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
CatPrint (\r
Str,\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
+ (UINTN) IPDevPath->RemoteIpAddress.Addr[0],\r
+ (UINTN) IPDevPath->RemoteIpAddress.Addr[1],\r
+ (UINTN) IPDevPath->RemoteIpAddress.Addr[2],\r
+ (UINTN) IPDevPath->RemoteIpAddress.Addr[3]\r
);\r
return ;\r
}\r
\r
CatPrint (\r
Str,\r
- L"IPv4(%d.%d.%d.%d,%s,%s,%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 == 1) ? L"TCP" : L"UDP",\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
+ );\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
+ (UINTN) IPDevPath->LocalIpAddress.Addr[0],\r
+ (UINTN) IPDevPath->LocalIpAddress.Addr[1],\r
+ (UINTN) IPDevPath->LocalIpAddress.Addr[2],\r
+ (UINTN) IPDevPath->LocalIpAddress.Addr[3]\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
- 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
+ (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
);\r
return ;\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,%s,%s,%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[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
- (IPDevPath->Protocol == 1) ? L"TCP" : L"UDP",\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
+ );\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
- 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
+ (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
);\r
}\r
\r
CatPrint (\r
Str,\r
L"Infiniband(0x%x,%g,0x%lx,0x%lx,0x%lx)",\r
- InfiniBand->ResourceFlags,\r
+ (UINTN) 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,", Uart->DataBits);\r
+ CatPrint (Str, L"%d,", (UINTN) Uart->DataBits);\r
}\r
\r
CatPrint (Str, L"%c,", Parity);\r
CatPrint (\r
Str,\r
L"iSCSI(%a,0x%x,0x%lx,",\r
- ISCSIDevPath->iSCSITargetName,\r
- ISCSIDevPath->TargetPortalGroupTag,\r
+ ISCSIDevPath->TargetName,\r
+ (UINTN) ISCSIDevPath->TargetPortalGroupTag,\r
ISCSIDevPath->Lun\r
);\r
\r
CatPrint (Str, L"%s)", (ISCSIDevPath->NetworkProtocol == 0) ? L"TCP" : L"reserved");\r
}\r
\r
+/**\r
+ Converts a VLAN 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
+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)", (UINTN) Vlan->VlanId);\r
+}\r
+\r
/**\r
Converts a Hard drive device path structure to its string representative.\r
\r
CatPrint (\r
Str,\r
L"HD(%d,%s,0x%08x,",\r
- Hd->PartitionNumber,\r
+ (UINTN) Hd->PartitionNumber,\r
L"MBR",\r
- *((UINT32 *) (&(Hd->Signature[0])))\r
+ (UINTN) *((UINT32 *) (&(Hd->Signature[0])))\r
);\r
break;\r
\r
CatPrint (\r
Str,\r
L"HD(%d,%s,%g,",\r
- Hd->PartitionNumber,\r
+ (UINTN) Hd->PartitionNumber,\r
L"GPT",\r
(EFI_GUID *) &(Hd->Signature[0])\r
);\r
CatPrint (\r
Str,\r
L"HD(%d,%d,0,",\r
- Hd->PartitionNumber,\r
- Hd->SignatureType\r
+ (UINTN) Hd->PartitionNumber,\r
+ (UINTN) Hd->SignatureType\r
);\r
break;\r
}\r
\r
Cd = DevPath;\r
if (DisplayOnly) {\r
- CatPrint (Str, L"CDROM(0x%x)", Cd->BootEntry);\r
+ CatPrint (Str, L"CDROM(0x%x)", (UINTN) Cd->BootEntry);\r
return ;\r
}\r
\r
- CatPrint (Str, L"CDROM(0x%x,0x%lx,0x%lx)", Cd->BootEntry, Cd->PartitionStart, Cd->PartitionSize);\r
+ CatPrint (Str, L"CDROM(0x%x,0x%lx,0x%lx)", (UINTN) Cd->BootEntry, Cd->PartitionStart, Cd->PartitionSize);\r
}\r
\r
/**\r
CatPrint (Str, L"FvFile(%g)", &FvFile->FvFileName);\r
}\r
\r
+/**\r
+ Converts a Relative Offset 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
+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
if (Type != NULL) {\r
CatPrint (Str, L"BBS(%s,%a", Type, Bbs->String);\r
} else {\r
- CatPrint (Str, L"BBS(0x%x,%a", Bbs->DeviceType, Bbs->String);\r
+ CatPrint (Str, L"BBS(0x%x,%a", (UINTN) Bbs->DeviceType, Bbs->String);\r
}\r
\r
if (DisplayOnly) {\r
return ;\r
}\r
\r
- CatPrint (Str, L",0x%x)", Bbs->StatusFlag);\r
+ CatPrint (Str, L",0x%x)", (UINTN) Bbs->StatusFlag);\r
}\r
\r
/**\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
projects / mirror_edk2.git / blobdiff