update for passing the ICC compiler

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

diff --git a/MdeModulePkg/Universal/iScsi/IScsiCHAP.c b/MdeModulePkg/Universal/iScsi/IScsiCHAP.c
index e6ea8b5400331d2273eba26ba895ff377aa70b2c..6f4b170a60b304206157b06d4c04270d5f1e94be 100644 (file)
--- a/MdeModulePkg/Universal/iScsi/IScsiCHAP.c
+++ b/MdeModulePkg/Universal/iScsi/IScsiCHAP.c
@@ -119,7 +119,6 @@ Returns:
 {\r
   EFI_STATUS                Status;\r
   ISCSI_SESSION             *Session;\r
-  ISCSI_SESSION_CONFIG_DATA *ConfigData;\r
   ISCSI_CHAP_AUTH_DATA      *AuthData;\r
   CHAR8                     *Value;\r
   UINT8                     *Data;\r
@@ -137,7 +136,6 @@ Returns:
   ASSERT (Conn->RspQue.BufNum != 0);\r
 \r
   Session     = Conn->Session;\r
-  ConfigData  = &Session->ConfigData;\r
   AuthData    = &Session->AuthData;\r
 \r
   Len         = Conn->RspQue.BufSize;\r
@@ -153,7 +151,7 @@ Returns:
   //\r
   // Build the key-value list from the data segment of the Login Response.\r
   //\r
-  KeyValueList = IScsiBuildKeyValueList (Data, Len);\r
+  KeyValueList = IScsiBuildKeyValueList ((CHAR8*)Data, Len);\r
   if (KeyValueList == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_EXIT;\r
@@ -319,7 +317,6 @@ Returns:
   EFI_STATUS                Status;\r
   ISCSI_SESSION             *Session;\r
   ISCSI_LOGIN_REQUEST       *LoginReq;\r
-  ISCSI_SESSION_CONFIG_DATA *ConfigData;\r
   ISCSI_CHAP_AUTH_DATA      *AuthData;\r
   CHAR8                     *Value;\r
   CHAR8                     ValueStr[256];\r
@@ -331,7 +328,6 @@ Returns:
   ASSERT (Conn->CurrentStage == ISCSI_SECURITY_NEGOTIATION);\r
 \r
   Session     = Conn->Session;\r
-  ConfigData  = &Session->ConfigData;\r
   AuthData    = &Session->AuthData;\r
   LoginReq    = (ISCSI_LOGIN_REQUEST *) NetbufGetByte (Pdu, 0, 0);\r
   Status      = EFI_SUCCESS;\r
@@ -387,7 +383,7 @@ Returns:
     //\r
     // CHAP_N=<N>\r
     //\r
-    IScsiAddKeyValuePair (Pdu, ISCSI_KEY_CHAP_NAME, (UINT8 *) &AuthData->AuthConfig.CHAPName);\r
+    IScsiAddKeyValuePair (Pdu, ISCSI_KEY_CHAP_NAME, (CHAR8 *) &AuthData->AuthConfig.CHAPName);\r
     //\r
     // CHAP_R=<R>\r
     //\r

diff --git a/MdeModulePkg/Universal/iScsi/IScsiConfig.h b/MdeModulePkg/Universal/iScsi/IScsiConfig.h
index e5c528e08cc0a96dc0ab0f34ac9c6c2015299ce5..726b7a2f713d4d28fd8ff63fb5359635fa1ff772 100644 (file)
--- a/MdeModulePkg/Universal/iScsi/IScsiConfig.h
+++ b/MdeModulePkg/Universal/iScsi/IScsiConfig.h
@@ -21,19 +21,12 @@ Abstract:
 #ifndef _ISCSI_CONFIG_H_\r
 #define _ISCSI_CONFIG_H_\r
 \r
-//#include "Tiano.h"\r
-//#include "EfiDriverLib.h"\r
-//#include "Base.h"\r
 #include <Library/FrameworkHiiLib.h>\r
 #include <Protocol/FrameworkFormBrowser.h>\r
 #include <Protocol/FrameworkFormCallback.h>\r
 #include <Library/FrameworkIfrSupportLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/BaseLib.h>\r
-//#include "EfiPrintLib.h"\r
-//#include EFI_PROTOCOL_DEFINITION (Hii)\r
-//#include EFI_PROTOCOL_DEFINITION (FormBrowser)\r
-//#include EFI_PROTOCOL_DEFINITION (FormCallback)\r
 \r
 #include <Library/NetLib.h>\r
 #include "IScsiConfigNVDataStruc.h"\r

diff --git a/MdeModulePkg/Universal/iScsi/IScsiDhcp.c b/MdeModulePkg/Universal/iScsi/IScsiDhcp.c
index b9b8cea8abcef62ce95402f223ae6f1faf71e3f4..145483b0e748f7d96047e50bd7d441ac45f1cbd7 100644 (file)
--- a/MdeModulePkg/Universal/iScsi/IScsiDhcp.c
+++ b/MdeModulePkg/Universal/iScsi/IScsiDhcp.c
@@ -230,9 +230,9 @@ Returns:
 \r
   Status      = This->Parse (This, Packet, &OptionCount, NULL);\r
   if (Status != EFI_BUFFER_TOO_SMALL) {\r
-    \rreturn EFI_NOT_READY;\r
+    return EFI_NOT_READY;\r
   }\r
-\r
+  \r
   OptionList = NetAllocatePool (OptionCount * sizeof (EFI_DHCP4_PACKET_OPTION *));\r
   if (OptionList == NULL) {\r
     return EFI_NOT_READY;\r
@@ -437,7 +437,7 @@ Returns:
   // Ask the server to reply with Netmask, Router, DNS and RootPath options.\r
   //\r
   ParaList->OpCode  = DHCP4_TAG_PARA_LIST;\r
-  ParaList->Length  = ConfigData->NvData.TargetInfoFromDhcp ? 4 : 3;\r
+  ParaList->Length  = (UINT8)(ConfigData->NvData.TargetInfoFromDhcp ? 4 : 3);\r
   ParaList->Data[0] = DHCP4_TAG_NETMASK;\r
   ParaList->Data[1] = DHCP4_TAG_ROUTER;\r
   ParaList->Data[2] = DHCP4_TAG_DNS;\r

diff --git a/MdeModulePkg/Universal/iScsi/IScsiDhcp.h b/MdeModulePkg/Universal/iScsi/IScsiDhcp.h
index 9312b547bd744b9462d66b143491528532b03400..f70aebd26e57e77a4c3765352fb9dc4ba08ddc2a 100644 (file)
--- a/MdeModulePkg/Universal/iScsi/IScsiDhcp.h
+++ b/MdeModulePkg/Universal/iScsi/IScsiDhcp.h
@@ -20,9 +20,7 @@ Abstract:
 #ifndef _ISCSI_DHCP_H_\r
 #define _ISCSI_DHCP_H_\r
 \r
-//#include "Tiano.h"\r
-//#include EFI_PROTOCOL_CONSUMER (Dhcp4)\r
-#include "protocol\Dhcp4.h"\r
+#include <Protocol/Dhcp4.h>\r
 \r
 #define DHCP4_TAG_PARA_LIST             55\r
 #define DHCP4_TAG_NETMASK               1\r

diff --git a/MdeModulePkg/Universal/iScsi/IScsiIbft.c b/MdeModulePkg/Universal/iScsi/IScsiIbft.c
index e5d6324727698e4d87c34a2166e3fa58b98aa065..bf68be6a3759f3337bf56bbf60bdfc98dc1c1225 100644 (file)
--- a/MdeModulePkg/Universal/iScsi/IScsiIbft.c
+++ b/MdeModulePkg/Universal/iScsi/IScsiIbft.c
@@ -101,7 +101,7 @@ Returns:
     // Need expand the control section if more than 2 NIC/Target sections\r
     // exist.\r
     //\r
-    Control->Header.Length += (UINT16) (NumOffset - 4) * sizeof (UINT16);\r
+    Control->Header.Length = (UINT16)(Control->Header.Length + (NumOffset - 4) * sizeof (UINT16));\r
   }\r
 }\r
 \r
@@ -191,7 +191,7 @@ Returns:
   //\r
   // Get the identifier from the handle.\r
   //\r
-  Status = gBS->HandleProtocol (Handle, &mIScsiPrivateGuid, &IScsiIdentifier);\r
+  Status = gBS->HandleProtocol (Handle, &mIScsiPrivateGuid, (void **)&IScsiIdentifier);\r
   if (EFI_ERROR (Status)) {\r
     ASSERT (FALSE);\r
     return ;\r
@@ -278,7 +278,7 @@ Returns:
   Status = gBS->HandleProtocol (\r
                   Controller,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  &DevicePath\r
+                  (void **)&DevicePath\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return 0;\r
@@ -293,7 +293,7 @@ Returns:
     return 0;\r
   }\r
 \r
-  Status = gBS->HandleProtocol (PciIoHandle, &gEfiPciIoProtocolGuid, &PciIo);\r
+  Status = gBS->HandleProtocol (PciIoHandle, &gEfiPciIoProtocolGuid, (void **)&PciIo);\r
   if (EFI_ERROR (Status)) {\r
     return 0;\r
   }\r
@@ -333,7 +333,7 @@ Returns:
   Status = gBS->HandleProtocol (\r
                   Controller,\r
                   &gEfiSimpleNetworkProtocolGuid,\r
-                  &Snp\r
+                  (void **)&Snp\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -392,7 +392,7 @@ Returns:
   SectionOffset = &Control->NIC0Offset;\r
 \r
   for (Index = 0; Index < HandleCount; Index++) {\r
-    Status = gBS->HandleProtocol (Handles[Index], &mIScsiPrivateGuid, &IScsiIdentifier);\r
+    Status = gBS->HandleProtocol (Handles[Index], &mIScsiPrivateGuid, (void **)&IScsiIdentifier);\r
     if (EFI_ERROR (Status)) {\r
       ASSERT (FALSE);\r
       return ;\r
@@ -552,7 +552,7 @@ Returns:
   EFI_ACPI_TABLE_VERSION                    Version;\r
   UINT32                                    Signature;\r
 \r
-  Status = gBS->LocateProtocol (&gEfiAcpiSupportProtocolGuid, NULL, &AcpiSupport);\r
+  Status = gBS->LocateProtocol (&gEfiAcpiSupportProtocolGuid, NULL, (void **)&AcpiSupport);\r
   if (EFI_ERROR (Status)) {\r
     return ;\r
   }\r
@@ -563,7 +563,7 @@ Returns:
     Status = AcpiSupport->GetAcpiTable (\r
                             AcpiSupport,\r
                             Index,\r
-                            &Table,\r
+                            (void **)&Table,\r
                             &Version,\r
                             &TableHandle\r
                             );\r
@@ -613,7 +613,7 @@ Returns:
     return ;\r
   }\r
 \r
-  Heap = (CHAR8 *) Table + IBFT_HEAP_OFFSET;\r
+  Heap = (UINT8 *) Table + IBFT_HEAP_OFFSET;\r
 \r
   //\r
   // Fill in the various section of the iSCSI Boot Firmware Table.\r

diff --git a/MdeModulePkg/Universal/iScsi/IScsiImpl.h b/MdeModulePkg/Universal/iScsi/IScsiImpl.h
index 715f814882b92f86c429f4ca29457d6209de96b0..535bc8461e7a0f481a773598b667cb709e9118c3 100644 (file)
--- a/MdeModulePkg/Universal/iScsi/IScsiImpl.h
+++ b/MdeModulePkg/Universal/iScsi/IScsiImpl.h
@@ -37,7 +37,7 @@ Abstract:
 \r
 #define ISCSI_SESSION_SIGNATURE EFI_SIGNATURE_32 ('I', 'S', 'S', 'N')\r
 \r
-typedef struct _ISCSI_SESSION {\r
+struct _ISCSI_SESSION {\r
   UINT32                    Signature;\r
 \r
   ISCSI_SESSION_CONFIG_DATA ConfigData;\r
@@ -77,11 +77,11 @@ typedef struct _ISCSI_SESSION {
   BOOLEAN                   DataPDUInOrder;\r
   BOOLEAN                   DataSequenceInOrder;\r
   UINT8                     ErrorRecoveryLevel;\r
-} ISCSI_SESSION;\r
+};\r
 \r
 #define ISCSI_CONNECTION_SIGNATURE  EFI_SIGNATURE_32 ('I', 'S', 'C', 'N')\r
 \r
-typedef struct _ISCSI_CONNECTION {\r
+struct _ISCSI_CONNECTION {\r
   UINT32            Signature;\r
   NET_LIST_ENTRY    Link;\r
 \r
@@ -116,7 +116,7 @@ typedef struct _ISCSI_CONNECTION {
   UINT32            MaxRecvDataSegmentLength;\r
   ISCSI_DIGEST_TYPE HeaderDigest;\r
   ISCSI_DIGEST_TYPE DataDigest;\r
-} ISCSI_CONNECTION;\r
+};\r
 \r
 #define ISCSI_DRIVER_DATA_SIGNATURE EFI_SIGNATURE_32 ('I', 'S', 'D', 'A')\r
 \r
@@ -142,7 +142,7 @@ typedef struct _ISCSI_CONNECTION {
   ISCSI_DRIVER_DATA_SIGNATURE \\r
   )\r
 \r
-typedef struct _ISCSI_DRIVER_DATA {\r
+struct _ISCSI_DRIVER_DATA {\r
   UINT32                          Signature;\r
   EFI_HANDLE                      Image;\r
   EFI_HANDLE                      Controller;\r
@@ -156,6 +156,6 @@ typedef struct _ISCSI_DRIVER_DATA {
   EFI_DEVICE_PATH_PROTOCOL        *DevicePath;\r
 \r
   ISCSI_SESSION                   Session;\r
-} ISCSI_DRIVER_DATA;\r
+};\r
 \r
 #endif\r

diff --git a/MdeModulePkg/Universal/iScsi/IScsiMisc.c b/MdeModulePkg/Universal/iScsi/IScsiMisc.c
index 0347d320423275a0145531c9ec860ace3c9d508c..214af746976333e571b40b8cda2853b101a5d46d 100644 (file)
--- a/MdeModulePkg/Universal/iScsi/IScsiMisc.c
+++ b/MdeModulePkg/Universal/iScsi/IScsiMisc.c
@@ -167,7 +167,7 @@ Returns:
     Len++;\r
   }\r
 \r
-  return 32 - Len;\r
+  return (UINT8)(32 - Len);\r
 }\r
 \r
 EFI_STATUS\r
@@ -196,6 +196,7 @@ Returns:
   UINT32  Index;\r
   CHAR8   *LunUnitStr[4];\r
   CHAR8   Digit;\r
+  UINTN   Temp;\r
 \r
   NetZeroMem (Lun, 8);\r
   NetZeroMem (LunUnitStr, sizeof (LunUnitStr));\r
@@ -203,7 +204,7 @@ Returns:
   Index         = 0;\r
   LunUnitStr[0] = Str;\r
 \r
-  if (!IsHexDigit (&Digit, *Str)) {\r
+  if (!IsHexDigit ((UINT8 *)&Digit, *Str)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -219,13 +220,13 @@ Returns:
       Index++;\r
 \r
       if (*(Str + 1) != '\0') {\r
-        if (!IsHexDigit (&Digit, *(Str + 1))) {\r
+        if (!IsHexDigit ((UINT8 *)&Digit, *(Str + 1))) {\r
           return EFI_INVALID_PARAMETER;\r
         }\r
 \r
         LunUnitStr[Index] = Str + 1;\r
       }\r
-    } else if (!IsHexDigit (&Digit, *Str)) {\r
+    } else if (!IsHexDigit ((UINT8 *)&Digit, *Str)) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
@@ -237,7 +238,8 @@ Returns:
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
-    *((UINT16 *) &Lun[Index * 2]) = HTONS (AsciiStrHexToUintn (LunUnitStr[Index]));\r
+    Temp = AsciiStrHexToUintn (LunUnitStr[Index]);\r
+    *((UINT16 *) &Lun[Index * 2]) = HTONS (Temp);\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -470,7 +472,7 @@ Returns:
   UINT32  Index;\r
 \r
   for (Index = 0; Index < Len; Index++) {\r
-    Str[3 * Index]      = NibbleToHexChar (Mac->Addr[Index] >> 4);\r
+    Str[3 * Index]      = NibbleToHexChar ((UINT8)(Mac->Addr[Index] >> 4));\r
     Str[3 * Index + 1]  = NibbleToHexChar (Mac->Addr[Index]);\r
     Str[3 * Index + 2]  = L'-';\r
   }\r
@@ -600,7 +602,7 @@ Returns:
     } else {\r
       Byte = BinBuffer[*BinLength - 1 - Index / 2];\r
       Byte &= 0x0F;\r
-      Byte |= Digit << 4;\r
+      Byte = (UINT8)(Byte | (Digit << 4));\r
     }\r
 \r
     BinBuffer[*BinLength - 1 - Index / 2] = Byte;\r
@@ -809,7 +811,7 @@ Returns:
   Status = gBS->HandleProtocol (\r
                   Private->Controller,\r
                   &gEfiSimpleNetworkProtocolGuid,\r
-                  &Snp\r
+                  (void **)&Snp\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -905,7 +907,7 @@ Returns:
   Status = gBS->HandleProtocol (\r
                   Tcp4Io->Handle,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  &DevicePath\r
+                  (void **)&DevicePath\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return NULL;\r
@@ -923,7 +925,7 @@ Returns:
         ) {\r
 \r
       DPathNode->Ipv4.LocalPort       = 0;\r
-      DPathNode->Ipv4.StaticIpAddress = !Session->ConfigData.NvData.InitiatorInfoFromDhcp;\r
+      DPathNode->Ipv4.StaticIpAddress = (BOOLEAN)(!Session->ConfigData.NvData.InitiatorInfoFromDhcp);\r
       break;\r
     }\r
 \r

diff --git a/MdeModulePkg/Universal/iScsi/IScsiMisc.h b/MdeModulePkg/Universal/iScsi/IScsiMisc.h
index 33c51841a416070f011f36ae030937aa05290f90..1f98a8e220ca877f5f2510f908ffd016004e0f04 100644 (file)
--- a/MdeModulePkg/Universal/iScsi/IScsiMisc.h
+++ b/MdeModulePkg/Universal/iScsi/IScsiMisc.h
@@ -39,13 +39,13 @@ typedef struct _ISCSI_SESSION_CONFIG_NVDATA {
 } ISCSI_SESSION_CONFIG_NVDATA;\r
 #pragma pack()\r
 \r
-typedef struct _ISCSI_SESSION_CONFIG_DATA {\r
+struct _ISCSI_SESSION_CONFIG_DATA {\r
   ISCSI_SESSION_CONFIG_NVDATA NvData;\r
 \r
   EFI_IPv4_ADDRESS            PrimaryDns;\r
   EFI_IPv4_ADDRESS            SecondaryDns;\r
   EFI_IPv4_ADDRESS            DhcpServer;\r
-} ISCSI_SESSION_CONFIG_DATA;\r
+};\r
 \r
 UINT8\r
 IScsiGetSubnetMaskPrefixLength (\r

diff --git a/MdeModulePkg/Universal/iScsi/IScsiProto.c b/MdeModulePkg/Universal/iScsi/IScsiProto.c
index 4cef3dc45d3c9e92072667bc9bfa793898c2daef..fa1c7d6c1b4394d747e739c725b6976aaf8b60bd 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 = NetbufAllocSpace (Pdu, TotalLen, NET_BUF_TAIL);\r
+  Data = (CHAR8 *) 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 = ISCSI_FLAG_ON (LoginReq, ISCSI_LOGIN_REQ_PDU_FLAG_TRANSIT);\r
+    Conn->TransitInitiated = (BOOLEAN)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, DataSeg, DataSegLen);\r
+    Status = IScsiUpdateTargetAddress (Session, (CHAR8 *)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                     = ISCSI_FLAG_ON (LoginRsp, ISCSI_LOGIN_RSP_PDU_FLAG_TRANSIT);\r
-  Continue                    = ISCSI_FLAG_ON (LoginRsp, ISCSI_LOGIN_RSP_PDU_FLAG_CONTINUE);\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
 \r
-  CurrentStage                = ISCSI_GET_CURRENT_STAGE (LoginRsp);\r
-  NextStage                   = ISCSI_GET_NEXT_STAGE (LoginRsp);\r
+  CurrentStage                = (UINT8)ISCSI_GET_CURRENT_STAGE (LoginRsp);\r
+  NextStage                   = (UINT8)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, Data);\r
+  NetbufQueCopy (&Conn->RspQue, 0, Len, (UINT8 *)Data);\r
 \r
   Status = EFI_PROTOCOL_ERROR;\r
 \r
@@ -1352,7 +1352,7 @@ Returns:
     goto ON_ERROR;\r
   }\r
 \r
-  Session->InitialR2T = Session->InitialR2T || (BOOLEAN) (AsciiStrCmp (Value, "Yes") == 0);\r
+  Session->InitialR2T = (BOOLEAN)(Session->InitialR2T || (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 = Session->ImmediateData && (BOOLEAN) (AsciiStrCmp (Value, "Yes") == 0);\r
+  Session->ImmediateData = (BOOLEAN)(Session->ImmediateData && (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 = Session->DataPDUInOrder || (BOOLEAN) (AsciiStrCmp (Value, "Yes") == 0);\r
+  Session->DataPDUInOrder = (BOOLEAN)(Session->DataPDUInOrder || (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 = Session->DataSequenceInOrder || (BOOLEAN) (AsciiStrCmp (Value, "Yes") == 0);\r
+  Session->DataSequenceInOrder = (BOOLEAN)(Session->DataSequenceInOrder || (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] = Name[Index] - 'A' + 'a';\r
+      Name[Index] = (CHAR8)(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 += ISCSI_ROUNDUP (Packet->CdbLength - 16) + sizeof (ISCSI_ADDITIONAL_HEADER);\r
+    AHSLength = (UINT8)(AHSLength + (ISCSI_ROUNDUP (Packet->CdbLength - 16) + sizeof (ISCSI_ADDITIONAL_HEADER)));\r
   }\r
 \r
   Length    = sizeof (SCSI_COMMAND) + AHSLength;\r
@@ -2769,6 +2769,7 @@ 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
@@ -2814,7 +2815,8 @@ Returns:
   }\r
 \r
   XferContext         = &Tcb->XferContext;\r
-  XferContext->Offset = ISCSI_GET_DATASEG_LEN (NetbufGetByte (Pdu, 0, NULL));\r
+  Buffer              = NetbufGetByte (Pdu, 0, NULL);\r
+  XferContext->Offset = ISCSI_GET_DATASEG_LEN (Buffer);\r
 \r
   //\r
   // Transmit the SCSI Command PDU.\r

diff --git a/MdeModulePkg/Universal/iScsi/IScsiProto.h b/MdeModulePkg/Universal/iScsi/IScsiProto.h
index 59608fcec7fe2b1a23aa5daa81fef75ad95acb35..d47a5b56799e3446cdc414716cf581d3fef0c6a1 100644 (file)
--- a/MdeModulePkg/Universal/iScsi/IScsiProto.h
+++ b/MdeModulePkg/Universal/iScsi/IScsiProto.h
@@ -119,8 +119,8 @@ typedef enum {
 #define ISCSI_IMMEDIATE_ON(PduHdr)          ((PduHdr)->OpCode & ISCSI_REQ_IMMEDIATE)\r
 #define ISCSI_SET_FLAG(PduHdr, Flag)        (((ISCSI_BASIC_HEADER *) (PduHdr))->Flags |= (Flag))\r
 #define ISCSI_CLEAR_FLAG(PduHdr, Flag)      (((ISCSI_BASIC_HEADER *) (PduHdr))->Flags &= ~(Flag))\r
-#define ISCSI_FLAG_ON(PduHdr, Flag)         ((((ISCSI_BASIC_HEADER *) (PduHdr))->Flags & (Flag)) == (Flag))\r
-#define ISCSI_SET_STAGES(PduHdr, Cur, Nxt)  ((PduHdr)->Flags |= ((Cur) << 2 | (Nxt)))\r
+#define ISCSI_FLAG_ON(PduHdr, Flag)         ((((ISCSI_BASIC_HEADER *) (PduHdr))->Flags & (Flag)) == (BOOLEAN)(Flag))\r
+#define ISCSI_SET_STAGES(PduHdr, Cur, Nxt)  ((PduHdr)->Flags = (UINT8)(((PduHdr)->Flags)|(((Cur) << 2) | (Nxt))))\r
 #define ISCSI_GET_CURRENT_STAGE(PduHdr)     (((PduHdr)->Flags >> 2) & 0x3)\r
 #define ISCSI_GET_NEXT_STAGE(PduHdr)        (((PduHdr)->Flags) & 0x3)\r
 \r
@@ -129,9 +129,9 @@ typedef enum {
 \r
 #define HTON24(Dst, Src) \\r
   do { \\r
-    (Dst)[0]  = (UINT8) ((Src) >> 16) & 0xFF; \\r
-    (Dst)[1]  = (UINT8) ((Src) >> 8) & 0xFF; \\r
-    (Dst)[2]  = (UINT8) (Src) & 0xFF; \\r
+    (Dst)[0]  = (UINT8)(((Src) >> 16) & 0xFF); \\r
+    (Dst)[1]  = (UINT8)(((Src) >> 8) & 0xFF); \\r
+    (Dst)[2]  = (UINT8)((Src) & 0xFF); \\r
   } while (0);\r
 \r
 #define NTOH24(src)                         (((src)[0] << 16) | ((src)[1] << 8) | ((src)[2]))\r