deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix avr-gcc compiler warnings

Browse source
This commit is contained in:
dak664 2010-12-18 22:12:53 +00:00
parent 9575daede2
commit 322d835fee
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/net/mac/phase.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: phase.c,v 1.16 2010/12/16 22:43:07 adamdunkels Exp $ * $Id: phase.c,v 1.17 2010/12/18 22:12:53 dak664 Exp $
*/ */
/** /**
@ -119,7 +119,7 @@ phase_update(const struct phase_list *list,
timer_set(&e->noacks_timer, MAX_NOACKS_TIME); timer_set(&e->noacks_timer, MAX_NOACKS_TIME);
} }
if(e->noacks >= MAX_NOACKS || timer_expired(&e->noacks_timer)) { if(e->noacks >= MAX_NOACKS || timer_expired(&e->noacks_timer)) {
printf("drop %d\n", neighbor->u8[0]); PRINTF("drop %d\n", neighbor->u8[0]);
list_remove(*list->list, e); list_remove(*list->list, e);
memb_free(list->memb, e); memb_free(list->memb, e);
return; return;

6
core/net/rime/collect.c
View file

@ -33,7 +33,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: collect.c,v 1.68 2010/12/16 22:45:15 adamdunkels Exp $ * $Id: collect.c,v 1.69 2010/12/18 22:12:53 dak664 Exp $
*/ */
/** /**
@ -214,7 +214,7 @@ struct {
/* Forward declarations. */ /* Forward declarations. */
static void send_queued_packet(struct collect_conn *c); static void send_queued_packet(struct collect_conn *c);
static void retransmit_callback(void *ptr); static void retransmit_callback(void *ptr);
static void retransmit_not_sent_callback(void *ptr); //static void retransmit_not_sent_callback(void *ptr); //Currently not used, avoid any compiler warning
static void set_keepalive_timer(struct collect_conn *c); static void set_keepalive_timer(struct collect_conn *c);
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -1133,6 +1133,7 @@ node_packet_sent(struct unicast_conn *c, int status, int transmissions)
* MAC layer transmissions to the transmission count, and call the * MAC layer transmissions to the transmission count, and call the
* retransmit function. * retransmit function.
*/ */
#if 0 //not currently used, avoid any compiler warning
static void static void
retransmit_not_sent_callback(void *ptr) retransmit_not_sent_callback(void *ptr)
{ {
@ -1142,6 +1143,7 @@ retransmit_not_sent_callback(void *ptr)
c->transmissions += MAX_MAC_REXMITS + 1; c->transmissions += MAX_MAC_REXMITS + 1;
retransmit_callback(c); retransmit_callback(c);
} }
#endif
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** /**
* This function is called from a ctimer that is setup when a packet * This function is called from a ctimer that is setup when a packet