From b6b6fd2626f40990bfd0f1071435ce08a5a3d23d Mon Sep 17 00:00:00 2001 From: PeterKietzmann Date: Wed, 29 Nov 2017 16:47:09 +0100 Subject: [PATCH] cpu/xxx430: correct channel check in periph timer driver --- cpu/cc430/periph/timer.c | 4 ++-- cpu/msp430fxyz/periph/timer.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cpu/cc430/periph/timer.c b/cpu/cc430/periph/timer.c index ef89c14f5f..58f79a8468 100644 --- a/cpu/cc430/periph/timer.c +++ b/cpu/cc430/periph/timer.c @@ -70,7 +70,7 @@ int timer_init(tim_t dev, unsigned long freq, timer_cb_t cb, void *arg) int timer_set_absolute(tim_t dev, int channel, unsigned int value) { - if (dev != 0 || channel > TIMER_CHAN) { + if (dev != 0 || channel >= TIMER_CHAN) { return -1; } TIMER_BASE->CCR[channel] = value; @@ -81,7 +81,7 @@ int timer_set_absolute(tim_t dev, int channel, unsigned int value) int timer_clear(tim_t dev, int channel) { - if (dev != 0 || channel > TIMER_CHAN) { + if (dev != 0 || channel >= TIMER_CHAN) { return -1; } TIMER_BASE->CCTL[channel] &= ~(CCTL_CCIE); diff --git a/cpu/msp430fxyz/periph/timer.c b/cpu/msp430fxyz/periph/timer.c index 450045887d..040c9cc740 100644 --- a/cpu/msp430fxyz/periph/timer.c +++ b/cpu/msp430fxyz/periph/timer.c @@ -70,7 +70,7 @@ int timer_init(tim_t dev, unsigned long freq, timer_cb_t cb, void *arg) int timer_set_absolute(tim_t dev, int channel, unsigned int value) { - if (dev != 0 || channel > TIMER_CHAN) { + if (dev != 0 || channel >= TIMER_CHAN) { return -1; } TIMER_BASE->CCR[channel] = value; @@ -81,7 +81,7 @@ int timer_set_absolute(tim_t dev, int channel, unsigned int value) int timer_clear(tim_t dev, int channel) { - if (dev != 0 || channel > TIMER_CHAN) { + if (dev != 0 || channel >= TIMER_CHAN) { return -1; } TIMER_BASE->CCTL[channel] &= ~(TIMER_CCTL_CCIE);