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

Replaced old framer (framer_get/framer_set) with new NETSTACK style configuration. Added nullrdc-framer that is a nullrdc with framer support.

Browse source
This commit is contained in:
nifi 2010-03-01 13:30:21 +00:00
parent 0c084b8c68
commit 5e43a6998b
10 changed files with 166 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/net/netstack.h
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: netstack.h,v 1.4 2010/02/23 20:09:11 nifi Exp $
* $Id: netstack.h,v 1.5 2010/03/01 13:30:21 nifi Exp $
*/
/**
@ -75,8 +75,17 @@
#endif /* NETSTACK_CONF_RADIO */
#endif /* NETSTACK_RADIO */
#ifndef NETSTACK_FRAMER
#ifdef NETSTACK_CONF_FRAMER
#define NETSTACK_FRAMER NETSTACK_CONF_FRAMER
#else /* NETSTACK_CONF_FRAMER */
#define NETSTACK_FRAMER framer_nullmac
#endif /* NETSTACK_CONF_FRAMER */
#endif /* NETSTACK_FRAMER */
#include "net/mac/mac.h"
#include "net/mac/rdc.h"
#include "net/mac/framer.h"
#include "dev/radio.h"
/**
@ -96,6 +105,7 @@ extern const struct network_driver NETSTACK_NETWORK;
extern const struct rdc_driver NETSTACK_RDC;
extern const struct mac_driver NETSTACK_MAC;
extern const struct radio_driver NETSTACK_RADIO;
extern const struct framer NETSTACK_FRAMER;
void netstack_init(void);