tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-31 01:24:12 +02:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
View File

@ -780,9 +780,9 @@ EfiDhcp4Start (
{ {
DHCP_PROTOCOL *Instance; DHCP_PROTOCOL *Instance;
DHCP_SERVICE *DhcpSb; DHCP_SERVICE *DhcpSb;
BOOLEAN MediaPresent;
EFI_STATUS Status; EFI_STATUS Status;
EFI_TPL OldTpl; EFI_TPL OldTpl;
EFI_STATUS MediaStatus;
// //
// First validate the parameters // First validate the parameters
@ -813,9 +813,9 @@ EfiDhcp4Start (
// //
// Check Media Satus. // Check Media Satus.
// //
MediaPresent = TRUE; MediaStatus = EFI_SUCCESS;
NetLibDetectMedia (DhcpSb->Controller, &MediaPresent); NetLibDetectMediaWaitTimeout (DhcpSb->Controller, DHCP_CHECK_MEDIA_WAITING_TIME, &MediaStatus);
if (!MediaPresent) { if (MediaStatus != EFI_SUCCESS) {
Status = EFI_NO_MEDIA; Status = EFI_NO_MEDIA;
goto ON_ERROR; goto ON_ERROR;
} }

1
MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h
View File

@ -43,6 +43,7 @@ typedef struct _DHCP_PROTOCOL DHCP_PROTOCOL;
#define DHCP_SERVICE_SIGNATURE SIGNATURE_32 ('D', 'H', 'C', 'P') #define DHCP_SERVICE_SIGNATURE SIGNATURE_32 ('D', 'H', 'C', 'P')
#define DHCP_PROTOCOL_SIGNATURE SIGNATURE_32 ('d', 'h', 'c', 'p') #define DHCP_PROTOCOL_SIGNATURE SIGNATURE_32 ('d', 'h', 'c', 'p')
#define DHCP_CHECK_MEDIA_WAITING_TIME EFI_TIMER_PERIOD_SECONDS(20)
// //
// The state of the DHCP service. It starts as UNCONFIGED. If // The state of the DHCP service. It starts as UNCONFIGED. If

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

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

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

@ -289,16 +289,16 @@ IScsiSessionLogin (
ISCSI_SESSION *Session; ISCSI_SESSION *Session;
ISCSI_CONNECTION *Conn; ISCSI_CONNECTION *Conn;
EFI_TCP4_PROTOCOL *Tcp4; EFI_TCP4_PROTOCOL *Tcp4;
BOOLEAN MediaPresent; EFI_STATUS MediaStatus;
Session = &Private->Session; Session = &Private->Session;
// //
// Check media status before session login // Check media status before session login
// //
MediaPresent = TRUE; MediaStatus = EFI_SUCCESS;
NetLibDetectMedia (Private->Controller, &MediaPresent); NetLibDetectMediaWaitTimeout (Private->Controller, ISCSI_CHECK_MEDIA_LOGIN_WAITING_TIME, &MediaStatus);
if (!MediaPresent) { if (MediaStatus != EFI_SUCCESS) {
return EFI_NO_MEDIA; 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_MAX 0x00
#define ISCSI_VERSION_MIN 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_AUTH_METHOD "AuthMethod"
#define ISCSI_KEY_HEADER_DIGEST "HeaderDigest" #define ISCSI_KEY_HEADER_DIGEST "HeaderDigest"
#define ISCSI_KEY_DATA_DIGEST "DataDigest" #define ISCSI_KEY_DATA_DIGEST "DataDigest"

8
MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
View File

@ -2801,7 +2801,7 @@ EfiPxeLoadFile (
BOOLEAN NewMakeCallback; BOOLEAN NewMakeCallback;
EFI_STATUS Status; EFI_STATUS Status;
UINT64 TmpBufSize; UINT64 TmpBufSize;
BOOLEAN MediaPresent; EFI_STATUS MediaStatus;
if (FilePath == NULL || !IsDevicePathEnd (FilePath)) { if (FilePath == NULL || !IsDevicePathEnd (FilePath)) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
@ -2827,9 +2827,9 @@ EfiPxeLoadFile (
// //
// Check media status before PXE start // Check media status before PXE start
// //
MediaPresent = TRUE; MediaStatus = EFI_SUCCESS;
NetLibDetectMedia (Private->Controller, &MediaPresent); NetLibDetectMediaWaitTimeout (Private->Controller, PXEBC_CHECK_MEDIA_WAITING_TIME, &MediaStatus);
if (!MediaPresent) { if (MediaStatus != EFI_SUCCESS) {
return EFI_NO_MEDIA; return EFI_NO_MEDIA;
} }

1
MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h
View File

@ -57,6 +57,7 @@ typedef struct _PXEBC_PRIVATE_DATA PXEBC_PRIVATE_DATA;
#define PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE 4 #define PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE 4
#define PXEBC_DEFAULT_PACKET_SIZE 1480 #define PXEBC_DEFAULT_PACKET_SIZE 1480
#define PXEBC_DEFAULT_LIFETIME 50000 // 50ms, unit is microsecond #define PXEBC_DEFAULT_LIFETIME 50000 // 50ms, unit is microsecond
#define PXEBC_CHECK_MEDIA_WAITING_TIME EFI_TIMER_PERIOD_SECONDS(20)
struct _PXEBC_PRIVATE_DATA { struct _PXEBC_PRIVATE_DATA {
UINT32 Signature; UINT32 Signature;