diff --git a/core/net/mac/phase.c b/core/net/mac/phase.c index 735e61f45..e1af5407e 100644 --- a/core/net/mac/phase.c +++ b/core/net/mac/phase.c @@ -28,7 +28,7 @@ * * 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); } 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); memb_free(list->memb, e); return; diff --git a/core/net/rime/collect.c b/core/net/rime/collect.c index ca7895ac4..01a07c18e 100644 --- a/core/net/rime/collect.c +++ b/core/net/rime/collect.c @@ -33,7 +33,7 @@ * * 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. */ static void send_queued_packet(struct collect_conn *c); 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); /*---------------------------------------------------------------------------*/ @@ -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 * retransmit function. */ +#if 0 //not currently used, avoid any compiler warning static void retransmit_not_sent_callback(void *ptr) { @@ -1142,6 +1143,7 @@ retransmit_not_sent_callback(void *ptr) c->transmissions += MAX_MAC_REXMITS + 1; retransmit_callback(c); } +#endif /*---------------------------------------------------------------------------*/ /** * This function is called from a ctimer that is setup when a packet