Update DevicePath driver to reflect several device path update in UEFI spec: SATA, memory, iScsi, Firmware volume, Firmware volume File, etc

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3915 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 6 insertions, 3 deletions

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
index f95b13f..85bd82f 100644
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
@@ -109,6 +109,8 @@ typedef struct {
 #define USB_SUBCLASS_IRDA_BRIDGE   2

 #define USB_SUBCLASS_TEST          3

 

+#pragma pack(1)

+

 typedef struct {

   EFI_DEVICE_PATH_PROTOCOL  Header;

   EFI_GUID                  Guid;

@@ -139,10 +141,9 @@ typedef struct {
   EFI_DEVICE_PATH_PROTOCOL  Header;

   UINT16                    NetworkProtocol;

   UINT16                    LoginOption;

-  UINT16                    Reserved;

-  UINT16                    TargetPortalGroupTag;

   UINT64                    Lun;

-  CHAR16                    iSCSITargetName[1];

+  UINT16                    TargetPortalGroupTag;

+  CHAR8                     iSCSITargetName[1];

 } ISCSI_DEVICE_PATH_WITH_NAME;

 

 typedef struct {

@@ -151,6 +152,8 @@ typedef struct {
   UINT8                     VendorDefinedData[1];

 } VENDOR_DEVICE_PATH_WITH_DATA;

 

+#pragma pack()

+

 CHAR16 *

 ConvertDeviceNodeToText (

   IN CONST EFI_DEVICE_PATH_PROTOCOL  *DeviceNode,