git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7957
6f19259b-4bc3-4df7-8a09-
765794883524
IScsiConfig.c\r
IScsiConfig.h\r
IScsiImpl.h\r
IScsiConfig.c\r
IScsiConfig.h\r
IScsiImpl.h\r
+ IScsiConfigNVDataStruc.h\r
\r
[Packages]\r
MdePkg/MdePkg.dec\r
\r
[Packages]\r
MdePkg/MdePkg.dec\r
UINTN InitiatorNameLength;\r
UINT8 State;\r
\r
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
\r
UINT32 CmdSN;\r
UINT32 ExpCmdSN;\r
UINT32 MaxCmdSN;\r
\r
UINT32 InitiatorTaskTag;\r
\r
LIST_ENTRY Conns;\r
UINT32 NumConns;\r
\r
LIST_ENTRY Conns;\r
UINT32 NumConns;\r
\r
BOOLEAN TransitInitiated;\r
\r
\r
BOOLEAN TransitInitiated;\r
\r
UINT32 ExpStatSN;\r
\r
//\r
UINT32 ExpStatSN;\r
\r
//\r
Conn->ExpStatSN = 0;\r
Conn->PartialReqSent = FALSE;\r
Conn->PartialRspRcvd = FALSE;\r
Conn->ExpStatSN = 0;\r
Conn->PartialReqSent = FALSE;\r
Conn->PartialRspRcvd = FALSE;\r
- Conn->CID = Session->NextCID++;\r
+ Conn->Cid = Session->NextCid++;\r
\r
Status = gBS->CreateEvent (\r
EVT_TIMER,\r
\r
Status = gBS->CreateEvent (\r
EVT_TIMER,\r
ISCSI_SET_STAGES (LoginReq, Conn->CurrentStage, Conn->NextStage);\r
LoginReq->VersionMax = ISCSI_VERSION_MAX;\r
LoginReq->VersionMin = ISCSI_VERSION_MIN;\r
ISCSI_SET_STAGES (LoginReq, Conn->CurrentStage, Conn->NextStage);\r
LoginReq->VersionMax = ISCSI_VERSION_MAX;\r
LoginReq->VersionMin = ISCSI_VERSION_MIN;\r
- LoginReq->TSIH = HTONS (Session->TSIH);\r
+ LoginReq->Tsih = HTONS (Session->Tsih);\r
LoginReq->InitiatorTaskTag = HTONL (Session->InitiatorTaskTag);\r
LoginReq->InitiatorTaskTag = HTONL (Session->InitiatorTaskTag);\r
- LoginReq->CID = HTONS (Conn->CID);\r
+ LoginReq->Cid = HTONS (Conn->Cid);\r
LoginReq->CmdSN = HTONL (Session->CmdSN);\r
\r
//\r
LoginReq->CmdSN = HTONL (Session->CmdSN);\r
\r
//\r
// with their increasing StatSN values.\r
//\r
LoginReq->ExpStatSN = HTONL (Conn->ExpStatSN);\r
// with their increasing StatSN values.\r
//\r
LoginReq->ExpStatSN = HTONL (Conn->ExpStatSN);\r
- CopyMem (LoginReq->ISID, Session->ISID, sizeof (LoginReq->ISID));\r
+ CopyMem (LoginReq->Isid, Session->Isid, sizeof (LoginReq->Isid));\r
\r
if (Conn->PartialRspRcvd) {\r
//\r
\r
if (Conn->PartialRspRcvd) {\r
//\r
(CurrentStage != Conn->CurrentStage) ||\r
(!Conn->TransitInitiated && Transit) ||\r
(Transit && (NextStage != Conn->NextStage)) ||\r
(CurrentStage != Conn->CurrentStage) ||\r
(!Conn->TransitInitiated && Transit) ||\r
(Transit && (NextStage != Conn->NextStage)) ||\r
- (CompareMem (Session->ISID, LoginRsp->ISID, sizeof (LoginRsp->ISID)) != 0) ||\r
+ (CompareMem (Session->Isid, LoginRsp->Isid, sizeof (LoginRsp->Isid)) != 0) ||\r
(LoginRsp->InitiatorTaskTag != Session->InitiatorTaskTag)\r
) {\r
//\r
(LoginRsp->InitiatorTaskTag != Session->InitiatorTaskTag)\r
) {\r
//\r
// CurrentStage is iSCSI Full Feature, it's the Login-Final Response,\r
// get the TSIH from the Login Response.\r
//\r
// CurrentStage is iSCSI Full Feature, it's the Login-Final Response,\r
// get the TSIH from the Login Response.\r
//\r
- Session->TSIH = NTOHS (LoginRsp->TSIH);\r
+ Session->Tsih = NTOHS (LoginRsp->Tsih);\r
\r
Random = NET_RANDOM (NetRandomInitSeed ());\r
\r
\r
Random = NET_RANDOM (NetRandomInitSeed ());\r
\r
- Session->ISID[0] = ISID_BYTE_0;\r
- Session->ISID[1] = ISID_BYTE_1;\r
- Session->ISID[2] = ISID_BYTE_2;\r
- Session->ISID[3] = ISID_BYTE_3;\r
- Session->ISID[4] = (UINT8) Random;\r
- Session->ISID[5] = (UINT8) (Random >> 8);\r
+ Session->Isid[0] = ISID_BYTE_0;\r
+ Session->Isid[1] = ISID_BYTE_1;\r
+ Session->Isid[2] = ISID_BYTE_2;\r
+ Session->Isid[3] = ISID_BYTE_3;\r
+ Session->Isid[4] = (UINT8) Random;\r
+ Session->Isid[5] = (UINT8) (Random >> 8);\r
\r
InitializeListHead (&Session->Conns);\r
InitializeListHead (&Session->TcbList);\r
}\r
\r
\r
InitializeListHead (&Session->Conns);\r
InitializeListHead (&Session->TcbList);\r
}\r
\r
\r
Session->CmdSN = 1;\r
Session->InitiatorTaskTag = 1;\r
\r
Session->CmdSN = 1;\r
Session->InitiatorTaskTag = 1;\r
- Session->NextCID = 1;\r
+ Session->NextCid = 1;\r
\r
Session->TargetPortalGroupTag = 0;\r
Session->MaxConnections = ISCSI_MAX_CONNS_PER_SESSION;\r
\r
Session->TargetPortalGroupTag = 0;\r
Session->MaxConnections = ISCSI_MAX_CONNS_PER_SESSION;\r
UINT8 VersionMin;\r
UINT8 TotalAHSLength;\r
UINT8 DataSegmentLength[3];\r
UINT8 VersionMin;\r
UINT8 TotalAHSLength;\r
UINT8 DataSegmentLength[3];\r
- UINT8 ISID[6];\r
- UINT16 TSIH;\r
+ UINT8 Isid[6];\r
+ UINT16 Tsih;\r
UINT32 InitiatorTaskTag;\r
UINT32 InitiatorTaskTag;\r
UINT16 Reserved1;\r
UINT32 CmdSN;\r
UINT32 ExpStatSN;\r
UINT16 Reserved1;\r
UINT32 CmdSN;\r
UINT32 ExpStatSN;\r
UINT8 VersionActive;\r
UINT8 TotalAHSLength;\r
UINT8 DataSegmentLength[3];\r
UINT8 VersionActive;\r
UINT8 TotalAHSLength;\r
UINT8 DataSegmentLength[3];\r
- UINT8 ISID[6];\r
- UINT16 TSIH;\r
+ UINT8 Isid[6];\r
+ UINT16 Tsih;\r
UINT32 InitiatorTaskTag;\r
UINT32 Reserved1;\r
UINT32 StatSN;\r
UINT32 InitiatorTaskTag;\r
UINT32 Reserved1;\r
UINT32 StatSN;\r
UINT8 DataSegmentLength[3];\r
UINT32 Reserved2[2];\r
UINT32 InitiatorTaskTag;\r
UINT8 DataSegmentLength[3];\r
UINT32 Reserved2[2];\r
UINT32 InitiatorTaskTag;\r
UINT16 Reserved3;\r
UINT32 CmdSN;\r
UINT32 ExpStatSN;\r
UINT16 Reserved3;\r
UINT32 CmdSN;\r
UINT32 ExpStatSN;\r
AccessPoint = &(ConfigData->AccessPoint);\r
Option = ConfigData->ControlOption;\r
\r
AccessPoint = &(ConfigData->AccessPoint);\r
Option = ConfigData->ControlOption;\r
\r
- ConfigData->TypeOfService = Tcb->TOS;\r
- ConfigData->TimeToLive = Tcb->TTL;\r
+ ConfigData->TypeOfService = Tcb->Tos;\r
+ ConfigData->TimeToLive = Tcb->Ttl;\r
\r
AccessPoint->UseDefaultAddress = Tcb->UseDefaultAddr;\r
\r
\r
AccessPoint->UseDefaultAddress = Tcb->UseDefaultAddr;\r
\r
//\r
// initialize Tcb in the light of CfgData\r
//\r
//\r
// initialize Tcb in the light of CfgData\r
//\r
- Tcb->TTL = CfgData->TimeToLive;\r
- Tcb->TOS = CfgData->TypeOfService;\r
+ Tcb->Ttl = CfgData->TimeToLive;\r
+ Tcb->Tos = CfgData->TypeOfService;\r
\r
Tcb->UseDefaultAddr = CfgData->AccessPoint.UseDefaultAddress;\r
\r
\r
Tcb->UseDefaultAddr = CfgData->AccessPoint.UseDefaultAddress;\r
\r
// configuration for tcp provided by user\r
//\r
BOOLEAN UseDefaultAddr;\r
// configuration for tcp provided by user\r
//\r
BOOLEAN UseDefaultAddr;\r
- UINT8 TOS;\r
- UINT8 TTL;\r
+ UINT8 Tos;\r
+ UINT8 Ttl;\r
EFI_IPv4_ADDRESS SubnetMask;\r
\r
IP_IO_IP_INFO *IpInfo; ///<pointer reference to Ip used to send pkt\r
EFI_IPv4_ADDRESS SubnetMask;\r
\r
IP_IO_IP_INFO *IpInfo; ///<pointer reference to Ip used to send pkt\r