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

Merge pull request #13658 from fjmolinas/pr_periph_timer_cc2538

Browse Source 
cpu/cc2538: fix GPT3 IRQ definition
This commit is contained in:
Francisco 2020-03-20 14:31:05 +01:00 committed by GitHub
commit b98e4bf0d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
boards/cc2538dk/include/periph_conf.h
View File

@ -26,6 +26,13 @@
extern "C" { extern "C" {
#endif #endif
/**
* @name Clock system configuration
* @{
*/
#define CLOCK_CORECLOCK (16000000U) /* desired core clock frequency, 16MHz */
/** @} */
/** /**
* @name Timer configuration * @name Timer configuration
* *

2
boards/common/remote/include/cfg_clk_default.h
View File

@ -30,7 +30,7 @@ extern "C" {
* @name Clock system configuration * @name Clock system configuration
* @{ * @{
*/ */
#define CLOCK_CORECLOCK (32000000U) /* 32MHz */ #define CLOCK_CORECLOCK (16000000U) /* 16MHz */
/** @} */ /** @} */
#ifdef __cplusplus #ifdef __cplusplus

2
boards/openmote-b/include/periph_conf.h
View File

@ -33,7 +33,7 @@
* @name Clock system configuration * @name Clock system configuration
* @{ * @{
*/ */
#define CLOCK_CORECLOCK (32000000U) /* desired core clock frequency, 32MHz */ #define CLOCK_CORECLOCK (16000000U) /* desired core clock frequency, 16MHz */
/** @} */ /** @} */
/** /**

2
boards/openmote-cc2538/include/periph_conf.h
View File

@ -31,7 +31,7 @@
* @name Clock system configuration * @name Clock system configuration
* @{ * @{
*/ */
#define CLOCK_CORECLOCK (32000000U) /* desired core clock frequency, 32MHz */ #define CLOCK_CORECLOCK (16000000U) /* desired core clock frequency, 16MHz */
/** @} */ /** @} */
/** /**

17
cpu/cc2538/periph/timer.c
View File

@ -67,8 +67,21 @@ static inline void _irq_enable(tim_t tim)
DEBUG("%s(%u)\n", __FUNCTION__, tim); DEBUG("%s(%u)\n", __FUNCTION__, tim);
if (tim < TIMER_NUMOF) { if (tim < TIMER_NUMOF) {
IRQn_Type irqn = GPTIMER_0A_IRQn + (2 * tim); IRQn_Type irqn;
switch (tim) {
case 0:
irqn = GPTIMER_0A_IRQn;
break;
case 1:
irqn = GPTIMER_1A_IRQn;
break;
case 2:
irqn = GPTIMER_2A_IRQn;
break;
case 3:
irqn = GPTIMER_3A_IRQn;
break;
}
NVIC_SetPriority(irqn, TIMER_IRQ_PRIO); NVIC_SetPriority(irqn, TIMER_IRQ_PRIO);
NVIC_EnableIRQ(irqn); NVIC_EnableIRQ(irqn);

10
tests/periph_timer/Makefile
View File

@ -21,10 +21,20 @@ BOARDS_TIMER_32kHz := \
frdm-k22f \ frdm-k22f \
# #
BOARDS_TIMER_16MHz := \
cc2538dk \
openmote-b \
openmote-cc2538 \
remote-reva \
remote-revb \
#
ifneq (,$(filter $(BOARDS_TIMER_25kHz),$(BOARD))) ifneq (,$(filter $(BOARDS_TIMER_25kHz),$(BOARD)))
TIMER_SPEED ?= 250000 TIMER_SPEED ?= 250000
else ifneq (,$(filter $(BOARDS_TIMER_32kHz),$(BOARD))) else ifneq (,$(filter $(BOARDS_TIMER_32kHz),$(BOARD)))
TIMER_SPEED ?= 32768 TIMER_SPEED ?= 32768
else ifneq (,$(filter $(BOARDS_TIMER_16MHz),$(BOARD)))
TIMER_SPEED ?= 16000000
endif endif
TIMER_SPEED ?= 1000000 TIMER_SPEED ?= 1000000