Check in patch to refine DevicePath Module and USB2HostController Module.

[mirror_edk2.git] / EdkModulePkg / Universal / DevicePath / Dxe / DevicePathToText.c

diff --git a/EdkModulePkg/Universal/DevicePath/Dxe/DevicePathToText.c b/EdkModulePkg/Universal/DevicePath/Dxe/DevicePathToText.c
index 64fd5658fd3e099b1329b3086a9ace593ef94d82..f38f2ea1101b796eaed7bab9ecbe3c01d4ef2dd9 100644 (file)
--- a/EdkModulePkg/Universal/DevicePath/Dxe/DevicePathToText.c
+++ b/EdkModulePkg/Universal/DevicePath/Dxe/DevicePathToText.c
@@ -19,7 +19,6 @@ Abstract:
 \r
 --*/\r
 \r
 \r
 --*/\r
 \r

-#include <protocol/DevicePathToText.h>\r

 #include "DevicePath.h"\r
 \r
 EFI_DEVICE_PATH_PROTOCOL *\r
 #include "DevicePath.h"\r
 \r
 EFI_DEVICE_PATH_PROTOCOL *\r


@@ -372,7 +371,7 @@ DevPathToTextController (
   CatPrint (\r
     Str,\r
     L"Ctrl(%x)",\r
   CatPrint (\r
     Str,\r
     L"Ctrl(%x)",\r

-    (UINT16 *)Controller->ControllerNumber\r
+    Controller->ControllerNumber\r

     );\r
 }\r
 \r
     );\r
 }\r
 \r


@@ -423,7 +422,7 @@ DevPathToTextAcpi (
   }\r
 }\r
 \r
   }\r
 }\r
 \r

-#define NextStrA(a) ((UINT8 *) (((UINT8 *) (a)) + AsciiStrLen (a) + 1))\r
+#define NextStrA(a) ((UINT8 *) (((UINT8 *) (a)) + AsciiStrLen ((CHAR8 *) (a)) + 1))\r

 \r
 VOID\r
 DevPathToTextExtAcpi (\r
 \r
 VOID\r
 DevPathToTextExtAcpi (\r


@@ -1257,102 +1256,38 @@ DevPathToTextNodeUnknown (
 }\r
 \r
 DEVICE_PATH_TO_TEXT_TABLE DevPathToTextTable[] = {\r
 }\r
 \r
 DEVICE_PATH_TO_TEXT_TABLE DevPathToTextTable[] = {\r

-  HARDWARE_DEVICE_PATH,\r
-  HW_PCI_DP,\r
-  DevPathToTextPci,\r
-  HARDWARE_DEVICE_PATH,\r
-  HW_PCCARD_DP,\r
-  DevPathToTextPccard,\r
-  HARDWARE_DEVICE_PATH,\r
-  HW_MEMMAP_DP,\r
-  DevPathToTextMemMap,\r
-  HARDWARE_DEVICE_PATH,\r
-  HW_VENDOR_DP,\r
-  DevPathToTextVendor,\r
-  HARDWARE_DEVICE_PATH,\r
-  HW_CONTROLLER_DP,\r
-  DevPathToTextController,\r
-  ACPI_DEVICE_PATH,\r
-  ACPI_DP,\r
-  DevPathToTextAcpi,\r
-  ACPI_DEVICE_PATH,\r
-  ACPI_EXTENDED_DP,\r
-  DevPathToTextExtAcpi,\r
-  MESSAGING_DEVICE_PATH,\r
-  MSG_ATAPI_DP,\r
-  DevPathToTextAtapi,\r
-  MESSAGING_DEVICE_PATH,\r
-  MSG_SCSI_DP,\r
-  DevPathToTextScsi,\r
-  MESSAGING_DEVICE_PATH,\r
-  MSG_FIBRECHANNEL_DP,\r
-  DevPathToTextFibre,\r
-  MESSAGING_DEVICE_PATH,\r
-  MSG_1394_DP,\r
-  DevPathToText1394,\r
-  MESSAGING_DEVICE_PATH,\r
-  MSG_USB_DP,\r
-  DevPathToTextUsb,\r
-  MESSAGING_DEVICE_PATH,\r
-  MSG_USB_WWID_DP,\r
-  DevPathToTextUsbWWID,\r
-  MESSAGING_DEVICE_PATH,\r
-  MSG_DEVICE_LOGICAL_UNIT_DP,\r
-  DevPathToTextLogicalUnit,\r
-  MESSAGING_DEVICE_PATH,\r
-  MSG_USB_CLASS_DP,\r
-  DevPathToTextUsbClass,\r
-  MESSAGING_DEVICE_PATH,\r
-  MSG_I2O_DP,\r
-  DevPathToTextI2O,\r
-  MESSAGING_DEVICE_PATH,\r
-  MSG_MAC_ADDR_DP,\r
-  DevPathToTextMacAddr,\r
-  MESSAGING_DEVICE_PATH,\r
-  MSG_IPv4_DP,\r
-  DevPathToTextIPv4,\r
-  MESSAGING_DEVICE_PATH,\r
-  MSG_IPv6_DP,\r
-  DevPathToTextIPv6,\r
-  MESSAGING_DEVICE_PATH,\r
-  MSG_INFINIBAND_DP,\r
-  DevPathToTextInfiniBand,\r
-  MESSAGING_DEVICE_PATH,\r
-  MSG_UART_DP,\r
-  DevPathToTextUart,\r
-  MESSAGING_DEVICE_PATH,\r
-  MSG_VENDOR_DP,\r
-  DevPathToTextVendor,\r
-  MESSAGING_DEVICE_PATH,\r
-  MSG_ISCSI_DP,\r
-  DevPathToTextiSCSI,\r
-  MEDIA_DEVICE_PATH,\r
-  MEDIA_HARDDRIVE_DP,\r
-  DevPathToTextHardDrive,\r
-  MEDIA_DEVICE_PATH,\r
-  MEDIA_CDROM_DP,\r
-  DevPathToTextCDROM,\r
-  MEDIA_DEVICE_PATH,\r
-  MEDIA_VENDOR_DP,\r
-  DevPathToTextVendor,\r
-  MEDIA_DEVICE_PATH,\r
-  MEDIA_FILEPATH_DP,\r
-  DevPathToTextFilePath,\r
-  MEDIA_DEVICE_PATH,\r
-  MEDIA_PROTOCOL_DP,\r
-  DevPathToTextMediaProtocol,\r
-  MEDIA_DEVICE_PATH,\r
-  MEDIA_FILEPATH_DP,\r
-  DevPathToTextFilePath,\r
-  BBS_DEVICE_PATH,\r
-  BBS_BBS_DP,\r
-  DevPathToTextBBS,\r
-  END_DEVICE_PATH_TYPE,\r
-  END_INSTANCE_DEVICE_PATH_SUBTYPE,\r
-  DevPathToTextEndInstance,\r
-  0,\r
-  0,\r
-  NULL\r
+  {HARDWARE_DEVICE_PATH, HW_PCI_DP, DevPathToTextPci},\r
+  {HARDWARE_DEVICE_PATH, HW_PCCARD_DP, DevPathToTextPccard},\r
+  {HARDWARE_DEVICE_PATH, HW_MEMMAP_DP, DevPathToTextMemMap},\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
+  {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_1394_DP, DevPathToText1394},\r
+  {MESSAGING_DEVICE_PATH, MSG_USB_DP, DevPathToTextUsb},\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_I2O_DP, DevPathToTextI2O},\r
+  {MESSAGING_DEVICE_PATH, MSG_MAC_ADDR_DP, DevPathToTextMacAddr},\r
+  {MESSAGING_DEVICE_PATH, MSG_IPv4_DP, DevPathToTextIPv4},\r
+  {MESSAGING_DEVICE_PATH, MSG_IPv6_DP, DevPathToTextIPv6},\r
+  {MESSAGING_DEVICE_PATH, MSG_INFINIBAND_DP, DevPathToTextInfiniBand},\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
+  {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
+  {BBS_DEVICE_PATH, BBS_BBS_DP, DevPathToTextBBS},\r
+  {END_DEVICE_PATH_TYPE, END_INSTANCE_DEVICE_PATH_SUBTYPE, DevPathToTextEndInstance},\r
+  {0, 0, NULL}\r

 };\r
 \r
 CHAR16 *\r
 };\r
 \r
 CHAR16 *\r