X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdePkg%2FInclude%2FProtocol%2FDevicePath.h;h=cabad21436f0dc3cf286a59abdb128b8fcffc795;hb=7d582d6b499ed30268da033cc17fbde6e7b02a9d;hp=77b79a0c6f78de2a854eef393c49c363308eb28e;hpb=a6508c051b680c94e8823070c655a857487e862e;p=mirror_edk2.git

diff --git a/MdePkg/Include/Protocol/DevicePath.h b/MdePkg/Include/Protocol/DevicePath.h
index 77b79a0c6f..cabad21436 100644
--- a/MdePkg/Include/Protocol/DevicePath.h
+++ b/MdePkg/Include/Protocol/DevicePath.h
@@ -1,5 +1,5 @@
 /** @file
-  The device path protocol as defined in EFI 1.0.
+  The device path protocol as defined in UEFI 2.0.
 
   The device path represents a programatic path to a device. It's the view
   from a software point of view. It also must persist from boot to boot, so 
@@ -14,13 +14,13 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-  Module Name:  DevicePath.h
-
 **/
 
 #ifndef __EFI_DEVICE_PATH_PROTOCOL_H__
 #define __EFI_DEVICE_PATH_PROTOCOL_H__
 
+#include <Guid/PcAnsi.h>
+
 //
 // Device Path protocol
 //
@@ -207,9 +207,9 @@ typedef struct {
 #define MSG_SATA_DP               0x12
 typedef struct {
   EFI_DEVICE_PATH_PROTOCOL        Header;
-  UINT16                          HbaPortNumber;
-  UINT16                          PortMultiplierPort;
-  UINT16                          LogicalUnitNumber;
+  UINT16                          HBAPortNumber;
+  UINT16                          PortMultiplierPortNumber;
+  UINT16                          Lun;
 } SATA_DEVICE_PATH;
 
 #define MSG_I2O_DP                0x06
@@ -309,9 +309,8 @@ typedef struct {
   EFI_DEVICE_PATH_PROTOCOL        Header;
   UINT16                          NetworkProtocol;
   UINT16                          LoginOption;
-  UINT16                          Reserved;
+  UINT64                          Lun;
   UINT16                          TargetPortalGroupTag;
-  UINT64                          LUN;
   // CHAR8                        iSCSI Target Name
 } ISCSI_DEVICE_PATH;
 
@@ -365,7 +364,7 @@ typedef struct {
   CHAR16                          PathName[1];
 } FILEPATH_DEVICE_PATH;
 
-#define SIZE_OF_FILEPATH_DEVICE_PATH EFI_FIELD_OFFSET(FILEPATH_DEVICE_PATH,PathName)
+#define SIZE_OF_FILEPATH_DEVICE_PATH  EFI_FIELD_OFFSET(FILEPATH_DEVICE_PATH,PathName)
 
 #define MEDIA_PROTOCOL_DP         0x05
 typedef struct {
@@ -375,11 +374,17 @@ typedef struct {
 
 
 #define MEDIA_PIWG_FW_VOL_DP      0x6
-typedef MEDIA_PROTOCOL_DEVICE_PATH MEDIA_FW_VOL_FILEPATH_DEVICE_PATH;
+typedef struct {
+  EFI_DEVICE_PATH_PROTOCOL        Header;
+  EFI_GUID                        FvName;
+} MEDIA_FW_VOL_DEVICE_PATH;
 
 
 #define MEDIA_PIWG_FW_FILE_DP     0x7
-typedef MEDIA_PROTOCOL_DEVICE_PATH MEDIA_FW_VOL_DEVICE_PATH;
+typedef struct {
+  EFI_DEVICE_PATH_PROTOCOL        Header;
+  EFI_GUID                        FvFileName;
+} MEDIA_FW_VOL_FILEPATH_DEVICE_PATH;
 
 //
 // BBS Device Path
@@ -422,6 +427,7 @@ typedef union {
 
   ATAPI_DEVICE_PATH                    Atapi;
   SCSI_DEVICE_PATH                     Scsi;
+  ISCSI_DEVICE_PATH                    Iscsi;
   FIBRECHANNEL_DEVICE_PATH             FibreChannel;
 
   F1394_DEVICE_PATH                    F1394;