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

Merge pull request #216 from lebrush/printf-leftovers

Browse source 
Corrects some leftover uncapitalized printfs
This commit is contained in:
Oliver Schmidt 2013-05-15 12:50:20 -07:00
parent 8451a4198d 82d498f3a1
commit 223083d192
2 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -304,7 +304,7 @@ schedule_powercycle(struct rtimer *t, rtimer_clock_t time)
r = rtimer_set(t, RTIMER_TIME(t) + time, 1, r = rtimer_set(t, RTIMER_TIME(t) + time, 1,
(void (*)(struct rtimer *, void *))powercycle, NULL); (void (*)(struct rtimer *, void *))powercycle, NULL);
if(r != RTIMER_OK) { if(r != RTIMER_OK) {
printf("schedule_powercycle: could not set rtimer\n"); PRINTF("schedule_powercycle: could not set rtimer\n");
} }
} }
} }
@ -323,7 +323,7 @@ schedule_powercycle_fixed(struct rtimer *t, rtimer_clock_t fixed_time)
r = rtimer_set(t, fixed_time, 1, r = rtimer_set(t, fixed_time, 1,
(void (*)(struct rtimer *, void *))powercycle, NULL); (void (*)(struct rtimer *, void *))powercycle, NULL);
if(r != RTIMER_OK) { if(r != RTIMER_OK) {
printf("schedule_powercycle: could not set rtimer\n"); PRINTF("schedule_powercycle: could not set rtimer\n");
} }
} }
} }

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

@ -310,7 +310,7 @@ update_parent(struct collect_conn *tc)
bump_advertisement(tc); bump_advertisement(tc);
} else { } else {
if(DRAW_TREE) { if(DRAW_TREE) {
printf("#A e=%d\n", collect_neighbor_link_estimate(best)); PRINTF("#A e=%d\n", collect_neighbor_link_estimate(best));
} }
if(collect_neighbor_rtmetric_link_estimate(best) + if(collect_neighbor_rtmetric_link_estimate(best) +
SIGNIFICANT_RTMETRIC_PARENT_CHANGE < SIGNIFICANT_RTMETRIC_PARENT_CHANGE <
@ -329,30 +329,30 @@ update_parent(struct collect_conn *tc)
bump_advertisement(tc); bump_advertisement(tc);
if(DRAW_TREE) { if(DRAW_TREE) {
printf("#A e=%d\n", collect_neighbor_link_estimate(best)); PRINTF("#A e=%d\n", collect_neighbor_link_estimate(best));
/* { /* {
int i; int i;
int etx = 0; int etx = 0;
printf("#A l="); PRINTF("#A l=");
for(i = 0; i < 8; i++) { for(i = 0; i < 8; i++) {
printf("%d ", best->le.history[(best->le.historyptr - 1 - i) & 7]); PRINTF("%d ", best->le.history[(best->le.historyptr - 1 - i) & 7]);
etx += current->le.history[i]; etx += current->le.history[i];
} }
printf("\n"); PRINTF("\n");
}*/ }*/
} }
} else { } else {
if(DRAW_TREE) { if(DRAW_TREE) {
printf("#A e=%d\n", collect_neighbor_link_estimate(current)); PRINTF("#A e=%d\n", collect_neighbor_link_estimate(current));
/* { /* {
int i; int i;
int etx = 0; int etx = 0;
printf("#A l="); PRINTF("#A l=");
for(i = 0; i < 8; i++) { for(i = 0; i < 8; i++) {
printf("%d ", current->le.history[(current->le.historyptr - 1 - i) & 7]); PRINTF("%d ", current->le.history[(current->le.historyptr - 1 - i) & 7]);
etx += current->le.history[i]; etx += current->le.history[i];
} }
printf("\n"); PRINTF("\n");
}*/ }*/
} }
} }
@ -360,16 +360,16 @@ update_parent(struct collect_conn *tc)
if(DRAW_TREE) { if(DRAW_TREE) {
if(!rimeaddr_cmp(&previous_parent, &tc->parent)) { if(!rimeaddr_cmp(&previous_parent, &tc->parent)) {
if(!rimeaddr_cmp(&previous_parent, &rimeaddr_null)) { if(!rimeaddr_cmp(&previous_parent, &rimeaddr_null)) {
printf("#L %d 0\n", previous_parent.u8[0]); PRINTF("#L %d 0\n", previous_parent.u8[0]);
} }
printf("#L %d 1\n", tc->parent.u8[0]); PRINTF("#L %d 1\n", tc->parent.u8[0]);
} }
} }
} else { } else {
/* No parent. */ /* No parent. */
if(!rimeaddr_cmp(&tc->parent, &rimeaddr_null)) { if(!rimeaddr_cmp(&tc->parent, &rimeaddr_null)) {
if(DRAW_TREE) { if(DRAW_TREE) {
printf("#L %d 0\n", tc->parent.u8[0]); PRINTF("#L %d 0\n", tc->parent.u8[0]);
} }
stats.routelost++; stats.routelost++;
} }
@ -437,7 +437,7 @@ update_rtmetric(struct collect_conn *tc)
} }
if(DRAW_TREE) { if(DRAW_TREE) {
if(old_rtmetric != new_rtmetric) { if(old_rtmetric != new_rtmetric) {
printf("#A rt=%d,p=%d\n", tc->rtmetric, tc->parent.u8[0]); PRINTF("#A rt=%d,p=%d\n", tc->rtmetric, tc->parent.u8[0]);
} }
} }
} }
@ -772,7 +772,7 @@ handle_ack(struct collect_conn *tc)
&tc->current_parent) && &tc->current_parent) &&
packetbuf_attr(PACKETBUF_ATTR_PACKET_ID) == tc->seqno) { packetbuf_attr(PACKETBUF_ATTR_PACKET_ID) == tc->seqno) {
/* printf("rtt %d / %d = %d.%02d\n", /* PRINTF("rtt %d / %d = %d.%02d\n",
(int)(clock_time() - tc->send_time), (int)(clock_time() - tc->send_time),
(int)CLOCK_SECOND, (int)CLOCK_SECOND,
(int)((clock_time() - tc->send_time) / CLOCK_SECOND), (int)((clock_time() - tc->send_time) / CLOCK_SECOND),
@ -945,7 +945,7 @@ node_packet_received(struct unicast_conn *c, const rimeaddr_t *from)
/* If the queue is more than half filled, we add the CONGESTED /* If the queue is more than half filled, we add the CONGESTED
flag to our outgoing acks. */ flag to our outgoing acks. */
if(DRAW_TREE) { if(DRAW_TREE) {
printf("#A s=%d\n", packetqueue_len(&tc->send_queue)); PRINTF("#A s=%d\n", packetqueue_len(&tc->send_queue));
} }
if(packetqueue_len(&tc->send_queue) >= MAX_SENDING_QUEUE / 2) { if(packetqueue_len(&tc->send_queue) >= MAX_SENDING_QUEUE / 2) {
ackflags |= ACK_FLAGS_CONGESTED; ackflags |= ACK_FLAGS_CONGESTED;
@ -1089,7 +1089,7 @@ timedout(struct collect_conn *tc)
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1], tc->transmissions, rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1], tc->transmissions,
tc->current_parent.u8[0], tc->current_parent.u8[1], tc->current_parent.u8[0], tc->current_parent.u8[1],
tc->max_rexmits); tc->max_rexmits);
printf("%d.%d: timedout after %d retransmissions to %d.%d (max retransmissions %d): packet dropped\n", PRINTF("%d.%d: timedout after %d retransmissions to %d.%d (max retransmissions %d): packet dropped\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1], tc->transmissions, rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1], tc->transmissions,
tc->current_parent.u8[0], tc->current_parent.u8[1], tc->current_parent.u8[0], tc->current_parent.u8[1],
tc->max_rexmits); tc->max_rexmits);
@ -1394,7 +1394,7 @@ collect_set_sink(struct collect_conn *tc, int should_be_sink)
bump_advertisement(tc); bump_advertisement(tc);
if(DRAW_TREE) { if(DRAW_TREE) {
printf("#A rt=0,p=0\n"); PRINTF("#A rt=0,p=0\n");
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -1455,7 +1455,7 @@ collect_send(struct collect_conn *tc, int rexmits)
} else { } else {
PRINTF("%d.%d: drop originated packet: no queuebuf\n", PRINTF("%d.%d: drop originated packet: no queuebuf\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1]); rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1]);
printf("%d.%d: drop originated packet: no queuebuf\n", PRINTF("%d.%d: drop originated packet: no queuebuf\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1]); rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1]);
ret = 0; ret = 0;
} }
@ -1491,7 +1491,7 @@ collect_send(struct collect_conn *tc, int rexmits)
} else { } else {
PRINTF("%d.%d: drop originated packet: no queuebuf\n", PRINTF("%d.%d: drop originated packet: no queuebuf\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1]); rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1]);
printf("%d.%d: drop originated packet: no queuebuf\n", PRINTF("%d.%d: drop originated packet: no queuebuf\n",
rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1]); rimeaddr_node_addr.u8[0], rimeaddr_node_addr.u8[1]);
}*/ }*/
} }
@ -1518,7 +1518,7 @@ collect_purge(struct collect_conn *tc)
rimeaddr_copy(&tc->parent, &rimeaddr_null); rimeaddr_copy(&tc->parent, &rimeaddr_null);
update_rtmetric(tc); update_rtmetric(tc);
if(DRAW_TREE) { if(DRAW_TREE) {
printf("#L %d 0\n", tc->parent.u8[0]); PRINTF("#L %d 0\n", tc->parent.u8[0]);
} }
rimeaddr_copy(&tc->parent, &rimeaddr_null); rimeaddr_copy(&tc->parent, &rimeaddr_null);
} }