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

Add rtimers, allow Jackdaw to use RF230BB driver

Browse source
This commit is contained in:
dak664 2010-02-16 21:48:38 +00:00
parent 893a31f49b
commit 0f59ba3187
2 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cpu/avr/Makefile.avr
View file

@ -1,4 +1,4 @@
# $Id: Makefile.avr,v 1.19 2010/02/07 23:05:20 adamdunkels Exp $ # $Id: Makefile.avr,v 1.20 2010/02/16 21:48:38 dak664 Exp $
### Check if we are running under Windows ### Check if we are running under Windows
@ -23,13 +23,12 @@ CONTIKI_CPU=$(CONTIKI)/cpu/avr
### These directories will be searched for the specified source files ### These directories will be searched for the specified source files
### TARGETLIBS are platform-specific routines in the contiki library path ### TARGETLIBS are platform-specific routines in the contiki library path
CONTIKI_CPU_DIRS = . dev CONTIKI_CPU_DIRS = . dev
AVR = clock.c mtarch.c eeprom.c flash.c rs232.c leds-arch.c watchdog.c AVR = clock.c mtarch.c eeprom.c flash.c rs232.c leds-arch.c watchdog.c rtimer-arch.c
ELFLOADER = elfloader.c elfloader-avr.c symtab-avr.c ELFLOADER = elfloader.c elfloader-avr.c symtab-avr.c
TARGETLIBS = random.c leds.c TARGETLIBS = random.c leds.c
ifdef USB ifdef USB
### Add the directories for the USB stick and remove the default rs232 driver ### Add the directories for the USB stick and remove the default rs232 driver
override RF230BB = 0
CONTIKI_CPU_DIRS += dev/usb dev/usb/serial dev/usb/rndis dev/usb/storage CONTIKI_CPU_DIRS += dev/usb dev/usb/serial dev/usb/rndis dev/usb/storage
CONTIKI_TARGET_SOURCEFILES += $(USB) CONTIKI_TARGET_SOURCEFILES += $(USB)
AVR = clock.c mtarch.c eeprom.c flash.c leds-arch.c watchdog.c AVR = clock.c mtarch.c eeprom.c flash.c leds-arch.c watchdog.c

26
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.5 2009/09/07 12:02:58 joxe Exp $ * $Id: rtimer-arch.c,v 1.6 2010/02/16 21:48:38 dak664 Exp $
*/ */
/** /**
@ -50,15 +50,23 @@
#include "rtimer-arch.h" #include "rtimer-arch.h"
#if defined(__AVR_ATmega1281__) || defined(__AVR_ATmega1284P__) #if defined(__AVR_ATmega1281__) || defined(__AVR_ATmega1284P__)
#error FTH081029 test timer 3 //#error FTH081029 test timer 3
#define ETIMSK TIMSK3 #define ETIMSK TIMSK3
#define ETIFR TIFR3 #define ETIFR TIFR3
#define TICIE3 ICIE3 #define TICIE3 ICIE3
//Has no 'C', so we just set it to B. The code doesn't really use C so this //Has no 'C', so we just set it to B. The code doesn't really use C so this
//is safe to do but lets it compile //is safe to do but lets it compile
#define OCIE3C OCIE3B #warning No OCIE3C in architecture, hopefully it will not be needed
#define OCF3C OCF3B #define OCIE3C OCIE3B
#define OCF3C OCF3B
#endif
#if defined(__AVR_AT90USB1287__)
#warning AT90USB1287 rtimers not tested
#define ETIMSK TIMSK3
#define ETIFR TIFR3
#define TICIE3 ICIE3
#endif #endif
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/