Fix coding style issue.

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

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
index 3f00007ddb4fb0a0b795247151989d51200a00e8..8710845abe04f8f71715c6ce8e5f82561c35e76e 100644 (file)
--- 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\r
   IScsiConfig.h\r
   IScsiImpl.h\r
+  IScsiConfigNVDataStruc.h\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
index d45a7362b3981878b7c87303689927f673f7c05d..a27df41b6c36a4009e42c956f1aab30732c8ad5d 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h
@@ -50,15 +50,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
@@ -103,7 +103,7 @@ struct _ISCSI_CONNECTION {
 \r
   BOOLEAN           TransitInitiated;\r
 \r
-  UINT16            CID;\r
+  UINT16            Cid;\r
   UINT32            ExpStatSN;\r
 \r
   //\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
index 8d294ddb12a9eb051b631a5297083a7afdb0bc36..7c350d0d9ffad3baf29e5ebcea41baac56d2bace 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
@@ -205,7 +205,7 @@ IScsiCreateConnection (
   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
@@ -501,9 +501,9 @@ IScsiPrepareLoginReq (
   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->CID               = HTONS (Conn->CID);\r
+  LoginReq->Cid               = HTONS (Conn->Cid);\r
   LoginReq->CmdSN             = HTONL (Session->CmdSN);\r
 \r
   //\r
@@ -514,7 +514,7 @@ IScsiPrepareLoginReq (
   // 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
@@ -655,7 +655,7 @@ IScsiProcessLoginRsp (
       (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
@@ -753,7 +753,7 @@ IScsiProcessLoginRsp (
       // 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
   }\r
   //\r
@@ -2673,22 +2673,22 @@ IScsiSessionInit (
 \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
-  Session->TSIH                 = 0;\r
+  Session->Tsih                 = 0;\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

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h
index e6a6588d84065581f1da1f2946c2adaa414598b3..3ffb2c47f1705c3da7e2bfe69468dd184552ed12 100644 (file)
--- 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;\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
-  UINT16  CID;\r
+  UINT16  Cid;\r
   UINT16  Reserved1;\r
   UINT32  CmdSN;\r
   UINT32  ExpStatSN;\r
@@ -443,8 +443,8 @@ typedef struct _ISCSI_LOGIN_RESPONSE {
   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
@@ -470,7 +470,7 @@ typedef struct _ISCSI_LOGOUT_REQUEST {
   UINT8   DataSegmentLength[3];\r
   UINT32  Reserved2[2];\r
   UINT32  InitiatorTaskTag;\r
-  UINT16  CID;\r
+  UINT16  Cid;\r
   UINT16  Reserved3;\r
   UINT32  CmdSN;\r
   UINT32  ExpStatSN;\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
index e04e5eb038a4529a1392df8d75b05d57e646e4a7..49b313615d2ac78216f4e5a443b2609fd7567304 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
@@ -96,8 +96,8 @@ Tcp4GetMode (
     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
@@ -424,8 +424,8 @@ Tcp4ConfigurePcb (
   //\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

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Proto.h
index 56b68db904873b55a932279eac48123aa7840536..78d2eb3799abf8a873a481df7e1c58f5750cf6d4 100644 (file)
--- 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\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