From fe3e06bfce87154c6f77878d760b2a628f08cb5e Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Thu, 8 Aug 2013 22:56:17 +0200 Subject: [PATCH 1/2] added missing include to transceiver --- sys/transceiver/transceiver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/transceiver/transceiver.c b/sys/transceiver/transceiver.c index 97bdb66d7971..3ce84c94f8b3 100644 --- a/sys/transceiver/transceiver.c +++ b/sys/transceiver/transceiver.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include From 0815de942a84b1d6fb28d5bd2173ae6551fac6ae Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Thu, 8 Aug 2013 23:43:15 +0200 Subject: [PATCH 2/2] fixed debugging in transceiver (stack size was too small) --- sys/include/transceiver.h | 32 ++++++++++++++++++++++++-------- sys/transceiver/transceiver.c | 19 ++++++------------- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/sys/include/transceiver.h b/sys/include/transceiver.h index 1c3d5be666b8..1731c892d6d6 100644 --- a/sys/include/transceiver.h +++ b/sys/include/transceiver.h @@ -5,17 +5,33 @@ /* Stack size for transceiver thread */ #ifndef TRANSCEIVER_STACK_SIZE -#if ENABLE_DEBUG -#define TRANSCEIVER_STACK_SIZE (KERNEL_CONF_STACKSIZE_PRINTF) -#else -#define TRANSCEIVER_STACK_SIZE (512) -#endif + #define TRANSCEIVER_STACK_SIZE (512) #endif +#define PAYLOAD_SIZE (0) +#ifdef MODULE_CC110X + #if (CC1100_MAX_DATA_LENGTH > PAYLOAD_SIZE) + #undef PAYLOAD_SIZE + #define PAYLOAD_SIZE (CC1100_MAX_DATA_LENGTH) + #endif +#endif +#ifdef MODULE_CC110X_NG + #if (CC1100_MAX_DATA_LENGTH > PAYLOAD_SIZE) + #undef PAYLOAD_SIZE + #define PAYLOAD_SIZE (CC1100_MAX_DATA_LENGTH) + #endif +#endif #ifdef MODULE_CC2420 -#define PAYLOAD_SIZE (118) -#else -#define PAYLOAD_SIZE (58) + #if (CC2420_MAX_DATA_LENGTH > PAYLOAD_SIZE) + #undef PAYLOAD_SIZE + #define PAYLOAD_SIZE (CC2420_MAX_DATA_LENGTH) + #endif +#endif +#ifdef MODULE_MC1322X + #if (MC1322X_MAX_DATA_LENGTH > PAYLOAD_SIZE) + #undef PAYLOAD_SIZE + #define PAYLOAD_SIZE (MC1322X_MAX_DATA_LENGTH) + #endif #endif /* The maximum of threads to register */ #define TRANSCEIVER_MAX_REGISTERED (4) diff --git a/sys/transceiver/transceiver.c b/sys/transceiver/transceiver.c index 3ce84c94f8b3..015b1f1a56b0 100644 --- a/sys/transceiver/transceiver.c +++ b/sys/transceiver/transceiver.c @@ -24,32 +24,21 @@ #include #include -#include #include +#include "transceiver.h" + /* supported transceivers */ #ifdef MODULE_CC110X #include -#if (CC1100_MAX_DATA_LENGTH > PAYLOAD_SIZE) -#undef PAYLOAD_SIZE -#define PAYLOAD_SIZE (CC1100_MAX_DATA_LENGTH) -#endif #endif #ifdef MODULE_CC110X_NG #include -#if (CC1100_MAX_DATA_LENGTH > PAYLOAD_SIZE) -#undef PAYLOAD_SIZE -#define PAYLOAD_SIZE (CC1100_MAX_DATA_LENGTH) -#endif #endif #ifdef MODULE_CC2420 #include -#if (CC2420_MAX_DATA_LENGTH > PAYLOAD_SIZE) - #undef PAYLOAD_SIZE - #define PAYLOAD_SIZE (CC2420_MAX_DATA_LENGTH) -#endif #endif #ifdef MODULE_MC1322X @@ -59,6 +48,10 @@ #endif #define ENABLE_DEBUG (0) +#if ENABLE_DEBUG + #undef TRANSCEIVER_STACK_SIZE + #define TRANSCEIVER_STACK_SIZE (KERNEL_CONF_STACKSIZE_PRINTF) +#endif #include /*------------------------------------------------------------------------------------*/