\r
#include "IScsiImpl.h"\r
\r
-EFI_DRIVER_BINDING_PROTOCOL gIScsiIp4DriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL gIScsiIp4DriverBinding = {\r
IScsiIp4DriverBindingSupported,\r
IScsiIp4DriverBindingStart,\r
IScsiIp4DriverBindingStop,\r
NULL\r
};\r
\r
-EFI_DRIVER_BINDING_PROTOCOL gIScsiIp6DriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL gIScsiIp6DriverBinding = {\r
IScsiIp6DriverBindingSupported,\r
IScsiIp6DriverBindingStart,\r
IScsiIp6DriverBindingStop,\r
NULL\r
};\r
\r
-EFI_GUID gIScsiV4PrivateGuid = ISCSI_V4_PRIVATE_GUID;\r
-EFI_GUID gIScsiV6PrivateGuid = ISCSI_V6_PRIVATE_GUID;\r
-ISCSI_PRIVATE_DATA *mPrivate = NULL;\r
+EFI_GUID gIScsiV4PrivateGuid = ISCSI_V4_PRIVATE_GUID;\r
+EFI_GUID gIScsiV6PrivateGuid = ISCSI_V6_PRIVATE_GUID;\r
+ISCSI_PRIVATE_DATA *mPrivate = NULL;\r
\r
/**\r
Tests to see if this driver supports the RemainingDevicePath.\r
**/\r
EFI_STATUS\r
IScsiIsDevicePathSupported (\r
- IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL\r
+ IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL\r
)\r
{\r
EFI_DEVICE_PATH_PROTOCOL *CurrentDevicePath;\r
VOID\r
)\r
{\r
- UINTN AipHandleCount;\r
- EFI_HANDLE *AipHandleBuffer;\r
- UINTN AipIndex;\r
- EFI_ADAPTER_INFORMATION_PROTOCOL *Aip;\r
- EFI_EXT_SCSI_PASS_THRU_PROTOCOL *ExtScsiPassThru;\r
- EFI_GUID *InfoTypesBuffer;\r
- UINTN InfoTypeBufferCount;\r
- UINTN TypeIndex;\r
- VOID *InfoBlock;\r
- UINTN InfoBlockSize;\r
- BOOLEAN Supported;\r
- EFI_ADAPTER_INFO_NETWORK_BOOT *NetworkBoot;\r
- EFI_STATUS Status;\r
- UINT8 NetworkBootPolicy;\r
+ UINTN AipHandleCount;\r
+ EFI_HANDLE *AipHandleBuffer;\r
+ UINTN AipIndex;\r
+ EFI_ADAPTER_INFORMATION_PROTOCOL *Aip;\r
+ EFI_EXT_SCSI_PASS_THRU_PROTOCOL *ExtScsiPassThru;\r
+ EFI_GUID *InfoTypesBuffer;\r
+ UINTN InfoTypeBufferCount;\r
+ UINTN TypeIndex;\r
+ VOID *InfoBlock;\r
+ UINTN InfoBlockSize;\r
+ BOOLEAN Supported;\r
+ EFI_ADAPTER_INFO_NETWORK_BOOT *NetworkBoot;\r
+ EFI_STATUS Status;\r
+ UINT8 NetworkBootPolicy;\r
\r
//\r
// Check any AIP instances exist in system.\r
//\r
AipHandleCount = 0;\r
AipHandleBuffer = NULL;\r
- Status = gBS->LocateHandleBuffer (\r
- ByProtocol,\r
- &gEfiAdapterInformationProtocolGuid,\r
- NULL,\r
- &AipHandleCount,\r
- &AipHandleBuffer\r
- );\r
- if (EFI_ERROR (Status) || AipHandleCount == 0) {\r
+ Status = gBS->LocateHandleBuffer (\r
+ ByProtocol,\r
+ &gEfiAdapterInformationProtocolGuid,\r
+ NULL,\r
+ &AipHandleCount,\r
+ &AipHandleBuffer\r
+ );\r
+ if (EFI_ERROR (Status) || (AipHandleCount == 0)) {\r
return EFI_NOT_FOUND;\r
}\r
\r
Status = gBS->HandleProtocol (\r
AipHandleBuffer[AipIndex],\r
&gEfiAdapterInformationProtocolGuid,\r
- (VOID *) &Aip\r
+ (VOID *)&Aip\r
);\r
ASSERT_EFI_ERROR (Status);\r
ASSERT (Aip != NULL);\r
Status = gBS->HandleProtocol (\r
AipHandleBuffer[AipIndex],\r
&gEfiExtScsiPassThruProtocolGuid,\r
- (VOID *) &ExtScsiPassThru\r
+ (VOID *)&ExtScsiPassThru\r
);\r
- if (EFI_ERROR (Status) || ExtScsiPassThru == NULL) {\r
+ if (EFI_ERROR (Status) || (ExtScsiPassThru == NULL)) {\r
continue;\r
}\r
\r
InfoTypesBuffer = NULL;\r
InfoTypeBufferCount = 0;\r
- Status = Aip->GetSupportedTypes (Aip, &InfoTypesBuffer, &InfoTypeBufferCount);\r
- if (EFI_ERROR (Status) || InfoTypesBuffer == NULL) {\r
+ Status = Aip->GetSupportedTypes (Aip, &InfoTypesBuffer, &InfoTypeBufferCount);\r
+ if (EFI_ERROR (Status) || (InfoTypesBuffer == NULL)) {\r
continue;\r
}\r
+\r
//\r
// Check whether the AIP instance has Network boot information block.\r
//\r
//\r
InfoBlock = NULL;\r
InfoBlockSize = 0;\r
- Status = Aip->GetInformation (Aip, &gEfiAdapterInfoNetworkBootGuid, &InfoBlock, &InfoBlockSize);\r
- if (EFI_ERROR (Status) || InfoBlock == NULL) {\r
+ Status = Aip->GetInformation (Aip, &gEfiAdapterInfoNetworkBootGuid, &InfoBlock, &InfoBlockSize);\r
+ if (EFI_ERROR (Status) || (InfoBlock == NULL)) {\r
continue;\r
}\r
\r
//\r
// Check whether the network boot policy matches.\r
//\r
- NetworkBoot = (EFI_ADAPTER_INFO_NETWORK_BOOT *) InfoBlock;\r
+ NetworkBoot = (EFI_ADAPTER_INFO_NETWORK_BOOT *)InfoBlock;\r
NetworkBootPolicy = PcdGet8 (PcdIScsiAIPNetworkBootPolicy);\r
\r
if (NetworkBootPolicy == STOP_UEFI_ISCSI_IF_HBA_INSTALL_AIP) {\r
Status = EFI_SUCCESS;\r
goto Exit;\r
}\r
- if (((NetworkBootPolicy & STOP_UEFI_ISCSI_IF_AIP_SUPPORT_IP4) != 0 &&\r
+\r
+ if ((((NetworkBootPolicy & STOP_UEFI_ISCSI_IF_AIP_SUPPORT_IP4) != 0) &&\r
!NetworkBoot->iScsiIpv4BootCapablity) ||\r
- ((NetworkBootPolicy & STOP_UEFI_ISCSI_IF_AIP_SUPPORT_IP6) != 0 &&\r
+ (((NetworkBootPolicy & STOP_UEFI_ISCSI_IF_AIP_SUPPORT_IP6) != 0) &&\r
!NetworkBoot->iScsiIpv6BootCapablity) ||\r
- ((NetworkBootPolicy & STOP_UEFI_ISCSI_IF_AIP_SUPPORT_OFFLOAD) != 0 &&\r
+ (((NetworkBootPolicy & STOP_UEFI_ISCSI_IF_AIP_SUPPORT_OFFLOAD) != 0) &&\r
!NetworkBoot->OffloadCapability) ||\r
- ((NetworkBootPolicy & STOP_UEFI_ISCSI_IF_AIP_SUPPORT_MPIO) != 0 &&\r
+ (((NetworkBootPolicy & STOP_UEFI_ISCSI_IF_AIP_SUPPORT_MPIO) != 0) &&\r
!NetworkBoot->iScsiMpioCapability) ||\r
- ((NetworkBootPolicy & STOP_UEFI_ISCSI_IF_AIP_CONFIGURED_IP4) != 0 &&\r
+ (((NetworkBootPolicy & STOP_UEFI_ISCSI_IF_AIP_CONFIGURED_IP4) != 0) &&\r
!NetworkBoot->iScsiIpv4Boot) ||\r
- ((NetworkBootPolicy & STOP_UEFI_ISCSI_IF_AIP_CONFIGURED_IP6) != 0 &&\r
- !NetworkBoot->iScsiIpv6Boot)) {\r
+ (((NetworkBootPolicy & STOP_UEFI_ISCSI_IF_AIP_CONFIGURED_IP6) != 0) &&\r
+ !NetworkBoot->iScsiIpv6Boot))\r
+ {\r
FreePool (InfoBlock);\r
continue;\r
}\r
if (InfoBlock != NULL) {\r
FreePool (InfoBlock);\r
}\r
+\r
if (AipHandleBuffer != NULL) {\r
FreePool (AipHandleBuffer);\r
}\r
+\r
return Status;\r
}\r
\r
IN UINT8 IpVersion\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_GUID *IScsiServiceBindingGuid;\r
- EFI_GUID *TcpServiceBindingGuid;\r
- EFI_GUID *DhcpServiceBindingGuid;\r
- EFI_GUID *DnsServiceBindingGuid;\r
+ EFI_STATUS Status;\r
+ EFI_GUID *IScsiServiceBindingGuid;\r
+ EFI_GUID *TcpServiceBindingGuid;\r
+ EFI_GUID *DhcpServiceBindingGuid;\r
+ EFI_GUID *DnsServiceBindingGuid;\r
\r
if (IpVersion == IP_VERSION_4) {\r
- IScsiServiceBindingGuid = &gIScsiV4PrivateGuid;\r
- TcpServiceBindingGuid = &gEfiTcp4ServiceBindingProtocolGuid;\r
- DhcpServiceBindingGuid = &gEfiDhcp4ServiceBindingProtocolGuid;\r
- DnsServiceBindingGuid = &gEfiDns4ServiceBindingProtocolGuid;\r
-\r
+ IScsiServiceBindingGuid = &gIScsiV4PrivateGuid;\r
+ TcpServiceBindingGuid = &gEfiTcp4ServiceBindingProtocolGuid;\r
+ DhcpServiceBindingGuid = &gEfiDhcp4ServiceBindingProtocolGuid;\r
+ DnsServiceBindingGuid = &gEfiDns4ServiceBindingProtocolGuid;\r
} else {\r
- IScsiServiceBindingGuid = &gIScsiV6PrivateGuid;\r
- TcpServiceBindingGuid = &gEfiTcp6ServiceBindingProtocolGuid;\r
- DhcpServiceBindingGuid = &gEfiDhcp6ServiceBindingProtocolGuid;\r
- DnsServiceBindingGuid = &gEfiDns6ServiceBindingProtocolGuid;\r
+ IScsiServiceBindingGuid = &gIScsiV6PrivateGuid;\r
+ TcpServiceBindingGuid = &gEfiTcp6ServiceBindingProtocolGuid;\r
+ DhcpServiceBindingGuid = &gEfiDhcp6ServiceBindingProtocolGuid;\r
+ DnsServiceBindingGuid = &gEfiDns6ServiceBindingProtocolGuid;\r
}\r
\r
Status = gBS->OpenProtocol (\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
Start to manage the controller. This is the worker function for\r
IScsiIp4(6)DriverBindingStart.\r
**/\r
EFI_STATUS\r
IScsiStart (\r
- IN EFI_HANDLE Image,\r
- IN EFI_HANDLE ControllerHandle,\r
- IN UINT8 IpVersion\r
+ IN EFI_HANDLE Image,\r
+ IN EFI_HANDLE ControllerHandle,\r
+ IN UINT8 IpVersion\r
)\r
{\r
- EFI_STATUS Status;\r
- ISCSI_DRIVER_DATA *Private;\r
- LIST_ENTRY *Entry;\r
- LIST_ENTRY *NextEntry;\r
- ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
- ISCSI_SESSION *Session;\r
- UINT8 Index;\r
- EFI_EXT_SCSI_PASS_THRU_PROTOCOL *ExistIScsiExtScsiPassThru;\r
- ISCSI_DRIVER_DATA *ExistPrivate;\r
- UINT8 *AttemptConfigOrder;\r
- UINTN AttemptConfigOrderSize;\r
- UINT8 BootSelected;\r
- EFI_HANDLE *HandleBuffer;\r
- UINTN NumberOfHandles;\r
- EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
- EFI_GUID *IScsiPrivateGuid;\r
- EFI_GUID *TcpServiceBindingGuid;\r
- BOOLEAN NeedUpdate;\r
- VOID *Interface;\r
- EFI_GUID *ProtocolGuid;\r
- UINT8 NetworkBootPolicy;\r
- ISCSI_SESSION_CONFIG_NVDATA *NvData;\r
+ EFI_STATUS Status;\r
+ ISCSI_DRIVER_DATA *Private;\r
+ LIST_ENTRY *Entry;\r
+ LIST_ENTRY *NextEntry;\r
+ ISCSI_ATTEMPT_CONFIG_NVDATA *AttemptConfigData;\r
+ ISCSI_SESSION *Session;\r
+ UINT8 Index;\r
+ EFI_EXT_SCSI_PASS_THRU_PROTOCOL *ExistIScsiExtScsiPassThru;\r
+ ISCSI_DRIVER_DATA *ExistPrivate;\r
+ UINT8 *AttemptConfigOrder;\r
+ UINTN AttemptConfigOrderSize;\r
+ UINT8 BootSelected;\r
+ EFI_HANDLE *HandleBuffer;\r
+ UINTN NumberOfHandles;\r
+ EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
+ EFI_GUID *IScsiPrivateGuid;\r
+ EFI_GUID *TcpServiceBindingGuid;\r
+ BOOLEAN NeedUpdate;\r
+ VOID *Interface;\r
+ EFI_GUID *ProtocolGuid;\r
+ UINT8 NetworkBootPolicy;\r
+ ISCSI_SESSION_CONFIG_NVDATA *NvData;\r
\r
//\r
// Test to see if iSCSI driver supports the given controller.\r
if (mPrivate->OneSessionEstablished && mPrivate->EnableMpio) {\r
AttemptConfigData = NULL;\r
NET_LIST_FOR_EACH (Entry, &mPrivate->AttemptConfigs) {\r
- AttemptConfigData = NET_LIST_USER_STRUCT (Entry, ISCSI_ATTEMPT_CONFIG_NVDATA, Link);\r
+ AttemptConfigData = NET_LIST_USER_STRUCT (Entry, ISCSI_ATTEMPT_CONFIG_NVDATA, Link);\r
if (AttemptConfigData->SessionConfigData.Enabled == ISCSI_ENABLED_FOR_MPIO) {\r
break;\r
}\r
Status = gBS->HandleProtocol (\r
HandleBuffer[Index],\r
&gEfiDevicePathProtocolGuid,\r
- (VOID **) &DevicePath\r
+ (VOID **)&DevicePath\r
);\r
if (EFI_ERROR (Status)) {\r
continue;\r
Status = gBS->HandleProtocol (\r
HandleBuffer[Index],\r
&gEfiExtScsiPassThruProtocolGuid,\r
- (VOID **) &ExistIScsiExtScsiPassThru\r
+ (VOID **)&ExistIScsiExtScsiPassThru\r
);\r
ASSERT_EFI_ERROR (Status);\r
break;\r
// Don't process the attempt that does not associate with the current NIC or\r
// this attempt is disabled or established.\r
//\r
- if (AttemptConfigData->NicIndex != mPrivate->CurrentNic ||\r
- AttemptConfigData->SessionConfigData.Enabled == ISCSI_DISABLED ||\r
- AttemptConfigData->ValidPath) {\r
+ if ((AttemptConfigData->NicIndex != mPrivate->CurrentNic) ||\r
+ (AttemptConfigData->SessionConfigData.Enabled == ISCSI_DISABLED) ||\r
+ AttemptConfigData->ValidPath)\r
+ {\r
continue;\r
}\r
\r
// In default single path mode, don't process attempts configured for multipath.\r
//\r
if ((mPrivate->EnableMpio &&\r
- AttemptConfigData->SessionConfigData.Enabled != ISCSI_ENABLED_FOR_MPIO) ||\r
+ (AttemptConfigData->SessionConfigData.Enabled != ISCSI_ENABLED_FOR_MPIO)) ||\r
(!mPrivate->EnableMpio &&\r
- AttemptConfigData->SessionConfigData.Enabled != ISCSI_ENABLED)) {\r
+ (AttemptConfigData->SessionConfigData.Enabled != ISCSI_ENABLED)))\r
+ {\r
continue;\r
}\r
\r
// Don't process the attempt that fails to get the init/target information from DHCP.\r
//\r
if (AttemptConfigData->SessionConfigData.InitiatorInfoFromDhcp &&\r
- !AttemptConfigData->DhcpSuccess) {\r
- if (!mPrivate->EnableMpio && mPrivate->ValidSinglePathCount > 0) {\r
+ !AttemptConfigData->DhcpSuccess)\r
+ {\r
+ if (!mPrivate->EnableMpio && (mPrivate->ValidSinglePathCount > 0)) {\r
mPrivate->ValidSinglePathCount--;\r
}\r
+\r
continue;\r
}\r
\r
//\r
// Don't process the autoconfigure path if it is already established.\r
//\r
- if (AttemptConfigData->SessionConfigData.IpMode == IP_MODE_AUTOCONFIG &&\r
- AttemptConfigData->AutoConfigureSuccess) {\r
+ if ((AttemptConfigData->SessionConfigData.IpMode == IP_MODE_AUTOCONFIG) &&\r
+ AttemptConfigData->AutoConfigureSuccess)\r
+ {\r
continue;\r
}\r
\r
if (AttemptConfigData->SessionConfigData.IpMode == IP_MODE_IP6) {\r
continue;\r
}\r
- if (AttemptConfigData->SessionConfigData.IpMode == IP_MODE_AUTOCONFIG &&\r
- AttemptConfigData->AutoConfigureMode == IP_MODE_AUTOCONFIG_IP6) {\r
+\r
+ if ((AttemptConfigData->SessionConfigData.IpMode == IP_MODE_AUTOCONFIG) &&\r
+ (AttemptConfigData->AutoConfigureMode == IP_MODE_AUTOCONFIG_IP6))\r
+ {\r
continue;\r
}\r
} else {\r
if (AttemptConfigData->SessionConfigData.IpMode == IP_MODE_IP4) {\r
continue;\r
}\r
- if (AttemptConfigData->SessionConfigData.IpMode == IP_MODE_AUTOCONFIG &&\r
- AttemptConfigData->AutoConfigureMode == IP_MODE_AUTOCONFIG_IP4) {\r
+\r
+ if ((AttemptConfigData->SessionConfigData.IpMode == IP_MODE_AUTOCONFIG) &&\r
+ (AttemptConfigData->AutoConfigureMode == IP_MODE_AUTOCONFIG_IP4))\r
+ {\r
continue;\r
}\r
}\r
//\r
// Fill in the Session and init it.\r
//\r
- Session = (ISCSI_SESSION *) AllocateZeroPool (sizeof (ISCSI_SESSION));\r
+ Session = (ISCSI_SESSION *)AllocateZeroPool (sizeof (ISCSI_SESSION));\r
if (Session == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto ON_ERROR;\r
\r
UnicodeSPrint (\r
mPrivate->PortString,\r
- (UINTN) ISCSI_NAME_IFR_MAX_SIZE,\r
+ (UINTN)ISCSI_NAME_IFR_MAX_SIZE,\r
L"Attempt %d",\r
- (UINTN) AttemptConfigData->AttemptConfigIndex\r
+ (UINTN)AttemptConfigData->AttemptConfigIndex\r
);\r
\r
if (Session->AuthType == ISCSI_AUTH_TYPE_CHAP) {\r
// In Single path mode, only the successful attempt will be recorded in iBFT;\r
// in multi-path mode, all the attempt entries in MPIO will be recorded in iBFT.\r
//\r
- if (!mPrivate->EnableMpio && mPrivate->ValidSinglePathCount > 0) {\r
+ if (!mPrivate->EnableMpio && (mPrivate->ValidSinglePathCount > 0)) {\r
mPrivate->ValidSinglePathCount--;\r
}\r
\r
FreePool (Session);\r
-\r
} else {\r
AttemptConfigData->ValidPath = TRUE;\r
\r
// TODO: record KRB5 attempt information in the iSCSI device path.\r
//\r
if (Session->AuthType == ISCSI_AUTH_TYPE_KRB) {\r
- if (!mPrivate->EnableMpio && mPrivate->ValidSinglePathCount > 0) {\r
+ if (!mPrivate->EnableMpio && (mPrivate->ValidSinglePathCount > 0)) {\r
mPrivate->ValidSinglePathCount--;\r
}\r
\r
//\r
// Reinstall the original ExtScsiPassThru back.\r
//\r
- if (mPrivate->OneSessionEstablished && ExistPrivate != NULL) {\r
+ if (mPrivate->OneSessionEstablished && (ExistPrivate != NULL)) {\r
Status = gBS->InstallProtocolInterface (\r
&ExistPrivate->ExtScsiPassThruHandle,\r
&gEfiExtScsiPassThruProtocolGuid,\r
//\r
// More than one attempt successes.\r
//\r
- if (Private->Session != NULL && mPrivate->OneSessionEstablished) {\r
-\r
+ if ((Private->Session != NULL) && mPrivate->OneSessionEstablished) {\r
AttemptConfigOrder = IScsiGetVariableAndSize (\r
L"AttemptOrder",\r
&gIScsiConfigGuid,\r
if (AttemptConfigOrder == NULL) {\r
goto ON_ERROR;\r
}\r
+\r
for (Index = 0; Index < AttemptConfigOrderSize / sizeof (UINT8); Index++) {\r
- if (AttemptConfigOrder[Index] == mPrivate->BootSelectedIndex ||\r
- AttemptConfigOrder[Index] == BootSelected) {\r
+ if ((AttemptConfigOrder[Index] == mPrivate->BootSelectedIndex) ||\r
+ (AttemptConfigOrder[Index] == BootSelected))\r
+ {\r
break;\r
}\r
}\r
if (AttemptConfigOrder[Index] != BootSelected) {\r
goto ON_ERROR;\r
}\r
+\r
mPrivate->BootSelectedIndex = BootSelected;\r
//\r
// Clear the resource in ExistPrivate.\r
\r
gBS->CloseEvent (ExistPrivate->ExitBootServiceEvent);\r
FreePool (ExistPrivate);\r
-\r
}\r
} else {\r
//\r
NeedUpdate = FALSE;\r
}\r
}\r
-\r
}\r
\r
if (NeedUpdate) {\r
Status = EFI_DEVICE_ERROR;\r
goto ON_ERROR;\r
}\r
+\r
//\r
// Install the updated device path onto the ExtScsiPassThruHandle.\r
//\r
IN UINT8 IpVersion\r
)\r
{\r
- EFI_HANDLE IScsiController;\r
- EFI_STATUS Status;\r
- ISCSI_PRIVATE_PROTOCOL *IScsiIdentifier;\r
- ISCSI_DRIVER_DATA *Private;\r
- EFI_EXT_SCSI_PASS_THRU_PROTOCOL *PassThru;\r
- ISCSI_CONNECTION *Conn;\r
- EFI_GUID *ProtocolGuid;\r
- EFI_GUID *TcpServiceBindingGuid;\r
- EFI_GUID *TcpProtocolGuid;\r
-\r
+ EFI_HANDLE IScsiController;\r
+ EFI_STATUS Status;\r
+ ISCSI_PRIVATE_PROTOCOL *IScsiIdentifier;\r
+ ISCSI_DRIVER_DATA *Private;\r
+ EFI_EXT_SCSI_PASS_THRU_PROTOCOL *PassThru;\r
+ ISCSI_CONNECTION *Conn;\r
+ EFI_GUID *ProtocolGuid;\r
+ EFI_GUID *TcpServiceBindingGuid;\r
+ EFI_GUID *TcpProtocolGuid;\r
\r
if (NumberOfChildren != 0) {\r
//\r
Status = gBS->OpenProtocol (\r
ChildHandleBuffer[0],\r
&gEfiExtScsiPassThruProtocolGuid,\r
- (VOID **) &PassThru,\r
+ (VOID **)&PassThru,\r
This->DriverBindingHandle,\r
ControllerHandle,\r
EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
// Get the handle of the controller we are controlling.\r
//\r
if (IpVersion == IP_VERSION_4) {\r
- ProtocolGuid = &gIScsiV4PrivateGuid;\r
- TcpProtocolGuid = &gEfiTcp4ProtocolGuid;\r
- TcpServiceBindingGuid = &gEfiTcp4ServiceBindingProtocolGuid;\r
+ ProtocolGuid = &gIScsiV4PrivateGuid;\r
+ TcpProtocolGuid = &gEfiTcp4ProtocolGuid;\r
+ TcpServiceBindingGuid = &gEfiTcp4ServiceBindingProtocolGuid;\r
} else {\r
- ProtocolGuid = &gIScsiV6PrivateGuid;\r
- TcpProtocolGuid = &gEfiTcp6ProtocolGuid;\r
- TcpServiceBindingGuid = &gEfiTcp6ServiceBindingProtocolGuid;\r
+ ProtocolGuid = &gIScsiV6PrivateGuid;\r
+ TcpProtocolGuid = &gEfiTcp6ProtocolGuid;\r
+ TcpServiceBindingGuid = &gEfiTcp6ServiceBindingProtocolGuid;\r
}\r
+\r
IScsiController = NetLibGetNicHandle (ControllerHandle, TcpProtocolGuid);\r
if (IScsiController == NULL) {\r
return EFI_SUCCESS;\r
Status = gBS->OpenProtocol (\r
IScsiController,\r
ProtocolGuid,\r
- (VOID **) &IScsiIdentifier,\r
+ (VOID **)&IScsiIdentifier,\r
This->DriverBindingHandle,\r
ControllerHandle,\r
EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL\r
)\r
{\r
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
\r
Status = IScsiStart (This->DriverBindingHandle, ControllerHandle, IP_VERSION_4);\r
if (Status == EFI_ALREADY_STARTED) {\r
IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL\r
)\r
{\r
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
\r
Status = IScsiStart (This->DriverBindingHandle, ControllerHandle, IP_VERSION_6);\r
if (Status == EFI_ALREADY_STARTED) {\r
IN EFI_HANDLE ImageHandle\r
)\r
{\r
- EFI_STATUS Status;\r
- UINTN DeviceHandleCount;\r
- EFI_HANDLE *DeviceHandleBuffer;\r
- UINTN Index;\r
- EFI_COMPONENT_NAME_PROTOCOL *ComponentName;\r
- EFI_COMPONENT_NAME2_PROTOCOL *ComponentName2;\r
+ EFI_STATUS Status;\r
+ UINTN DeviceHandleCount;\r
+ EFI_HANDLE *DeviceHandleBuffer;\r
+ UINTN Index;\r
+ EFI_COMPONENT_NAME_PROTOCOL *ComponentName;\r
+ EFI_COMPONENT_NAME2_PROTOCOL *ComponentName2;\r
\r
//\r
// Try to disconnect the driver from the devices it's controlling.\r
Status = IScsiTestManagedDevice (\r
DeviceHandleBuffer[Index],\r
gIScsiIp4DriverBinding.DriverBindingHandle,\r
- &gEfiTcp4ProtocolGuid)\r
- ;\r
+ &gEfiTcp4ProtocolGuid\r
+ )\r
+ ;\r
if (EFI_ERROR (Status)) {\r
continue;\r
}\r
+\r
Status = gBS->DisconnectController (\r
DeviceHandleBuffer[Index],\r
gIScsiIp4DriverBinding.DriverBindingHandle,\r
if (EFI_ERROR (Status)) {\r
continue;\r
}\r
+\r
Status = gBS->DisconnectController (\r
DeviceHandleBuffer[Index],\r
gIScsiIp6DriverBinding.DriverBindingHandle,\r
goto ON_EXIT;\r
}\r
\r
- if (gIScsiControllerNameTable!= NULL) {\r
+ if (gIScsiControllerNameTable != NULL) {\r
Status = FreeUnicodeStringTable (gIScsiControllerNameTable);\r
if (EFI_ERROR (Status)) {\r
goto ON_EXIT;\r
}\r
+\r
gIScsiControllerNameTable = NULL;\r
}\r
\r
Status = gBS->HandleProtocol (\r
gIScsiIp4DriverBinding.DriverBindingHandle,\r
&gEfiComponentNameProtocolGuid,\r
- (VOID **) &ComponentName\r
+ (VOID **)&ComponentName\r
);\r
if (!EFI_ERROR (Status)) {\r
Status = gBS->UninstallMultipleProtocolInterfaces (\r
- gIScsiIp4DriverBinding.DriverBindingHandle,\r
- &gEfiComponentNameProtocolGuid,\r
- ComponentName,\r
- NULL\r
- );\r
+ gIScsiIp4DriverBinding.DriverBindingHandle,\r
+ &gEfiComponentNameProtocolGuid,\r
+ ComponentName,\r
+ NULL\r
+ );\r
if (EFI_ERROR (Status)) {\r
goto ON_EXIT;\r
}\r
Status = gBS->HandleProtocol (\r
gIScsiIp4DriverBinding.DriverBindingHandle,\r
&gEfiComponentName2ProtocolGuid,\r
- (VOID **) &ComponentName2\r
+ (VOID **)&ComponentName2\r
);\r
if (!EFI_ERROR (Status)) {\r
gBS->UninstallMultipleProtocolInterfaces (\r
Status = gBS->HandleProtocol (\r
gIScsiIp6DriverBinding.DriverBindingHandle,\r
&gEfiComponentNameProtocolGuid,\r
- (VOID **) &ComponentName\r
+ (VOID **)&ComponentName\r
);\r
if (!EFI_ERROR (Status)) {\r
Status = gBS->UninstallMultipleProtocolInterfaces (\r
- gIScsiIp6DriverBinding.DriverBindingHandle,\r
- &gEfiComponentNameProtocolGuid,\r
- ComponentName,\r
- NULL\r
- );\r
+ gIScsiIp6DriverBinding.DriverBindingHandle,\r
+ &gEfiComponentNameProtocolGuid,\r
+ ComponentName,\r
+ NULL\r
+ );\r
if (EFI_ERROR (Status)) {\r
goto ON_EXIT;\r
}\r
Status = gBS->HandleProtocol (\r
gIScsiIp6DriverBinding.DriverBindingHandle,\r
&gEfiComponentName2ProtocolGuid,\r
- (VOID **) &ComponentName2\r
+ (VOID **)&ComponentName2\r
);\r
if (!EFI_ERROR (Status)) {\r
gBS->UninstallMultipleProtocolInterfaces (\r
EFI_STATUS\r
EFIAPI\r
IScsiDriverEntryPoint (\r
- IN EFI_HANDLE ImageHandle,\r
- IN EFI_SYSTEM_TABLE *SystemTable\r
+ IN EFI_HANDLE ImageHandle,\r
+ IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
EFI_STATUS Status;\r
Status = gBS->LocateProtocol (\r
&gEfiIScsiInitiatorNameProtocolGuid,\r
NULL,\r
- (VOID **) &IScsiInitiatorName\r
+ (VOID **)&IScsiInitiatorName\r
);\r
if (!EFI_ERROR (Status)) {\r
return EFI_ACCESS_DENIED;\r
Status = gBS->LocateProtocol (\r
&gEfiAuthenticationInfoProtocolGuid,\r
NULL,\r
- (VOID **) &AuthenticationInfo\r
+ (VOID **)&AuthenticationInfo\r
);\r
if (Status == EFI_NOT_FOUND) {\r
Status = gBS->InstallProtocolInterface (\r
\r
return Status;\r
}\r
-\r