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

Merge pull request #13765 from gschorcht/cpu/esp/fix_netopt_link_type

Browse Source 
cpu/esp: fix type for NETOPT_LINK for esp_wifi/esp_eth
This commit is contained in:
benpicco 2020-03-31 21:51:08 +02:00 committed by GitHub
commit e5562a89a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpu/esp32/esp-eth/esp_eth_netdev.c
View File

@ -280,8 +280,8 @@ static int _esp_eth_get(netdev_t *netdev, netopt_t opt, void *val, size_t max_le
assert(max_len >= ETHERNET_ADDR_LEN); assert(max_len >= ETHERNET_ADDR_LEN);
esp_eth_get_mac((uint8_t *)val); esp_eth_get_mac((uint8_t *)val);
return ETHERNET_ADDR_LEN; return ETHERNET_ADDR_LEN;
case NETOPT_LINK_CONNECTED: case NETOPT_LINK:
assert(max_len == 1); assert(max_len == sizeof(netopt_enable_t));
*((netopt_enable_t *)val) = (dev->link_up) ? NETOPT_ENABLE *((netopt_enable_t *)val) = (dev->link_up) ? NETOPT_ENABLE
: NETOPT_DISABLE; : NETOPT_DISABLE;
return sizeof(netopt_enable_t); return sizeof(netopt_enable_t);

6
cpu/esp_common/esp-wifi/esp_wifi_netdev.c
View File

@ -639,11 +639,11 @@ static int _esp_wifi_get(netdev_t *netdev, netopt_t opt, void *val, size_t max_l
assert(max_len >= ETHERNET_ADDR_LEN); assert(max_len >= ETHERNET_ADDR_LEN);
esp_wifi_get_mac(ESP_MAC_WIFI_STA,(uint8_t *)val); esp_wifi_get_mac(ESP_MAC_WIFI_STA,(uint8_t *)val);
return ETHERNET_ADDR_LEN; return ETHERNET_ADDR_LEN;
case NETOPT_LINK_CONNECTED: case NETOPT_LINK:
assert(max_len == 1); assert(max_len == sizeof(netopt_enable_t));
*((netopt_enable_t *)val) = (dev->connected) ? NETOPT_ENABLE *((netopt_enable_t *)val) = (dev->connected) ? NETOPT_ENABLE
: NETOPT_DISABLE; : NETOPT_DISABLE;
return 1; return sizeof(netopt_enable_t);
default: default:
return netdev_eth_get(netdev, opt, val, max_len); return netdev_eth_get(netdev, opt, val, max_len);
} }