Enhance iSCSI ibft table for copy oemid and oemtableID from acpi tables.

[mirror_edk2.git] / MdeModulePkg / Universal / Network / IScsiDxe / IScsiImpl.h

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
index 34847f52b8d3f24d4ce379f17ba667ffe68d4052..66084964a011be0cf72c304196db56416397e69f 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
@@ -17,12 +17,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include <Uefi.h>\r
 \r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
 #include <Library/NetLib.h>\r
 #include <Library/PrintLib.h>\r
 #include <Library/UefiRuntimeServicesTableLib.h>\r
+\r
+#include <Guid/EventGroup.h>\r
+#include <Guid/Acpi.h>\r
+\r
 #include "IScsiCommon.h"\r
 #include "IScsiDriver.h"\r
-#include "IscsiInitiatorName.h"\r
+#include "IScsiInitiatorName.h"\r
 #include "ComponentName.h"\r
 #include "IScsiConfigNVDataStruc.h"\r
 #include "IScsiExtScsiPassThru.h"\r
@@ -35,7 +41,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "IScsiIbft.h"\r
 \r
 \r
-#define ISCSI_SESSION_SIGNATURE EFI_SIGNATURE_32 ('I', 'S', 'S', 'N')\r
+#define ISCSI_SESSION_SIGNATURE SIGNATURE_32 ('I', 'S', 'S', 'N')\r
 \r
 struct _ISCSI_SESSION {\r
   UINT32                    Signature;\r
@@ -47,15 +53,15 @@ struct _ISCSI_SESSION {
   UINTN                     InitiatorNameLength;\r
   UINT8                     State;\r
 \r
-  UINT8                     ISID[6];\r
-  UINT16                    TSIH;\r
+  UINT8                     Isid[6];\r
+  UINT16                    Tsih;\r
 \r
   UINT32                    CmdSN;\r
   UINT32                    ExpCmdSN;\r
   UINT32                    MaxCmdSN;\r
 \r
   UINT32                    InitiatorTaskTag;\r
-  UINT16                    NextCID;\r
+  UINT16                    NextCid;\r
 \r
   LIST_ENTRY                Conns;\r
   UINT32                    NumConns;\r
@@ -79,7 +85,7 @@ struct _ISCSI_SESSION {
   UINT8                     ErrorRecoveryLevel;\r
 };\r
 \r
-#define ISCSI_CONNECTION_SIGNATURE  EFI_SIGNATURE_32 ('I', 'S', 'C', 'N')\r
+#define ISCSI_CONNECTION_SIGNATURE  SIGNATURE_32 ('I', 'S', 'C', 'N')\r
 \r
 struct _ISCSI_CONNECTION {\r
   UINT32            Signature;\r
@@ -100,7 +106,7 @@ struct _ISCSI_CONNECTION {
 \r
   BOOLEAN           TransitInitiated;\r
 \r
-  UINT16            CID;\r
+  UINT16            Cid;\r
   UINT32            ExpStatSN;\r
 \r
   //\r
@@ -118,7 +124,7 @@ struct _ISCSI_CONNECTION {
   ISCSI_DIGEST_TYPE DataDigest;\r
 };\r
 \r
-#define ISCSI_DRIVER_DATA_SIGNATURE EFI_SIGNATURE_32 ('I', 'S', 'D', 'A')\r
+#define ISCSI_DRIVER_DATA_SIGNATURE SIGNATURE_32 ('I', 'S', 'D', 'A')\r
 \r
 #define ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU(PassThru) \\r
   CR ( \\r