X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FDevicePathDxe%2FDevicePathToText.c;h=e8ee5c55464fa7ae8039d668ce2bb08d4be9753b;hb=af9c2a563c88c6f2ed23178d2f6e9a01f2063a90;hp=dfc14bf1aecdeed737a089ecb9d11a91cf2a0fa8;hpb=5755841f2a748fe0a1598f1f8b3a257fc577d48f;p=mirror_edk2.git

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c
index dfc14bf1ae..e8ee5c5546 100644
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c
@@ -1,8 +1,8 @@
 /** @file
   DevicePathToText protocol as defined in the UEFI 2.0 specification.
 
-Copyright (c) 2006 - 2008, Intel Corporation. <BR>
-All rights reserved. This program and the accompanying materials
+Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
 http://opensource.org/licenses/bsd-license.php
@@ -29,6 +29,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 **/
 CHAR16 *
+EFIAPI
 CatPrint (
   IN OUT POOL_PRINT   *Str,
   IN CHAR16           *Fmt,
@@ -96,7 +97,7 @@ DevPathToTextPci (
   PCI_DEVICE_PATH *Pci;
 
   Pci = DevPath;
-  CatPrint (Str, L"Pci(0x%x,0x%x)", Pci->Device, Pci->Function);
+  CatPrint (Str, L"Pci(0x%x,0x%x)", (UINTN) Pci->Device, (UINTN) Pci->Function);
 }
 
 /**
@@ -123,7 +124,7 @@ DevPathToTextPccard (
   PCCARD_DEVICE_PATH  *Pccard;
 
   Pccard = DevPath;
-  CatPrint (Str, L"PcCard(0x%x)", Pccard->FunctionNumber);
+  CatPrint (Str, L"PcCard(0x%x)", (UINTN) Pccard->FunctionNumber);
 }
 
 /**
@@ -153,7 +154,7 @@ DevPathToTextMemMap (
   CatPrint (
     Str,
     L"MemoryMapped(0x%x,0x%lx,0x%lx)",
-    MemMap->MemoryType,
+    (UINTN) MemMap->MemoryType,
     MemMap->StartingAddress,
     MemMap->EndingAddress
     );
@@ -234,7 +235,7 @@ DevPathToTextVendor (
           L"SAS(0x%lx,0x%lx,0x%x,",
           ((SAS_DEVICE_PATH *) Vendor)->SasAddress,
           ((SAS_DEVICE_PATH *) Vendor)->Lun,
-          ((SAS_DEVICE_PATH *) Vendor)->RelativeTargetPort
+          (UINTN) ((SAS_DEVICE_PATH *) Vendor)->RelativeTargetPort
           );
         Info = (((SAS_DEVICE_PATH *) Vendor)->DeviceTopology);
         if ((Info & 0x0f) == 0) {
@@ -250,13 +251,13 @@ DevPathToTextVendor (
           if ((Info & 0x0f) == 1) {
             CatPrint (Str, L"0,");
           } else {
-            CatPrint (Str, L"0x%x,", (Info >> 8) & 0xff);
+            CatPrint (Str, L"0x%x,",(UINTN) (Info >> 8) & 0xff);
           }
         } else {
           CatPrint (Str, L"0,0,0,0,");
         }
 
-        CatPrint (Str, L"0x%x)", ((SAS_DEVICE_PATH *) Vendor)->Reserved);
+        CatPrint (Str, L"0x%x)", (UINTN) ((SAS_DEVICE_PATH *) Vendor)->Reserved);
         return ;
       } else if (CompareGuid (&Vendor->Guid, &gEfiDebugPortProtocolGuid)) {
         CatPrint (Str, L"DebugPort()");
@@ -279,7 +280,7 @@ DevPathToTextVendor (
   if (DataLength != 0) {
     CatPrint (Str, L",");
     for (Index = 0; Index < DataLength; Index++) {
-      CatPrint (Str, L"%02x", ((VENDOR_DEVICE_PATH_WITH_DATA *) Vendor)->VendorDefinedData[Index]);
+      CatPrint (Str, L"%02x", (UINTN) ((VENDOR_DEVICE_PATH_WITH_DATA *) Vendor)->VendorDefinedData[Index]);
     }
   }
 
@@ -313,7 +314,7 @@ DevPathToTextController (
   CatPrint (
     Str,
     L"Ctrl(0x%x)",
-    Controller->ControllerNumber
+    (UINTN) Controller->ControllerNumber
     );
 }
 
@@ -344,31 +345,31 @@ DevPathToTextAcpi (
   if ((Acpi->HID & PNP_EISA_ID_MASK) == PNP_EISA_ID_CONST) {
     switch (EISA_ID_TO_NUM (Acpi->HID)) {
     case 0x0a03:
-      CatPrint (Str, L"PciRoot(0x%x)", Acpi->UID);
+      CatPrint (Str, L"PciRoot(0x%x)", (UINTN) Acpi->UID);
       break;
 
     case 0x0604:
-      CatPrint (Str, L"Floppy(0x%x)", Acpi->UID);
+      CatPrint (Str, L"Floppy(0x%x)", (UINTN) Acpi->UID);
       break;
 
     case 0x0301:
-      CatPrint (Str, L"Keyboard(0x%x)", Acpi->UID);
+      CatPrint (Str, L"Keyboard(0x%x)", (UINTN) Acpi->UID);
       break;
 
     case 0x0501:
-      CatPrint (Str, L"Serial(0x%x)", Acpi->UID);
+      CatPrint (Str, L"Serial(0x%x)", (UINTN) Acpi->UID);
       break;
 
     case 0x0401:
-      CatPrint (Str, L"ParallelPort(0x%x)", Acpi->UID);
+      CatPrint (Str, L"ParallelPort(0x%x)", (UINTN) Acpi->UID);
       break;
 
     default:
-      CatPrint (Str, L"Acpi(PNP%04x,0x%x)", EISA_ID_TO_NUM (Acpi->HID), Acpi->UID);
+      CatPrint (Str, L"Acpi(PNP%04x,0x%x)", (UINTN) EISA_ID_TO_NUM (Acpi->HID), (UINTN) Acpi->UID);
       break;
     }
   } else {
-    CatPrint (Str, L"Acpi(0x%08x,0x%x)", Acpi->HID, Acpi->UID);
+    CatPrint (Str, L"Acpi(0x%08x,0x%x)", (UINTN) Acpi->HID, (UINTN) Acpi->UID);
   }
 }
 
@@ -464,7 +465,7 @@ DevPathToTextAcpiEx (
       if (AcpiEx->UID == 0) {
         CatPrint (Str, L"%a,", UIDStr);
       } else {
-        CatPrint (Str, L"0x%x,", AcpiEx->UID);
+        CatPrint (Str, L"0x%x,", (UINTN) AcpiEx->UID);
       }
 
       if (AcpiEx->CID == 0) {
@@ -478,7 +479,7 @@ DevPathToTextAcpiEx (
         L"AcpiEx(%s,%s,0x%x,%a,%a,%a)",
         HIDText,
         CIDText,
-        AcpiEx->UID,
+        (UINTN) AcpiEx->UID,
         HIDStr,
         CIDStr,
         UIDStr
@@ -517,9 +518,9 @@ DevPathToTextAcpiAdr (
   Length             = (UINT16) DevicePathNodeLength ((EFI_DEVICE_PATH_PROTOCOL *) AcpiAdr);
   AdditionalAdrCount = (UINT16) ((Length - 8) / 4);
 
-  CatPrint (Str, L"AcpiAdr(0x%x", AcpiAdr->ADR);
+  CatPrint (Str, L"AcpiAdr(0x%x", (UINTN) AcpiAdr->ADR);
   for (Index = 0; Index < AdditionalAdrCount; Index++) {
-    CatPrint (Str, L",0x%x", *(UINT32 *) ((UINT8 *) AcpiAdr + 8 + Index * 4));
+    CatPrint (Str, L",0x%x", (UINTN) *(UINT32 *) ((UINT8 *) AcpiAdr + 8 + Index * 4));
   }
   CatPrint (Str, L")");
 }
@@ -550,14 +551,14 @@ DevPathToTextAtapi (
   Atapi = DevPath;
 
   if (DisplayOnly) {
-    CatPrint (Str, L"Ata(0x%x)", Atapi->Lun);
+    CatPrint (Str, L"Ata(0x%x)", (UINTN) Atapi->Lun);
   } else {
     CatPrint (
       Str,
       L"Ata(%s,%s,0x%x)",
       (Atapi->PrimarySecondary == 1) ? L"Secondary" : L"Primary",
       (Atapi->SlaveMaster == 1) ? L"Slave" : L"Master",
-      Atapi->Lun
+      (UINTN) Atapi->Lun
       );
   }
 }
@@ -586,7 +587,7 @@ DevPathToTextScsi (
   SCSI_DEVICE_PATH  *Scsi;
 
   Scsi = DevPath;
-  CatPrint (Str, L"Scsi(0x%x,0x%x)", Scsi->Pun, Scsi->Lun);
+  CatPrint (Str, L"Scsi(0x%x,0x%x)", (UINTN) Scsi->Pun, (UINTN) Scsi->Lun);
 }
 
 /**
@@ -716,9 +717,9 @@ DevPathToTextUsbWWID (
   CatPrint (
     Str,
     L"UsbWwid(0x%x,0x%x,0x%x,\"%s\")",
-    UsbWWId->VendorId,
-    UsbWWId->ProductId,
-    UsbWWId->InterfaceNumber,
+    (UINTN) UsbWWId->VendorId,
+    (UINTN) UsbWWId->ProductId,
+    (UINTN) UsbWWId->InterfaceNumber,
     SerialNumberStr
     );
 }
@@ -747,7 +748,7 @@ DevPathToTextLogicalUnit (
   DEVICE_LOGICAL_UNIT_DEVICE_PATH *LogicalUnit;
 
   LogicalUnit = DevPath;
-  CatPrint (Str, L"Unit(0x%x)", LogicalUnit->Lun);
+  CatPrint (Str, L"Unit(0x%x)", (UINTN) LogicalUnit->Lun);
 }
 
 /**
@@ -836,10 +837,10 @@ DevPathToTextUsbClass (
     CatPrint (
       Str,
       L"(0x%x,0x%x,0x%x,0x%x)",
-      UsbClass->VendorId,
-      UsbClass->ProductId,
-      UsbClass->DeviceSubClass,
-      UsbClass->DeviceProtocol
+      (UINTN) UsbClass->VendorId,
+      (UINTN) UsbClass->ProductId,
+      (UINTN) UsbClass->DeviceSubClass,
+      (UINTN) UsbClass->DeviceProtocol
       );
     return;
   }
@@ -849,27 +850,27 @@ DevPathToTextUsbClass (
       CatPrint (
         Str,
         L"UsbDeviceFirmwareUpdate(0x%x,0x%x,0x%x)",
-        UsbClass->VendorId,
-        UsbClass->ProductId,
-        UsbClass->DeviceProtocol
+        (UINTN) UsbClass->VendorId,
+        (UINTN) UsbClass->ProductId,
+        (UINTN) UsbClass->DeviceProtocol
         );
       return;
     } else if (UsbClass->DeviceSubClass == USB_SUBCLASS_IRDA_BRIDGE) {
       CatPrint (
         Str,
         L"UsbIrdaBridge(0x%x,0x%x,0x%x)",
-        UsbClass->VendorId,
-        UsbClass->ProductId,
-        UsbClass->DeviceProtocol
+        (UINTN) UsbClass->VendorId,
+        (UINTN) UsbClass->ProductId,
+        (UINTN) UsbClass->DeviceProtocol
         );
       return;
     } else if (UsbClass->DeviceSubClass == USB_SUBCLASS_TEST) {
       CatPrint (
         Str,
         L"UsbTestAndMeasurement(0x%x,0x%x,0x%x)",
-        UsbClass->VendorId,
-        UsbClass->ProductId,
-        UsbClass->DeviceProtocol
+        (UINTN) UsbClass->VendorId,
+        (UINTN) UsbClass->ProductId,
+        (UINTN) UsbClass->DeviceProtocol
         );
       return;
     }
@@ -878,11 +879,11 @@ DevPathToTextUsbClass (
   CatPrint (
     Str,
     L"UsbClass(0x%x,0x%x,0x%x,0x%x,0x%x)",
-    UsbClass->VendorId,
-    UsbClass->ProductId,
-    UsbClass->DeviceClass,
-    UsbClass->DeviceSubClass,
-    UsbClass->DeviceProtocol
+    (UINTN) UsbClass->VendorId,
+    (UINTN) UsbClass->ProductId,
+    (UINTN) UsbClass->DeviceClass,
+    (UINTN) UsbClass->DeviceSubClass,
+    (UINTN) UsbClass->DeviceProtocol
     );
 }
 
@@ -910,13 +911,22 @@ DevPathToTextSata (
   SATA_DEVICE_PATH *Sata;
 
   Sata = DevPath;
-  CatPrint (
-    Str,
-    L"Sata(0x%x,0x%x,0x%x)",
-    (UINTN) Sata->HBAPortNumber,
-    (UINTN) Sata->PortMultiplierPortNumber,
-    (UINTN) Sata->Lun
-    );
+  if ((Sata->PortMultiplierPortNumber & SATA_HBA_DIRECT_CONNECT_FLAG) != 0) {
+    CatPrint (
+      Str,
+      L"Sata(0x%x,0x%x)",
+      (UINTN) Sata->HBAPortNumber,
+      (UINTN) Sata->Lun
+      );
+  } else {
+    CatPrint (
+      Str,
+      L"Sata(0x%x,0x%x,0x%x)",
+      (UINTN) Sata->HBAPortNumber,
+      (UINTN) Sata->PortMultiplierPortNumber,
+      (UINTN) Sata->Lun
+      );
+  }
 }
 
 /**
@@ -943,7 +953,7 @@ DevPathToTextI2O (
   I2O_DEVICE_PATH *I2ODevPath;
 
   I2ODevPath = DevPath;
-  CatPrint (Str, L"I2O(0x%x)", I2ODevPath->Tid);
+  CatPrint (Str, L"I2O(0x%x)", (UINTN) I2ODevPath->Tid);
 }
 
 /**
@@ -981,10 +991,32 @@ DevPathToTextMacAddr (
   CatPrint (Str, L"MAC(");
 
   for (Index = 0; Index < HwAddressSize; Index++) {
-    CatPrint (Str, L"%02x", MacDevPath->MacAddress.Addr[Index]);
+    CatPrint (Str, L"%02x", (UINTN) MacDevPath->MacAddress.Addr[Index]);
   }
 
-  CatPrint (Str, L",0x%x)", MacDevPath->IfType);
+  CatPrint (Str, L",0x%x)", (UINTN) MacDevPath->IfType);
+}
+
+/**
+  Converts network protocol string to its text representation.
+
+  @param Str             The string representative of input device.
+  @param Protocol        The network protocol ID.
+
+**/
+VOID
+CatNetworkProtocol (
+  IN OUT POOL_PRINT  *Str,
+  IN UINT16          Protocol
+  )
+{
+  if (Protocol == RFC_1700_TCP_PROTOCOL) {
+    CatPrint (Str, L"TCP");
+  } else if (Protocol == RFC_1700_UDP_PROTOCOL) {
+    CatPrint (Str, L"UDP");
+  } else {
+    CatPrint (Str, L"0x%x", Protocol);
+  }
 }
 
 /**
@@ -1015,27 +1047,36 @@ DevPathToTextIPv4 (
     CatPrint (
       Str,
       L"IPv4(%d.%d.%d.%d)",
-      IPDevPath->RemoteIpAddress.Addr[0],
-      IPDevPath->RemoteIpAddress.Addr[1],
-      IPDevPath->RemoteIpAddress.Addr[2],
-      IPDevPath->RemoteIpAddress.Addr[3]
+      (UINTN) IPDevPath->RemoteIpAddress.Addr[0],
+      (UINTN) IPDevPath->RemoteIpAddress.Addr[1],
+      (UINTN) IPDevPath->RemoteIpAddress.Addr[2],
+      (UINTN) IPDevPath->RemoteIpAddress.Addr[3]
       );
     return ;
   }
 
   CatPrint (
     Str,
-    L"IPv4(%d.%d.%d.%d,%s,%s,%d.%d.%d.%d)",
-    IPDevPath->RemoteIpAddress.Addr[0],
-    IPDevPath->RemoteIpAddress.Addr[1],
-    IPDevPath->RemoteIpAddress.Addr[2],
-    IPDevPath->RemoteIpAddress.Addr[3],
-    (IPDevPath->Protocol == 1) ? L"TCP" : L"UDP",
+    L"IPv4(%d.%d.%d.%d,",
+    (UINTN) IPDevPath->RemoteIpAddress.Addr[0],
+    (UINTN) IPDevPath->RemoteIpAddress.Addr[1],
+    (UINTN) IPDevPath->RemoteIpAddress.Addr[2],
+    (UINTN) IPDevPath->RemoteIpAddress.Addr[3]
+    );
+
+  CatNetworkProtocol (
+    Str,
+    IPDevPath->Protocol
+    );
+
+  CatPrint (
+    Str,
+    L",%s,%d.%d.%d.%d)",
     IPDevPath->StaticIpAddress ? L"Static" : L"DHCP",
-    IPDevPath->LocalIpAddress.Addr[0],
-    IPDevPath->LocalIpAddress.Addr[1],
-    IPDevPath->LocalIpAddress.Addr[2],
-    IPDevPath->LocalIpAddress.Addr[3]
+    (UINTN) IPDevPath->LocalIpAddress.Addr[0],
+    (UINTN) IPDevPath->LocalIpAddress.Addr[1],
+    (UINTN) IPDevPath->LocalIpAddress.Addr[2],
+    (UINTN) IPDevPath->LocalIpAddress.Addr[3]
     );
 }
 
@@ -1067,63 +1108,72 @@ DevPathToTextIPv6 (
     CatPrint (
       Str,
       L"IPv6(%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x)",
-      IPDevPath->RemoteIpAddress.Addr[0],
-      IPDevPath->RemoteIpAddress.Addr[1],
-      IPDevPath->RemoteIpAddress.Addr[2],
-      IPDevPath->RemoteIpAddress.Addr[3],
-      IPDevPath->RemoteIpAddress.Addr[4],
-      IPDevPath->RemoteIpAddress.Addr[5],
-      IPDevPath->RemoteIpAddress.Addr[6],
-      IPDevPath->RemoteIpAddress.Addr[7],
-      IPDevPath->RemoteIpAddress.Addr[8],
-      IPDevPath->RemoteIpAddress.Addr[9],
-      IPDevPath->RemoteIpAddress.Addr[10],
-      IPDevPath->RemoteIpAddress.Addr[11],
-      IPDevPath->RemoteIpAddress.Addr[12],
-      IPDevPath->RemoteIpAddress.Addr[13],
-      IPDevPath->RemoteIpAddress.Addr[14],
-      IPDevPath->RemoteIpAddress.Addr[15]
+      (UINTN) IPDevPath->RemoteIpAddress.Addr[0],
+      (UINTN) IPDevPath->RemoteIpAddress.Addr[1],
+      (UINTN) IPDevPath->RemoteIpAddress.Addr[2],
+      (UINTN) IPDevPath->RemoteIpAddress.Addr[3],
+      (UINTN) IPDevPath->RemoteIpAddress.Addr[4],
+      (UINTN) IPDevPath->RemoteIpAddress.Addr[5],
+      (UINTN) IPDevPath->RemoteIpAddress.Addr[6],
+      (UINTN) IPDevPath->RemoteIpAddress.Addr[7],
+      (UINTN) IPDevPath->RemoteIpAddress.Addr[8],
+      (UINTN) IPDevPath->RemoteIpAddress.Addr[9],
+      (UINTN) IPDevPath->RemoteIpAddress.Addr[10],
+      (UINTN) IPDevPath->RemoteIpAddress.Addr[11],
+      (UINTN) IPDevPath->RemoteIpAddress.Addr[12],
+      (UINTN) IPDevPath->RemoteIpAddress.Addr[13],
+      (UINTN) IPDevPath->RemoteIpAddress.Addr[14],
+      (UINTN) IPDevPath->RemoteIpAddress.Addr[15]
       );
     return ;
   }
 
   CatPrint (
     Str,
-    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)",
-    IPDevPath->RemoteIpAddress.Addr[0],
-    IPDevPath->RemoteIpAddress.Addr[1],
-    IPDevPath->RemoteIpAddress.Addr[2],
-    IPDevPath->RemoteIpAddress.Addr[3],
-    IPDevPath->RemoteIpAddress.Addr[4],
-    IPDevPath->RemoteIpAddress.Addr[5],
-    IPDevPath->RemoteIpAddress.Addr[6],
-    IPDevPath->RemoteIpAddress.Addr[7],
-    IPDevPath->RemoteIpAddress.Addr[8],
-    IPDevPath->RemoteIpAddress.Addr[9],
-    IPDevPath->RemoteIpAddress.Addr[10],
-    IPDevPath->RemoteIpAddress.Addr[11],
-    IPDevPath->RemoteIpAddress.Addr[12],
-    IPDevPath->RemoteIpAddress.Addr[13],
-    IPDevPath->RemoteIpAddress.Addr[14],
-    IPDevPath->RemoteIpAddress.Addr[15],
-    (IPDevPath->Protocol == 1) ? L"TCP" : L"UDP",
+    L"IPv6(%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x,",
+    (UINTN) IPDevPath->RemoteIpAddress.Addr[0],
+    (UINTN) IPDevPath->RemoteIpAddress.Addr[1],
+    (UINTN) IPDevPath->RemoteIpAddress.Addr[2],
+    (UINTN) IPDevPath->RemoteIpAddress.Addr[3],
+    (UINTN) IPDevPath->RemoteIpAddress.Addr[4],
+    (UINTN) IPDevPath->RemoteIpAddress.Addr[5],
+    (UINTN) IPDevPath->RemoteIpAddress.Addr[6],
+    (UINTN) IPDevPath->RemoteIpAddress.Addr[7],
+    (UINTN) IPDevPath->RemoteIpAddress.Addr[8],
+    (UINTN) IPDevPath->RemoteIpAddress.Addr[9],
+    (UINTN) IPDevPath->RemoteIpAddress.Addr[10],
+    (UINTN) IPDevPath->RemoteIpAddress.Addr[11],
+    (UINTN) IPDevPath->RemoteIpAddress.Addr[12],
+    (UINTN) IPDevPath->RemoteIpAddress.Addr[13],
+    (UINTN) IPDevPath->RemoteIpAddress.Addr[14],
+    (UINTN) IPDevPath->RemoteIpAddress.Addr[15]
+    );
+    
+  CatNetworkProtocol (
+    Str,
+    IPDevPath->Protocol
+    );
+
+  CatPrint (
+    Str,
+    L"%s,%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x)",
     IPDevPath->StaticIpAddress ? L"Static" : L"DHCP",
-    IPDevPath->LocalIpAddress.Addr[0],
-    IPDevPath->LocalIpAddress.Addr[1],
-    IPDevPath->LocalIpAddress.Addr[2],
-    IPDevPath->LocalIpAddress.Addr[3],
-    IPDevPath->LocalIpAddress.Addr[4],
-    IPDevPath->LocalIpAddress.Addr[5],
-    IPDevPath->LocalIpAddress.Addr[6],
-    IPDevPath->LocalIpAddress.Addr[7],
-    IPDevPath->LocalIpAddress.Addr[8],
-    IPDevPath->LocalIpAddress.Addr[9],
-    IPDevPath->LocalIpAddress.Addr[10],
-    IPDevPath->LocalIpAddress.Addr[11],
-    IPDevPath->LocalIpAddress.Addr[12],
-    IPDevPath->LocalIpAddress.Addr[13],
-    IPDevPath->LocalIpAddress.Addr[14],
-    IPDevPath->LocalIpAddress.Addr[15]
+    (UINTN) IPDevPath->LocalIpAddress.Addr[0],
+    (UINTN) IPDevPath->LocalIpAddress.Addr[1],
+    (UINTN) IPDevPath->LocalIpAddress.Addr[2],
+    (UINTN) IPDevPath->LocalIpAddress.Addr[3],
+    (UINTN) IPDevPath->LocalIpAddress.Addr[4],
+    (UINTN) IPDevPath->LocalIpAddress.Addr[5],
+    (UINTN) IPDevPath->LocalIpAddress.Addr[6],
+    (UINTN) IPDevPath->LocalIpAddress.Addr[7],
+    (UINTN) IPDevPath->LocalIpAddress.Addr[8],
+    (UINTN) IPDevPath->LocalIpAddress.Addr[9],
+    (UINTN) IPDevPath->LocalIpAddress.Addr[10],
+    (UINTN) IPDevPath->LocalIpAddress.Addr[11],
+    (UINTN) IPDevPath->LocalIpAddress.Addr[12],
+    (UINTN) IPDevPath->LocalIpAddress.Addr[13],
+    (UINTN) IPDevPath->LocalIpAddress.Addr[14],
+    (UINTN) IPDevPath->LocalIpAddress.Addr[15]
     );
 }
 
@@ -1154,7 +1204,7 @@ DevPathToTextInfiniBand (
   CatPrint (
     Str,
     L"Infiniband(0x%x,%g,0x%lx,0x%lx,0x%lx)",
-    InfiniBand->ResourceFlags,
+    (UINTN) InfiniBand->ResourceFlags,
     InfiniBand->PortGid,
     InfiniBand->ServiceId,
     InfiniBand->TargetPortId,
@@ -1226,7 +1276,7 @@ DevPathToTextUart (
   if (Uart->DataBits == 0) {
     CatPrint (Str, L"DEFAULT,");
   } else {
-    CatPrint (Str, L"%d,", Uart->DataBits);
+    CatPrint (Str, L"%d,", (UINTN) Uart->DataBits);
   }
 
   CatPrint (Str, L"%c,", Parity);
@@ -1282,8 +1332,8 @@ DevPathToTextiSCSI (
   CatPrint (
     Str,
     L"iSCSI(%a,0x%x,0x%lx,",
-    ISCSIDevPath->iSCSITargetName,
-    ISCSIDevPath->TargetPortalGroupTag,
+    ISCSIDevPath->TargetName,
+    (UINTN) ISCSIDevPath->TargetPortalGroupTag,
     ISCSIDevPath->Lun
     );
 
@@ -1302,6 +1352,33 @@ DevPathToTextiSCSI (
   CatPrint (Str, L"%s)", (ISCSIDevPath->NetworkProtocol == 0) ? L"TCP" : L"reserved");
 }
 
+/**
+  Converts a VLAN device path structure to its string representative.
+
+  @param Str             The string representative of input device.
+  @param DevPath         The input device path structure.
+  @param DisplayOnly     If DisplayOnly is TRUE, then the shorter text representation
+                         of the display node is used, where applicable. If DisplayOnly
+                         is FALSE, then the longer text representation of the display node
+                         is used.
+  @param AllowShortcuts  If AllowShortcuts is TRUE, then the shortcut forms of text
+                         representation for a device node can be used, where applicable.
+
+**/
+VOID
+DevPathToTextVlan (
+  IN OUT POOL_PRINT  *Str,
+  IN VOID            *DevPath,
+  IN BOOLEAN         DisplayOnly,
+  IN BOOLEAN         AllowShortcuts
+  )
+{
+  VLAN_DEVICE_PATH  *Vlan;
+
+  Vlan = DevPath;
+  CatPrint (Str, L"Vlan(%d)", (UINTN) Vlan->VlanId);
+}
+
 /**
   Converts a Hard drive device path structure to its string representative.
 
@@ -1331,9 +1408,9 @@ DevPathToTextHardDrive (
     CatPrint (
       Str,
       L"HD(%d,%s,0x%08x,",
-      Hd->PartitionNumber,
+      (UINTN) Hd->PartitionNumber,
       L"MBR",
-      *((UINT32 *) (&(Hd->Signature[0])))
+      (UINTN) *((UINT32 *) (&(Hd->Signature[0])))
       );
     break;
 
@@ -1341,7 +1418,7 @@ DevPathToTextHardDrive (
     CatPrint (
       Str,
       L"HD(%d,%s,%g,",
-      Hd->PartitionNumber,
+      (UINTN) Hd->PartitionNumber,
       L"GPT",
       (EFI_GUID *) &(Hd->Signature[0])
       );
@@ -1351,8 +1428,8 @@ DevPathToTextHardDrive (
     CatPrint (
       Str,
       L"HD(%d,%d,0,",
-      Hd->PartitionNumber,
-      Hd->SignatureType
+      (UINTN) Hd->PartitionNumber,
+      (UINTN) Hd->SignatureType
       );
     break;
   }
@@ -1385,11 +1462,11 @@ DevPathToTextCDROM (
 
   Cd = DevPath;
   if (DisplayOnly) {
-    CatPrint (Str, L"CDROM(0x%x)", Cd->BootEntry);
+    CatPrint (Str, L"CDROM(0x%x)", (UINTN) Cd->BootEntry);
     return ;
   }
 
-  CatPrint (Str, L"CDROM(0x%x,0x%lx,0x%lx)", Cd->BootEntry, Cd->PartitionStart, Cd->PartitionSize);
+  CatPrint (Str, L"CDROM(0x%x,0x%lx,0x%lx)", (UINTN) Cd->BootEntry, Cd->PartitionStart, Cd->PartitionSize);
 }
 
 /**
@@ -1500,6 +1577,38 @@ DevPathToTextFvFile (
   CatPrint (Str, L"FvFile(%g)", &FvFile->FvFileName);
 }
 
+/**
+  Converts a Relative Offset device path structure to its string representative.
+
+  @param Str             The string representative of input device.
+  @param DevPath         The input device path structure.
+  @param DisplayOnly     If DisplayOnly is TRUE, then the shorter text representation
+                         of the display node is used, where applicable. If DisplayOnly
+                         is FALSE, then the longer text representation of the display node
+                         is used.
+  @param AllowShortcuts  If AllowShortcuts is TRUE, then the shortcut forms of text
+                         representation for a device node can be used, where applicable.
+
+**/
+VOID
+DevPathRelativeOffsetRange (
+  IN OUT POOL_PRINT       *Str,
+  IN VOID                 *DevPath,
+  IN BOOLEAN              DisplayOnly,
+  IN BOOLEAN              AllowShortcuts
+  )
+{
+  MEDIA_RELATIVE_OFFSET_RANGE_DEVICE_PATH *Offset;
+
+  Offset = DevPath;
+  CatPrint (
+    Str,
+    L"Offset(0x%lx,0x%lx)",
+    Offset->StartingOffset,
+    Offset->EndingOffset
+    );
+}
+
 /**
   Converts a BIOS Boot Specification device path structure to its string representative.
 
@@ -1558,7 +1667,7 @@ DevPathToTextBBS (
   if (Type != NULL) {
     CatPrint (Str, L"BBS(%s,%a", Type, Bbs->String);
   } else {
-    CatPrint (Str, L"BBS(0x%x,%a", Bbs->DeviceType, Bbs->String);
+    CatPrint (Str, L"BBS(0x%x,%a", (UINTN) Bbs->DeviceType, Bbs->String);
   }
 
   if (DisplayOnly) {
@@ -1566,7 +1675,7 @@ DevPathToTextBBS (
     return ;
   }
 
-  CatPrint (Str, L",0x%x)", Bbs->StatusFlag);
+  CatPrint (Str, L",0x%x)", (UINTN) Bbs->StatusFlag);
 }
 
 /**
@@ -1643,14 +1752,15 @@ GLOBAL_REMOVE_IF_UNREFERENCED const DEVICE_PATH_TO_TEXT_TABLE DevPathToTextTable
   {MESSAGING_DEVICE_PATH, MSG_UART_DP, DevPathToTextUart},
   {MESSAGING_DEVICE_PATH, MSG_VENDOR_DP, DevPathToTextVendor},
   {MESSAGING_DEVICE_PATH, MSG_ISCSI_DP, DevPathToTextiSCSI},
+  {MESSAGING_DEVICE_PATH, MSG_VLAN_DP, DevPathToTextVlan},
   {MEDIA_DEVICE_PATH, MEDIA_HARDDRIVE_DP, DevPathToTextHardDrive},
   {MEDIA_DEVICE_PATH, MEDIA_CDROM_DP, DevPathToTextCDROM},
   {MEDIA_DEVICE_PATH, MEDIA_VENDOR_DP, DevPathToTextVendor},
-  {MEDIA_DEVICE_PATH, MEDIA_FILEPATH_DP, DevPathToTextFilePath},
   {MEDIA_DEVICE_PATH, MEDIA_PROTOCOL_DP, DevPathToTextMediaProtocol},
   {MEDIA_DEVICE_PATH, MEDIA_FILEPATH_DP, DevPathToTextFilePath},
   {MEDIA_DEVICE_PATH, MEDIA_PIWG_FW_VOL_DP, DevPathToTextFv},
   {MEDIA_DEVICE_PATH, MEDIA_PIWG_FW_FILE_DP, DevPathToTextFvFile},
+  {MEDIA_DEVICE_PATH, MEDIA_RELATIVE_OFFSET_RANGE_DP, DevPathRelativeOffsetRange},
   {BBS_DEVICE_PATH, BBS_BBS_DP, DevPathToTextBBS},
   {END_DEVICE_PATH_TYPE, END_INSTANCE_DEVICE_PATH_SUBTYPE, DevPathToTextEndInstance},
   {0, 0, NULL}