MdeModulePkg: Update Api from NetLibDetectMedia to NetLibDetectMediaWaitTimeout.

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>

7 files changed, 21 insertions, 16 deletions

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
index 87804145f4..aad667483a 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
@@ -780,9 +780,9 @@ EfiDhcp4Start (
 {

   DHCP_PROTOCOL             *Instance;

   DHCP_SERVICE              *DhcpSb;

-  BOOLEAN                   MediaPresent;

   EFI_STATUS                Status;

   EFI_TPL                   OldTpl;

+  EFI_STATUS                MediaStatus;

 

   //

   // First validate the parameters

@@ -813,9 +813,9 @@ EfiDhcp4Start (
   //

   // Check Media Satus.

   //

-  MediaPresent = TRUE;

-  NetLibDetectMedia (DhcpSb->Controller, &MediaPresent);

-  if (!MediaPresent) {

+  MediaStatus = EFI_SUCCESS;

+  NetLibDetectMediaWaitTimeout (DhcpSb->Controller, DHCP_CHECK_MEDIA_WAITING_TIME, &MediaStatus);

+  if (MediaStatus != EFI_SUCCESS) {

     Status = EFI_NO_MEDIA;

     goto ON_ERROR;

   }

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h
index e546a08f92..2d66afe48b 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h
@@ -43,6 +43,7 @@ typedef struct _DHCP_PROTOCOL DHCP_PROTOCOL;
 #define DHCP_SERVICE_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

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
index 869a56a491..976fe5d436 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
@@ -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;

   }

 

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
index 14f13f8fce..4317de258d 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
@@ -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;

   }

 

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h
index 48b4e7251f..2f953236fd 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h
@@ -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"

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
index 4bfeaf3d31..825a22cae9 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
@@ -2801,7 +2801,7 @@ EfiPxeLoadFile (
   BOOLEAN                     NewMakeCallback;

   EFI_STATUS                  Status;

   UINT64                      TmpBufSize;

-  BOOLEAN                     MediaPresent;

+  EFI_STATUS                  MediaStatus;

 

   if (FilePath == NULL || !IsDevicePathEnd (FilePath)) {

     return EFI_INVALID_PARAMETER;

@@ -2827,9 +2827,9 @@ EfiPxeLoadFile (
   //

   // Check media status before PXE start

   //

-  MediaPresent = TRUE;

-  NetLibDetectMedia (Private->Controller, &MediaPresent);

-  if (!MediaPresent) {

+  MediaStatus = EFI_SUCCESS;

+  NetLibDetectMediaWaitTimeout (Private->Controller, PXEBC_CHECK_MEDIA_WAITING_TIME, &MediaStatus);

+  if (MediaStatus != EFI_SUCCESS) {

     return EFI_NO_MEDIA;

   }

 

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h
index 834c0d0089..e96b6f2c5d 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h
@@ -57,6 +57,7 @@ typedef struct _PXEBC_PRIVATE_DATA  PXEBC_PRIVATE_DATA;
 #define PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE   4

 #define PXEBC_DEFAULT_PACKET_SIZE          1480

 #define PXEBC_DEFAULT_LIFETIME             50000  // 50ms, unit is microsecond

+#define PXEBC_CHECK_MEDIA_WAITING_TIME     EFI_TIMER_PERIOD_SECONDS(20)

 

 struct _PXEBC_PRIVATE_DATA {

   UINT32                                    Signature;