diff options
author | niry <niry@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-03-26 02:40:48 +0000 |
---|---|---|
committer | niry <niry@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-03-26 02:40:48 +0000 |
commit | a78d176c1446157a0ae1169ef37d30f2ce0eca68 (patch) | |
tree | 9a57d96fcda734a94a668b3d525b6d2985e8a7c7 /MdeModulePkg/Universal/Network | |
parent | 40b499c613d006e0531013064e57721b6e777a9c (diff) | |
download | edk2-a78d176c1446157a0ae1169ef37d30f2ce0eca68.zip edk2-a78d176c1446157a0ae1169ef37d30f2ce0eca68.tar.gz edk2-a78d176c1446157a0ae1169ef37d30f2ce0eca68.tar.bz2 |
Fix coding style issue.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7957 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg/Universal/Network')
6 files changed, 31 insertions, 30 deletions
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf index 3f00007..8710845 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf @@ -60,6 +60,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. IScsiConfig.c
IScsiConfig.h
IScsiImpl.h
+ IScsiConfigNVDataStruc.h
[Packages]
MdePkg/MdePkg.dec
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h index d45a736..a27df41 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h @@ -50,15 +50,15 @@ struct _ISCSI_SESSION { UINTN InitiatorNameLength;
UINT8 State;
- UINT8 ISID[6];
- UINT16 TSIH;
+ UINT8 Isid[6];
+ UINT16 Tsih;
UINT32 CmdSN;
UINT32 ExpCmdSN;
UINT32 MaxCmdSN;
UINT32 InitiatorTaskTag;
- UINT16 NextCID;
+ UINT16 NextCid;
LIST_ENTRY Conns;
UINT32 NumConns;
@@ -103,7 +103,7 @@ struct _ISCSI_CONNECTION { BOOLEAN TransitInitiated;
- UINT16 CID;
+ UINT16 Cid;
UINT32 ExpStatSN;
//
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c index 8d294dd..7c350d0 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c @@ -205,7 +205,7 @@ IScsiCreateConnection ( Conn->ExpStatSN = 0;
Conn->PartialReqSent = FALSE;
Conn->PartialRspRcvd = FALSE;
- Conn->CID = Session->NextCID++;
+ Conn->Cid = Session->NextCid++;
Status = gBS->CreateEvent (
EVT_TIMER,
@@ -501,9 +501,9 @@ IScsiPrepareLoginReq ( ISCSI_SET_STAGES (LoginReq, Conn->CurrentStage, Conn->NextStage);
LoginReq->VersionMax = ISCSI_VERSION_MAX;
LoginReq->VersionMin = ISCSI_VERSION_MIN;
- LoginReq->TSIH = HTONS (Session->TSIH);
+ LoginReq->Tsih = HTONS (Session->Tsih);
LoginReq->InitiatorTaskTag = HTONL (Session->InitiatorTaskTag);
- LoginReq->CID = HTONS (Conn->CID);
+ LoginReq->Cid = HTONS (Conn->Cid);
LoginReq->CmdSN = HTONL (Session->CmdSN);
//
@@ -514,7 +514,7 @@ IScsiPrepareLoginReq ( // with their increasing StatSN values.
//
LoginReq->ExpStatSN = HTONL (Conn->ExpStatSN);
- CopyMem (LoginReq->ISID, Session->ISID, sizeof (LoginReq->ISID));
+ CopyMem (LoginReq->Isid, Session->Isid, sizeof (LoginReq->Isid));
if (Conn->PartialRspRcvd) {
//
@@ -655,7 +655,7 @@ IScsiProcessLoginRsp ( (CurrentStage != Conn->CurrentStage) ||
(!Conn->TransitInitiated && Transit) ||
(Transit && (NextStage != Conn->NextStage)) ||
- (CompareMem (Session->ISID, LoginRsp->ISID, sizeof (LoginRsp->ISID)) != 0) ||
+ (CompareMem (Session->Isid, LoginRsp->Isid, sizeof (LoginRsp->Isid)) != 0) ||
(LoginRsp->InitiatorTaskTag != Session->InitiatorTaskTag)
) {
//
@@ -753,7 +753,7 @@ IScsiProcessLoginRsp ( // CurrentStage is iSCSI Full Feature, it's the Login-Final Response,
// get the TSIH from the Login Response.
//
- Session->TSIH = NTOHS (LoginRsp->TSIH);
+ Session->Tsih = NTOHS (LoginRsp->Tsih);
}
}
//
@@ -2673,22 +2673,22 @@ IScsiSessionInit ( Random = NET_RANDOM (NetRandomInitSeed ());
- Session->ISID[0] = ISID_BYTE_0;
- Session->ISID[1] = ISID_BYTE_1;
- Session->ISID[2] = ISID_BYTE_2;
- Session->ISID[3] = ISID_BYTE_3;
- Session->ISID[4] = (UINT8) Random;
- Session->ISID[5] = (UINT8) (Random >> 8);
+ Session->Isid[0] = ISID_BYTE_0;
+ Session->Isid[1] = ISID_BYTE_1;
+ Session->Isid[2] = ISID_BYTE_2;
+ Session->Isid[3] = ISID_BYTE_3;
+ Session->Isid[4] = (UINT8) Random;
+ Session->Isid[5] = (UINT8) (Random >> 8);
InitializeListHead (&Session->Conns);
InitializeListHead (&Session->TcbList);
}
- Session->TSIH = 0;
+ Session->Tsih = 0;
Session->CmdSN = 1;
Session->InitiatorTaskTag = 1;
- Session->NextCID = 1;
+ Session->NextCid = 1;
Session->TargetPortalGroupTag = 0;
Session->MaxConnections = ISCSI_MAX_CONNS_PER_SESSION;
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h index e6a6588..3ffb2c4 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h @@ -415,10 +415,10 @@ typedef struct _ISCSI_LOGIN_REQUEST { UINT8 VersionMin;
UINT8 TotalAHSLength;
UINT8 DataSegmentLength[3];
- UINT8 ISID[6];
- UINT16 TSIH;
+ UINT8 Isid[6];
+ UINT16 Tsih;
UINT32 InitiatorTaskTag;
- UINT16 CID;
+ UINT16 Cid;
UINT16 Reserved1;
UINT32 CmdSN;
UINT32 ExpStatSN;
@@ -443,8 +443,8 @@ typedef struct _ISCSI_LOGIN_RESPONSE { UINT8 VersionActive;
UINT8 TotalAHSLength;
UINT8 DataSegmentLength[3];
- UINT8 ISID[6];
- UINT16 TSIH;
+ UINT8 Isid[6];
+ UINT16 Tsih;
UINT32 InitiatorTaskTag;
UINT32 Reserved1;
UINT32 StatSN;
@@ -470,7 +470,7 @@ typedef struct _ISCSI_LOGOUT_REQUEST { UINT8 DataSegmentLength[3];
UINT32 Reserved2[2];
UINT32 InitiatorTaskTag;
- UINT16 CID;
+ UINT16 Cid;
UINT16 Reserved3;
UINT32 CmdSN;
UINT32 ExpStatSN;
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c index e04e5eb..49b3136 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c @@ -96,8 +96,8 @@ Tcp4GetMode ( AccessPoint = &(ConfigData->AccessPoint);
Option = ConfigData->ControlOption;
- ConfigData->TypeOfService = Tcb->TOS;
- ConfigData->TimeToLive = Tcb->TTL;
+ ConfigData->TypeOfService = Tcb->Tos;
+ ConfigData->TimeToLive = Tcb->Ttl;
AccessPoint->UseDefaultAddress = Tcb->UseDefaultAddr;
@@ -424,8 +424,8 @@ Tcp4ConfigurePcb ( //
// initialize Tcb in the light of CfgData
//
- Tcb->TTL = CfgData->TimeToLive;
- Tcb->TOS = CfgData->TypeOfService;
+ Tcb->Ttl = CfgData->TimeToLive;
+ Tcb->Tos = CfgData->TypeOfService;
Tcb->UseDefaultAddr = CfgData->AccessPoint.UseDefaultAddress;
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h index 56b68db..78d2eb3 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h @@ -259,8 +259,8 @@ struct _TCP_CB { // configuration for tcp provided by user
//
BOOLEAN UseDefaultAddr;
- UINT8 TOS;
- UINT8 TTL;
+ UINT8 Tos;
+ UINT8 Ttl;
EFI_IPv4_ADDRESS SubnetMask;
IP_IO_IP_INFO *IpInfo; ///<pointer reference to Ip used to send pkt
|