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

Merge pull request #7525 from bergzand/mrf24j40-cleanup

Browse Source 
mrf24j40: Minor cleanup
This commit is contained in:
Sebastian Meiling 2017-09-28 15:56:26 +02:00 committed by GitHub
commit cbc5eb0c06
3 changed files with 1 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/mrf24j40/include/mrf24j40_internal.h
View File

@ -73,16 +73,6 @@ uint8_t mrf24j40_reg_read_long(mrf24j40_t *dev, const uint16_t addr);
*/ */
void mrf24j40_reg_write_long(mrf24j40_t *dev, const uint16_t addr, const uint8_t value); void mrf24j40_reg_write_long(mrf24j40_t *dev, const uint16_t addr, const uint8_t value);
/**
* @brief Read a chunk of data from the TX Normal FIFO area of the given device
*
* @param[in] dev device to read from
* @param[in] offset starting address to read from [valid 0x00-0x1ff]
* @param[out] data buffer to read data into
* @param[in] len number of bytes to read from FIFO
*/
void mrf24j40_tx_normal_fifo_read(mrf24j40_t *dev, const uint16_t offset, uint8_t *data, const size_t len);
/** /**
* @brief Write a chunk of data into the TX Normal FIFO area of the given device * @brief Write a chunk of data into the TX Normal FIFO area of the given device
* *
@ -103,16 +93,6 @@ void mrf24j40_tx_normal_fifo_write(mrf24j40_t *dev, const uint16_t offset, const
*/ */
void mrf24j40_rx_fifo_read(mrf24j40_t *dev, const uint16_t offset, uint8_t *data, const size_t len); void mrf24j40_rx_fifo_read(mrf24j40_t *dev, const uint16_t offset, uint8_t *data, const size_t len);
/**
* @brief Write a chunk of data into the RX_FIFO area of the given device
*
* @param[in] dev device to write to
* @param[in] offset address in the RX FIFO to write to [valid 0x00-0x1ff]
* @param[in] data data to copy into FIFO
* @param[in] len number of bytes to write to FIFO
*/
void mrf24j40_rx_fifo_write(mrf24j40_t *dev, const uint16_t offset, const uint8_t *data, const size_t len);
/** /**
* @brief Reset the pending task list of a device * @brief Reset the pending task list of a device
* *

22
drivers/mrf24j40/mrf24j40_internal.c
View File

@ -153,19 +153,6 @@ void mrf24j40_reg_write_long(mrf24j40_t *dev, const uint16_t addr, const uint8_t
spi_release(SPIDEV); spi_release(SPIDEV);
} }
void mrf24j40_tx_normal_fifo_read(mrf24j40_t *dev, const uint16_t offset, uint8_t *data, const size_t len)
{
uint8_t reg1, reg2;
reg1 = MRF24J40_LONG_ADDR_TRANS | (offset >> 3);
reg2 = (offset << 5) | MRF24J40_ACCESS_READ;
getbus(dev);
spi_transfer_byte(SPIDEV, CSPIN, true, reg1);
spi_transfer_byte(SPIDEV, CSPIN, true, reg2);
spi_transfer_bytes(SPIDEV, CSPIN, false, NULL, (char *)data, len);
spi_release(SPIDEV);
}
void mrf24j40_tx_normal_fifo_write(mrf24j40_t *dev, void mrf24j40_tx_normal_fifo_write(mrf24j40_t *dev,
const uint16_t offset, const uint16_t offset,
const uint8_t *data, const uint8_t *data,
@ -203,15 +190,6 @@ void mrf24j40_rx_fifo_read(mrf24j40_t *dev, const uint16_t offset, uint8_t *data
spi_release(SPIDEV); spi_release(SPIDEV);
} }
void mrf24j40_rx_fifo_write(mrf24j40_t *dev, const uint16_t offset, const uint8_t *data, const size_t len)
{
uint16_t i;
for (i = 0; i < len; i++) {
mrf24j40_reg_write_long(dev, i, data[i]);
}
}
void mrf24j40_reset_tasks(mrf24j40_t *dev) void mrf24j40_reset_tasks(mrf24j40_t *dev)
{ {
dev->pending = MRF24J40_TASK_TX_DONE; dev->pending = MRF24J40_TASK_TX_DONE;

2
drivers/mrf24j40/mrf24j40_netdev.c
View File

@ -92,7 +92,7 @@ static int _send(netdev_t *netdev, const struct iovec *vector, unsigned count)
mrf24j40_tx_prepare(dev); mrf24j40_tx_prepare(dev);
/* load packet data into FIFO */ /* load packet data into FIFO */
for (int i = 0; i < count; i++, ptr++) { for (unsigned i = 0; i < count; i++, ptr++) {
/* current packet data + FCS too long */ /* current packet data + FCS too long */
if ((len + ptr->iov_len + 2) > IEEE802154_FRAME_LEN_MAX) { if ((len + ptr->iov_len + 2) > IEEE802154_FRAME_LEN_MAX) {
DEBUG("[mrf24j40] error: packet too large (%u byte) to be send\n", DEBUG("[mrf24j40] error: packet too large (%u byte) to be send\n",