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

drivers/enc28j60: register with netdev

Browse Source
This commit is contained in:
Benjamin Valentin 2020-09-24 18:02:47 +02:00 committed by Benjamin Valentin
parent ab37c9fba1
commit 1afe72a5e5
6 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/enc28j60/Makefile.dep
View File

@ -1,6 +1,7 @@
FEATURES_REQUIRED += periph_gpio FEATURES_REQUIRED += periph_gpio
FEATURES_REQUIRED += periph_gpio_irq FEATURES_REQUIRED += periph_gpio_irq
FEATURES_REQUIRED += periph_spi FEATURES_REQUIRED += periph_spi
USEMODULE += eui_provider
USEMODULE += netdev_eth USEMODULE += netdev_eth
USEMODULE += xtimer USEMODULE += xtimer
USEMODULE += luid

16
drivers/enc28j60/enc28j60.c
View File

@ -21,12 +21,11 @@
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include "luid.h"
#include "mutex.h" #include "mutex.h"
#include "xtimer.h" #include "xtimer.h"
#include "assert.h" #include "assert.h"
#include "net/ethernet.h" #include "net/ethernet.h"
#include "net/eui48.h" #include "net/eui_provider.h"
#include "net/netdev/eth.h" #include "net/netdev/eth.h"
#include "enc28j60.h" #include "enc28j60.h"
@ -424,12 +423,11 @@ static int nd_init(netdev_t *netdev)
cmd_wcr(dev, REG_B2_MABBIPG, 2, MABBIPG_FD); cmd_wcr(dev, REG_B2_MABBIPG, 2, MABBIPG_FD);
/* set non-back-to-back inter packet gap -> 0x12 is default */ /* set non-back-to-back inter packet gap -> 0x12 is default */
cmd_wcr(dev, REG_B2_MAIPGL, 2, MAIPGL_FD); cmd_wcr(dev, REG_B2_MAIPGL, 2, MAIPGL_FD);
/* set default MAC address */ /* set default MAC address */
uint8_t macbuf[ETHERNET_ADDR_LEN]; eui48_t addr;
luid_get(macbuf, ETHERNET_ADDR_LEN); netdev_eui48_get(netdev, &addr);
eui48_set_local((eui48_t*)macbuf); /* locally administered address */ mac_set(dev, addr.uint8);
eui48_clear_group((eui48_t*)macbuf); /* unicast address */
mac_set(dev, macbuf);
/* PHY configuration */ /* PHY configuration */
cmd_w_phy(dev, REG_PHY_PHCON1, PHCON1_PDPXMD); cmd_w_phy(dev, REG_PHY_PHCON1, PHCON1_PDPXMD);
@ -541,10 +539,12 @@ static const netdev_driver_t netdev_driver_enc28j60 = {
.set = nd_set, .set = nd_set,
}; };
void enc28j60_setup(enc28j60_t *dev, const enc28j60_params_t *params) void enc28j60_setup(enc28j60_t *dev, const enc28j60_params_t *params, uint8_t index)
{ {
dev->netdev.driver = &netdev_driver_enc28j60; dev->netdev.driver = &netdev_driver_enc28j60;
dev->p = *params; dev->p = *params;
mutex_init(&dev->lock); mutex_init(&dev->lock);
dev->tx_time = 0; dev->tx_time = 0;
netdev_register(&dev->netdev, NETDEV_ENC28J60, index);
} }

4
drivers/include/enc28j60.h
View File

@ -57,8 +57,10 @@ typedef struct {
* *
* @param[in] dev device descriptor * @param[in] dev device descriptor
* @param[in] params peripheral configuration to use * @param[in] params peripheral configuration to use
* @param[in] index Index of @p params in a global parameter struct array.
* If initialized manually, pass a unique identifier instead.
*/ */
void enc28j60_setup(enc28j60_t *dev, const enc28j60_params_t *params); void enc28j60_setup(enc28j60_t *dev, const enc28j60_params_t *params, uint8_t index);
#ifdef __cplusplus #ifdef __cplusplus
} }

1
drivers/include/net/netdev.h
View File

@ -282,6 +282,7 @@ typedef enum {
NETDEV_AT86RF2XX, NETDEV_AT86RF2XX,
NETDEV_CC2538, NETDEV_CC2538,
NETDEV_DOSE, NETDEV_DOSE,
NETDEV_ENC28J60,
NETDEV_MRF24J40, NETDEV_MRF24J40,
NETDEV_NRF802154, NETDEV_NRF802154,
/* add more if needed */ /* add more if needed */

2
pkg/lwip/contrib/lwip.c
View File

@ -218,7 +218,7 @@ void lwip_bootstrap(void)
} }
#elif defined(MODULE_ENC28J60) #elif defined(MODULE_ENC28J60)
for (unsigned i = 0; i < LWIP_NETIF_NUMOF; i++) { for (unsigned i = 0; i < LWIP_NETIF_NUMOF; i++) {
enc28j60_setup(&enc28j60_devs[i], &enc28j60_params[i]); enc28j60_setup(&enc28j60_devs[i], &enc28j60_params[i], i);
if (_netif_add(&netif[0], &enc28j60_devs[i], lwip_netdev_init, if (_netif_add(&netif[0], &enc28j60_devs[i], lwip_netdev_init,
tcpip_input) == NULL) { tcpip_input) == NULL) {
DEBUG("Could not add enc28j60 device\n"); DEBUG("Could not add enc28j60 device\n");

2
sys/net/gnrc/netif/init_devs/auto_init_enc28j60.c
View File

@ -60,7 +60,7 @@ void auto_init_enc28j60(void)
LOG_DEBUG("[auto_init_netif] initializing enc28j60 #%u\n", i); LOG_DEBUG("[auto_init_netif] initializing enc28j60 #%u\n", i);
/* setup netdev device */ /* setup netdev device */
enc28j60_setup(&dev[i], &enc28j60_params[i]); enc28j60_setup(&dev[i], &enc28j60_params[i], i);
gnrc_netif_ethernet_create(&_netif[i], stack[i], ENC28J60_MAC_STACKSIZE, gnrc_netif_ethernet_create(&_netif[i], stack[i], ENC28J60_MAC_STACKSIZE,
ENC28J60_MAC_PRIO, "enc28j60", ENC28J60_MAC_PRIO, "enc28j60",
(netdev_t *)&dev[i]); (netdev_t *)&dev[i]);