riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #459 from rousselk/msp430-lpm-freq

Browse Source 
Msp430 lpm freq
This commit is contained in:
Oleg Hahm 2014-01-16 04:57:27 -08:00
commit 9eebc532ef
9 changed files with 101 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/chronos/include/board.h
View File

@ -29,6 +29,8 @@
#endif
#define MSP430_INITIAL_CPU_SPEED 7372800uL
#define F_CPU MSP430_INITIAL_CPU_SPEED
#define F_RC_OSCILLATOR 32768
#define MSP430_HAS_DCOR 1
#define MSP430_HAS_EXTERNAL_CRYSTAL 1

4
boards/msb-430/include/board.h
View File

@ -52,7 +52,9 @@ and the mailinglist (subscription via web site)
#endif
//MSB430 core
#define MSP430_INITIAL_CPU_SPEED 2457600uL
#define MSP430_INITIAL_CPU_SPEED 2457600uL
#define F_CPU MSP430_INITIAL_CPU_SPEED
#define F_RC_OSCILLATOR 32768
#define MSP430_HAS_DCOR 1
#define MSP430_HAS_EXTERNAL_CRYSTAL 0

2
boards/msb-430h/include/board.h
View File

@ -46,6 +46,8 @@ and the mailinglist (subscription via web site)
//MSB430 core
#define MSP430_INITIAL_CPU_SPEED 7372800uL
#define F_CPU MSP430_INITIAL_CPU_SPEED
#define F_RC_OSCILLATOR 32768
#define MSP430_HAS_DCOR 1
#define MSP430_HAS_EXTERNAL_CRYSTAL 1

2
boards/telosb/include/board.h
View File

@ -32,6 +32,8 @@
//MSB430 core
#define MSP430_INITIAL_CPU_SPEED 8000000uL
#define F_CPU MSP430_INITIAL_CPU_SPEED
#define F_RC_OSCILLATOR 32768
#define MSP430_HAS_DCOR 0
#define MSP430_HAS_EXTERNAL_CRYSTAL 1

2
boards/wsn430-v1_3b/include/board.h
View File

@ -35,6 +35,8 @@
//MSB430 core
#define MSP430_INITIAL_CPU_SPEED 800000uL
#define F_CPU MSP430_INITIAL_CPU_SPEED
#define F_RC_OSCILLATOR 32768
#define MSP430_HAS_DCOR 0
#define MSP430_HAS_EXTERNAL_CRYSTAL 1

2
boards/wsn430-v1_4/include/board.h
View File

@ -35,6 +35,8 @@
//MSB430 core
#define MSP430_INITIAL_CPU_SPEED 800000uL
#define F_CPU MSP430_INITIAL_CPU_SPEED
#define F_RC_OSCILLATOR 32768
#define MSP430_HAS_DCOR 0
#define MSP430_HAS_EXTERNAL_CRYSTAL 1

3
core/include/lpm.h
View File

@ -31,7 +31,8 @@ enum lpm_mode {
LPM_IDLE, ///< MCU is idle
LPM_SLEEP, ///< MCU in sleep mode
LPM_POWERDOWN, ///< MCU is powered down
LPM_OFF ///< MCU is off
LPM_OFF, ///< MCU is off
LPM_UNKNOWN = -1 ///< status unknown/unavailable
};
/**

6
cpu/msp430-common/include/cpu.h
View File

@ -36,9 +36,9 @@ See the file LICENSE in the top level directory for more details.
#define WORDSIZE 16
/* CPU speed */
#define F_CPU (2457600ul)
#define F_RC_OSCILLATOR (32768) ///< Frequency of internal RC oscillator
/* CPU speed, to be defined in board.h */
//#define F_CPU (2457600ul)
//#define F_RC_OSCILLATOR (32768) ///< Frequency of internal RC oscillator
extern volatile int __inISR;
extern char __isr_stack[MSP430_ISR_STACK_SIZE];

92
cpu/msp430-common/lpm_cpu.c
View File

@ -1,26 +1,100 @@
#include <stdio.h>
#include <intrinsics.h> // MSP430-gcc compiler instrinsics
#include "board.h"
#include <msp430.h>
#include "lpm.h"
/* TODO: implement */
/* Initialise the MSP430 power-saving mechanisms. */
void lpm_init(void)
{
// nothing to initialize on MSP430s: everything is done by fiddling
// with 4 bits of the status register (SR).
// just ensure MCU is fully up and running at start
lpm_awake();
}
/* Change the current power-saving mode. */
enum lpm_mode lpm_set(enum lpm_mode target)
{
enum lpm_mode last_mode;
enum lpm_mode last_mode = lpm_get();
/* dummy value as lpm is not currently implemented */
last_mode = LPM_ON;
switch (target)
{
case LPM_ON:
// fully running MCU
__bic_status_register(CPUOFF | OSCOFF | SCG0 | SCG1);
break;
case LPM_IDLE:
// lightest mode => LPM0 mode of MSP430
__bic_status_register(OSCOFF | SCG0 | SCG1);
// only stops CPU block
__bis_status_register(CPUOFF);
break;
case LPM_SLEEP:
// mid-level mode => LPM1 mode of MSP430
__bic_status_register(OSCOFF | SCG1);
// stops CPU and master clock blocks
__bis_status_register(CPUOFF | SCG0);
break;
case LPM_POWERDOWN:
// deep-level mode => LPM3 mode of MSP430
__bic_status_register(OSCOFF);
// stops all blocks except auxiliary clock (timers)
__bis_status_register(CPUOFF | SCG0 | SCG1);
break;
case LPM_OFF:
// MCU totally down (LPM4), only RESET or NMI can resume execution
__bis_status_register(CPUOFF | OSCOFF | SCG0 | SCG1); // all blocks off
break;
default:
printf("ERROR: trying to set an invalid low-power mode!\n");
printf(" Operation aborted.\n\n");
}
return last_mode;
}
#define LPM_MASK_SR (CPUOFF | OSCOFF | SCG0 | SCG1)
/* TODO: implement */
enum lpm_mode lpm_get()
/* Return the current LPM mode of the MSP430 MCU. */
enum lpm_mode lpm_get(void)
{
enum lpm_mode current_mode;
enum lpm_mode current_mode = LPM_UNKNOWN;
/* dummy value as lpm is not currently implemented */
current_mode = LPM_ON;
unsigned int current_sr = __read_status_register();
switch (current_sr & LPM_MASK_SR) {
case CPUOFF + OSCOFF + SCG0 + SCG1: // MSP430's LPM4
current_mode = LPM_OFF;
break;
case CPUOFF + SCG0 + SCG1: // MSP430's LPM3
case CPUOFF + SCG1: // MSP430's LPM2
current_mode = LPM_POWERDOWN;
break;
case CPUOFF + SCG0: // MSP430's LPM1
current_mode = LPM_SLEEP;
break;
case CPUOFF: // MSP430's LPM1
current_mode = LPM_IDLE;
break;
case 0: // MSP430 active
current_mode = LPM_ON;
break;
}
return current_mode;
}
/* resume the MSP430 MCU */
inline void lpm_awake(void)
{
// disable all power savings mechanisms
__bic_status_register(CPUOFF | OSCOFF | SCG0 | SCG1);
}
/* the following two functions have no actual role to play MSP430s */
inline void lpm_begin_awake(void) { }
inline void lpm_end_awake(void) { }