Skip to content

Commit d920b7b

Browse files
cmagliecmaglie
committed
Removed unused stuff from WiFi library.
1 parent 825d8c8 commit d920b7b

File tree

9 files changed

+51
-172
lines changed

9 files changed

+51
-172
lines changed

‎libraries/WiFi/arch/avr/WiFiClient.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,10 @@ int WiFiClient::read() {
104104

105105

106106
int WiFiClient::read(uint8_t* buf, size_t size) {
107-
if (!ServerDrv::getDataBuf(_sock, buf, &size))
107+
// sizeof(size_t) is architecture dependent
108+
// but we need a 16 bit data type here
109+
uint16_t _size = size;
110+
if (!ServerDrv::getDataBuf(_sock, buf, &_size))
108111
return -1;
109112
return 0;
110113
}

‎libraries/WiFi/arch/avr/WiFiUdp.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ int WiFiUDP::read(unsigned char* buffer, size_t len)
115115
{
116116
if (available())
117117
{
118-
size_t size = 0;
118+
uint16_t size = 0;
119119
if (!ServerDrv::getDataBuf(_sock, buffer, &size))
120120
return -1;
121121
// TODO check if the buffer is too smal respect to buffer size

‎libraries/WiFi/arch/avr/utility/socket.h‎

Lines changed: 10 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -15,73 +15,20 @@
1515
#define SOCK_NOT_AVAIL 255
1616

1717
#include "utility/wl_definitions.h"
18-
/**
19-
* The 8-bit signed data type.
20-
*/
21-
typedef char int8;
22-
/**
23-
* The volatile 8-bit signed data type.
24-
*/
25-
typedef volatile char vint8;
26-
/**
27-
* The 8-bit unsigned data type.
28-
*/
29-
typedef unsigned char uint8;
30-
/**
31-
* The volatile 8-bit unsigned data type.
32-
*/
33-
typedef volatile unsigned char vuint8;
3418

35-
/**
36-
* The 16-bit signed data type.
37-
*/
38-
typedef int int16;
39-
/**
40-
* The volatile 16-bit signed data type.
41-
*/
42-
typedef volatile int vint16;
43-
/**
44-
* The 16-bit unsigned data type.
45-
*/
46-
typedef unsigned int uint16;
47-
/**
48-
* The volatile 16-bit unsigned data type.
49-
*/
50-
typedef volatile unsigned int vuint16;
51-
/**
52-
* The 32-bit signed data type.
53-
*/
54-
typedef long int32;
55-
/**
56-
* The volatile 32-bit signed data type.
57-
*/
58-
typedef volatile long vint32;
59-
/**
60-
* The 32-bit unsigned data type.
61-
*/
62-
typedef unsigned long uint32;
63-
/**
64-
* The volatile 32-bit unsigned data type.
65-
*/
66-
typedef volatile unsigned long vuint32;
19+
typedef uint16_t SOCKET;
6720

68-
/* bsd */
69-
typedef uint8 u_char; /**< 8-bit value */
70-
typedef uint16_t SOCKET;
71-
typedef uint16 u_short; /**< 16-bit value */
72-
typedef uint16 u_int; /**< 16-bit value */
73-
typedef uint32 u_long; /**< 32-bit value */
74-
75-
extern SOCKET socket(uint8 protocol); // Opens a socket(TCP or UDP or IP_RAW mode)
21+
extern SOCKET socket(uint8_t protocol); // Opens a socket(TCP or UDP or IP_RAW mode)
7622
extern void close(SOCKET s); // Close socket
77-
extern uint8 connect(SOCKET s, uint8 * addr, uint16 port); // Establish TCP connection (Active connection)
23+
extern uint8_t connect(SOCKET s, uint8_t * addr, uint16_t port); // Establish TCP connection (Active connection)
7824
extern void disconnect(SOCKET s); // disconnect the connection
79-
extern uint8 listen(SOCKET s); // Establish TCP connection (Passive connection)
80-
extern uint16 send(SOCKET s, const uint8 * buf, uint16 len); // Send data (TCP)
81-
extern uint16 recv(SOCKET s, uint8 * buf, uint16 len); // Receive data (TCP)
82-
extern uint16 sendto(SOCKET s, const uint8 * buf, uint16 len, uint8 * addr, uint16 port); // Send data (UDP/IP RAW)
83-
extern uint16 recvfrom(SOCKET s, uint8 * buf, uint16 len, uint8 * addr, uint16 *port); // Receive data (UDP/IP RAW)
25+
extern uint8_t listen(SOCKET s); // Establish TCP connection (Passive connection)
26+
extern uint16_t send(SOCKET s, const uint8_t * buf, uint16_t len); // Send data (TCP)
27+
extern uint16_t recv(SOCKET s, uint8_t * buf, uint16_t len); // Receive data (TCP)
28+
extern uint16_t sendto(SOCKET s, const uint8_t * buf, uint16_t len, uint8_t * addr, uint16_t port); // Send data (UDP/IP RAW)
29+
extern uint16_t recvfrom(SOCKET s, uint8_t * buf, uint16_t len, uint8_t * addr, uint16_t *port); // Receive data (UDP/IP RAW)
30+
31+
extern uint16_t igmpsend(SOCKET s, const uint8_t * buf, uint16_t len);
8432

85-
extern uint16 igmpsend(SOCKET s, const uint8 * buf, uint16 len);
8633
#endif
8734
/* _SOCKET_H_ */

‎libraries/WiFi/arch/avr/utility/spi_drv.cpp‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@ extern "C" {
88
#include "utility/debug.h"
99
}
1010

11-
#define DATAOUT 11 // MOSI
12-
#define DATAIN 12 // MISO
13-
#define SPICLOCK 13 // sck
14-
#define SLAVESELECT 10 // ss
15-
#define SLAVEREADY 7 // handshake pin
16-
#define WIFILED 9 // led on wifi shield
17-
18-
#define DELAY_100NS do { asm volatile("nop"); }while(0);
19-
#define DELAY_SPI(X) { int ii=0; do { asm volatile("nop"); }while(++ii<X);}
11+
#define DATAOUT 11 // MOSI
12+
#define DATAIN 12 // MISO
13+
#define SPICLOCK 13 // sck
14+
#define SLAVESELECT 10 // ss
15+
#define SLAVEREADY 7 // handshake pin
16+
#define WIFILED 9 // led on wifi shield
17+
18+
#define DELAY_SPI(X) { int ii=0; do { asm volatile("nop"); } while (++ii < X); }
2019
#define DELAY_TRANSFER() DELAY_SPI(10)
2120

2221
void SpiDrv::begin()
@@ -52,17 +51,6 @@ void SpiDrv::spiSlaveDeselect()
5251
digitalWrite(SLAVESELECT,HIGH);
5352
}
5453

55-
/*
56-
void delaySpi()
57-
{
58-
int i = 0;
59-
const int DELAY = 1000;
60-
for (;i<DELAY;++i)
61-
{
62-
int a =a+1;
63-
}
64-
}
65-
*/
6654

6755
char SpiDrv::spiTransfer(volatile char data)
6856
{

‎libraries/WiFi/arch/avr/utility/wifi_spi.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#ifndef WiFi_Spi_h
22
#define WiFi_Spi_h
33

4+
#include <inttypes.h>
45
#include "utility/wl_definitions.h"
56

67
#define CMD_FLAG 0

‎libraries/WiFi/arch/sam/WiFiClient.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ int WiFiClient::read() {
104104

105105

106106
int WiFiClient::read(uint8_t* buf, size_t size) {
107+
// sizeof(size_t) is architecture dependent
108+
// but we need a 16 bit data type here
107109
uint16_t _size = size;
108110
if (!ServerDrv::getDataBuf(_sock, buf, &_size))
109111
return -1;

‎libraries/WiFi/arch/sam/utility/socket.h‎

Lines changed: 10 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -15,73 +15,20 @@
1515
#define SOCK_NOT_AVAIL 255
1616

1717
#include "utility/wl_definitions.h"
18-
/**
19-
* The 8-bit signed data type.
20-
*/
21-
typedef char int8;
22-
/**
23-
* The volatile 8-bit signed data type.
24-
*/
25-
typedef volatile char vint8;
26-
/**
27-
* The 8-bit unsigned data type.
28-
*/
29-
typedef unsigned char uint8;
30-
/**
31-
* The volatile 8-bit unsigned data type.
32-
*/
33-
typedef volatile unsigned char vuint8;
3418

35-
/**
36-
* The 16-bit signed data type.
37-
*/
38-
typedef int int16;
39-
/**
40-
* The volatile 16-bit signed data type.
41-
*/
42-
typedef volatile int vint16;
43-
/**
44-
* The 16-bit unsigned data type.
45-
*/
46-
typedef unsigned int uint16;
47-
/**
48-
* The volatile 16-bit unsigned data type.
49-
*/
50-
typedef volatile unsigned int vuint16;
51-
/**
52-
* The 32-bit signed data type.
53-
*/
54-
typedef long int32;
55-
/**
56-
* The volatile 32-bit signed data type.
57-
*/
58-
typedef volatile long vint32;
59-
/**
60-
* The 32-bit unsigned data type.
61-
*/
62-
typedef unsigned long uint32;
63-
/**
64-
* The volatile 32-bit unsigned data type.
65-
*/
66-
typedef volatile unsigned long vuint32;
19+
typedef uint16_t SOCKET;
6720

68-
/* bsd */
69-
typedef uint8 u_char; /**< 8-bit value */
70-
typedef uint16_t SOCKET;
71-
//typedef uint16 u_short; /**< 16-bit value */
72-
typedef uint16 u_int; /**< 16-bit value */
73-
typedef uint32 u_long; /**< 32-bit value */
74-
75-
extern SOCKET socket(uint8 protocol); // Opens a socket(TCP or UDP or IP_RAW mode)
21+
extern SOCKET socket(uint8_t protocol); // Opens a socket(TCP or UDP or IP_RAW mode)
7622
extern void close(SOCKET s); // Close socket
77-
extern uint8 connect(SOCKET s, uint8 * addr, uint16 port); // Establish TCP connection (Active connection)
23+
extern uint8_t connect(SOCKET s, uint8_t * addr, uint16_t port); // Establish TCP connection (Active connection)
7824
extern void disconnect(SOCKET s); // disconnect the connection
79-
extern uint8 listen(SOCKET s); // Establish TCP connection (Passive connection)
80-
extern uint16 send(SOCKET s, const uint8 * buf, uint16 len); // Send data (TCP)
81-
extern uint16 recv(SOCKET s, uint8 * buf, uint16 len); // Receive data (TCP)
82-
extern uint16 sendto(SOCKET s, const uint8 * buf, uint16 len, uint8 * addr, uint16 port); // Send data (UDP/IP RAW)
83-
extern uint16 recvfrom(SOCKET s, uint8 * buf, uint16 len, uint8 * addr, uint16 *port); // Receive data (UDP/IP RAW)
25+
extern uint8_t listen(SOCKET s); // Establish TCP connection (Passive connection)
26+
extern uint16_t send(SOCKET s, const uint8_t * buf, uint16_t len); // Send data (TCP)
27+
extern uint16_t recv(SOCKET s, uint8_t * buf, uint16_t len); // Receive data (TCP)
28+
extern uint16_t sendto(SOCKET s, const uint8_t * buf, uint16_t len, uint8_t * addr, uint16_t port); // Send data (UDP/IP RAW)
29+
extern uint16_t recvfrom(SOCKET s, uint8_t * buf, uint16_t len, uint8_t * addr, uint16_t *port); // Receive data (UDP/IP RAW)
30+
31+
extern uint16_t igmpsend(SOCKET s, const uint8_t * buf, uint16_t len);
8432

85-
extern uint16 igmpsend(SOCKET s, const uint8 * buf, uint16 len);
8633
#endif
8734
/* _SOCKET_H_ */

‎libraries/WiFi/arch/sam/utility/spi_drv.cpp‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ extern "C" {
88
#include "utility/debug.h"
99
}
1010

11-
#define DATAOUT 11 // MOSI
12-
#define DATAIN 12 // MISO
13-
#define SPICLOCK 13 // sck
11+
#define DATAOUT 11 // MOSI
12+
#define DATAIN 12 // MISO
13+
#define SPICLOCK 13 // sck
1414
#define SLAVESELECT 10 // ss
15-
#define SLAVEREADY 7 // handshake pin
16-
#define WIFILED 9 // led on wifi shield
15+
#define SLAVEREADY 7 // handshake pin
16+
#define WIFILED 9 // led on wifi shield
1717

1818
#define DELAY_SPI(X) { int ii=0; do { asm volatile("nop"); } while (++ii < X*6); }
1919
#define DELAY_TRANSFER() DELAY_SPI(10)
@@ -37,7 +37,7 @@ void SpiDrv::begin()
3737
}
3838

3939
void SpiDrv::end() {
40-
SPI.end();
40+
SPI.end();
4141
}
4242

4343
void SpiDrv::spiSlaveSelect()
@@ -51,19 +51,10 @@ void SpiDrv::spiSlaveDeselect()
5151
digitalWrite(SLAVESELECT,HIGH);
5252
}
5353

54-
//void delaySpi()
55-
//{
56-
// int i = 0;
57-
// const int DELAY = 1000;
58-
// for (;i<DELAY;++i)
59-
// {
60-
// int a =a+1;
61-
// }
62-
//}
6354

6455
char SpiDrv::spiTransfer(volatile char data)
6556
{
66-
char result = SPI.transfer(data);
57+
char result = SPI.transfer(data);
6758
DELAY_TRANSFER();
6859

6960
return result; // return the received byte

‎libraries/WiFi/src/utility/socket.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
#include <inttypes.h>
88
#include "utility/socket.h"
99

10-
SOCKET socket(uint8 protocol) {return 0;} // Opens a socket(TCP or UDP or IP_RAW mode)
10+
SOCKET socket(uint8_t protocol) {return 0;} // Opens a socket(TCP or UDP or IP_RAW mode)
1111
void close(SOCKET s) {} // Close socket
12-
uint8 connect(SOCKET s, uint8 * addr, uint16 port) {return 0;} // Establish TCP connection (Active connection)
12+
uint8_t connect(SOCKET s, uint8_t * addr, uint16_t port) {return 0;} // Establish TCP connection (Active connection)
1313
void disconnect(SOCKET s) {} // disconnect the connection
14-
uint8 listen(SOCKET s) { return 0;} // Establish TCP connection (Passive connection)
15-
uint16 send(SOCKET s, const uint8 * buf, uint16 len) { return 0;} // Send data (TCP)
16-
uint16 recv(SOCKET s, uint8 * buf, uint16 len) {return 0;} // Receive data (TCP)
17-
uint16 sendto(SOCKET s, const uint8 * buf, uint16 len, uint8 * addr, uint16 port) {return 0;} // Send data (UDP/IP RAW)
18-
uint16 recvfrom(SOCKET s, uint8 * buf, uint16 len, uint8 * addr, uint16 *port) {return 0;} // Receive data (UDP/IP RAW)
14+
uint8_t listen(SOCKET s) { return 0;} // Establish TCP connection (Passive connection)
15+
uint16_t send(SOCKET s, const uint8_t * buf, uint16_t len) { return 0;} // Send data (TCP)
16+
uint16_t recv(SOCKET s, uint8_t * buf, uint16_t len) {return 0;} // Receive data (TCP)
17+
uint16_t sendto(SOCKET s, const uint8_t * buf, uint16_t len, uint8_t * addr, uint16_t port) {return 0;} // Send data (UDP/IP RAW)
18+
uint16_t recvfrom(SOCKET s, uint8_t * buf, uint16_t len, uint8_t * addr, uint16_t *port) {return 0;} // Receive data (UDP/IP RAW)
1919

20-
uint16 igmpsend(SOCKET s, const uint8 * buf, uint16 len) {return 0;}
20+
uint16_t igmpsend(SOCKET s, const uint8_t * buf, uint16_t len) {return 0;}

0 commit comments

Comments
 (0)