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

add rtimers for cxmac

Browse source
This commit is contained in:
dak664 2010-02-18 17:21:44 +00:00
parent fee5efb141
commit a83381de30
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cpu/avr/rtimer-arch.c
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: rtimer-arch.c,v 1.6 2010/02/16 21:48:38 dak664 Exp $ * $Id: rtimer-arch.c,v 1.7 2010/02/18 17:21:44 dak664 Exp $
*/ */
/** /**
@ -44,6 +44,7 @@
#include <avr/io.h> #include <avr/io.h>
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include <stdio.h>
#include "sys/energest.h" #include "sys/energest.h"
#include "sys/rtimer.h" #include "sys/rtimer.h"
@ -68,7 +69,7 @@
#define ETIFR TIFR3 #define ETIFR TIFR3
#define TICIE3 ICIE3 #define TICIE3 ICIE3
#endif #endif
uint8_t rtimerworks;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#ifdef TCNT3 #ifdef TCNT3
ISR (TIMER3_COMPA_vect) { ISR (TIMER3_COMPA_vect) {
@ -76,7 +77,7 @@ ISR (TIMER3_COMPA_vect) {
ETIMSK &= ~((1 << OCIE3A) | (1 << OCIE3B) | (1 << TOIE3) | ETIMSK &= ~((1 << OCIE3A) | (1 << OCIE3B) | (1 << TOIE3) |
(1 << TICIE3) | (1 << OCIE3C)); (1 << TICIE3) | (1 << OCIE3C));
rtimerworks++;
/* Call rtimer callback */ /* Call rtimer callback */
rtimer_run_next(); rtimer_run_next();
@ -97,6 +98,7 @@ rtimer_arch_init(void)
cli (); cli ();
#ifdef TCNT3 #ifdef TCNT3
rtimerworks=240;
ETIMSK &= ~((1 << OCIE3A) | (1 << OCIE3B) | (1 << TOIE3) | ETIMSK &= ~((1 << OCIE3A) | (1 << OCIE3B) | (1 << TOIE3) |
(1 << TICIE3) | (1 << OCIE3C)); (1 << TICIE3) | (1 << OCIE3C));
@ -132,6 +134,7 @@ rtimer_arch_schedule(rtimer_clock_t t)
cli (); cli ();
#ifdef TCNT3 #ifdef TCNT3
rtimerworks=250;
/* Set compare register */ /* Set compare register */
OCR3A = t; OCR3A = t;
ETIFR |= (1 << ICF3) | (1 << OCF3A) | (1 << OCF3B) | (1 << TOV3) | ETIFR |= (1 << ICF3) | (1 << OCF3A) | (1 << OCF3B) | (1 << TOV3) |
@ -145,4 +148,5 @@ rtimer_arch_schedule(rtimer_clock_t t)
/* Restore interrupt state */ /* Restore interrupt state */
SREG = sreg; SREG = sreg;
printf("rs%d",t);
} }

5
cpu/avr/rtimer-arch.h
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: rtimer-arch.h,v 1.4 2007/12/11 17:21:14 joxe Exp $ * $Id: rtimer-arch.h,v 1.5 2010/02/18 17:21:44 dak664 Exp $
*/ */
#ifndef __RTIMER_ARCH_H__ #ifndef __RTIMER_ARCH_H__
@ -36,8 +36,11 @@
#include <avr/interrupt.h> #include <avr/interrupt.h>
/* Will affect radio on/off timing for cx-mac */
#define RTIMER_ARCH_SECOND (8192) #define RTIMER_ARCH_SECOND (8192)
/* Handle that not all AVRs have TCNT3 - this should be configuratble /* Handle that not all AVRs have TCNT3 - this should be configuratble
in contiki-conf later! */ in contiki-conf later! */
#ifdef TCNT3 #ifdef TCNT3