rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-01 12:24:14 +01:00
Code Issues Releases Activity

Ethernet: removed useless casts in avr/w5100 class

Browse Source
This commit is contained in:
Cristian Maglie 2013-09-22 15:35:38 +02:00
parent ca90bf75cb
commit db640e08cd
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/Ethernet/arch/avr/utility/socket.cpp
View File

@ -256,7 +256,7 @@ uint16_t recvfrom(SOCKET s, uint8_t *buf, uint16_t len, uint8_t *addr, uint16_t
switch (W5100.readSnMR(s) & 0x07) switch (W5100.readSnMR(s) & 0x07)
{ {
case SnMR::UDP : case SnMR::UDP :
W5100.read_data(s, (uint8_t *)ptr, head, 0x08); W5100.read_data(s, ptr, head, 0x08);
ptr += 8; ptr += 8;
// read peer's IP address, port number. // read peer's IP address, port number.
addr[0] = head[0]; addr[0] = head[0];
@ -268,14 +268,14 @@ uint16_t recvfrom(SOCKET s, uint8_t *buf, uint16_t len, uint8_t *addr, uint16_t
data_len = head[6]; data_len = head[6];
data_len = (data_len << 8) + head[7]; data_len = (data_len << 8) + head[7];
W5100.read_data(s, (uint8_t *)ptr, buf, data_len); // data copy. W5100.read_data(s, ptr, buf, data_len); // data copy.
ptr += data_len; ptr += data_len;
W5100.writeSnRX_RD(s, ptr); W5100.writeSnRX_RD(s, ptr);
break; break;
case SnMR::IPRAW : case SnMR::IPRAW :
W5100.read_data(s, (uint8_t *)ptr, head, 0x06); W5100.read_data(s, ptr, head, 0x06);
ptr += 6; ptr += 6;
addr[0] = head[0]; addr[0] = head[0];
@ -285,19 +285,19 @@ uint16_t recvfrom(SOCKET s, uint8_t *buf, uint16_t len, uint8_t *addr, uint16_t
data_len = head[4]; data_len = head[4];
data_len = (data_len << 8) + head[5]; data_len = (data_len << 8) + head[5];
W5100.read_data(s, (uint8_t *)ptr, buf, data_len); // data copy. W5100.read_data(s, ptr, buf, data_len); // data copy.
ptr += data_len; ptr += data_len;
W5100.writeSnRX_RD(s, ptr); W5100.writeSnRX_RD(s, ptr);
break; break;
case SnMR::MACRAW: case SnMR::MACRAW:
W5100.read_data(s,(uint8_t*)ptr,head,2); W5100.read_data(s, ptr, head, 2);
ptr+=2; ptr+=2;
data_len = head[0]; data_len = head[0];
data_len = (data_len<<8) + head[1] - 2; data_len = (data_len<<8) + head[1] - 2;
W5100.read_data(s,(uint8_t*) ptr,buf,data_len); W5100.read_data(s, ptr, buf, data_len);
ptr += data_len; ptr += data_len;
W5100.writeSnRX_RD(s, ptr); W5100.writeSnRX_RD(s, ptr);
break; break;

6
libraries/Ethernet/arch/avr/utility/w5100.cpp
View File

@ -98,7 +98,7 @@ void W5100Class::recv_data_processing(SOCKET s, uint8_t *data, uint16_t len, uin
{ {
uint16_t ptr; uint16_t ptr;
ptr = readSnRX_RD(s); ptr = readSnRX_RD(s);
read_data(s, (uint8_t *)ptr, data, len); read_data(s, ptr, data, len);
if (!peek) if (!peek)
{ {
ptr += len; ptr += len;
@ -106,13 +106,13 @@ void W5100Class::recv_data_processing(SOCKET s, uint8_t *data, uint16_t len, uin
} }
} }
void W5100Class::read_data(SOCKET s, volatile uint8_t *src, volatile uint8_t *dst, uint16_t len) void W5100Class::read_data(SOCKET s, volatile uint16_t src, volatile uint8_t *dst, uint16_t len)
{ {
uint16_t size; uint16_t size;
uint16_t src_mask; uint16_t src_mask;
uint16_t src_ptr; uint16_t src_ptr;
src_mask = (uint16_t)src & RMASK; src_mask = src & RMASK;
src_ptr = RBASE[s] + src_mask; src_ptr = RBASE[s] + src_mask;
if( (src_mask + len) > RSIZE ) if( (src_mask + len) > RSIZE )

2
libraries/Ethernet/arch/avr/utility/w5100.h
View File

@ -138,7 +138,7 @@ public:
* the data from Receive buffer. Here also take care of the condition while it exceed * the data from Receive buffer. Here also take care of the condition while it exceed
* the Rx memory uper-bound of socket. * the Rx memory uper-bound of socket.
*/ */
void read_data(SOCKET s, volatile uint8_t * src, volatile uint8_t * dst, uint16_t len); void read_data(SOCKET s, volatile uint16_t src, volatile uint8_t * dst, uint16_t len);
/** /**
* @brief This function is being called by send() and sendto() function also. * @brief This function is being called by send() and sendto() function also.