mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-08-08 02:28:59 +00:00
temporary fix to get sicslowpan.c working on the Sky platform:
conventional MAC implementations require a call to the MAC driver's read function.
This commit is contained in:
parent
21e4b4be80
commit
0c4f7bed8f
@ -32,7 +32,7 @@
|
|||||||
*
|
*
|
||||||
* This file is part of the Contiki operating system.
|
* 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
|
* \file
|
||||||
@ -1209,6 +1209,12 @@ input(const struct mac_driver *r)
|
|||||||
u16_t frag_tag = 0;
|
u16_t frag_tag = 0;
|
||||||
#endif /*SICSLOWPAN_CONF_FRAG*/
|
#endif /*SICSLOWPAN_CONF_FRAG*/
|
||||||
|
|
||||||
|
#ifdef SICSLOWPAN_CONF_CONVENTIONAL_MAC
|
||||||
|
if(r->read() <= 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#endif /* SICSLOWPAN_CONF_CONVENTIONAL_MAC */
|
||||||
|
|
||||||
/* init */
|
/* init */
|
||||||
uncomp_hdr_len = 0;
|
uncomp_hdr_len = 0;
|
||||||
rime_hdr_len = 0;
|
rime_hdr_len = 0;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/* -*- C -*- */
|
/* -*- 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
|
#ifndef CONTIKI_CONF_H
|
||||||
#define CONTIKI_CONF_H
|
#define CONTIKI_CONF_H
|
||||||
@ -74,6 +74,7 @@
|
|||||||
#define SICSLOWPAN_CONF_COMPRESSION_HC01 2
|
#define SICSLOWPAN_CONF_COMPRESSION_HC01 2
|
||||||
#define SICSLOWPAN_CONF_COMPRESSION SICS_LOWPAN_CONF_COMPRESSION_HC1
|
#define SICSLOWPAN_CONF_COMPRESSION SICS_LOWPAN_CONF_COMPRESSION_HC1
|
||||||
#define SICSLOWPAN_CONF_FRAG 0
|
#define SICSLOWPAN_CONF_FRAG 0
|
||||||
|
#define SICSLOWPAN_CONF_CONVENTIONAL_MAC 1
|
||||||
#else
|
#else
|
||||||
#define UIP_CONF_IP_FORWARD 1
|
#define UIP_CONF_IP_FORWARD 1
|
||||||
#endif /* WITH_UIP6 */
|
#endif /* WITH_UIP6 */
|
||||||
|
Loading…
Reference in New Issue
Block a user