From 966e9fc4840514cd48f51c68a8a368c231555ea5 Mon Sep 17 00:00:00 2001 From: lebrush Date: Wed, 15 May 2013 11:42:17 +0200 Subject: [PATCH 1/2] Force sicslowpan to use uip-debug rather than an own system --- core/net/sicslowpan.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/core/net/sicslowpan.c b/core/net/sicslowpan.c index 1d643b409..ff79f46d8 100644 --- a/core/net/sicslowpan.c +++ b/core/net/sicslowpan.c @@ -72,25 +72,21 @@ #include -#define DEBUG 0 +#undef DEBUG +#define DEBUG DEBUG_NONE +#include "net/uip-debug.h" #if DEBUG /* PRINTFI and PRINTFO are defined for input and output to debug one without changing the timing of the other */ uint8_t p; #include -#define PRINTF(...) printf(__VA_ARGS__) -#define PRINTFI(...) printf(__VA_ARGS__) -#define PRINTFO(...) printf(__VA_ARGS__) -#define PRINT6ADDR(addr) PRINTF(" %02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x ", ((uint8_t *)addr)[0], ((uint8_t *)addr)[1], ((uint8_t *)addr)[2], ((uint8_t *)addr)[3], ((uint8_t *)addr)[4], ((uint8_t *)addr)[5], ((uint8_t *)addr)[6], ((uint8_t *)addr)[7], ((uint8_t *)addr)[8], ((uint8_t *)addr)[9], ((uint8_t *)addr)[10], ((uint8_t *)addr)[11], ((uint8_t *)addr)[12], ((uint8_t *)addr)[13], ((uint8_t *)addr)[14], ((uint8_t *)addr)[15]) -#define PRINTLLADDR(lladdr) PRINTF(" %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x ",lladdr->addr[0], lladdr->addr[1], lladdr->addr[2], lladdr->addr[3],lladdr->addr[4], lladdr->addr[5],lladdr->addr[6], lladdr->addr[7]) +#define PRINTFI(...) PRINTF(__VA_ARGS__) +#define PRINTFO(...) PRINTF(__VA_ARGS__) #define PRINTPACKETBUF() PRINTF("RIME buffer: "); for(p = 0; p < packetbuf_datalen(); p++){PRINTF("%.2X", *(rime_ptr + p));} PRINTF("\n") #define PRINTUIPBUF() PRINTF("UIP buffer: "); for(p = 0; p < uip_len; p++){PRINTF("%.2X", uip_buf[p]);}PRINTF("\n") #define PRINTSICSLOWPANBUF() PRINTF("SICSLOWPAN buffer: "); for(p = 0; p < sicslowpan_len; p++){PRINTF("%.2X", sicslowpan_buf[p]);}PRINTF("\n") #else -#define PRINTF(...) #define PRINTFI(...) #define PRINTFO(...) -#define PRINT6ADDR(addr) -#define PRINTLLADDR(lladdr) #define PRINTPACKETBUF() #define PRINTUIPBUF() #define PRINTSICSLOWPANBUF() From eef6d7a37efb81f6ca15716ceaa8f9d679f13831 Mon Sep 17 00:00:00 2001 From: lebrush Date: Wed, 15 May 2013 16:49:36 +0200 Subject: [PATCH 2/2] Removed undef --- core/net/sicslowpan.c | 1 - 1 file changed, 1 deletion(-) diff --git a/core/net/sicslowpan.c b/core/net/sicslowpan.c index ff79f46d8..78bc0dceb 100644 --- a/core/net/sicslowpan.c +++ b/core/net/sicslowpan.c @@ -72,7 +72,6 @@ #include -#undef DEBUG #define DEBUG DEBUG_NONE #include "net/uip-debug.h" #if DEBUG