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 77b79a0c6f78de2a854eef393c49c363308eb28e..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
@@ -14,13 +14,13 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
 \r
-  Module Name:  DevicePath.h\r
-\r
 **/\r
 \r
 #ifndef __EFI_DEVICE_PATH_PROTOCOL_H__\r
 #define __EFI_DEVICE_PATH_PROTOCOL_H__\r
 \r
+#include <Guid/PcAnsi.h>\r
+\r
 //\r
 // Device Path protocol\r
 //\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
@@ -365,7 +364,7 @@ typedef struct {
   CHAR16                          PathName[1];\r
 } FILEPATH_DEVICE_PATH;\r
 \r
-#define SIZE_OF_FILEPATH_DEVICE_PATH EFI_FIELD_OFFSET(FILEPATH_DEVICE_PATH,PathName)\r
+#define SIZE_OF_FILEPATH_DEVICE_PATH  EFI_FIELD_OFFSET(FILEPATH_DEVICE_PATH,PathName)\r
 \r
 #define MEDIA_PROTOCOL_DP         0x05\r
 typedef struct {\r
@@ -375,11 +374,17 @@ typedef struct {
 \r
 \r
 #define MEDIA_PIWG_FW_VOL_DP      0x6\r
-typedef MEDIA_PROTOCOL_DEVICE_PATH MEDIA_FW_VOL_FILEPATH_DEVICE_PATH;\r
+typedef struct {\r
+  EFI_DEVICE_PATH_PROTOCOL        Header;\r
+  EFI_GUID                        FvName;\r
+} MEDIA_FW_VOL_DEVICE_PATH;\r
 \r
 \r
 #define MEDIA_PIWG_FW_FILE_DP     0x7\r
-typedef MEDIA_PROTOCOL_DEVICE_PATH MEDIA_FW_VOL_DEVICE_PATH;\r
+typedef struct {\r
+  EFI_DEVICE_PATH_PROTOCOL        Header;\r
+  EFI_GUID                        FvFileName;\r
+} MEDIA_FW_VOL_FILEPATH_DEVICE_PATH;\r
 \r
 //\r
 // BBS Device Path\r
@@ -422,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