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

Merge pull request #15733 from liyue75/liyue

Browse Source 
drivers/w5100/w5100.c: correct the pointer position when w5100's buf is full
This commit is contained in:
Marian Buschsieweke 2021-01-09 21:51:03 +01:00 committed by GitHub
commit f1367818ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/w5100/w5100.c
View File

@ -73,6 +73,7 @@ static void wreg(w5100_t *dev, uint16_t reg, uint8_t data)
static uint16_t raddr(w5100_t *dev, uint16_t addr_high, uint16_t addr_low) static uint16_t raddr(w5100_t *dev, uint16_t addr_high, uint16_t addr_low)
{ {
uint16_t res = (rreg(dev, addr_high) << 8); uint16_t res = (rreg(dev, addr_high) << 8);
res |= rreg(dev, addr_low); res |= rreg(dev, addr_low);
return res; return res;
} }
@ -143,7 +144,7 @@ static int init(netdev_t *netdev)
/* reset the device */ /* reset the device */
wreg(dev, REG_MODE, MODE_RESET); wreg(dev, REG_MODE, MODE_RESET);
while (rreg(dev, REG_MODE) & MODE_RESET) {}; while (rreg(dev, REG_MODE) & MODE_RESET) {}
/* initialize the device, start with writing the MAC address */ /* initialize the device, start with writing the MAC address */
luid_get(hwaddr, ETHERNET_ADDR_LEN); luid_get(hwaddr, ETHERNET_ADDR_LEN);
@ -183,7 +184,7 @@ static uint16_t tx_upload(w5100_t *dev, uint16_t start, void *data, size_t len)
size_t limit = ((S0_TX_BASE + S0_MEMSIZE) - start); size_t limit = ((S0_TX_BASE + S0_MEMSIZE) - start);
wchunk(dev, start, data, limit); wchunk(dev, start, data, limit);
wchunk(dev, S0_TX_BASE, &((uint8_t *)data)[limit], len - limit); wchunk(dev, S0_TX_BASE, &((uint8_t *)data)[limit], len - limit);
return (S0_TX_BASE + limit); return (S0_TX_BASE + len - limit);
} }
else { else {
wchunk(dev, start, data, len); wchunk(dev, start, data, len);
@ -218,7 +219,7 @@ static int send(netdev_t *netdev, const iolist_t *iolist)
/* trigger the sending process */ /* trigger the sending process */
wreg(dev, S0_CR, CR_SEND_MAC); wreg(dev, S0_CR, CR_SEND_MAC);
while (!(rreg(dev, S0_IR) & IR_SEND_OK)) {}; while (!(rreg(dev, S0_IR) & IR_SEND_OK)) {}
wreg(dev, S0_IR, IR_SEND_OK); wreg(dev, S0_IR, IR_SEND_OK);
DEBUG("[w5100] send: transferred %i byte (at 0x%04x)\n", sum, (int)pos); DEBUG("[w5100] send: transferred %i byte (at 0x%04x)\n", sum, (int)pos);
@ -257,10 +258,11 @@ static int recv(netdev_t *netdev, void *buf, size_t max_len, void *info)
/* find the size of the next packet in the RX buffer */ /* find the size of the next packet in the RX buffer */
uint16_t rp = raddr(dev, S0_RX_RD0, S0_RX_RD1); uint16_t rp = raddr(dev, S0_RX_RD0, S0_RX_RD1);
uint16_t psize = raddr(dev, (S0_RX_BASE + (rp & S0_MASK)), uint16_t psize = raddr(dev, (S0_RX_BASE + (rp & S0_MASK)),
(S0_RX_BASE + ((rp + 1) & S0_MASK))); (S0_RX_BASE + ((rp + 1) & S0_MASK)));
len = psize - 2; len = psize - 2;
DEBUG("[w5100] recv: got packet of %i byte (at 0x%04x)\n", len, (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 */ /* read the actual data into the given buffer if wanted */
if (in_buf != NULL) { if (in_buf != NULL) {
@ -321,16 +323,16 @@ static int get(netdev_t *netdev, netopt_t opt, void *value, size_t max_len)
int res = 0; int res = 0;
switch (opt) { switch (opt) {
case NETOPT_ADDRESS: case NETOPT_ADDRESS:
assert(max_len >= ETHERNET_ADDR_LEN); assert(max_len >= ETHERNET_ADDR_LEN);
spi_acquire(dev->p.spi, dev->p.cs, SPI_CONF, dev->p.clk); spi_acquire(dev->p.spi, dev->p.cs, SPI_CONF, dev->p.clk);
rchunk(dev, REG_SHAR0, value, ETHERNET_ADDR_LEN); rchunk(dev, REG_SHAR0, value, ETHERNET_ADDR_LEN);
spi_release(dev->p.spi); spi_release(dev->p.spi);
res = ETHERNET_ADDR_LEN; res = ETHERNET_ADDR_LEN;
break; break;
default: default:
res = netdev_eth_get(netdev, opt, value, max_len); res = netdev_eth_get(netdev, opt, value, max_len);
break; break;
} }
return res; return res;