From bb1baffc7963927ae4713259e55031400e091d7e Mon Sep 17 00:00:00 2001 From: Mariano Alvira Date: Thu, 17 Feb 2011 20:54:57 -0500 Subject: [PATCH] change FIX2ETX -> NEIGHBOR_INFO_FIX2ETX in some debug prints. --- core/net/neighbor-info.c | 4 +++- core/net/rpl/rpl.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/net/neighbor-info.c b/core/net/neighbor-info.c index 45986d471..16312e06d 100644 --- a/core/net/neighbor-info.c +++ b/core/net/neighbor-info.c @@ -72,7 +72,9 @@ update_etx(const rimeaddr_t *dest, int packet_etx) new_etx = ((uint16_t)recorded_etx * ETX_ALPHA + (uint16_t)packet_etx * (ETX_SCALE - ETX_ALPHA)) / ETX_SCALE; PRINTF("neighbor-info: ETX changed from %d to %d (packet ETX = %d) %d\n", - FIX2ETX(recorded_etx), FIX2ETX(new_etx), FIX2ETX(packet_etx), + NEIGHBOR_INFO_FIX2ETX(recorded_etx), + NEIGHBOR_INFO_FIX2ETX(new_etx), + NEIGHBOR_INFO_FIX2ETX(packet_etx), dest->u8[7]); if(neighbor_attr_has_neighbor(dest)) { diff --git a/core/net/rpl/rpl.c b/core/net/rpl/rpl.c index 1ff82bf50..fa7ad7be6 100644 --- a/core/net/rpl/rpl.c +++ b/core/net/rpl/rpl.c @@ -130,7 +130,7 @@ rpl_link_neighbor_callback(const rimeaddr_t *addr, int known, int etx) uip_ds6_set_addr_iid(&ipaddr, (uip_lladdr_t *)addr); PRINTF("RPL: Neighbor "); PRINT6ADDR(&ipaddr); - PRINTF(" is %sknown. ETX = %u\n", known ? "" : "no longer ", FIX2ETX(etx)); + PRINTF(" is %sknown. ETX = %u\n", known ? "" : "no longer ", NEIGHBOR_INFO_FIX2ETX(etx)); dag = rpl_get_dag(RPL_DEFAULT_INSTANCE); if(dag == NULL) {