ctimer moved from net/rime to sys/

This commit is contained in:
adamdunkels 2010-06-14 18:58:45 +00:00
parent fad2b1def9
commit 951fd78f6c
5 changed files with 7 additions and 8 deletions

View File

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: deluge.c,v 1.9 2010/04/12 14:39:52 nvt-se Exp $ * $Id: deluge.c,v 1.10 2010/06/14 18:58:45 adamdunkels Exp $
*/ */
/** /**
@ -43,7 +43,6 @@
#include "contiki.h" #include "contiki.h"
#include "net/rime.h" #include "net/rime.h"
#include "net/rime/ctimer.h"
#include "cfs/cfs.h" #include "cfs/cfs.h"
#include "loader/elfloader.h" #include "loader/elfloader.h"
#include "lib/crc16.h" #include "lib/crc16.h"

View File

@ -28,14 +28,14 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: ctdma_mac.c,v 1.4 2009/06/22 11:14:11 nifi Exp $ * $Id: ctdma_mac.c,v 1.5 2010/06/14 18:58:45 adamdunkels Exp $
*/ */
#include "contiki.h" #include "contiki.h"
#include "net/mac/ctdma_mac.h" #include "net/mac/ctdma_mac.h"
#include "net/rime/packetbuf.h" #include "net/rime/packetbuf.h"
#include "net/uip-fw.h" #include "net/uip-fw.h"
#include "net/rime/ctimer.h" #include "sys/ctimer.h"
#include "net/rime.h" #include "net/rime.h"
#include "lib/memb.h" #include "lib/memb.h"
#include "lib/list.h" #include "lib/list.h"

View File

@ -29,6 +29,7 @@
#include "contiki.h" #include "contiki.h"
#include "lib/random.h" #include "lib/random.h"
#include "sys/ctimer.h"
#include "net/uip.h" #include "net/uip.h"
#include "net/uip-ds6.h" #include "net/uip-ds6.h"
#include "net/uip-udp-packet.h" #include "net/uip-udp-packet.h"

View File

@ -26,11 +26,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: testctimer.c,v 1.2 2008/10/03 09:39:38 fros4943 Exp $ * $Id: testctimer.c,v 1.3 2010/06/14 18:58:45 adamdunkels Exp $
*/ */
#include "contiki.h" #include "contiki.h"
#include "net/rime/ctimer.h" #include "sys/ctimer.h"
#include <stdio.h> #include <stdio.h>

View File

@ -29,7 +29,7 @@
* *
* This file is part of the Contiki OS * This file is part of the Contiki OS
* *
* $Id: contiki-main.c,v 1.12 2010/02/23 18:43:21 adamdunkels Exp $ * $Id: contiki-main.c,v 1.13 2010/06/14 18:58:45 adamdunkels Exp $
* *
*/ */
@ -39,7 +39,6 @@
#include "contiki.h" #include "contiki.h"
#include "net/netstack.h" #include "net/netstack.h"
#include "net/rime/ctimer.h"
#include "dev/serial-line.h" #include "dev/serial-line.h"