riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8601 from bergzand/pr/netopt-link-status

Browse Source 
netopt/drivers: Add phy link status output
This commit is contained in:
Martine Lenders 2018-03-18 15:25:01 +00:00 committed by GitHub
commit ce807173ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/enc28j60/enc28j60.c
View File

@ -454,6 +454,14 @@ static int nd_get(netdev_t *netdev, netopt_t opt, void *value, size_t max_len)
assert(max_len >= ETHERNET_ADDR_LEN); assert(max_len >= ETHERNET_ADDR_LEN);
mac_get(dev, (uint8_t *)value); mac_get(dev, (uint8_t *)value);
return ETHERNET_ADDR_LEN; return ETHERNET_ADDR_LEN;
case NETOPT_LINK_CONNECTED:
if (cmd_r_phy(dev, REG_PHY_PHSTAT2) & PHSTAT2_LSTAT) {
*((netopt_enable_t *)value) = NETOPT_ENABLE;
}
else {
*((netopt_enable_t *)value) = NETOPT_DISABLE;
}
return sizeof(netopt_enable_t);
default: default:
return netdev_eth_get(netdev, opt, value, max_len); return netdev_eth_get(netdev, opt, value, max_len);
} }

8
drivers/encx24j600/encx24j600.c
View File

@ -401,6 +401,14 @@ static int _get(netdev_t *dev, netopt_t opt, void *value, size_t max_len)
res = ETHERNET_ADDR_LEN; res = ETHERNET_ADDR_LEN;
} }
break; break;
case NETOPT_LINK_CONNECTED:
if (reg_get((encx24j600_t *)dev, ENC_ESTAT) & ENC_PHYLNK) {
*((netopt_enable_t *)value) = NETOPT_ENABLE;
}
else {
*((netopt_enable_t *)value) = NETOPT_DISABLE;
}
return sizeof(netopt_enable_t);
default: default:
res = netdev_eth_get(dev, opt, value, max_len); res = netdev_eth_get(dev, opt, value, max_len);
break; break;

12
sys/include/net/netopt.h
View File

@ -276,6 +276,18 @@ typedef enum {
*/ */
NETOPT_IS_WIRED, NETOPT_IS_WIRED,
/**
* @brief (@ref netopt_enable_t) Phy link status.
*
* Returns NETOPT_ENABLE when the the link of the interface is up,
* NETOPT_DISABLE when the link is down. If the interface is wireless or
* doesn't support link status detection this function will return
* -ENOTSUP.
*
* @note Setting this option will always return -ENOTSUP.
*/
NETOPT_LINK_CONNECTED,
/** /**
* @brief get a device's "type", e.g., ethernet, 802.15.4, ... * @brief get a device's "type", e.g., ethernet, 802.15.4, ...
*/ */

1
sys/net/crosslayer/netopt/netopt.c
View File

@ -62,6 +62,7 @@ static const char *_netopt_strmap[] = {
[NETOPT_CSMA_MINBE] = "NETOPT_CSMA_MINBE", [NETOPT_CSMA_MINBE] = "NETOPT_CSMA_MINBE",
[NETOPT_MAC_NO_SLEEP] = "NETOPT_MAC_NO_SLEEP", [NETOPT_MAC_NO_SLEEP] = "NETOPT_MAC_NO_SLEEP",
[NETOPT_IS_WIRED] = "NETOPT_IS_WIRED", [NETOPT_IS_WIRED] = "NETOPT_IS_WIRED",
[NETOPT_LINK_CONNECTED] = "NETOPT_LINK_CONNECTED",
[NETOPT_DEVICE_TYPE] = "NETOPT_DEVICE_TYPE", [NETOPT_DEVICE_TYPE] = "NETOPT_DEVICE_TYPE",
[NETOPT_CHANNEL_PAGE] = "NETOPT_CHANNEL_PAGE", [NETOPT_CHANNEL_PAGE] = "NETOPT_CHANNEL_PAGE",
[NETOPT_CCA_THRESHOLD] = "NETOPT_CCA_THRESHOLD", [NETOPT_CCA_THRESHOLD] = "NETOPT_CCA_THRESHOLD",

4
sys/shell/commands/sc_gnrc_netif.c
View File

@ -426,6 +426,10 @@ static void _netif_list(kernel_pid_t iface)
if (res >= 0) { if (res >= 0) {
printf(" CR: %s ", _netopt_coding_rate_str[u8]); printf(" CR: %s ", _netopt_coding_rate_str[u8]);
} }
res = gnrc_netapi_get(iface, NETOPT_LINK_CONNECTED, 0, &u8, sizeof(u8));
if (res >= 0) {
printf(" Link: %s ", (netopt_enable_t)u8 ? "up" : "down" );
}
line_thresh = _newline(0U, line_thresh); line_thresh = _newline(0U, line_thresh);
res = gnrc_netapi_get(iface, NETOPT_ADDRESS_LONG, 0, hwaddr, sizeof(hwaddr)); res = gnrc_netapi_get(iface, NETOPT_ADDRESS_LONG, 0, hwaddr, sizeof(hwaddr));
if (res >= 0) { if (res >= 0) {