deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Allow build with original radio driver using $make RF230BB=0

Browse source
This commit is contained in:
dak664 2010-02-23 17:43:20 +00:00
parent 7274f1d1ed
commit e695e4860d
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
platform/avr-raven/contiki-conf.h
View file

@ -101,7 +101,7 @@ typedef int32_t s32_t;
#define LOG_CONF_ENABLED 1 #define LOG_CONF_ENABLED 1
/* RF230BB reduces program size by 6.5KB, RAM by 500 bytes */ /* RF230BB reduces program size by 6.5KB, RAM by 500 bytes */
#ifdef RF230BB #if RF230BB
#define SICSLOWPAN_CONF_CONVENTIONAL_MAC 1 //for barebones driver, sicslowpan calls radio->read function #define SICSLOWPAN_CONF_CONVENTIONAL_MAC 1 //for barebones driver, sicslowpan calls radio->read function
#undef PACKETBUF_CONF_HDR_SIZE //RF230BB takes the packetbuf default for header size #undef PACKETBUF_CONF_HDR_SIZE //RF230BB takes the packetbuf default for header size
#define UIP_CONF_ROUTER 0 #define UIP_CONF_ROUTER 0

4
platform/avr-raven/contiki-raven-main.c
View file

@ -53,7 +53,7 @@ extern int rf230_interrupt_flag;
#include "loader/symbols-def.h" #include "loader/symbols-def.h"
#include "loader/symtab.h" #include "loader/symtab.h"
#ifdef RF230BB //radio driver using contiki core mac #if RF230BB //radio driver using contiki core mac
#include "radio/rf230bb/rf230bb.h" #include "radio/rf230bb/rf230bb.h"
#include "net/mac/frame802154.h" #include "net/mac/frame802154.h"
#include "net/mac/framer-802154.h" #include "net/mac/framer-802154.h"
@ -169,7 +169,7 @@ void initialize(void)
/* etimers must be started before ctimer_init */ /* etimers must be started before ctimer_init */
process_start(&etimer_process, NULL); process_start(&etimer_process, NULL);
#ifdef RF230BB #if RF230BB
{ {
ctimer_init(); ctimer_init();
/* Start radio and radio receive process */ /* Start radio and radio receive process */