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

cpu/atmega_common: use TIMER_CHANNEL_NUMOF

Browse Source
This commit is contained in:
Benjamin Valentin 2020-06-23 19:24:15 +02:00
parent 51135a50fc
commit 96273b4df0
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/atmega1281/include/default_timer_config.h
View File

@ -29,7 +29,7 @@ extern "C" {
#ifndef TIMER_NUMOF #ifndef TIMER_NUMOF
#define TIMER_NUMOF (2U) #define TIMER_NUMOF (2U)
#define TIMER_CHANNELS (3) #define TIMER_CHANNEL_NUMOF (3)
#define TIMER_0 MEGA_TIMER1 #define TIMER_0 MEGA_TIMER1
#define TIMER_0_MASK &TIMSK1 #define TIMER_0_MASK &TIMSK1

2
cpu/atmega1284p/include/default_timer_config.h
View File

@ -28,7 +28,7 @@ extern "C" {
#ifndef TIMER_NUMOF #ifndef TIMER_NUMOF
#define TIMER_NUMOF (2U) #define TIMER_NUMOF (2U)
#define TIMER_CHANNELS (2) #define TIMER_CHANNEL_NUMOF (2)
#define TIMER_0 MEGA_TIMER1 #define TIMER_0 MEGA_TIMER1
#define TIMER_0_MASK &TIMSK1 #define TIMER_0_MASK &TIMSK1

2
cpu/atmega128rfa1/include/default_timer_config.h
View File

@ -26,7 +26,7 @@ extern "C" {
#ifndef TIMER_NUMOF #ifndef TIMER_NUMOF
#define TIMER_NUMOF (3U) #define TIMER_NUMOF (3U)
#define TIMER_CHANNELS (3) #define TIMER_CHANNEL_NUMOF (3)
#define TIMER_0 MEGA_TIMER4 #define TIMER_0 MEGA_TIMER4
#define TIMER_0_MASK &TIMSK4 #define TIMER_0_MASK &TIMSK4

2
cpu/atmega2560/include/default_timer_config.h
View File

@ -29,7 +29,7 @@ extern "C" {
#ifndef TIMER_NUMOF #ifndef TIMER_NUMOF
#define TIMER_NUMOF (2U) #define TIMER_NUMOF (2U)
#define TIMER_CHANNELS (3) #define TIMER_CHANNEL_NUMOF (3)
#define TIMER_0 MEGA_TIMER1 #define TIMER_0 MEGA_TIMER1
#define TIMER_0_MASK &TIMSK1 #define TIMER_0_MASK &TIMSK1

2
cpu/atmega256rfr2/include/default_timer_config.h
View File

@ -26,7 +26,7 @@ extern "C" {
#ifndef TIMER_NUMOF #ifndef TIMER_NUMOF
#define TIMER_NUMOF (3U) #define TIMER_NUMOF (3U)
#define TIMER_CHANNELS (3) #define TIMER_CHANNEL_NUMOF (3)
#define TIMER_0 MEGA_TIMER4 #define TIMER_0 MEGA_TIMER4
#define TIMER_0_MASK &TIMSK4 #define TIMER_0_MASK &TIMSK4

2
cpu/atmega328p/include/default_timer_config.h
View File

@ -27,7 +27,7 @@ extern "C" {
#ifndef TIMER_NUMOF #ifndef TIMER_NUMOF
#define TIMER_NUMOF (1U) #define TIMER_NUMOF (1U)
#define TIMER_CHANNELS (2) #define TIMER_CHANNEL_NUMOF (2)
#define TIMER_0 MEGA_TIMER1 #define TIMER_0 MEGA_TIMER1
#define TIMER_0_MASK &TIMSK1 #define TIMER_0_MASK &TIMSK1

2
cpu/atmega32u4/include/default_timer_config.h
View File

@ -26,7 +26,7 @@ extern "C" {
#ifndef TIMER_NUMOF #ifndef TIMER_NUMOF
#define TIMER_NUMOF (2U) #define TIMER_NUMOF (2U)
#define TIMER_CHANNELS (3) #define TIMER_CHANNEL_NUMOF (3)
#define TIMER_0 MEGA_TIMER1 #define TIMER_0 MEGA_TIMER1
#define TIMER_0_MASK &TIMSK1 #define TIMER_0_MASK &TIMSK1

14
cpu/atmega_common/periph/timer.c
View File

@ -78,17 +78,17 @@ static unsigned _oneshot;
static inline void set_oneshot(tim_t tim, int chan) static inline void set_oneshot(tim_t tim, int chan)
{ {
_oneshot |= (1 << chan) << (TIMER_CHANNELS * tim); _oneshot |= (1 << chan) << (TIMER_CHANNEL_NUMOF * tim);
} }
static inline void clear_oneshot(tim_t tim, int chan) static inline void clear_oneshot(tim_t tim, int chan)
{ {
_oneshot &= ~((1 << chan) << (TIMER_CHANNELS * tim)); _oneshot &= ~((1 << chan) << (TIMER_CHANNEL_NUMOF * tim));
} }
static inline bool is_oneshot(tim_t tim, int chan) static inline bool is_oneshot(tim_t tim, int chan)
{ {
return _oneshot & ((1 << chan) << (TIMER_CHANNELS * tim)); return _oneshot & ((1 << chan) << (TIMER_CHANNEL_NUMOF * tim));
} }
/** /**
@ -150,7 +150,7 @@ int timer_init(tim_t tim, unsigned long freq, timer_cb_t cb, void *arg)
int timer_set_absolute(tim_t tim, int channel, unsigned int value) int timer_set_absolute(tim_t tim, int channel, unsigned int value)
{ {
if (channel >= TIMER_CHANNELS) { if (channel >= TIMER_CHANNEL_NUMOF) {
return -1; return -1;
} }
@ -168,7 +168,7 @@ int timer_set_absolute(tim_t tim, int channel, unsigned int value)
int timer_set(tim_t tim, int channel, unsigned int timeout) int timer_set(tim_t tim, int channel, unsigned int timeout)
{ {
if (channel >= TIMER_CHANNELS) { if (channel >= TIMER_CHANNEL_NUMOF) {
return -1; return -1;
} }
@ -197,7 +197,7 @@ int timer_set_periodic(tim_t tim, int channel, unsigned int value, uint8_t flags
{ {
int res = 0; int res = 0;
if (channel >= TIMER_CHANNELS) { if (channel >= TIMER_CHANNEL_NUMOF) {
return -1; return -1;
} }
@ -235,7 +235,7 @@ int timer_set_periodic(tim_t tim, int channel, unsigned int value, uint8_t flags
int timer_clear(tim_t tim, int channel) int timer_clear(tim_t tim, int channel)
{ {
if (channel >= TIMER_CHANNELS) { if (channel >= TIMER_CHANNEL_NUMOF) {
return -1; return -1;
} }