summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
152f2d5)
Since new Api NetLibDetectMediaWaitTimeout was involved to support connecting
state handling, and it is forward compatible. So apply this Api in ShellPkg.
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>
LIST_ENTRY *Entry;\r
LIST_ENTRY *Next;\r
IFCONFIG_INTERFACE_CB *IfCb;\r
LIST_ENTRY *Entry;\r
LIST_ENTRY *Next;\r
IFCONFIG_INTERFACE_CB *IfCb;\r
- BOOLEAN MediaPresent;\r
+ EFI_STATUS MediaStatus;\r
EFI_IPv4_ADDRESS Gateway;\r
UINT32 Index;\r
\r
EFI_IPv4_ADDRESS Gateway;\r
UINT32 Index;\r
\r
+ MediaStatus = EFI_SUCCESS;\r
\r
if (IsListEmpty (IfList)) {\r
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INVALID_INTERFACE), gShellNetwork1HiiHandle);\r
\r
if (IsListEmpty (IfList)) {\r
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INVALID_INTERFACE), gShellNetwork1HiiHandle);\r
//\r
// Get Media State.\r
//\r
//\r
// Get Media State.\r
//\r
- if (EFI_SUCCESS == NetLibDetectMedia (IfCb->NicHandle, &MediaPresent)) {\r
- if (!MediaPresent) {\r
+ if (EFI_SUCCESS == NetLibDetectMediaWaitTimeout (IfCb->NicHandle, 0, &MediaStatus)) {\r
+ if (MediaStatus != EFI_SUCCESS) {\r
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INFO_MEDIA_STATE), gShellNetwork1HiiHandle, L"Media disconnected");\r
} else {\r
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INFO_MEDIA_STATE), gShellNetwork1HiiHandle, L"Media present");\r
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INFO_MEDIA_STATE), gShellNetwork1HiiHandle, L"Media disconnected");\r
} else {\r
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_INFO_MEDIA_STATE), gShellNetwork1HiiHandle, L"Media present");\r
UINTN HandleNum;\r
EFI_HANDLE *HandleBuffer;\r
BOOLEAN UnspecifiedSrc;\r
UINTN HandleNum;\r
EFI_HANDLE *HandleBuffer;\r
BOOLEAN UnspecifiedSrc;\r
- BOOLEAN MediaPresent;\r
+ EFI_STATUS MediaStatus;\r
EFI_SERVICE_BINDING_PROTOCOL *EfiSb;\r
VOID *IpXCfg;\r
EFI_IP6_CONFIG_DATA Ip6Config;\r
EFI_SERVICE_BINDING_PROTOCOL *EfiSb;\r
VOID *IpXCfg;\r
EFI_IP6_CONFIG_DATA Ip6Config;\r
\r
HandleBuffer = NULL;\r
UnspecifiedSrc = FALSE;\r
\r
HandleBuffer = NULL;\r
UnspecifiedSrc = FALSE;\r
+ MediaStatus = EFI_SUCCESS;\r
EfiSb = NULL;\r
IpXInterfaceInfo = NULL;\r
IfInfoSize = 0;\r
EfiSb = NULL;\r
IpXInterfaceInfo = NULL;\r
IfInfoSize = 0;\r
//\r
// Check media.\r
//\r
//\r
// Check media.\r
//\r
- NetLibDetectMedia (HandleBuffer[HandleIndex], &MediaPresent);\r
- if (!MediaPresent) {\r
+ NetLibDetectMediaWaitTimeout (HandleBuffer[HandleIndex], 0, &MediaStatus);\r
+ if (MediaStatus != EFI_SUCCESS) {\r
//\r
// Skip this one.\r
//\r
//\r
// Skip this one.\r
//\r
UINTN HandleNum;\r
EFI_HANDLE *HandleBuffer;\r
BOOLEAN UnspecifiedSrc;\r
UINTN HandleNum;\r
EFI_HANDLE *HandleBuffer;\r
BOOLEAN UnspecifiedSrc;\r
- BOOLEAN MediaPresent;\r
+ EFI_STATUS MediaStatus;\r
EFI_SERVICE_BINDING_PROTOCOL *Ip6Sb;\r
EFI_IP6_CONFIG_PROTOCOL *Ip6Cfg;\r
EFI_IP6_CONFIG_DATA Ip6Config;\r
EFI_SERVICE_BINDING_PROTOCOL *Ip6Sb;\r
EFI_IP6_CONFIG_PROTOCOL *Ip6Cfg;\r
EFI_IP6_CONFIG_DATA Ip6Config;\r
\r
HandleBuffer = NULL;\r
UnspecifiedSrc = FALSE;\r
\r
HandleBuffer = NULL;\r
UnspecifiedSrc = FALSE;\r
+ MediaStatus = EFI_SUCCESS\r
Ip6Sb = NULL;\r
IfInfo = NULL;\r
IfInfoSize = 0;\r
Ip6Sb = NULL;\r
IfInfo = NULL;\r
IfInfoSize = 0;\r
//\r
// Check media.\r
//\r
//\r
// Check media.\r
//\r
- NetLibDetectMedia (HandleBuffer[HandleIndex], &MediaPresent);\r
- if (!MediaPresent) {\r
+ NetLibDetectMediaWaitTimeout (HandleBuffer[HandleIndex], 0, &MediaStatus);\r
+ if (MediaStatus != EFI_SUCCESS) {\r
//\r
// Skip this one.\r
//\r
//\r
// Skip this one.\r
//\r