PCI_DEVICE_PATH *Pci;\r
\r
Pci = DevPath;\r
- CatPrint (Str, L"Pci(%x,%x)", Pci->Function, Pci->Device);\r
+ CatPrint (Str, L"Pci(0x%x,0x%x)", Pci->Device, Pci->Function);\r
}\r
\r
STATIC\r
PCCARD_DEVICE_PATH *Pccard;\r
\r
Pccard = DevPath;\r
- CatPrint (Str, L"PcCard(%x)", Pccard->FunctionNumber);\r
+ CatPrint (Str, L"PcCard(0x%x)", Pccard->FunctionNumber);\r
}\r
\r
STATIC\r
MemMap = DevPath;\r
CatPrint (\r
Str,\r
- L"MemoryMapped(%lx,%lx)",\r
+ L"MemoryMapped(0x%x,0x%lx,0x%lx)",\r
+ MemMap->MemoryType,\r
MemMap->StartingAddress,\r
MemMap->EndingAddress\r
);\r
VENDOR_DEVICE_PATH *Vendor;\r
CHAR16 *Type;\r
UINTN Index;\r
+ UINTN DataLength;\r
UINT32 FlowControlMap;\r
UINT16 Info;\r
\r
} else if (CompareGuid (&Vendor->Guid, &mEfiDevicePathMessagingSASGuid)) {\r
CatPrint (\r
Str,\r
- L"SAS(%lx,%lx,%x,",\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
if ((Info & 0x0f) == 1) {\r
CatPrint (Str, L"0,");\r
} else {\r
- CatPrint (Str, L"%x,", (Info >> 8) & 0xff);\r
+ CatPrint (Str, L"0x%x,", (Info >> 8) & 0xff);\r
}\r
} else {\r
CatPrint (Str, L"0,0,0,0,");\r
}\r
\r
- CatPrint (Str, L"%x)", ((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
return ;\r
- } else {\r
- return ;\r
- //\r
- // reserved\r
- //\r
}\r
}\r
break;\r
break;\r
}\r
\r
- CatPrint (Str, L"Ven%s(%g,", Type, &Vendor->Guid);\r
- for (Index = 0; Index < DevicePathNodeLength (&Vendor->Header) - sizeof (VENDOR_DEVICE_PATH); Index++) {\r
- CatPrint (Str, L"%02x", ((VENDOR_DEVICE_PATH_WITH_DATA *) Vendor)->VendorDefinedData[Index]);\r
+ DataLength = DevicePathNodeLength (&Vendor->Header) - sizeof (VENDOR_DEVICE_PATH);\r
+ CatPrint (Str, L"Ven%s(%g", Type, &Vendor->Guid);\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
+ }\r
}\r
\r
CatPrint (Str, L")");\r
Controller = DevPath;\r
CatPrint (\r
Str,\r
- L"Ctrl(%x)",\r
+ L"Ctrl(0x%x)",\r
Controller->ControllerNumber\r
);\r
}\r
\r
Acpi = DevPath;\r
if ((Acpi->HID & PNP_EISA_ID_MASK) == PNP_EISA_ID_CONST) {\r
- if (AllowShortcuts) {\r
- switch (EISA_ID_TO_NUM (Acpi->HID)) {\r
- case 0x0a03:\r
- CatPrint (Str, L"PciRoot(%x)", Acpi->UID);\r
- break;\r
-\r
- case 0x0604:\r
- CatPrint (Str, L"Floppy(%x)", Acpi->UID);\r
- break;\r
+ switch (EISA_ID_TO_NUM (Acpi->HID)) {\r
+ case 0x0a03:\r
+ CatPrint (Str, L"PciRoot(0x%x)", Acpi->UID);\r
+ break;\r
\r
- case 0x0301:\r
- CatPrint (Str, L"Keyboard(%x)", Acpi->UID);\r
- break;\r
+ case 0x0604:\r
+ CatPrint (Str, L"Floppy(0x%x)", Acpi->UID);\r
+ break;\r
\r
- case 0x0501:\r
- CatPrint (Str, L"Serial(%x)", Acpi->UID);\r
- break;\r
+ case 0x0301:\r
+ CatPrint (Str, L"Keyboard(0x%x)", Acpi->UID);\r
+ break;\r
\r
- case 0x0401:\r
- CatPrint (Str, L"ParallelPort(%x)", Acpi->UID);\r
- break;\r
+ case 0x0501:\r
+ CatPrint (Str, L"Serial(0x%x)", Acpi->UID);\r
+ break;\r
\r
- default:\r
- break;\r
- }\r
+ case 0x0401:\r
+ CatPrint (Str, L"ParallelPort(0x%x)", Acpi->UID);\r
+ break;\r
\r
- return ;\r
+ default:\r
+ CatPrint (Str, L"Acpi(PNP%04x,0x%x)", EISA_ID_TO_NUM (Acpi->HID), Acpi->UID);\r
+ break;\r
}\r
-\r
- CatPrint (Str, L"Acpi(PNP%04x,%x)", EISA_ID_TO_NUM (Acpi->HID), Acpi->UID);\r
} else {\r
- CatPrint (Str, L"Acpi(%08x,%x)", Acpi->HID, Acpi->UID);\r
+ CatPrint (Str, L"Acpi(0x%08x,0x%x)", Acpi->HID, Acpi->UID);\r
}\r
}\r
\r
-#define NextStrA(a) ((UINT8 *) (((UINT8 *) (a)) + AsciiStrLen ((CHAR8 *) (a)) + 1))\r
+STATIC\r
+VOID\r
+EisaIdToText (\r
+ IN UINT32 EisaId,\r
+ IN OUT CHAR16 *Text\r
+ )\r
+{\r
+ CHAR16 PnpIdStr[17];\r
+\r
+ //\r
+ //UnicodeSPrint ("%X", 0x0a03) => "0000000000000A03"\r
+ //\r
+ UnicodeSPrint (PnpIdStr, 17 * 2, L"%X", EisaId >> 16);\r
+\r
+ UnicodeSPrint (\r
+ Text,\r
+ 0,\r
+ L"%c%c%c%s",\r
+ '@' + ((EisaId >> 10) & 0x1f),\r
+ '@' + ((EisaId >> 5) & 0x1f),\r
+ '@' + ((EisaId >> 0) & 0x1f),\r
+ PnpIdStr + (16 - 4)\r
+ );\r
+}\r
\r
STATIC\r
VOID\r
-DevPathToTextExtAcpi (\r
+DevPathToTextAcpiEx (\r
IN OUT POOL_PRINT *Str,\r
IN VOID *DevPath,\r
IN BOOLEAN DisplayOnly,\r
IN BOOLEAN AllowShortcuts\r
)\r
{\r
- ACPI_EXTENDED_HID_DEVICE_PATH_WITH_STR *AcpiExt;\r
- UINT8 *NextString;\r
+ ACPI_EXTENDED_HID_DEVICE_PATH *AcpiEx;\r
+ CHAR8 *HIDStr;\r
+ CHAR8 *UIDStr;\r
+ CHAR8 *CIDStr;\r
+ CHAR16 HIDText[11];\r
+ CHAR16 CIDText[11];\r
+\r
+ AcpiEx = DevPath;\r
+ HIDStr = (CHAR8 *) (((UINT8 *) AcpiEx) + sizeof (ACPI_EXTENDED_HID_DEVICE_PATH));\r
+ UIDStr = HIDStr + AsciiStrLen (HIDStr) + 1;\r
+ CIDStr = UIDStr + AsciiStrLen (UIDStr) + 1;\r
+\r
+ EisaIdToText (AcpiEx->HID, HIDText);\r
+ EisaIdToText (AcpiEx->CID, CIDText);\r
+\r
+ if ((*HIDStr == '\0') && (*CIDStr == '\0') && (AcpiEx->UID == 0)) {\r
+ //\r
+ // use AcpiExp()\r
+ //\r
+ CatPrint (\r
+ Str,\r
+ L"AcpiExp(%s,%s,%a)",\r
+ HIDText,\r
+ CIDText,\r
+ UIDStr\r
+ );\r
+ } else {\r
+ if (AllowShortcuts) {\r
+ //\r
+ // display only\r
+ //\r
+ if (AcpiEx->HID == 0) {\r
+ CatPrint (Str, L"AcpiEx(%a,", HIDStr);\r
+ } else {\r
+ CatPrint (Str, L"AcpiEx(%s,", HIDText);\r
+ }\r
\r
- AcpiExt = DevPath;\r
+ if (AcpiEx->UID == 0) {\r
+ CatPrint (Str, L"%a,", UIDStr);\r
+ } else {\r
+ CatPrint (Str, L"0x%x,", AcpiEx->UID);\r
+ }\r
\r
- if (AllowShortcuts) {\r
- NextString = NextStrA (AcpiExt->HidUidCidStr);\r
- if ((*(AcpiExt->HidUidCidStr) == '\0') &&\r
- (*(NextStrA (NextString)) == '\0') &&\r
- (AcpiExt->UID == 0)\r
- ) {\r
- if ((AcpiExt->HID & PNP_EISA_ID_MASK) == PNP_EISA_ID_CONST) {\r
- CatPrint (\r
- Str,\r
- L"AcpiExp(PNP%04x,%x,%a)",\r
- EISA_ID_TO_NUM (AcpiExt->HID),\r
- AcpiExt->CID,\r
- NextStrA (AcpiExt->HidUidCidStr)\r
- );\r
+ if (AcpiEx->CID == 0) {\r
+ CatPrint (Str, L"%a)", CIDStr);\r
} else {\r
- CatPrint (\r
- Str,\r
- L"AcpiExp(%08x,%x,%a)",\r
- AcpiExt->HID,\r
- AcpiExt->CID,\r
- NextStrA (AcpiExt->HidUidCidStr)\r
- );\r
+ CatPrint (Str, L"%s)", CIDText);\r
}\r
+ } else {\r
+ CatPrint (\r
+ Str,\r
+ L"AcpiEx(%s,%s,0x%x,%a,%a,%a)",\r
+ HIDText,\r
+ CIDText,\r
+ AcpiEx->UID,\r
+ HIDStr,\r
+ CIDStr,\r
+ UIDStr\r
+ );\r
}\r
- return ;\r
}\r
+}\r
\r
- NextString = NextStrA (AcpiExt->HidUidCidStr);\r
- NextString = NextStrA (NextString);\r
- if ((AcpiExt->HID & PNP_EISA_ID_MASK) == PNP_EISA_ID_CONST) {\r
- CatPrint (\r
- Str,\r
- L"AcpiEx(PNP%04x,%x,%x,%a,%a,%a)",\r
- EISA_ID_TO_NUM (AcpiExt->HID),\r
- AcpiExt->CID,\r
- AcpiExt->UID,\r
- AcpiExt->HidUidCidStr,\r
- NextString,\r
- NextStrA (AcpiExt->HidUidCidStr)\r
- );\r
- } else {\r
- CatPrint (\r
- Str,\r
- L"AcpiEx(%08x,%x,%x,%a,%a,%a)",\r
- AcpiExt->HID,\r
- AcpiExt->CID,\r
- AcpiExt->UID,\r
- AcpiExt->HidUidCidStr,\r
- NextString,\r
- NextStrA (AcpiExt->HidUidCidStr)\r
- );\r
+STATIC\r
+VOID\r
+DevPathToTextAcpiAdr (\r
+ IN OUT POOL_PRINT *Str,\r
+ IN VOID *DevPath,\r
+ IN BOOLEAN DisplayOnly,\r
+ IN BOOLEAN AllowShortcuts\r
+ )\r
+{\r
+ ACPI_ADR_DEVICE_PATH *AcpiAdr;\r
+ UINT16 Index;\r
+ UINT16 Length;\r
+ UINT16 AdditionalAdrCount;\r
+\r
+ AcpiAdr = DevPath;\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
+ for (Index = 0; Index < AdditionalAdrCount; Index++) {\r
+ CatPrint (Str, L",0x%x", *(UINT32 *) ((UINT8 *) AcpiAdr + 8 + Index * 4));\r
}\r
+ CatPrint (Str, L")");\r
}\r
\r
STATIC\r
Atapi = DevPath;\r
\r
if (DisplayOnly) {\r
- CatPrint (Str, L"Ata(%x)", Atapi->Lun);\r
+ CatPrint (Str, L"Ata(0x%x)", Atapi->Lun);\r
} else {\r
CatPrint (\r
Str,\r
- L"Ata(%s,%s,%x)",\r
+ L"Ata(%s,%s,0x%x)",\r
Atapi->PrimarySecondary ? L"Secondary" : L"Primary",\r
Atapi->SlaveMaster ? L"Slave" : L"Master",\r
Atapi->Lun\r
SCSI_DEVICE_PATH *Scsi;\r
\r
Scsi = DevPath;\r
- CatPrint (Str, L"Scsi(%x,%x)", Scsi->Pun, Scsi->Lun);\r
+ CatPrint (Str, L"Scsi(0x%x,0x%x)", Scsi->Pun, Scsi->Lun);\r
}\r
\r
STATIC\r
FIBRECHANNEL_DEVICE_PATH *Fibre;\r
\r
Fibre = DevPath;\r
- CatPrint (Str, L"Fibre(%lx,%lx)", Fibre->WWN, Fibre->Lun);\r
+ CatPrint (Str, L"Fibre(0x%lx,0x%lx)", Fibre->WWN, Fibre->Lun);\r
}\r
\r
STATIC\r
F1394_DEVICE_PATH *F1394;\r
\r
F1394 = DevPath;\r
- CatPrint (Str, L"I1394(%lx)", F1394->Guid);\r
+ //\r
+ // Guid has format of IEEE-EUI64\r
+ //\r
+ CatPrint (Str, L"I1394(%016lx)", F1394->Guid);\r
}\r
\r
STATIC\r
USB_DEVICE_PATH *Usb;\r
\r
Usb = DevPath;\r
- CatPrint (Str, L"USB(%x,%x)", Usb->ParentPortNumber, Usb->InterfaceNumber);\r
+ CatPrint (Str, L"USB(0x%x,0x%x)", Usb->ParentPortNumber, Usb->InterfaceNumber);\r
}\r
\r
STATIC\r
)\r
{\r
USB_WWID_DEVICE_PATH *UsbWWId;\r
+ CHAR16 *SerialNumberStr;\r
+ CHAR16 *NewStr;\r
+ UINT16 Length;\r
\r
UsbWWId = DevPath;\r
+\r
+ SerialNumberStr = (CHAR16 *) ((UINT8 *) UsbWWId + sizeof (USB_WWID_DEVICE_PATH));\r
+ Length = (UINT16) ((DevicePathNodeLength ((EFI_DEVICE_PATH_PROTOCOL *) UsbWWId) - sizeof (USB_WWID_DEVICE_PATH)) / sizeof (CHAR16));\r
+ if (SerialNumberStr [Length - 1] != 0) {\r
+ //\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
+ NewStr [Length] = 0;\r
+ SerialNumberStr = NewStr;\r
+ }\r
+\r
CatPrint (\r
Str,\r
- L"UsbWwid(%x,%x,%x,\"WWID\")",\r
+ L"UsbWwid(0x%x,0x%x,0x%x,\"%s\")",\r
UsbWWId->VendorId,\r
UsbWWId->ProductId,\r
- UsbWWId->InterfaceNumber\r
+ UsbWWId->InterfaceNumber,\r
+ SerialNumberStr\r
);\r
}\r
\r
DEVICE_LOGICAL_UNIT_DEVICE_PATH *LogicalUnit;\r
\r
LogicalUnit = DevPath;\r
- CatPrint (Str, L"Unit(%x)", LogicalUnit->Lun);\r
+ CatPrint (Str, L"Unit(0x%x)", LogicalUnit->Lun);\r
}\r
\r
STATIC\r
)\r
{\r
USB_CLASS_DEVICE_PATH *UsbClass;\r
+ BOOLEAN IsKnownSubClass;\r
+\r
\r
UsbClass = DevPath;\r
\r
- if (AllowShortcuts == TRUE) {\r
- switch (UsbClass->DeviceClass) {\r
- case 1:\r
- CatPrint (\r
- Str,\r
- L"UsbAudio(%x,%x,%x,%x)",\r
- UsbClass->VendorId,\r
- UsbClass->ProductId,\r
- UsbClass->DeviceSubClass,\r
- UsbClass->DeviceProtocol\r
- );\r
- break;\r
+ IsKnownSubClass = TRUE;\r
+ switch (UsbClass->DeviceClass) {\r
+ case USB_CLASS_AUDIO:\r
+ CatPrint (Str, L"UsbAudio");\r
+ break;\r
\r
- case 2:\r
- CatPrint (\r
- Str,\r
- L"UsbCDCControl(%x,%x,%x,%x)",\r
- UsbClass->VendorId,\r
- UsbClass->ProductId,\r
- UsbClass->DeviceSubClass,\r
- UsbClass->DeviceProtocol\r
- );\r
- break;\r
+ case USB_CLASS_CDCCONTROL:\r
+ CatPrint (Str, L"UsbCDCControl");\r
+ break;\r
\r
- case 3:\r
- CatPrint (\r
- Str,\r
- L"UsbHID(%x,%x,%x,%x)",\r
- UsbClass->VendorId,\r
- UsbClass->ProductId,\r
- UsbClass->DeviceSubClass,\r
- UsbClass->DeviceProtocol\r
- );\r
- break;\r
+ case USB_CLASS_HID:\r
+ CatPrint (Str, L"UsbHID");\r
+ break;\r
\r
- case 6:\r
- CatPrint (\r
- Str,\r
- L"UsbImage(%x,%x,%x,%x)",\r
- UsbClass->VendorId,\r
- UsbClass->ProductId,\r
- UsbClass->DeviceSubClass,\r
- UsbClass->DeviceProtocol\r
- );\r
- break;\r
+ case USB_CLASS_IMAGE:\r
+ CatPrint (Str, L"UsbImage");\r
+ break;\r
\r
- case 7:\r
- CatPrint (\r
- Str,\r
- L"UsbPrinter(%x,%x,%x,%x)",\r
- UsbClass->VendorId,\r
- UsbClass->ProductId,\r
- UsbClass->DeviceSubClass,\r
- UsbClass->DeviceProtocol\r
- );\r
- break;\r
+ case USB_CLASS_PRINTER:\r
+ CatPrint (Str, L"UsbPrinter");\r
+ break;\r
\r
- case 8:\r
- CatPrint (\r
- Str,\r
- L"UsbMassStorage(%x,%x,%x,%x)",\r
- UsbClass->VendorId,\r
- UsbClass->ProductId,\r
- UsbClass->DeviceSubClass,\r
- UsbClass->DeviceProtocol\r
- );\r
- break;\r
+ case USB_CLASS_MASS_STORAGE:\r
+ CatPrint (Str, L"UsbMassStorage");\r
+ break;\r
\r
- case 9:\r
- CatPrint (\r
- Str,\r
- L"UsbHub(%x,%x,%x,%x)",\r
- UsbClass->VendorId,\r
- UsbClass->ProductId,\r
- UsbClass->DeviceSubClass,\r
- UsbClass->DeviceProtocol\r
- );\r
- break;\r
+ case USB_CLASS_HUB:\r
+ CatPrint (Str, L"UsbHub");\r
+ break;\r
\r
- case 10:\r
- CatPrint (\r
- Str,\r
- L"UsbCDCData(%x,%x,%x,%x)",\r
- UsbClass->VendorId,\r
- UsbClass->ProductId,\r
- UsbClass->DeviceSubClass,\r
- UsbClass->DeviceProtocol\r
- );\r
- break;\r
+ case USB_CLASS_CDCDATA:\r
+ CatPrint (Str, L"UsbCDCData");\r
+ break;\r
\r
- case 11:\r
- CatPrint (\r
- Str,\r
- L"UsbSmartCard(%x,%x,%x,%x)",\r
- UsbClass->VendorId,\r
- UsbClass->ProductId,\r
- UsbClass->DeviceSubClass,\r
- UsbClass->DeviceProtocol\r
- );\r
- break;\r
+ case USB_CLASS_SMART_CARD:\r
+ CatPrint (Str, L"UsbSmartCard");\r
+ break;\r
\r
- case 14:\r
+ case USB_CLASS_VIDEO:\r
+ CatPrint (Str, L"UsbVideo");\r
+ break;\r
+\r
+ case USB_CLASS_DIAGNOSTIC:\r
+ CatPrint (Str, L"UsbDiagnostic");\r
+ break;\r
+\r
+ case USB_CLASS_WIRELESS:\r
+ CatPrint (Str, L"UsbWireless");\r
+ break;\r
+\r
+ default:\r
+ IsKnownSubClass = FALSE;\r
+ break;\r
+ }\r
+\r
+ if (IsKnownSubClass) {\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
+ );\r
+ return;\r
+ }\r
+\r
+ if (UsbClass->DeviceClass == USB_CLASS_RESERVE) {\r
+ if (UsbClass->DeviceSubClass == USB_SUBCLASS_FW_UPDATE) {\r
CatPrint (\r
Str,\r
- L"UsbVideo(%x,%x,%x,%x)",\r
+ L"UsbDeviceFirmwareUpdate(0x%x,0x%x,0x%x)",\r
UsbClass->VendorId,\r
UsbClass->ProductId,\r
- UsbClass->DeviceSubClass,\r
UsbClass->DeviceProtocol\r
);\r
- break;\r
-\r
- case 220:\r
+ return;\r
+ } else if (UsbClass->DeviceSubClass == USB_SUBCLASS_IRDA_BRIDGE) {\r
CatPrint (\r
Str,\r
- L"UsbDiagnostic(%x,%x,%x,%x)",\r
+ L"UsbIrdaBridge(0x%x,0x%x,0x%x)",\r
UsbClass->VendorId,\r
UsbClass->ProductId,\r
- UsbClass->DeviceSubClass,\r
UsbClass->DeviceProtocol\r
);\r
- break;\r
-\r
- case 224:\r
+ return;\r
+ } else if (UsbClass->DeviceSubClass == USB_SUBCLASS_TEST) {\r
CatPrint (\r
Str,\r
- L"UsbWireless(%x,%x,%x,%x)",\r
+ L"UsbTestAndMeasurement(0x%x,0x%x,0x%x)",\r
UsbClass->VendorId,\r
UsbClass->ProductId,\r
- UsbClass->DeviceSubClass,\r
UsbClass->DeviceProtocol\r
);\r
- break;\r
-\r
- case 254:\r
- if (UsbClass->DeviceSubClass == 1) {\r
- CatPrint (\r
- Str,\r
- L"UsbDeviceFirmwareUpdate(%x,%x,%x)",\r
- UsbClass->VendorId,\r
- UsbClass->ProductId,\r
- UsbClass->DeviceProtocol\r
- );\r
- } else if (UsbClass->DeviceSubClass == 2) {\r
- CatPrint (\r
- Str,\r
- L"UsbIrdaBridge(%x,%x,%x)",\r
- UsbClass->VendorId,\r
- UsbClass->ProductId,\r
- UsbClass->DeviceProtocol\r
- );\r
- } else if (UsbClass->DeviceSubClass == 3) {\r
- CatPrint (\r
- Str,\r
- L"UsbTestAndMeasurement(%x,%x,%x)",\r
- UsbClass->VendorId,\r
- UsbClass->ProductId,\r
- UsbClass->DeviceProtocol\r
- );\r
- }\r
- break;\r
-\r
- default:\r
- break;\r
+ return;\r
}\r
-\r
- return ;\r
}\r
\r
CatPrint (\r
Str,\r
- L"UsbClass(%x,%x,%x,%x,%x)",\r
+ L"UsbClass(0x%x,0x%x,0x%x,0x%x,0x%x)",\r
UsbClass->VendorId,\r
UsbClass->ProductId,\r
UsbClass->DeviceClass,\r
);\r
}\r
\r
+STATIC\r
+VOID\r
+DevPathToTextSata (\r
+ IN OUT POOL_PRINT *Str,\r
+ IN VOID *DevPath,\r
+ IN BOOLEAN DisplayOnly,\r
+ IN BOOLEAN AllowShortcuts\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->PortMultiplierPort,\r
+ (UINTN) Sata->LogicalUnitNumber\r
+ );\r
+}\r
+\r
STATIC\r
VOID\r
DevPathToTextI2O (\r
I2O_DEVICE_PATH *I2O;\r
\r
I2O = DevPath;\r
- CatPrint (Str, L"I2O(%x)", I2O->Tid);\r
+ CatPrint (Str, L"I2O(0x%x)", I2O->Tid);\r
}\r
\r
STATIC\r
CatPrint (Str, L"%02x", MAC->MacAddress.Addr[Index]);\r
}\r
\r
- CatPrint (Str, L",%x)", MAC->IfType);\r
+ CatPrint (Str, L",0x%x)", MAC->IfType);\r
}\r
\r
STATIC\r
InfiniBand = DevPath;\r
CatPrint (\r
Str,\r
- L"Infiniband(%x,%g,%lx,%lx,%lx)",\r
+ L"Infiniband(0x%x,%g,0x%lx,0x%lx,0x%lx)",\r
InfiniBand->ResourceFlags,\r
InfiniBand->PortGid,\r
InfiniBand->ServiceId,\r
iSCSI = DevPath;\r
CatPrint (\r
Str,\r
- L"iSCSI(%s,%x,%lx,",\r
+ L"iSCSI(%a,0x%x,0x%lx,",\r
iSCSI->iSCSITargetName,\r
iSCSI->TargetPortalGroupTag,\r
iSCSI->Lun\r
\r
Hd = DevPath;\r
switch (Hd->SignatureType) {\r
- case 0:\r
- CatPrint (\r
- Str,\r
- L"HD(%d,%s,0,",\r
- Hd->PartitionNumber,\r
- L"None"\r
- );\r
- break;\r
-\r
case SIGNATURE_TYPE_MBR:\r
CatPrint (\r
Str,\r
- L"HD(%d,%s,%08x,",\r
+ L"HD(%d,%s,0x%08x,",\r
Hd->PartitionNumber,\r
L"MBR",\r
*((UINT32 *) (&(Hd->Signature[0])))\r
Str,\r
L"HD(%d,%s,%g,",\r
Hd->PartitionNumber,\r
- L"GUID",\r
+ L"GPT",\r
(EFI_GUID *) &(Hd->Signature[0])\r
);\r
break;\r
\r
default:\r
+ CatPrint (\r
+ Str,\r
+ L"HD(%d,%d,0,",\r
+ Hd->PartitionNumber,\r
+ Hd->SignatureType\r
+ );\r
break;\r
}\r
\r
- CatPrint (Str, L"%lx,%lx)", Hd->PartitionStart, Hd->PartitionSize);\r
+ CatPrint (Str, L"0x%lx,0x%lx)", Hd->PartitionStart, Hd->PartitionSize);\r
}\r
\r
STATIC\r
\r
Cd = DevPath;\r
if (DisplayOnly == TRUE) {\r
- CatPrint (Str, L"CDROM(%x)", Cd->BootEntry);\r
+ CatPrint (Str, L"CDROM(0x%x)", Cd->BootEntry);\r
return ;\r
}\r
\r
- CatPrint (Str, L"CDROM(%x,%lx,%lx)", 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
STATIC\r
CatPrint (Str, L"Media(%g)", &MediaProt->Protocol);\r
}\r
\r
+STATIC\r
+VOID\r
+DevPathToTextFv (\r
+ IN OUT POOL_PRINT *Str,\r
+ IN VOID *DevPath,\r
+ IN BOOLEAN DisplayOnly,\r
+ IN BOOLEAN AllowShortcuts\r
+ )\r
+{\r
+ MEDIA_FW_VOL_DEVICE_PATH *Fv;\r
+\r
+ Fv = DevPath;\r
+ CatPrint (Str, L"Fv(%g)", &Fv->FvName);\r
+}\r
+\r
+STATIC\r
+VOID\r
+DevPathToTextFvFile (\r
+ IN OUT POOL_PRINT *Str,\r
+ IN VOID *DevPath,\r
+ IN BOOLEAN DisplayOnly,\r
+ IN BOOLEAN AllowShortcuts\r
+ )\r
+{\r
+ MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *FvFile;\r
+\r
+ FvFile = DevPath;\r
+ CatPrint (Str, L"FvFile(%g)", &FvFile->FvFileName);\r
+}\r
+\r
STATIC\r
VOID\r
DevPathToTextBBS (\r
break;\r
\r
default:\r
- Type = L"?";\r
+ Type = NULL;\r
break;\r
}\r
\r
- CatPrint (Str, L"BBS(%s,%a", Type, Bbs->String);\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
+ }\r
\r
if (DisplayOnly == TRUE) {\r
CatPrint (Str, L")");\r
return ;\r
}\r
\r
- CatPrint (Str, L",%x)", Bbs->StatusFlag);\r
+ CatPrint (Str, L",0x%x)", Bbs->StatusFlag);\r
}\r
\r
STATIC\r
{HARDWARE_DEVICE_PATH, HW_VENDOR_DP, DevPathToTextVendor},\r
{HARDWARE_DEVICE_PATH, HW_CONTROLLER_DP, DevPathToTextController},\r
{ACPI_DEVICE_PATH, ACPI_DP, DevPathToTextAcpi},\r
- {ACPI_DEVICE_PATH, ACPI_EXTENDED_DP, DevPathToTextExtAcpi},\r
+ {ACPI_DEVICE_PATH, ACPI_EXTENDED_DP, DevPathToTextAcpiEx},\r
+ {ACPI_DEVICE_PATH, ACPI_ADR_DP, DevPathToTextAcpiAdr},\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_USB_WWID_DP, DevPathToTextUsbWWID},\r
{MESSAGING_DEVICE_PATH, MSG_DEVICE_LOGICAL_UNIT_DP, DevPathToTextLogicalUnit},\r
{MESSAGING_DEVICE_PATH, MSG_USB_CLASS_DP, DevPathToTextUsbClass},\r
+ {MESSAGING_DEVICE_PATH, MSG_SATA_DP, DevPathToTextSata},\r
{MESSAGING_DEVICE_PATH, MSG_I2O_DP, DevPathToTextI2O},\r
{MESSAGING_DEVICE_PATH, MSG_MAC_ADDR_DP, DevPathToTextMacAddr},\r
{MESSAGING_DEVICE_PATH, MSG_IPv4_DP, DevPathToTextIPv4},\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
{BBS_DEVICE_PATH, BBS_BBS_DP, DevPathToTextBBS},\r
{END_DEVICE_PATH_TYPE, END_INSTANCE_DEVICE_PATH_SUBTYPE, DevPathToTextEndInstance},\r
{0, 0, NULL}\r
// Put a path seperator in if needed\r
//\r
if (Str.Len && DumpNode != DevPathToTextEndInstance) {\r
- if (*(Str.Str + Str.Len / sizeof (CHAR16) - 1) != L',') { \r
+ if (*(Str.Str + Str.Len / sizeof (CHAR16) - 1) != L',') {\r
CatPrint (&Str, L"/");\r
- } \r
+ }\r
}\r
//\r
// Print this node of the device path\r
projects / mirror_edk2.git / blobdiff