1 files changed, 127 insertions, 85 deletions
diff --git a/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c b/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
index 9fbcbb3eb2..23ff12370e 100644
--- a/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
+++ b/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
@@ -1,7 +1,7 @@
 /** @file
   Main file for support of shell consist mapping.
 
-  Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2005 - 2012, 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
@@ -950,90 +950,132 @@ DevPathSerialDefault (
 }
 
 DEV_PATH_CONSIST_MAPPING_TABLE  DevPathConsistMappingTable[] = {
-  HARDWARE_DEVICE_PATH,
-  HW_PCI_DP,
-  DevPathSerialDefault,
-  DevPathComparePci,
-  ACPI_DEVICE_PATH,
-  ACPI_DP,
-  DevPathSerialAcpi,
-  DevPathCompareAcpi,
-  MESSAGING_DEVICE_PATH,
-  MSG_ATAPI_DP,
-  DevPathSerialAtapi,
-  DevPathCompareDefault,
-  MESSAGING_DEVICE_PATH,
-  MSG_SCSI_DP,
-  DevPathSerialScsi,
-  DevPathCompareDefault,
-  MESSAGING_DEVICE_PATH,
-  MSG_FIBRECHANNEL_DP,
-  DevPathSerialFibre,
-  DevPathCompareDefault,
-  MESSAGING_DEVICE_PATH,
-  MSG_1394_DP,
-  DevPathSerial1394,
-  DevPathCompareDefault,
-  MESSAGING_DEVICE_PATH,
-  MSG_USB_DP,
-  DevPathSerialUsb,
-  DevPathCompareDefault,
-  MESSAGING_DEVICE_PATH,
-  MSG_I2O_DP,
-  DevPathSerialI2O,
-  DevPathCompareDefault,
-  MESSAGING_DEVICE_PATH,
-  MSG_MAC_ADDR_DP,
-  DevPathSerialMacAddr,
-  DevPathCompareDefault,
-  MESSAGING_DEVICE_PATH,
-  MSG_IPv4_DP,
-  DevPathSerialIPv4,
-  DevPathCompareDefault,
-  MESSAGING_DEVICE_PATH,
-  MSG_IPv6_DP,
-  DevPathSerialIPv6,
-  DevPathCompareDefault,
-  MESSAGING_DEVICE_PATH,
-  MSG_INFINIBAND_DP,
-  DevPathSerialInfiniBand,
-  DevPathCompareDefault,
-  MESSAGING_DEVICE_PATH,
-  MSG_UART_DP,
-  DevPathSerialUart,
-  DevPathCompareDefault,
-  MESSAGING_DEVICE_PATH,
-  MSG_VENDOR_DP,
-  DevPathSerialVendor,
-  DevPathCompareDefault,
-  MESSAGING_DEVICE_PATH,
-  MSG_DEVICE_LOGICAL_UNIT_DP,
-  DevPathSerialLun,
-  DevPathCompareDefault,
-  MESSAGING_DEVICE_PATH,
-  MSG_SATA_DP,
-  DevPathSerialSata,
-  DevPathCompareDefault,
-  MESSAGING_DEVICE_PATH,
-  MSG_ISCSI_DP,
-  DevPathSerialIScsi,
-  DevPathCompareDefault,
-  MEDIA_DEVICE_PATH,
-  MEDIA_HARDDRIVE_DP,
-  DevPathSerialHardDrive,
-  DevPathCompareDefault,
-  MEDIA_DEVICE_PATH,
-  MEDIA_CDROM_DP,
-  DevPathSerialCdRom,
-  DevPathCompareDefault,
-  MEDIA_DEVICE_PATH,
-  MEDIA_VENDOR_DP,
-  DevPathSerialVendor,
-  DevPathCompareDefault,
-  0,
-  0,
-  NULL,
-  NULL
+  {
+    HARDWARE_DEVICE_PATH,
+    HW_PCI_DP,
+    DevPathSerialDefault,
+    DevPathComparePci
+  },
+  {
+    ACPI_DEVICE_PATH,
+    ACPI_DP,
+    DevPathSerialAcpi,
+    DevPathCompareAcpi
+  },
+  {
+    MESSAGING_DEVICE_PATH,
+    MSG_ATAPI_DP,
+    DevPathSerialAtapi,
+    DevPathCompareDefault
+  },
+  {
+    MESSAGING_DEVICE_PATH,
+    MSG_SCSI_DP,
+    DevPathSerialScsi,
+    DevPathCompareDefault
+  },
+  {
+    MESSAGING_DEVICE_PATH,
+    MSG_FIBRECHANNEL_DP,
+    DevPathSerialFibre,
+    DevPathCompareDefault
+  },
+  {
+    MESSAGING_DEVICE_PATH,
+    MSG_1394_DP,
+    DevPathSerial1394,
+    DevPathCompareDefault
+  },
+  {
+    MESSAGING_DEVICE_PATH,
+    MSG_USB_DP,
+    DevPathSerialUsb,
+    DevPathCompareDefault
+  },
+  {
+    MESSAGING_DEVICE_PATH,
+    MSG_I2O_DP,
+    DevPathSerialI2O,
+    DevPathCompareDefault
+  },
+  {
+    MESSAGING_DEVICE_PATH,
+    MSG_MAC_ADDR_DP,
+    DevPathSerialMacAddr,
+    DevPathCompareDefault
+  },
+  {
+    MESSAGING_DEVICE_PATH,
+    MSG_IPv4_DP,
+    DevPathSerialIPv4,
+    DevPathCompareDefault
+  },
+  {
+    MESSAGING_DEVICE_PATH,
+    MSG_IPv6_DP,
+    DevPathSerialIPv6,
+    DevPathCompareDefault
+  },
+  {
+    MESSAGING_DEVICE_PATH,
+    MSG_INFINIBAND_DP,
+    DevPathSerialInfiniBand,
+    DevPathCompareDefault
+  },
+  {
+    MESSAGING_DEVICE_PATH,
+    MSG_UART_DP,
+    DevPathSerialUart,
+    DevPathCompareDefault
+  },
+  {
+    MESSAGING_DEVICE_PATH,
+    MSG_VENDOR_DP,
+    DevPathSerialVendor,
+    DevPathCompareDefault
+  },
+  {
+    MESSAGING_DEVICE_PATH,
+    MSG_DEVICE_LOGICAL_UNIT_DP,
+    DevPathSerialLun,
+    DevPathCompareDefault
+  },
+  {
+    MESSAGING_DEVICE_PATH,
+    MSG_SATA_DP,
+    DevPathSerialSata,
+    DevPathCompareDefault
+  },
+  {
+    MESSAGING_DEVICE_PATH,
+    MSG_ISCSI_DP,
+    DevPathSerialIScsi,
+    DevPathCompareDefault
+  },
+  {
+    MEDIA_DEVICE_PATH,
+    MEDIA_HARDDRIVE_DP,
+    DevPathSerialHardDrive,
+    DevPathCompareDefault
+  },
+  {
+    MEDIA_DEVICE_PATH,
+    MEDIA_CDROM_DP,
+    DevPathSerialCdRom,
+    DevPathCompareDefault
+  },
+  {
+    MEDIA_DEVICE_PATH,
+    MEDIA_VENDOR_DP,
+    DevPathSerialVendor,
+    DevPathCompareDefault
+  },
+  {
+    0,
+    0,
+    NULL,
+    NULL
+  }
 };
 
 /**