Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drivers/w5100: Fixed netdev_driver_t::recv() API #10412

Merged
merged 2 commits into from
Feb 5, 2019
Merged

drivers/w5100: Fixed netdev_driver_t::recv() API #10412

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea3edef
drivers/w5100: Added missing drop implementation
maribu Nov 16, 2018
a81d394
drivers/w5100: Fix recv() with too small buffer
maribu Nov 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 30 additions & 15 deletions drivers/w5100/w5100.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
* @}
*/

#include <errno.h>
#include <stdio.h>
#include <string.h>

Expand Down Expand Up @@ -230,12 +231,24 @@ static int send(netdev_t *netdev, const iolist_t *iolist)
return sum;
}

static int recv(netdev_t *netdev, void *buf, size_t len, void *info)
static inline void drop(w5100_t *dev, uint16_t num, uint16_t rp, uint16_t psize)
{
/* set the new read pointer address */
waddr(dev, S0_RX_RD0, S0_RX_RD1, rp + psize);
wreg(dev, S0_CR, CR_RECV);

/* if RX buffer now empty, clear RECV interrupt flag */
if ((num - psize) == 0) {
wreg(dev, S0_IR, IR_RECV);
}
}

static int recv(netdev_t *netdev, void *buf, size_t max_len, void *info)
{
(void)info;
w5100_t *dev = (w5100_t *)netdev;
uint8_t *in_buf = (uint8_t *)buf;
unsigned n = 0;
unsigned len = 0;

/* get access to the SPI bus for the duration of this function */
spi_acquire(dev->p.spi, dev->p.cs, SPI_CONF, dev->p.clk);
Expand All @@ -247,36 +260,38 @@ static int recv(netdev_t *netdev, void *buf, size_t len, void *info)
uint16_t rp = raddr(dev, S0_RX_RD0, S0_RX_RD1);
uint16_t psize = raddr(dev, (S0_RX_BASE + (rp & S0_MASK)),
(S0_RX_BASE + ((rp + 1) & S0_MASK)));
n = psize - 2;
len = psize - 2;

DEBUG("[w5100] recv: got packet of %i byte (at 0x%04x)\n", n, (int)rp);
DEBUG("[w5100] recv: got packet of %i byte (at 0x%04x)\n", len, (int)rp);

/* read the actual data into the given buffer if wanted */
if (in_buf != NULL) {
/* Is provided buffer big enough? */
if (len > max_len) {
drop(dev, num, rp, psize);
spi_release(dev->p.spi);
return -ENOBUFS;
jia200x marked this conversation as resolved.
Show resolved Hide resolved
}
uint16_t pos = rp + 2;
len = (n <= len) ? n : len;

for (unsigned i = 0; i < len; i++) {
in_buf[i] = rreg(dev, (S0_RX_BASE + ((pos++) & S0_MASK)));
}

DEBUG("[w5100] recv: read %i byte from device (at 0x%04x)\n",
n, (int)rp);

/* set the new read pointer address */
waddr(dev, S0_RX_RD0, S0_RX_RD1, rp += psize);
wreg(dev, S0_CR, CR_RECV);
len, (int)rp);
}

/* if RX buffer now empty, clear RECV interrupt flag */
if ((num - psize) == 0) {
wreg(dev, S0_IR, IR_RECV);
}
/* if frame received OR drop requested, remove frame from RX buffer */
if (max_len > 0) {
drop(dev, num, rp, psize);
}
}

/* release the SPI bus again */
spi_release(dev->p.spi);

return (int)n;
return (int)len;
}

static void isr(netdev_t *netdev)
Expand Down