RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

Merge pull request #6127 from haukepetersen/fix_w5100_netdevapichange#

Browse Source 
drivers/w5100: adapted to netdev2 API changes
This commit is contained in:
Martine Lenders 2016-11-16 12:55:21 +01:00 committed by GitHub
commit fe57bfc650
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/w5100/w5100.c
View File

@ -201,7 +201,7 @@ static uint16_t tx_upload(w5100_t *dev, uint16_t start, void *data, size_t len)
} }
} }
static int send(netdev2_t *netdev, const struct iovec *vector, int count) static int send(netdev2_t *netdev, const struct iovec *vector, unsigned count)
{ {
w5100_t *dev = (w5100_t *)netdev; w5100_t *dev = (w5100_t *)netdev;
int sum = 0; int sum = 0;
@ -231,9 +231,10 @@ static int send(netdev2_t *netdev, const struct iovec *vector, int count)
return sum; return sum;
} }
static int recv(netdev2_t *netdev, char *buf, int len, void *info) static int recv(netdev2_t *netdev, void *buf, size_t len, void *info)
{ {
w5100_t *dev = (w5100_t *)netdev; w5100_t *dev = (w5100_t *)netdev;
uint8_t *in_buf = (uint8_t *)buf;
int n = 0; int n = 0;
uint16_t num = raddr(dev, S0_RX_RSR0, S0_RX_RSR1); uint16_t num = raddr(dev, S0_RX_RSR0, S0_RX_RSR1);
@ -248,11 +249,11 @@ static int recv(netdev2_t *netdev, char *buf, int len, void *info)
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", n, (int)rp);
/* read the actual data into the given buffer if wanted */ /* read the actual data into the given buffer if wanted */
if (buf != NULL) { if (in_buf != NULL) {
uint16_t pos = rp + 2; uint16_t pos = rp + 2;
len = (n <= len) ? n : len; len = (n <= len) ? n : len;
for (int i = 0; i < (int)len; i++) { for (int i = 0; i < (int)len; i++) {
buf[i] = rreg(dev, (S0_RX_BASE + ((pos++) & S0_MASK))); in_buf[i] = rreg(dev, (S0_RX_BASE + ((pos++) & S0_MASK)));
} }
DEBUG("[w5100] recv: read %i byte from device (at 0x%04x)\n", DEBUG("[w5100] recv: read %i byte from device (at 0x%04x)\n",