RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

esp-now: avoid explicit cast to netdev

Browse Source
This commit is contained in:
Jose Alamos 2021-06-22 10:54:58 +02:00
parent 0e65605c39
commit 88dc962c3e
No known key found for this signature in database
GPG Key ID: F483EB800EF89DD9
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/esp_common/esp-now/esp_now_gnrc.c
View File

@ -97,7 +97,7 @@ static int _send(gnrc_netif_t *netif, gnrc_pktsnip_t *pkt)
static gnrc_pktsnip_t *_recv(gnrc_netif_t *netif)
{
netdev_t *dev = netif->dev;
esp_now_netdev_t *esp_now = (esp_now_netdev_t*)dev;
esp_now_netdev_t *esp_now = container_of(dev, esp_now_netdev_t, netdev);
int bytes_expected = dev->driver->recv(dev, NULL, 0, NULL);
if (bytes_expected <= 0) {

17
cpu/esp_common/esp-now/esp_now_netdev.c
View File

@ -180,11 +180,12 @@ static void IRAM_ATTR esp_now_scan_peers_timer_cb(void* arg)
{
DEBUG("%s\n", __func__);
esp_now_netdev_t* dev = (esp_now_netdev_t*)arg;
netdev_t *netdev = arg;
esp_now_netdev_t *dev = container_of(netdev, esp_now_netdev_t, netdev);
if (dev->netdev.event_callback) {
dev->scan_event++;
netdev_trigger_event_isr((netdev_t*)dev);
netdev_trigger_event_isr(&dev->netdev);
}
}
@ -245,7 +246,7 @@ static IRAM_ATTR void esp_now_recv_cb(const uint8_t *mac, const uint8_t *data, i
* `NETDEV_EVENT_ISR` first. We can call the receive function directly.
*/
if (_esp_now_dev.netdev.event_callback) {
_esp_now_dev.netdev.event_callback((netdev_t*)&_esp_now_dev,
_esp_now_dev.netdev.event_callback(&_esp_now_dev.netdev,
NETDEV_EVENT_RX_COMPLETE);
}
@ -499,7 +500,7 @@ static int _send(netdev_t *netdev, const iolist_t *iolist)
CHECK_PARAM_RET(iolist != NULL && iolist->iol_len == ESP_NOW_ADDR_LEN, -EINVAL);
CHECK_PARAM_RET(iolist->iol_next != NULL, -EINVAL);
esp_now_netdev_t *dev = (esp_now_netdev_t*)netdev;
esp_now_netdev_t *dev = container_of(netdev, esp_now_netdev_t, netdev);
mutex_lock(&dev->dev_lock);
@ -574,7 +575,7 @@ static int _recv(netdev_t *netdev, void *buf, size_t len, void *info)
CHECK_PARAM_RET(netdev != NULL, -ENODEV);
esp_now_netdev_t* dev = (esp_now_netdev_t*)netdev;
esp_now_netdev_t *dev = container_of(netdev, esp_now_netdev_t, netdev);
/* we store source mac address and received data in `buf` */
uint16_t size = dev->rx_len ? ESP_NOW_ADDR_LEN + dev->rx_len : 0;
@ -624,7 +625,7 @@ static int _get(netdev_t *netdev, netopt_t opt, void *val, size_t max_len)
CHECK_PARAM_RET(netdev != NULL, -ENODEV);
CHECK_PARAM_RET(val != NULL, -EINVAL);
esp_now_netdev_t *dev = (esp_now_netdev_t*)netdev;
esp_now_netdev_t *dev = container_of(netdev, esp_now_netdev_t, netdev);
int res = -ENOTSUP;
switch (opt) {
@ -682,7 +683,7 @@ static int _set(netdev_t *netdev, netopt_t opt, const void *val, size_t max_len)
CHECK_PARAM_RET(netdev != NULL, -ENODEV);
CHECK_PARAM_RET(val != NULL, -EINVAL);
esp_now_netdev_t *dev = (esp_now_netdev_t *) netdev;
esp_now_netdev_t *dev = container_of(netdev, esp_now_netdev_t, netdev);
int res = -ENOTSUP;
switch (opt) {
@ -723,7 +724,7 @@ static void _isr(netdev_t *netdev)
CHECK_PARAM(netdev != NULL);
esp_now_netdev_t *dev = (esp_now_netdev_t*)netdev;
esp_now_netdev_t *dev = container_of(netdev, esp_now_netdev_t, netdev);
critical_enter();