sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MdeModulePkg: Update Api from NetLibDetectMedia to NetLibDetectMediaWaitTimeout.

Browse Source 
Since new Api NetLibDetectMediaWaitTimeout was involved to support connecting
state handling, and it is forward compatible. So apply this Api in MdeModulePkg.

V2:
   *Define time period in a macro instead of hard code.

Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Cc: Wu Jiaxin <jiaxin.wu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Wang Fan <fan.wang@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
Signed-off-by: fanwang2 <fan.wang@intel.com>
This commit is contained in:
fanwang2
2017-12-18 09:16:36 +08:00
committed by Fu Siyuan
parent 8569a87ef0
commit 8ce6b650b0
7 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
View File

@@ -360,7 +360,7 @@ IScsiDoDhcp (
EFI_STATUS Status;
EFI_DHCP4_PACKET_OPTION *ParaList;
EFI_DHCP4_CONFIG_DATA Dhcp4ConfigData;
BOOLEAN MediaPresent;
EFI_STATUS MediaStatus;
UINT8 *Data;
Dhcp4Handle = NULL;
@@ -370,9 +370,9 @@ IScsiDoDhcp (
//
// Check media status before do DHCP
//
MediaPresent = TRUE;
NetLibDetectMedia (Controller, &MediaPresent);
if (!MediaPresent) {
MediaStatus = EFI_SUCCESS;
NetLibDetectMediaWaitTimeout (Controller, ISCSI_CHECK_MEDIA_GET_DHCP_WAITING_TIME, &MediaStatus);
if (MediaStatus != EFI_SUCCESS) {
return EFI_NO_MEDIA;
}

8
MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
View File

@@ -289,16 +289,16 @@ IScsiSessionLogin (
ISCSI_SESSION *Session;
ISCSI_CONNECTION *Conn;
EFI_TCP4_PROTOCOL *Tcp4;
BOOLEAN MediaPresent;
EFI_STATUS MediaStatus;
Session = &Private->Session;
//
// Check media status before session login
//
MediaPresent = TRUE;
NetLibDetectMedia (Private->Controller, &MediaPresent);
if (!MediaPresent) {
MediaStatus = EFI_SUCCESS;
NetLibDetectMediaWaitTimeout (Private->Controller, ISCSI_CHECK_MEDIA_LOGIN_WAITING_TIME, &MediaStatus);
if (MediaStatus != EFI_SUCCESS) {
return EFI_NO_MEDIA;
}

3
MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h
View File

@@ -42,6 +42,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#define ISCSI_VERSION_MAX 0x00
#define ISCSI_VERSION_MIN 0x00
#define ISCSI_CHECK_MEDIA_LOGIN_WAITING_TIME EFI_TIMER_PERIOD_SECONDS(20)
#define ISCSI_CHECK_MEDIA_GET_DHCP_WAITING_TIME EFI_TIMER_PERIOD_SECONDS(20)
#define ISCSI_KEY_AUTH_METHOD "AuthMethod"
#define ISCSI_KEY_HEADER_DIGEST "HeaderDigest"
#define ISCSI_KEY_DATA_DIGEST "DataDigest"