Update DevicePath driver to reflect several device path update in UEFI spec: SATA...

[mirror_edk2.git] / MdeModulePkg / Universal / DevicePathDxe / DevicePath.h

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
index f95b13f7a89560f8c7323199be84fa6a9b48b63c..85bd82f39edc7cddb58dce1f3b8f85994ae94a87 100644 (file)
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
@@ -109,6 +109,8 @@ typedef struct {
 #define USB_SUBCLASS_IRDA_BRIDGE   2\r
 #define USB_SUBCLASS_TEST          3\r
 \r
+#pragma pack(1)\r
+\r
 typedef struct {\r
   EFI_DEVICE_PATH_PROTOCOL  Header;\r
   EFI_GUID                  Guid;\r
@@ -139,10 +141,9 @@ typedef struct {
   EFI_DEVICE_PATH_PROTOCOL  Header;\r
   UINT16                    NetworkProtocol;\r
   UINT16                    LoginOption;\r
-  UINT16                    Reserved;\r
-  UINT16                    TargetPortalGroupTag;\r
   UINT64                    Lun;\r
-  CHAR16                    iSCSITargetName[1];\r
+  UINT16                    TargetPortalGroupTag;\r
+  CHAR8                     iSCSITargetName[1];\r
 } ISCSI_DEVICE_PATH_WITH_NAME;\r
 \r
 typedef struct {\r
@@ -151,6 +152,8 @@ typedef struct {
   UINT8                     VendorDefinedData[1];\r
 } VENDOR_DEVICE_PATH_WITH_DATA;\r
 \r
+#pragma pack()\r
+\r
 CHAR16 *\r
 ConvertDeviceNodeToText (\r
   IN CONST EFI_DEVICE_PATH_PROTOCOL  *DeviceNode,\r