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

added configuration for panid

Browse source
This commit is contained in:
nifi 2009-04-06 13:31:00 +00:00
parent d6869018c7
commit a36e529df1
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
platform/sky/contiki-conf.h
View file

@ -1,5 +1,5 @@
/* -*- C -*- */ /* -*- C -*- */
/* @(#)$Id: contiki-conf.h,v 1.44 2009/04/06 13:23:14 nvt-se Exp $ */ /* @(#)$Id: contiki-conf.h,v 1.45 2009/04/06 13:31:00 nifi Exp $ */
#ifndef CONTIKI_CONF_H #ifndef CONTIKI_CONF_H
#define CONTIKI_CONF_H #define CONTIKI_CONF_H
@ -10,6 +10,8 @@
#define PACKETBUF_CONF_ATTRS_INLINE 1 #define PACKETBUF_CONF_ATTRS_INLINE 1
#define IEEE802154_CONF_PANID 0xABCD
#define SHELL_VARS_CONF_RAM_BEGIN 0x1100 #define SHELL_VARS_CONF_RAM_BEGIN 0x1100
#define SHELL_VARS_CONF_RAM_END 0x2000 #define SHELL_VARS_CONF_RAM_END 0x2000

8
platform/sky/contiki-sky-main.c
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)$Id: contiki-sky-main.c,v 1.50 2009/03/31 13:25:50 nifi Exp $ * @(#)$Id: contiki-sky-main.c,v 1.51 2009/04/06 13:31:00 nifi Exp $
*/ */
#include <signal.h> #include <signal.h>
@ -52,6 +52,7 @@
#include "lib/random.h" #include "lib/random.h"
#include "net/mac/frame802154.h"
#include "net/mac/nullmac.h" #include "net/mac/nullmac.h"
#include "net/mac/xmac.h" #include "net/mac/xmac.h"
#include "net/mac/lpp.h" #include "net/mac/lpp.h"
@ -115,9 +116,6 @@ force_float_inclusion()
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void uip_log(char *msg) { puts(msg); } void uip_log(char *msg) { puts(msg); }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Radio stuff in network byte order. */
static u16_t panId = 0x2024;
#ifndef RF_CHANNEL #ifndef RF_CHANNEL
#define RF_CHANNEL 26 #define RF_CHANNEL 26
#endif #endif
@ -231,7 +229,7 @@ main(int argc, char **argv)
ctimer_init(); ctimer_init();
cc2420_init(); cc2420_init();
cc2420_set_pan_addr(panId, 0 /*XXX*/, ds2411_id); cc2420_set_pan_addr(IEEE802154_PANID, 0 /*XXX*/, ds2411_id);
cc2420_set_channel(RF_CHANNEL); cc2420_set_channel(RF_CHANNEL);
#if WITH_NULLMAC #if WITH_NULLMAC
rime_init(nullmac_init(&cc2420_driver)); rime_init(nullmac_init(&cc2420_driver));