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

drivers/end28j60: adapted to SPI API changes

Browse Source
This commit is contained in:
Hauke Petersen 2016-11-08 18:41:08 +01:00
parent 5639b1d52f
commit dc3e78d521
3 changed files with 60 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
drivers/enc28j60/enc28j60.c
View File

@ -51,7 +51,7 @@
* The SPI speed is set to a fixed value, as it must be > 8MHz (see the devices * The SPI speed is set to a fixed value, as it must be > 8MHz (see the devices
* errata sheet). * errata sheet).
*/ */
#define SPI_SPEED SPI_SPEED_10MHZ #define SPI_CLK SPI_CLK_10MHZ
/** /**
* @brief The devices build-in buffer size * @brief The devices build-in buffer size
@ -82,61 +82,79 @@ static void switch_bank(enc28j60_t *dev, int8_t bank)
return; return;
} }
/* clear old value */ /* clear old value */
gpio_clear(dev->cs_pin); spi_transfer_reg(dev->spi, dev->cs_pin, (CMD_BFC | REG_ECON1), 0x03);
spi_transfer_reg(dev->spi, CMD_BFC | REG_ECON1, 0x03, 0);
gpio_set(dev->cs_pin);
/* set new value */ /* set new value */
gpio_clear(dev->cs_pin); spi_transfer_reg(dev->spi, dev->cs_pin, (CMD_BFS | REG_ECON1), bank);
spi_transfer_reg(dev->spi, CMD_BFS | REG_ECON1, bank, 0);
gpio_set(dev->cs_pin);
/* remember active bank */ /* remember active bank */
dev->bank = bank; dev->bank = bank;
} }
static uint8_t cmd_rcr(enc28j60_t *dev, uint8_t reg, int8_t bank) static uint8_t cmd_rcr(enc28j60_t *dev, uint8_t reg, int8_t bank)
{ {
char res; uint8_t res;
/* start transaction */
spi_acquire(dev->spi, dev->cs_pin, SPI_MODE_0, SPI_CLK);
switch_bank(dev, bank); switch_bank(dev, bank);
gpio_clear(dev->cs_pin); res = spi_transfer_reg(dev->spi, dev->cs_pin, (CMD_RCR | reg), 0);
spi_transfer_reg(dev->spi, CMD_RCR | reg, 0, &res);
gpio_set(dev->cs_pin); /* finish SPI transaction */
return (uint8_t)res; spi_release(dev->spi);
return res;
} }
static uint8_t cmd_rcr_miimac(enc28j60_t *dev, uint8_t reg, int8_t bank) static uint8_t cmd_rcr_miimac(enc28j60_t *dev, uint8_t reg, int8_t bank)
{ {
char res[2]; char res[2];
/* start transaction */
spi_acquire(dev->spi, dev->cs_pin, SPI_MODE_0, SPI_CLK);
switch_bank(dev, bank); switch_bank(dev, bank);
gpio_clear(dev->cs_pin); spi_transfer_regs(dev->spi, dev->cs_pin, (CMD_RCR | reg), NULL, res, 2);
spi_transfer_regs(dev->spi, CMD_RCR | reg, NULL, res, 2);
gpio_set(dev->cs_pin); /* finish SPI transaction */
spi_release(dev->spi);
return (uint8_t)res[1]; return (uint8_t)res[1];
} }
static void cmd_wcr(enc28j60_t *dev, uint8_t reg, int8_t bank, uint8_t value) static void cmd_wcr(enc28j60_t *dev, uint8_t reg, int8_t bank, uint8_t value)
{ {
/* start transaction */
spi_acquire(dev->spi, dev->cs_pin, SPI_MODE_0, SPI_CLK);
switch_bank(dev, bank); switch_bank(dev, bank);
gpio_clear(dev->cs_pin); spi_transfer_reg(dev->spi, dev->cs_pin, (CMD_WCR | reg), value);
spi_transfer_reg(dev->spi, CMD_WCR | reg, (char)value, 0);
gpio_set(dev->cs_pin); /* finish SPI transaction */
spi_release(dev->spi);
} }
static void cmd_bfs(enc28j60_t *dev, uint8_t reg, int8_t bank, uint8_t mask) static void cmd_bfs(enc28j60_t *dev, uint8_t reg, int8_t bank, uint8_t mask)
{ {
/* start transaction */
spi_acquire(dev->spi, dev->cs_pin, SPI_MODE_0, SPI_CLK);
switch_bank(dev, bank); switch_bank(dev, bank);
gpio_clear(dev->cs_pin); spi_transfer_reg(dev->spi, dev->cs_pin, (CMD_BFS | reg), mask);
spi_transfer_reg(dev->spi, CMD_BFS | reg, mask, 0);
gpio_set(dev->cs_pin); /* finish SPI transaction */
spi_release(dev->spi);
} }
static void cmd_bfc(enc28j60_t *dev, uint8_t reg, int8_t bank, uint8_t mask) static void cmd_bfc(enc28j60_t *dev, uint8_t reg, int8_t bank, uint8_t mask)
{ {
/* start transaction */
spi_acquire(dev->spi, dev->cs_pin, SPI_MODE_0, SPI_CLK);
switch_bank(dev, bank); switch_bank(dev, bank);
gpio_clear(dev->cs_pin); spi_transfer_reg(dev->spi, dev->cs_pin, (CMD_BFC | reg), mask);
spi_transfer_reg(dev->spi, CMD_BFC | reg, mask, 0);
gpio_set(dev->cs_pin); /* finish SPI transaction */
spi_release(dev->spi);
} }
static uint16_t cmd_r_addr(enc28j60_t *dev, uint8_t addr) static uint16_t cmd_r_addr(enc28j60_t *dev, uint8_t addr)
@ -178,16 +196,22 @@ static void cmd_w_phy(enc28j60_t *dev, uint8_t reg, uint16_t val)
static void cmd_rbm(enc28j60_t *dev, uint8_t *data, size_t len) static void cmd_rbm(enc28j60_t *dev, uint8_t *data, size_t len)
{ {
gpio_clear(dev->cs_pin); /* start transaction */
spi_transfer_regs(dev->spi, CMD_RBM, NULL, (char *)data, len); spi_acquire(dev->spi, dev->cs_pin, SPI_MODE_0, SPI_CLK);
gpio_set(dev->cs_pin); /* transfer data */
spi_transfer_regs(dev->spi, dev->cs_pin, CMD_RBM, NULL, data, len);
/* finish SPI transaction */
spi_release(dev->spi);
} }
static void cmd_wbm(enc28j60_t *dev, uint8_t *data, size_t len) static void cmd_wbm(enc28j60_t *dev, uint8_t *data, size_t len)
{ {
gpio_clear(dev->cs_pin); /* start transaction */
spi_transfer_regs(dev->spi, CMD_WBM, (char *)data, NULL, len); spi_acquire(dev->spi, dev->cs_pin, SPI_MODE_0, SPI_CLK);
gpio_set(dev->cs_pin); /* transfer data */
spi_transfer_regs(dev->spi, dev->cs_pin, CMD_WBM, data, NULL, len);
/* finish SPI transaction */
spi_release(dev->spi);
} }
static void mac_get(enc28j60_t *dev, uint8_t *mac) static void mac_get(enc28j60_t *dev, uint8_t *mac)
@ -296,14 +320,11 @@ static int nd_init(netdev2_t *netdev)
/* setup the low-level interfaces */ /* setup the low-level interfaces */
gpio_init(dev->reset_pin, GPIO_OUT); gpio_init(dev->reset_pin, GPIO_OUT);
gpio_clear(dev->reset_pin); /* this puts the device into reset state */ gpio_clear(dev->reset_pin); /* this puts the device into reset state */
gpio_init(dev->cs_pin, GPIO_OUT); if (spi_init_cs(dev->spi, dev->cs_pin) != SPI_OK) {
gpio_set(dev->cs_pin); DEBUG("[enc28j60] init: error initializing the CS pin [%i]\n", res);
gpio_init_int(dev->int_pin, GPIO_IN, GPIO_FALLING, on_int, (void *)dev);
res = spi_init_master(dev->spi, SPI_CONF_FIRST_RISING, SPI_SPEED);
if (res < 0) {
DEBUG("[enc28j60] init: error initializing SPI bus [%i]\n", res);
return -1; return -1;
} }
gpio_init_int(dev->int_pin, GPIO_IN, GPIO_FALLING, on_int, (void *)dev);
/* wait at least 1ms and then release device from reset state */ /* wait at least 1ms and then release device from reset state */
xtimer_usleep(DELAY_RESET); xtimer_usleep(DELAY_RESET);

2
drivers/enc28j60/include/enc28j60_params.h
View File

@ -30,7 +30,7 @@ extern "C" {
* @{ * @{
*/ */
#ifndef ENC28J60_PARAM_SPI #ifndef ENC28J60_PARAM_SPI
#define ENC28J60_PARAM_SPI (SPI_0) #define ENC28J60_PARAM_SPI (SPI_DEV(0))
#endif #endif
#ifndef ENC28J60_PARAM_CS #ifndef ENC28J60_PARAM_CS
#define ENC28J60_PARAM_CS (GPIO_PIN(0, 0)) #define ENC28J60_PARAM_CS (GPIO_PIN(0, 0))

4
tests/driver_enc28j60/Makefile
View File

@ -18,14 +18,14 @@ USEMODULE += ps
# set board specific peripheral configurations # set board specific peripheral configurations
ifneq (,$(filter stm32f4discovery,$(BOARD))) ifneq (,$(filter stm32f4discovery,$(BOARD)))
ENC_SPI ?= SPI_1 ENC_SPI ?= SPI_DEV\(1\)
ENC_CS ?= GPIO_PIN\(PORT_B,12\) ENC_CS ?= GPIO_PIN\(PORT_B,12\)
ENC_INT ?= GPIO_PIN\(PORT_B,11\) ENC_INT ?= GPIO_PIN\(PORT_B,11\)
ENC_RST ?= GPIO_PIN\(PORT_B,10\) ENC_RST ?= GPIO_PIN\(PORT_B,10\)
endif endif
# fallback: set SPI bus and pins to default values # fallback: set SPI bus and pins to default values
ENC_SPI ?= SPI_0 ENC_SPI ?= SPI_DEV\(0\)
ENC_CS ?= GPIO_PIN\(0,0\) ENC_CS ?= GPIO_PIN\(0,0\)
ENC_INT ?= GPIO_PIN\(0,1\) ENC_INT ?= GPIO_PIN\(0,1\)
ENC_RST ?= GPIO_PIN\(0,2\) ENC_RST ?= GPIO_PIN\(0,2\)