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

cpu/msp430-common: simplified hwtimer configuration

Browse Source
This commit is contained in:
Hauke Petersen 2015-08-26 18:41:22 +02:00
parent c20af817c7
commit fd8c0de3d2
2 changed files with 18 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/msp430-common/Makefile
View File

@ -1,3 +1,3 @@
MODULE =msp430_common MODULE = msp430_common
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base

59
cpu/msp430-common/include/hwtimer_cpu.h
View File

@ -1,5 +1,6 @@
/* /*
* Copyright (C) 2014 Freie Universitaet Berlin (FUB) and INRIA. All rights reserved. * Copyright (C) 2014 INRIA
* 2014, 2015 Freie Universität Berlin
* *
* This file is subject to the terms and conditions of the GNU Lesser * This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level * General Public License v2.1. See the file LICENSE in the top level
@ -7,66 +8,36 @@
*/ */
/** /**
* @ingroup cpu_msp430_common * @ingroup cpu_msp430-common
* @{ * @{
*/
/**
* @file
* @brief msp430 hardware timer driver definitions
* *
* @author Freie Universitaet Berlin, Computer Systems and Telematics group * @file
* @brief Hardware timer configuration for MSP430 based CPUs
*
* @author Oliver Hahm <oliver.hahm@inria.fr> * @author Oliver Hahm <oliver.hahm@inria.fr>
* @author Kévin Roussel <Kevin.Roussel@inria.fr> * @author Kévin Roussel <Kevin.Roussel@inria.fr>
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
* *
*/ */
#ifndef HWTIMER_CPU_H_ #ifndef HWTIMER_CPU_H_
#define HWTIMER_CPU_H_ #define HWTIMER_CPU_H_
#include <stdint.h> #include "board.h"
#include "periph_conf.h"
#include "cpu.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#if defined (__MSP430_HAS_TA2__) /**
#define TIMER_A_MAXCOMP 2 * @brief Hardware timer configuration
#elif defined (__MSP430_HAS_TA3__) * @{
#define TIMER_A_MAXCOMP 3 */
#elif defined (__MSP430_HAS_T0A5__) #define HWTIMER_MAXTIMERS (TIMER_CHAN)
#define TIMER_A_MAXCOMP 5
#else
#define TIMER_A_MAXCOMP 0
#endif
#if defined (__MSP430_HAS_TB3__)
#define TIMER_B_MAXCOMP 3
#elif defined (__MSP430_HAS_TB7__)
#define TIMER_B_MAXCOMP 7
#else
#define TIMER_B_MAXCOMP 0
#endif
#define HWTIMER_MAXTIMERS (TIMER_A_MAXCOMP + TIMER_B_MAXCOMP)
#ifndef HWTIMER_MAXTIMERS
#warning "HWTIMER_MAXTIMERS UNSET!"
#define HWTIMER_MAXTIMERS 0
#endif
typedef struct {
enum {
TIMER_A,
TIMER_B,
} base_timer;
uint8_t ccr_num;
} msp430_timer_t;
#define HWTIMER_SPEED (F_RC_OSCILLATOR) #define HWTIMER_SPEED (F_RC_OSCILLATOR)
#define HWTIMER_MAXTICKS (0x0000FFFF) #define HWTIMER_MAXTICKS (0x0000FFFF)
/** @} */
#ifdef __cplusplus #ifdef __cplusplus
} }