From bc398ca546421960cdde3417ef29b313dffdcdd8 Mon Sep 17 00:00:00 2001 From: joxe Date: Mon, 21 Jun 2010 19:48:00 +0000 Subject: [PATCH] removed platform dependent loop-count from cc2420 - moved to platform config instead --- core/dev/cc2420.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/core/dev/cc2420.c b/core/dev/cc2420.c index 96c8a4ed3..78a158be1 100644 --- a/core/dev/cc2420.c +++ b/core/dev/cc2420.c @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * @(#)$Id: cc2420.c,v 1.54 2010/06/21 19:09:35 joxe Exp $ + * @(#)$Id: cc2420.c,v 1.55 2010/06/21 19:48:00 joxe Exp $ */ /* * This code is almost device independent and should be easy to port. @@ -362,12 +362,10 @@ cc2420_transmit(unsigned short payload_len) * Note that we may have to wait up to 320 us (20 symbols) before * transmission starts. */ -#ifdef TMOTE_SKY -#define LOOP_20_SYMBOLS 800 /* 326us (msp430 @ 2.4576MHz) */ -#elif __AVR__ -#define LOOP_20_SYMBOLS 500 /* XXX */ -#elif ZOLERTIA_Z1 -#define LOOP_20_SYMBOLS 1302 /* 326us msp430X @ 8MHz */ +#ifndef CC2420_CONF_SYMBOL_LOOP_COUNT +#error CC2420_CONF_SYMBOL_LOOP_COUNT needs to be set!!! +#else +#define LOOP_20_SYMBOLS CC2420_CONF_SYMBOL_LOOP_COUNT #endif #if WITH_SEND_CCA