diff options
| author | fanwang2 <fan.wang@intel.com> | 2017-12-18 09:16:36 +0800 |
|---|---|---|
| committer | Fu Siyuan <siyuan.fu@intel.com> | 2017-12-18 16:38:22 +0800 |
| commit | 8ce6b650b0df28a0b8aa5784ccbbe4f8259b5626 (patch) | |
| tree | 13bef8689ccf0042dacc22d3447c59f219539875 /MdeModulePkg/Universal/Network/Dhcp4Dxe | |
| parent | 8569a87ef0e11127d3d138c1bbb50447256dbaa0 (diff) | |
| download | edk2-8ce6b650b0df28a0b8aa5784ccbbe4f8259b5626.tar.gz edk2-8ce6b650b0df28a0b8aa5784ccbbe4f8259b5626.tar.bz2 edk2-8ce6b650b0df28a0b8aa5784ccbbe4f8259b5626.zip | |
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>
Diffstat (limited to 'MdeModulePkg/Universal/Network/Dhcp4Dxe')
| -rw-r--r-- | MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c | 8 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h | 1 |
2 files changed, 5 insertions, 4 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
|