UEFI HII: Merge UEFI HII support changes from branch.

[mirror_edk2.git] / MdePkg / Include / Protocol / DevicePath.h

diff --git a/MdePkg/Include/Protocol/DevicePath.h b/MdePkg/Include/Protocol/DevicePath.h
index 9b40530c3895de27b5f3289f5affea487ce7a588..cabad21436f0dc3cf286a59abdb128b8fcffc795 100644 (file)
--- a/MdePkg/Include/Protocol/DevicePath.h
+++ b/MdePkg/Include/Protocol/DevicePath.h
@@ -1,5 +1,5 @@
 /** @file\r
-  The device path protocol as defined in EFI 1.0.\r
+  The device path protocol as defined in UEFI 2.0.\r
 \r
   The device path represents a programatic path to a device. It's the view\r
   from a software point of view. It also must persist from boot to boot, so \r
@@ -207,9 +207,9 @@ typedef struct {
 #define MSG_SATA_DP               0x12\r
 typedef struct {\r
   EFI_DEVICE_PATH_PROTOCOL        Header;\r
-  UINT16                          HbaPortNumber;\r
-  UINT16                          PortMultiplierPort;\r
-  UINT16                          LogicalUnitNumber;\r
+  UINT16                          HBAPortNumber;\r
+  UINT16                          PortMultiplierPortNumber;\r
+  UINT16                          Lun;\r
 } SATA_DEVICE_PATH;\r
 \r
 #define MSG_I2O_DP                0x06\r
@@ -309,9 +309,8 @@ typedef struct {
   EFI_DEVICE_PATH_PROTOCOL        Header;\r
   UINT16                          NetworkProtocol;\r
   UINT16                          LoginOption;\r
-  UINT16                          Reserved;\r
+  UINT64                          Lun;\r
   UINT16                          TargetPortalGroupTag;\r
-  UINT64                          LUN;\r
   // CHAR8                        iSCSI Target Name\r
 } ISCSI_DEVICE_PATH;\r
 \r
@@ -428,6 +427,7 @@ typedef union {
 \r
   ATAPI_DEVICE_PATH                    Atapi;\r
   SCSI_DEVICE_PATH                     Scsi;\r
+  ISCSI_DEVICE_PATH                    Iscsi;\r
   FIBRECHANNEL_DEVICE_PATH             FibreChannel;\r
 \r
   F1394_DEVICE_PATH                    F1394;\r