git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4609
6f19259b-4bc3-4df7-8a09-
765794883524
{\r
EFI_STATUS Status;\r
ISCSI_SESSION *Session;\r
{\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
ISCSI_CHAP_AUTH_DATA *AuthData;\r
CHAR8 *Value;\r
UINT8 *Data;\r
ASSERT (Conn->RspQue.BufNum != 0);\r
\r
Session = Conn->Session;\r
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
AuthData = &Session->AuthData;\r
\r
Len = Conn->RspQue.BufSize;\r
//\r
// Build the key-value list from the data segment of the Login Response.\r
//\r
//\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
if (KeyValueList == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto ON_EXIT;\r
EFI_STATUS Status;\r
ISCSI_SESSION *Session;\r
ISCSI_LOGIN_REQUEST *LoginReq;\r
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
ISCSI_CHAP_AUTH_DATA *AuthData;\r
CHAR8 *Value;\r
CHAR8 ValueStr[256];\r
ASSERT (Conn->CurrentStage == ISCSI_SECURITY_NEGOTIATION);\r
\r
Session = Conn->Session;\r
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
AuthData = &Session->AuthData;\r
LoginReq = (ISCSI_LOGIN_REQUEST *) NetbufGetByte (Pdu, 0, 0);\r
Status = EFI_SUCCESS;\r
//\r
// CHAP_N=<N>\r
//\r
//\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
//\r
// CHAP_R=<R>\r
//\r
ConfigFormEntry->PortTitleToken,\r
ConfigFormEntry->PortTitleHelpToken,\r
EFI_IFR_FLAG_CALLBACK,\r
ConfigFormEntry->PortTitleToken,\r
ConfigFormEntry->PortTitleHelpToken,\r
EFI_IFR_FLAG_CALLBACK,\r
- KEY_DEVICE_ENTRY_BASE + FormIndex,\r
+ (UINT16)(KEY_DEVICE_ENTRY_BASE + FormIndex),\r
EFI_HII_PACKAGE_LIST_HEADER *PackageList;\r
ISCSI_FORM_CALLBACK_INFO *CallbackInfo;\r
\r
EFI_HII_PACKAGE_LIST_HEADER *PackageList;\r
ISCSI_FORM_CALLBACK_INFO *CallbackInfo;\r
\r
- Status = gBS->LocateProtocol (&gEfiHiiDatabaseProtocolGuid, NULL, &HiiDatabase);\r
+ Status = gBS->LocateProtocol (&gEfiHiiDatabaseProtocolGuid, NULL, (VOID **)&HiiDatabase);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
CallbackInfo->ConfigAccess.RouteConfig = IScsiFormRouteConfig;\r
CallbackInfo->ConfigAccess.Callback = IScsiFormCallback;\r
\r
CallbackInfo->ConfigAccess.RouteConfig = IScsiFormRouteConfig;\r
CallbackInfo->ConfigAccess.Callback = IScsiFormCallback;\r
\r
- Status = gBS->LocateProtocol (&gEfiHiiConfigRoutingProtocolGuid, NULL, &CallbackInfo->ConfigRouting);\r
+ Status = gBS->LocateProtocol (&gEfiHiiConfigRoutingProtocolGuid, NULL, (VOID **)&CallbackInfo->ConfigRouting);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
#ifndef _ISCSI_CONFIG_H_\r
#define _ISCSI_CONFIG_H_\r
\r
#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/HiiLib.h>\r
#include <Library/IfrSupportLib.h>\r
#include <Library/DebugLib.h>\r
#include <Library/BaseLib.h>\r
#include <Library/HiiLib.h>\r
#include <Library/IfrSupportLib.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
\r
#include <Library/NetLib.h>\r
#include "IScsiConfigNVDataStruc.h"\r
\r
\r
Status = This->Parse (This, Packet, &OptionCount, NULL);\r
if (Status != EFI_BUFFER_TOO_SMALL) {\r
\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
OptionList = NetAllocatePool (OptionCount * sizeof (EFI_DHCP4_PACKET_OPTION *));\r
}\r
\r
OptionList = NetAllocatePool (OptionCount * sizeof (EFI_DHCP4_PACKET_OPTION *));\r
// Ask the server to reply with Netmask, Router, DNS and RootPath options.\r
//\r
ParaList->OpCode = DHCP4_TAG_PARA_LIST;\r
// 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
ParaList->Data[0] = DHCP4_TAG_NETMASK;\r
ParaList->Data[1] = DHCP4_TAG_ROUTER;\r
ParaList->Data[2] = DHCP4_TAG_DNS;\r
#ifndef _ISCSI_DHCP_H_\r
#define _ISCSI_DHCP_H_\r
\r
#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
\r
#define DHCP4_TAG_PARA_LIST 55\r
#define DHCP4_TAG_NETMASK 1\r
// Need expand the control section if more than 2 NIC/Target sections\r
// exist.\r
//\r
// 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
// Get the identifier from the handle.\r
//\r
//\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
if (EFI_ERROR (Status)) {\r
ASSERT (FALSE);\r
return ;\r
Status = gBS->HandleProtocol (\r
Controller,\r
&gEfiDevicePathProtocolGuid,\r
Status = gBS->HandleProtocol (\r
Controller,\r
&gEfiDevicePathProtocolGuid,\r
);\r
if (EFI_ERROR (Status)) {\r
return 0;\r
);\r
if (EFI_ERROR (Status)) {\r
return 0;\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
if (EFI_ERROR (Status)) {\r
return 0;\r
}\r
Status = gBS->HandleProtocol (\r
Controller,\r
&gEfiSimpleNetworkProtocolGuid,\r
Status = gBS->HandleProtocol (\r
Controller,\r
&gEfiSimpleNetworkProtocolGuid,\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
);\r
ASSERT_EFI_ERROR (Status);\r
\r
SectionOffset = &Control->NIC0Offset;\r
\r
for (Index = 0; Index < HandleCount; Index++) {\r
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
if (EFI_ERROR (Status)) {\r
ASSERT (FALSE);\r
return ;\r
EFI_ACPI_TABLE_VERSION Version;\r
UINT32 Signature;\r
\r
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
if (EFI_ERROR (Status)) {\r
return ;\r
}\r
Status = AcpiSupport->GetAcpiTable (\r
AcpiSupport,\r
Index,\r
Status = AcpiSupport->GetAcpiTable (\r
AcpiSupport,\r
Index,\r
&Version,\r
&TableHandle\r
);\r
&Version,\r
&TableHandle\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
\r
//\r
// Fill in the various section of the iSCSI Boot Firmware Table.\r
\r
#define ISCSI_SESSION_SIGNATURE EFI_SIGNATURE_32 ('I', 'S', 'S', 'N')\r
\r
\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
UINT32 Signature;\r
\r
ISCSI_SESSION_CONFIG_DATA ConfigData;\r
BOOLEAN DataPDUInOrder;\r
BOOLEAN DataSequenceInOrder;\r
UINT8 ErrorRecoveryLevel;\r
BOOLEAN DataPDUInOrder;\r
BOOLEAN DataSequenceInOrder;\r
UINT8 ErrorRecoveryLevel;\r
\r
#define ISCSI_CONNECTION_SIGNATURE EFI_SIGNATURE_32 ('I', 'S', 'C', 'N')\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
UINT32 Signature;\r
NET_LIST_ENTRY Link;\r
\r
UINT32 MaxRecvDataSegmentLength;\r
ISCSI_DIGEST_TYPE HeaderDigest;\r
ISCSI_DIGEST_TYPE DataDigest;\r
UINT32 MaxRecvDataSegmentLength;\r
ISCSI_DIGEST_TYPE HeaderDigest;\r
ISCSI_DIGEST_TYPE DataDigest;\r
\r
#define ISCSI_DRIVER_DATA_SIGNATURE EFI_SIGNATURE_32 ('I', 'S', 'D', 'A')\r
\r
\r
#define ISCSI_DRIVER_DATA_SIGNATURE EFI_SIGNATURE_32 ('I', 'S', 'D', 'A')\r
\r
ISCSI_DRIVER_DATA_SIGNATURE \\r
)\r
\r
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
UINT32 Signature;\r
EFI_HANDLE Image;\r
EFI_HANDLE Controller;\r
EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
\r
ISCSI_SESSION Session;\r
EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
\r
ISCSI_SESSION Session;\r
+ return (UINT8) (32 - Len);\r
UINT32 Index;\r
CHAR8 *LunUnitStr[4];\r
CHAR8 Digit;\r
UINT32 Index;\r
CHAR8 *LunUnitStr[4];\r
CHAR8 Digit;\r
\r
NetZeroMem (Lun, 8);\r
NetZeroMem (LunUnitStr, sizeof (LunUnitStr));\r
\r
NetZeroMem (Lun, 8);\r
NetZeroMem (LunUnitStr, sizeof (LunUnitStr));\r
Index = 0;\r
LunUnitStr[0] = Str;\r
\r
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
return EFI_INVALID_PARAMETER;\r
}\r
\r
Index++;\r
\r
if (*(Str + 1) != '\0') {\r
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
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
return EFI_INVALID_PARAMETER;\r
}\r
\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
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
}\r
\r
return EFI_SUCCESS;\r
UINT32 Index;\r
\r
for (Index = 0; Index < Len; Index++) {\r
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
Str[3 * Index + 1] = NibbleToHexChar (Mac->Addr[Index]);\r
Str[3 * Index + 2] = L'-';\r
}\r
} else {\r
Byte = BinBuffer[*BinLength - 1 - Index / 2];\r
Byte &= 0x0F;\r
} else {\r
Byte = BinBuffer[*BinLength - 1 - Index / 2];\r
Byte &= 0x0F;\r
+ Byte = (UINT8) (Byte | (Digit << 4));\r
}\r
\r
BinBuffer[*BinLength - 1 - Index / 2] = Byte;\r
}\r
\r
BinBuffer[*BinLength - 1 - Index / 2] = Byte;\r
Status = gBS->HandleProtocol (\r
Private->Controller,\r
&gEfiSimpleNetworkProtocolGuid,\r
Status = gBS->HandleProtocol (\r
Private->Controller,\r
&gEfiSimpleNetworkProtocolGuid,\r
);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
Status = gBS->HandleProtocol (\r
Tcp4Io->Handle,\r
&gEfiDevicePathProtocolGuid,\r
Status = gBS->HandleProtocol (\r
Tcp4Io->Handle,\r
&gEfiDevicePathProtocolGuid,\r
);\r
if (EFI_ERROR (Status)) {\r
return NULL;\r
);\r
if (EFI_ERROR (Status)) {\r
return NULL;\r
) {\r
\r
DPathNode->Ipv4.LocalPort = 0;\r
) {\r
\r
DPathNode->Ipv4.LocalPort = 0;\r
- DPathNode->Ipv4.StaticIpAddress = !Session->ConfigData.NvData.InitiatorInfoFromDhcp;\r
+ DPathNode->Ipv4.StaticIpAddress = (BOOLEAN) (!Session->ConfigData.NvData.InitiatorInfoFromDhcp);\r
//\r
// Allocate the space for the key-value pair.\r
//\r
//\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
if (Data == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
//\r
// Check whether we will issue the stage transition signal?\r
//\r
//\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
// Process the TargetAddress key-value strings in the data segment to update the\r
// target address info.\r
//\r
// 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
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
//\r
// The status is sucess, extract the wanted fields from the header segment.\r
//\r
//\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
- 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
\r
LoginRsp->InitiatorTaskTag = NTOHL (LoginRsp->InitiatorTaskTag);\r
\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
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
\r
Status = EFI_PROTOCOL_ERROR;\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
\r
//\r
// ImmediateData, result function is AND.\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
\r
//\r
// MaxRecvDataSegmentLength, result function is Mininum.\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
\r
//\r
// DataSequenceInorder, result function is OR.\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
\r
//\r
// DefaultTime2Wait, result function is Maximum.\r
//\r
// Convert the upper-case characters to lower-case ones\r
//\r
//\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
}\r
\r
if (!NET_IS_LOWER_CASE_CHAR (Name[Index]) &&\r
//\r
// The CDB exceeds 16 bytes, an extended CDB AHS is required.\r
//\r
//\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
}\r
\r
Length = sizeof (SCSI_COMMAND) + AHSLength;\r
UINT8 *Data;\r
ISCSI_IN_BUFFER_CONTEXT InBufferContext;\r
UINT64 Timeout;\r
UINT8 *Data;\r
ISCSI_IN_BUFFER_CONTEXT InBufferContext;\r
UINT64 Timeout;\r
\r
Private = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (PassThru);\r
Session = &Private->Session;\r
\r
Private = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (PassThru);\r
Session = &Private->Session;\r
}\r
\r
XferContext = &Tcb->XferContext;\r
}\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
\r
//\r
// Transmit the SCSI Command PDU.\r
#define ISCSI_GET_OPCODE(PduHdr) ((((ISCSI_BASIC_HEADER *) (PduHdr))->OpCode) & ISCSI_OPCODE_MASK)\r
#define ISCSI_CHECK_OPCODE(PduHdr, Op) ((((PduHdr)->OpCode) & ISCSI_OPCODE_MASK) == (Op))\r
#define ISCSI_IMMEDIATE_ON(PduHdr) ((PduHdr)->OpCode & ISCSI_REQ_IMMEDIATE)\r
#define ISCSI_GET_OPCODE(PduHdr) ((((ISCSI_BASIC_HEADER *) (PduHdr))->OpCode) & ISCSI_OPCODE_MASK)\r
#define ISCSI_CHECK_OPCODE(PduHdr, Op) ((((PduHdr)->OpCode) & ISCSI_OPCODE_MASK) == (Op))\r
#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_SET_FLAG(PduHdr, Flag) (((ISCSI_BASIC_HEADER *) (PduHdr))->Flags |= (BOOLEAN)(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_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_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
#define ISCSI_GET_CURRENT_STAGE(PduHdr) (((PduHdr)->Flags >> 2) & 0x3)\r
#define ISCSI_GET_NEXT_STAGE(PduHdr) (((PduHdr)->Flags) & 0x3)\r
\r
\r
#define HTON24(Dst, Src) \\r
do { \\r
\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
} while (0);\r
\r
#define NTOH24(src) (((src)[0] << 16) | ((src)[1] << 8) | ((src)[2]))\r