diff --git a/cpu/mc1322x/contiki-maca.c b/cpu/mc1322x/contiki-maca.c index 4a3171946..10bc2ba21 100644 --- a/cpu/mc1322x/contiki-maca.c +++ b/cpu/mc1322x/contiki-maca.c @@ -30,7 +30,7 @@ * * This file is part of the Contiki OS. * - * $Id: contiki-maca.c,v 1.4 2010/09/13 14:15:58 maralvira Exp $ + * $Id: contiki-maca.c,v 1.5 2010/11/07 18:34:52 maralvira Exp $ */ #include @@ -53,8 +53,8 @@ #define PRINTF(...) #endif -#ifndef MACA_RAW_PREPEND -#define MACA_RAW_PREPEND 0xff +#ifndef CONTIKI_MACA_PREPEND_BYTE +#define CONTIKI_MACA_PREPEND_BYTE 0xff #endif #ifndef BLOCKING_TX diff --git a/platform/redbee-econotag/contiki-conf.h b/platform/redbee-econotag/contiki-conf.h index 26a9db7d0..2250ad3b9 100644 --- a/platform/redbee-econotag/contiki-conf.h +++ b/platform/redbee-econotag/contiki-conf.h @@ -79,10 +79,10 @@ #define uart_init uart1_init #define dbg_putchar(x) uart1_putc(x) -#define USE_FORMATTED_STDIO 1 -#define MACA_DEBUG 0 -#define MACA_RAW_MODE 0 -#define USE_32KHZ_XTAL 0 +#define USE_FORMATTED_STDIO 1 +#define MACA_DEBUG 0 +#define CONTIKI_MACA_RAW_MODE 0 +#define USE_32KHZ_XTAL 0 #define BLOCKING_TX 0