UEFI HII: Merge UEFI HII support changes from branch.

[mirror_edk2.git] / MdeModulePkg / Universal / iScsi / IScsiProto.c

diff --git a/MdeModulePkg/Universal/iScsi/IScsiProto.c b/MdeModulePkg/Universal/iScsi/IScsiProto.c
index fa1c7d6c1b4394d747e739c725b6976aaf8b60bd..4cef3dc45d3c9e92072667bc9bfa793898c2daef 100644 (file)
--- a/MdeModulePkg/Universal/iScsi/IScsiProto.c
+++ b/MdeModulePkg/Universal/iScsi/IScsiProto.c
@@ -546,7 +546,7 @@ Returns:
   //\r
   // Allocate the space for the key-value pair.\r
   //\r
-  Data = (CHAR8 *) NetbufAllocSpace (Pdu, TotalLen, NET_BUF_TAIL);\r
+  Data = NetbufAllocSpace (Pdu, TotalLen, NET_BUF_TAIL);\r
   if (Data == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -668,7 +668,7 @@ Returns:
     //\r
     // Check whether we will issue the stage transition signal?\r
     //\r
-    Conn->TransitInitiated = (BOOLEAN)ISCSI_FLAG_ON (LoginReq, ISCSI_LOGIN_REQ_PDU_FLAG_TRANSIT);\r
+    Conn->TransitInitiated = ISCSI_FLAG_ON (LoginReq, ISCSI_LOGIN_REQ_PDU_FLAG_TRANSIT);\r
   }\r
 \r
   return Nbuf;\r
@@ -746,7 +746,7 @@ Returns:
     // Process the TargetAddress key-value strings in the data segment to update the\r
     // target address info.\r
     //\r
-    Status = IScsiUpdateTargetAddress (Session, (CHAR8 *)DataSeg, DataSegLen);\r
+    Status = IScsiUpdateTargetAddress (Session, DataSeg, DataSegLen);\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -765,11 +765,11 @@ Returns:
   //\r
   // The status is sucess, extract the wanted fields from the header segment.\r
   //\r
-  Transit                     = (BOOLEAN)ISCSI_FLAG_ON (LoginRsp, ISCSI_LOGIN_RSP_PDU_FLAG_TRANSIT);\r
-  Continue                    = (BOOLEAN)ISCSI_FLAG_ON (LoginRsp, ISCSI_LOGIN_RSP_PDU_FLAG_CONTINUE);\r
+  Transit                     = ISCSI_FLAG_ON (LoginRsp, ISCSI_LOGIN_RSP_PDU_FLAG_TRANSIT);\r
+  Continue                    = ISCSI_FLAG_ON (LoginRsp, ISCSI_LOGIN_RSP_PDU_FLAG_CONTINUE);\r
 \r
-  CurrentStage                = (UINT8)ISCSI_GET_CURRENT_STAGE (LoginRsp);\r
-  NextStage                   = (UINT8)ISCSI_GET_NEXT_STAGE (LoginRsp);\r
+  CurrentStage                = ISCSI_GET_CURRENT_STAGE (LoginRsp);\r
+  NextStage                   = ISCSI_GET_NEXT_STAGE (LoginRsp);\r
 \r
   LoginRsp->InitiatorTaskTag  = NTOHL (LoginRsp->InitiatorTaskTag);\r
 \r
@@ -1283,7 +1283,7 @@ Returns:
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  NetbufQueCopy (&Conn->RspQue, 0, Len, (UINT8 *)Data);\r
+  NetbufQueCopy (&Conn->RspQue, 0, Len, Data);\r
 \r
   Status = EFI_PROTOCOL_ERROR;\r
 \r
@@ -1352,7 +1352,7 @@ Returns:
     goto ON_ERROR;\r
   }\r
 \r
-  Session->InitialR2T = (BOOLEAN)(Session->InitialR2T || (AsciiStrCmp (Value, "Yes") == 0));\r
+  Session->InitialR2T = Session->InitialR2T || (BOOLEAN) (AsciiStrCmp (Value, "Yes") == 0);\r
 \r
   //\r
   // ImmediateData, result function is AND.\r
@@ -1362,7 +1362,7 @@ Returns:
     goto ON_ERROR;\r
   }\r
 \r
-  Session->ImmediateData = (BOOLEAN)(Session->ImmediateData && (AsciiStrCmp (Value, "Yes") == 0));\r
+  Session->ImmediateData = Session->ImmediateData && (BOOLEAN) (AsciiStrCmp (Value, "Yes") == 0);\r
 \r
   //\r
   // MaxRecvDataSegmentLength, result function is Mininum.\r
@@ -1422,7 +1422,7 @@ Returns:
     goto ON_ERROR;\r
   }\r
 \r
-  Session->DataPDUInOrder = (BOOLEAN)(Session->DataPDUInOrder || (AsciiStrCmp (Value, "Yes") == 0));\r
+  Session->DataPDUInOrder = Session->DataPDUInOrder || (BOOLEAN) (AsciiStrCmp (Value, "Yes") == 0);\r
 \r
   //\r
   // DataSequenceInorder, result function is OR.\r
@@ -1432,7 +1432,7 @@ Returns:
     goto ON_ERROR;\r
   }\r
 \r
-  Session->DataSequenceInOrder = (BOOLEAN)(Session->DataSequenceInOrder || (AsciiStrCmp (Value, "Yes") == 0));\r
+  Session->DataSequenceInOrder = Session->DataSequenceInOrder || (BOOLEAN) (AsciiStrCmp (Value, "Yes") == 0);\r
 \r
   //\r
   // DefaultTime2Wait, result function is Maximum.\r
@@ -1799,7 +1799,7 @@ Returns:
       //\r
       // Convert the upper-case characters to lower-case ones\r
       //\r
-      Name[Index] = (CHAR8)(Name[Index] - 'A' + 'a');\r
+      Name[Index] = Name[Index] - 'A' + 'a';\r
     }\r
 \r
     if (!NET_IS_LOWER_CASE_CHAR (Name[Index]) &&\r
@@ -2048,7 +2048,7 @@ Returns:
     //\r
     // The CDB exceeds 16 bytes, an extended CDB AHS is required.\r
     //\r
-    AHSLength = (UINT8)(AHSLength + (ISCSI_ROUNDUP (Packet->CdbLength - 16) + sizeof (ISCSI_ADDITIONAL_HEADER)));\r
+    AHSLength += ISCSI_ROUNDUP (Packet->CdbLength - 16) + sizeof (ISCSI_ADDITIONAL_HEADER);\r
   }\r
 \r
   Length    = sizeof (SCSI_COMMAND) + AHSLength;\r
@@ -2769,7 +2769,6 @@ Returns:
   UINT8                   *Data;\r
   ISCSI_IN_BUFFER_CONTEXT InBufferContext;\r
   UINT64                  Timeout;\r
-  UINT8                   *Buffer;\r
 \r
   Private       = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (PassThru);\r
   Session       = &Private->Session;\r
@@ -2815,8 +2814,7 @@ Returns:
   }\r
 \r
   XferContext         = &Tcb->XferContext;\r
-  Buffer              = NetbufGetByte (Pdu, 0, NULL);\r
-  XferContext->Offset = ISCSI_GET_DATASEG_LEN (Buffer);\r
+  XferContext->Offset = ISCSI_GET_DATASEG_LEN (NetbufGetByte (Pdu, 0, NULL));\r
 \r
   //\r
   // Transmit the SCSI Command PDU.\r