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

Moved ctimer.[ch] from their old and illogical location in core/net/rime to a more appropriate place in core/sys

Browse source
This commit is contained in:
adamdunkels 2010-06-14 07:34:36 +00:00
parent f81ca85157
commit 8f8393aadc
19 changed files with 41 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/net/mac/phase.c
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: phase.c,v 1.11 2010/04/27 12:56:35 fros4943 Exp $
* $Id: phase.c,v 1.12 2010/06/14 07:34:37 adamdunkels Exp $
*/
/**
@ -42,7 +42,7 @@
#include "net/rime/packetbuf.h"
#include "sys/clock.h"
#include "lib/memb.h"
#include "net/rime/ctimer.h"
#include "sys/ctimer.h"
#include "net/rime/queuebuf.h"
#include "dev/watchdog.h"
#include "dev/leds.h"
@ -57,7 +57,7 @@ struct phase_queueitem {
#define PHASE_DEFER_THRESHOLD 1
#define PHASE_QUEUESIZE 8
#define MAX_NOACKS 2
#define MAX_NOACKS 3
MEMB(queued_packets_memb, struct phase_queueitem, PHASE_QUEUESIZE);