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

added initial uart1 DMA rx support and required LPM requirements api

Browse source
This commit is contained in:
joxe 2011-01-05 12:02:01 +00:00
parent 65048c519c
commit 565fda47aa
3 changed files with 93 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

30
cpu/msp430/msp430.c
View file

@ -28,7 +28,7 @@
*
* This file is part of the Contiki operating system.
*
* @(#)$Id: msp430.c,v 1.13 2010/03/21 10:40:15 nifi Exp $
* @(#)$Id: msp430.c,v 1.14 2011/01/05 12:02:01 joxe Exp $
*/
#include <io.h>
#include <signal.h>
@ -38,6 +38,10 @@
#include "dev/watchdog.h"
#include "net/uip.h"
/* dco_required set to 1 will cause the CPU not to go into
sleep modes where the DCO clock stopped */
int msp430_dco_required;
/*---------------------------------------------------------------------------*/
#if defined(__MSP430__) && defined(__GNUC__) && MSP430_MEMCPY_WORKAROUND
void *
@ -126,7 +130,6 @@ static void
init_ports(void)
{
/* Turn everything off, device drivers enable what is needed. */
/* All configured for digital I/O */
#ifdef P1SEL
P1SEL = 0;
@ -183,6 +186,28 @@ init_ports(void)
extern int _end; /* Not in sys/unistd.h */
static char *cur_break = (char *)&_end;
/*---------------------------------------------------------------------------*/
/* add/remove_lpm_req - for requiring a specific LPM mode. currently Contiki */
/* jumps to LPM3 to save power, but DMA will not work if DCO is not clocked */
/* so some modules might need to enter their LPM requirements */
/* NOTE: currently only works with LPM1 (e.g. DCO) requirements. */
/*---------------------------------------------------------------------------*/
void
msp430_add_lpm_req(int req)
{
if (req <= MSP430_REQUIRE_LPM1) {
msp430_dco_required++;
}
}
void
msp430_remove_lpm_req(int req)
{
if (req <= MSP430_REQUIRE_LPM1) {
msp430_dco_required--;
}
}
void
msp430_cpu_init(void)
{
@ -194,6 +219,7 @@ msp430_cpu_init(void)
if((uintptr_t)cur_break & 1) { /* Workaround for msp430-ld bug! */
cur_break++;
}
msp430_dco_required = 0;
}
/*---------------------------------------------------------------------------*/
#define asmv(arg) __asm__ __volatile__(arg)