SATA Device path updated.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8010 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c
index 178b24bcdaa07e09f752fba72c25c798462b6e93..3cc08a450262d75ce5d114848676a2b9e14126de 100644 (file)
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c
@@ -2663,7 +2663,7 @@ DevPathFromTextSata (
     Sata->PortMultiplierPortNumber = (UINT16) Xtoi (Param2);\r
     Param2                   = Param3;\r
   } else {\r
-    Sata->PortMultiplierPortNumber = 0;\r
+    Sata->PortMultiplierPortNumber = SATA_HBA_DIRECT_CONNECT_FLAG;\r
   }\r
   Sata->Lun = (UINT16) Xtoi (Param2);\r
 \r

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c
index dfc14bf1aecdeed737a089ecb9d11a91cf2a0fa8..afa982afc4e9d4a3c1dee1a885973c5a640d57cb 100644 (file)
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathToText.c
@@ -96,7 +96,7 @@ DevPathToTextPci (
   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
@@ -123,7 +123,7 @@ DevPathToTextPccard (
   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
@@ -153,7 +153,7 @@ DevPathToTextMemMap (
   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
@@ -234,7 +234,7 @@ DevPathToTextVendor (
           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
@@ -250,13 +250,13 @@ DevPathToTextVendor (
           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
@@ -279,7 +279,7 @@ DevPathToTextVendor (
   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
@@ -313,7 +313,7 @@ DevPathToTextController (
   CatPrint (\r
     Str,\r
     L"Ctrl(0x%x)",\r
-    Controller->ControllerNumber\r
+    (UINTN) Controller->ControllerNumber\r
     );\r
 }\r
 \r
@@ -344,31 +344,31 @@ DevPathToTextAcpi (
   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
@@ -464,7 +464,7 @@ DevPathToTextAcpiEx (
       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
@@ -478,7 +478,7 @@ DevPathToTextAcpiEx (
         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
@@ -517,9 +517,9 @@ DevPathToTextAcpiAdr (
   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
@@ -550,14 +550,14 @@ DevPathToTextAtapi (
   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
@@ -586,7 +586,7 @@ DevPathToTextScsi (
   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
@@ -716,9 +716,9 @@ DevPathToTextUsbWWID (
   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
@@ -747,7 +747,7 @@ DevPathToTextLogicalUnit (
   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
@@ -836,10 +836,10 @@ DevPathToTextUsbClass (
     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
@@ -849,27 +849,27 @@ DevPathToTextUsbClass (
       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
@@ -878,11 +878,11 @@ DevPathToTextUsbClass (
   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
@@ -910,13 +910,22 @@ DevPathToTextSata (
   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) {\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
@@ -943,7 +952,7 @@ DevPathToTextI2O (
   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
@@ -981,10 +990,10 @@ DevPathToTextMacAddr (
   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
@@ -1015,10 +1024,10 @@ DevPathToTextIPv4 (
     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
@@ -1026,16 +1035,16 @@ DevPathToTextIPv4 (
   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
+    (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->Protocol == 1) ? L"TCP" : L"UDP",\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
@@ -1067,22 +1076,22 @@ DevPathToTextIPv6 (
     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
@@ -1090,40 +1099,40 @@ DevPathToTextIPv6 (
   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
+    (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->Protocol == 1) ? L"TCP" : L"UDP",\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
@@ -1154,7 +1163,7 @@ DevPathToTextInfiniBand (
   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
@@ -1226,7 +1235,7 @@ DevPathToTextUart (
   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
@@ -1283,7 +1292,7 @@ DevPathToTextiSCSI (
     Str,\r
     L"iSCSI(%a,0x%x,0x%lx,",\r
     ISCSIDevPath->iSCSITargetName,\r
-    ISCSIDevPath->TargetPortalGroupTag,\r
+    (UINTN) ISCSIDevPath->TargetPortalGroupTag,\r
     ISCSIDevPath->Lun\r
     );\r
 \r
@@ -1331,9 +1340,9 @@ DevPathToTextHardDrive (
     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
@@ -1341,7 +1350,7 @@ DevPathToTextHardDrive (
     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
@@ -1351,8 +1360,8 @@ DevPathToTextHardDrive (
     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
@@ -1385,11 +1394,11 @@ DevPathToTextCDROM (
 \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
@@ -1558,7 +1567,7 @@ DevPathToTextBBS (
   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
@@ -1566,7 +1575,7 @@ DevPathToTextBBS (
     return ;\r
   }\r
 \r
-  CatPrint (Str, L",0x%x)", Bbs->StatusFlag);\r
+  CatPrint (Str, L",0x%x)", (UINTN) Bbs->StatusFlag);\r
 }\r
 \r
 /**\r
@@ -1646,7 +1655,6 @@ GLOBAL_REMOVE_IF_UNREFERENCED const DEVICE_PATH_TO_TEXT_TABLE DevPathToTextTable
   {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