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

temporary fix to get sicslowpan.c working on the Sky platform:

Browse source 
conventional MAC implementations require a call to the MAC driver's
read function.
This commit is contained in:
nvt-se 2008-11-06 20:45:06 +00:00
parent 21e4b4be80
commit 0c4f7bed8f
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/net/sicslowpan.c
View file

@ -32,7 +32,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: sicslowpan.c,v 1.3 2008/10/14 13:39:12 julienabeille Exp $
* $Id: sicslowpan.c,v 1.4 2008/11/06 20:45:06 nvt-se Exp $
*/
/**
* \file
@ -1209,6 +1209,12 @@ input(const struct mac_driver *r)
u16_t frag_tag = 0;
#endif /*SICSLOWPAN_CONF_FRAG*/
#ifdef SICSLOWPAN_CONF_CONVENTIONAL_MAC
if(r->read() <= 0) {
return;
}
#endif /* SICSLOWPAN_CONF_CONVENTIONAL_MAC */
/* init */
uncomp_hdr_len = 0;
rime_hdr_len = 0;

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

@ -1,5 +1,5 @@
/* -*- C -*- */
/* @(#)$Id: contiki-conf.h,v 1.30 2008/11/06 15:14:24 nvt-se Exp $ */
/* @(#)$Id: contiki-conf.h,v 1.31 2008/11/06 20:45:06 nvt-se Exp $ */
#ifndef CONTIKI_CONF_H
#define CONTIKI_CONF_H
@ -74,6 +74,7 @@
#define SICSLOWPAN_CONF_COMPRESSION_HC01 2
#define SICSLOWPAN_CONF_COMPRESSION SICS_LOWPAN_CONF_COMPRESSION_HC1
#define SICSLOWPAN_CONF_FRAG 0
#define SICSLOWPAN_CONF_CONVENTIONAL_MAC 1
#else
#define UIP_CONF_IP_FORWARD 1
#endif /* WITH_UIP6 */