Skip to content

Commit 453ae01

Browse files
authored
Merge pull request #28 from soburi/uip_include
Correcting broken uIP library.
2 parents 6121f37 + 7930e80 commit 453ae01

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

libraries/uIP/src/MicroIp.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ extern "C" {
2727
#include <net/ip/uip-debug.h>
2828
}
2929

30+
#include "wiring_private.h"
3031
#include "MicroIp.h"
3132

3233
struct resolv_params {

libraries/uIP/src/MicroIpClient.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ extern "C" {
2525
}
2626

2727
#include "Arduino.h"
28+
#include "wiring_private.h"
2829
#include "MicroIp.h"
2930
#include "MicroIpClient.h"
3031

@@ -226,6 +227,8 @@ void MicroIPClient::do_tcp_socket_connect(void* ptr)
226227
int MicroIPClient::wait_tcp_socket_event(process_event_t ev, process_data_t data, void* ptr) {
227228
struct tcp_socket_params* params = reinterpret_cast<struct tcp_socket_params*>(ptr);
228229
MicroIPClient* client = const_cast<MicroIPClient*>(params->client);
230+
(void)ev;
231+
(void)data;
229232

230233
PRINTF("wait_tcp_socket_event client->state=%d\n", client->state);
231234
if(client->event_wait) {
@@ -287,13 +290,15 @@ int MicroIPClient::listen(uint16_t port)
287290
int MicroIPClient::data_callback(struct tcp_socket *s, void *ptr, const uint8_t *input_data_ptr, int input_data_len) {
288291
PRINTF("MicroIPClient::data_callback %d\n", input_data_len);
289292
MicroIPClient* client = reinterpret_cast<MicroIPClient*>(ptr);
293+
(void)s;
290294
int wb = client->receive(input_data_ptr, input_data_len);
291295
return (input_data_len - wb);
292296
}
293297

294298
void MicroIPClient::event_callback(struct tcp_socket *s, void *ptr, tcp_socket_event_t event) {
295299
PRINTF("MicroIPClient::event_callback %d\n", event);
296300
MicroIPClient* client = reinterpret_cast<MicroIPClient*>(ptr);
301+
(void)s;
297302
client->state = event;
298303
client->event_wait= false;
299304
post_continue();

libraries/uIP/src/MicroIpUdp.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ extern "C" {
2525
}
2626

2727
#include "Arduino.h"
28+
#include "wiring_private.h"
2829
#include "Udp.h"
2930
#include "MicroIP.h"
3031
#include "MicroIPUDP.h"
@@ -228,6 +229,8 @@ void MicroIPUDP::receive(const uip_ipaddr_t *source_addr, uint16_t source_port,
228229
{
229230
const uint16_t store_size =static_cast<uint16_t>(datalen+sz_pack);
230231
struct receive_pack pack = { store_size, *source_addr, source_port };
232+
(void) dest_addr;
233+
(void) dest_port;
231234
PRINTF("MicroIPUDP::receive %d %d %d\n", sz_pack, store_size, datalen );
232235

233236
if( store_size > ringbuf_size(&rxbuf) ) {
@@ -276,6 +279,7 @@ void MicroIPUDP::input_callback(struct udp_socket *c, void *ptr,
276279
const uint8_t *data, uint16_t datalen)
277280
{
278281
MicroIPUDP* udp = reinterpret_cast<MicroIPUDP*>(ptr);
282+
(void)c;
279283
udp->receive(source_addr, source_port, dest_addr, dest_port, data, datalen);
280284
}
281285

0 commit comments

Comments
 (0)