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
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile.include
View file

@ -50,7 +50,7 @@ include $(CONTIKI)/core/net/mac/Makefile.mac
SYSTEM = process.c procinit.c autostart.c elfloader.c profile.c \
timetable.c timetable-aggregate.c compower.c serial-line.c
THREADS = mt.c
LIBS = memb.c mmem.c timer.c list.c etimer.c energest.c rtimer.c stimer.c \
LIBS = memb.c mmem.c timer.c list.c etimer.c ctimer.c energest.c rtimer.c stimer.c \
print-stats.c ifft.c crc16.c random.c checkpoint.c ringbuf.c
DEV = nullradio.c
NET = netstack.c uip-debug.c
@ -93,10 +93,12 @@ PROJECT_OBJECTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(PROJECT_SOURCEFI
ifdef APPS
APPDIRS += ${wildcard ${addprefix $(CONTIKI)/apps/, $(APPS)} \
${addprefix $(CONTIKI)/platform/$(TARGET)/apps/, $(APPS)}}
${addprefix $(CONTIKI)/platform/$(TARGET)/apps/, $(APPS)} \
${addprefix , $(APPS)}}
APPINCLUDES = ${foreach APP, $(APPS), ${wildcard \
$(CONTIKI)/apps/$(APP)/Makefile.$(APP) \
$(CONTIKI)/platform/$(TARGET)/apps/$(APP)/Makefile.$(APP)}}
$(CONTIKI)/platform/$(TARGET)/apps/$(APP)/Makefile.$(APP) \
$(APP)/Makefile.$(APP)}}
-include $(APPINCLUDES)
APP_SOURCES = ${foreach APP, $(APPS), $($(APP)_src)}
DSC_SOURCES = ${foreach APP, $(APPS), $($(APP)_dsc)}

3
core/contiki.h
View file

@ -30,7 +30,7 @@
*
* Author: Adam Dunkels <adam@sics.se>
*
* $Id: contiki.h,v 1.5 2008/07/03 23:36:30 adamdunkels Exp $
* $Id: contiki.h,v 1.6 2010/06/14 07:34:36 adamdunkels Exp $
*/
#ifndef __CONTIKI_H__
#define __CONTIKI_H__
@ -42,6 +42,7 @@
#include "sys/autostart.h"
#include "sys/timer.h"
#include "sys/ctimer.h"
#include "sys/etimer.h"
#include "sys/rtimer.h"

5
core/net/mac/csma.c
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: csma.c,v 1.16 2010/04/08 09:33:37 adamdunkels Exp $
* $Id: csma.c,v 1.17 2010/06/14 07:34:36 adamdunkels Exp $
*/
/**
@ -41,7 +41,8 @@
#include "net/mac/csma.h"
#include "net/rime/packetbuf.h"
#include "net/rime/queuebuf.h"
#include "net/rime/ctimer.h"
#include "sys/ctimer.h"
#include "lib/random.h"

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);

3
core/net/rime.h
View file

@ -33,7 +33,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: rime.h,v 1.28 2010/03/19 13:20:40 adamdunkels Exp $
* $Id: rime.h,v 1.29 2010/06/14 07:34:36 adamdunkels Exp $
*/
/**
@ -48,7 +48,6 @@
#include "net/rime/announcement.h"
#include "net/rime/collect.h"
#include "net/rime/ctimer.h"
#include "net/rime/ipolite.h"
#include "net/rime/mesh.h"
#include "net/rime/multihop.h"

2
core/net/rime/Makefile.rime
View file

@ -1,5 +1,5 @@
RIME_CHAMELEON = chameleon.c channel.c chameleon-raw.c chameleon-bitopt.c
RIME_BASE = packetbuf.c queuebuf.c rimeaddr.c ctimer.c rime.c timesynch.c \
RIME_BASE = packetbuf.c queuebuf.c rimeaddr.c rime.c timesynch.c \
rimestats.c announcement.c polite-announcement.c packetqueue.c \
broadcast-announcement.c
RIME_SINGLEHOP = broadcast.c stbroadcast.c unicast.c stunicast.c \

4
core/net/rime/collect-neighbor.c
View file

@ -33,7 +33,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: collect-neighbor.c,v 1.1 2010/03/19 13:17:00 adamdunkels Exp $
* $Id: collect-neighbor.c,v 1.2 2010/06/14 07:34:37 adamdunkels Exp $
*/
/**
@ -49,8 +49,8 @@
#include "contiki.h"
#include "lib/memb.h"
#include "lib/list.h"
#include "net/rime/collect-neighbor.h"
#include "net/rime/ctimer.h"
#include "net/rime/collect.h"
#ifdef COLLECT_NEIGHBOR_CONF_MAX_COLLECT_NEIGHBORS

5
core/net/rime/ipolite.h
View file

@ -81,7 +81,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: ipolite.h,v 1.10 2010/01/25 13:54:06 adamdunkels Exp $
* $Id: ipolite.h,v 1.11 2010/06/14 07:34:37 adamdunkels Exp $
*/
/**
@ -94,8 +94,9 @@
#ifndef __IPOLITE_H__
#define __IPOLITE_H__
#include "sys/ctimer.h"
#include "net/rime/broadcast.h"
#include "net/rime/ctimer.h"
#include "net/rime/queuebuf.h"
struct ipolite_conn;

3
core/net/rime/neighbor-discovery.h
View file

@ -47,7 +47,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: neighbor-discovery.h,v 1.10 2010/02/23 18:36:50 adamdunkels Exp $
* $Id: neighbor-discovery.h,v 1.11 2010/06/14 07:34:37 adamdunkels Exp $
*/
/**
@ -61,7 +61,6 @@
#define __NEIGHBOR_DISCOVERY_H__
#include "net/rime/broadcast.h"
#include "net/rime/ctimer.h"
struct neighbor_discovery_conn;

4
core/net/rime/netflood.h
View file

@ -62,7 +62,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: netflood.h,v 1.5 2009/11/08 19:40:17 adamdunkels Exp $
* $Id: netflood.h,v 1.6 2010/06/14 07:34:37 adamdunkels Exp $
*/
/**
@ -75,8 +75,6 @@
#ifndef __NETFLOOD_H__
#define __NETFLOOD_H__
#include "net/rime/ctimer.h"
#include "net/rime/queuebuf.h"
#include "net/rime/ipolite.h"

4
core/net/rime/packetqueue.c
View file

@ -32,7 +32,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: packetqueue.c,v 1.2 2010/02/28 09:20:32 adamdunkels Exp $
* $Id: packetqueue.c,v 1.3 2010/06/14 07:34:37 adamdunkels Exp $
*/
/**
@ -42,7 +42,7 @@
* Adam Dunkels <adam@sics.se>
*/
#include "net/rime/ctimer.h"
#include "sys/ctimer.h"
#include "net/rime/packetqueue.h"
/*---------------------------------------------------------------------------*/

4
core/net/rime/packetqueue.h
View file

@ -41,7 +41,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: packetqueue.h,v 1.4 2010/02/28 09:20:32 adamdunkels Exp $
* $Id: packetqueue.h,v 1.5 2010/06/14 07:34:37 adamdunkels Exp $
*/
/**
@ -57,6 +57,8 @@
#include "lib/list.h"
#include "lib/memb.h"
#include "sys/ctimer.h"
#include "net/rime/packetbuf.h"
#include "net/rime/queuebuf.h"

3
core/net/rime/polite.h
View file

@ -81,7 +81,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: polite.h,v 1.7 2009/03/12 21:58:21 adamdunkels Exp $
* $Id: polite.h,v 1.8 2010/06/14 07:34:37 adamdunkels Exp $
*/
/**
@ -96,7 +96,6 @@
#include "net/rime/abc.h"
#include "net/rime/queuebuf.h"
#include "net/rime/ctimer.h"
struct polite_conn;

4
core/net/rime/route.c
View file

@ -33,7 +33,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: route.c,v 1.16 2010/02/03 01:18:24 adamdunkels Exp $
* $Id: route.c,v 1.17 2010/06/14 07:34:37 adamdunkels Exp $
*/
/**
@ -47,7 +47,7 @@
#include "lib/list.h"
#include "lib/memb.h"
#include "net/rime/ctimer.h"
#include "sys/ctimer.h"
#include "net/rime/route.h"
#include "contiki-conf.h"

5
core/net/rime/stbroadcast.h
View file

@ -48,7 +48,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: stbroadcast.h,v 1.2 2009/05/26 13:58:53 nvt-se Exp $
* $Id: stbroadcast.h,v 1.3 2010/06/14 07:34:37 adamdunkels Exp $
*/
/**
@ -61,8 +61,9 @@
#ifndef __STBROADCAST_H__
#define __STBROADCAST_H__
#include "sys/ctimer.h"
#include "net/rime/broadcast.h"
#include "net/rime/ctimer.h"
#include "net/rime/queuebuf.h"
struct stbroadcast_conn;

4
core/net/rime/stunicast.h
View file

@ -60,7 +60,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: stunicast.h,v 1.5 2010/02/23 18:38:05 adamdunkels Exp $
* $Id: stunicast.h,v 1.6 2010/06/14 07:34:37 adamdunkels Exp $
*/
/**
@ -73,8 +73,8 @@
#ifndef __STUNICAST_H__
#define __STUNICAST_H__
#include "sys/ctimer.h"
#include "net/rime/unicast.h"
#include "net/rime/ctimer.h"
#include "net/rime/queuebuf.h"
struct stunicast_conn;

5
core/net/rime/trickle.h
View file

@ -45,7 +45,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: trickle.h,v 1.11 2009/04/06 21:20:35 adamdunkels Exp $
* $Id: trickle.h,v 1.12 2010/06/14 07:34:37 adamdunkels Exp $
*/
/**
@ -58,8 +58,9 @@
#ifndef __TRICKLE_H__
#define __TRICKLE_H__
#include "sys/ctimer.h"
#include "net/rime/broadcast.h"
#include "net/rime/ctimer.h"
#include "net/rime/queuebuf.h"
#define TRICKLE_ATTRIBUTES { PACKETBUF_ATTR_EPACKET_ID, PACKETBUF_ATTR_BIT * 8 },\

5
core/net/rime/ctimer.c → core/sys/ctimer.c
View file

@ -33,7 +33,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: ctimer.c,v 1.8 2010/04/09 16:21:07 nvt-se Exp $
* $Id: ctimer.c,v 1.1 2010/06/14 07:34:36 adamdunkels Exp $
*/
/**
@ -43,10 +43,9 @@
* Adam Dunkels <adam@sics.se>
*/
#include "net/rime/ctimer.h"
#include "sys/ctimer.h"
#include "contiki.h"
#include "lib/list.h"
#include "net/rime.h"
LIST(ctimer_list);

2
core/net/rime/ctimer.h → core/sys/ctimer.h
View file

@ -42,7 +42,7 @@
*
* This file is part of the Contiki operating system.
*
* $Id: ctimer.h,v 1.4 2009/11/19 18:32:05 nifi Exp $
* $Id: ctimer.h,v 1.1 2010/06/14 07:34:36 adamdunkels Exp $
*/
/**