electronics
/
libopencm3
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

swm050: timer: use more standard bit definitions 

We normally use periph_reg_field naming, and most of this file was
already consistent. Switch the stragglers.
This commit is contained in:
Karl Palsson 2020-01-28 22:07:27 +00:00
parent a6aecf8ccd
commit 26d6f8f77e
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/libopencm3/swm050/timer.h
View File

@ -93,12 +93,6 @@ enum timer_pwm_period {
/** Timer Clock Divider Mask */ /** Timer Clock Divider Mask */
#define TIMER_DIV_MASK (0x3F << 16) #define TIMER_DIV_MASK (0x3F << 16)
/** Timer Operation Mode Mask */
#define TIMER_OPER_MODE_MASK (0x3 << 4)
/** Timer Output Mode Mask */
#define TIMER_OUTP_MODE_MASK (0x3 << 12)
/** @defgroup timer_registers Timer Registers /** @defgroup timer_registers Timer Registers
@{*/ @{*/
/** Timer control register */ /** Timer control register */
@ -135,6 +129,12 @@ enum timer_pwm_period {
#define TIMER_CTRL_TMOD (1 << 16) #define TIMER_CTRL_TMOD (1 << 16)
/** Loop mode selection */ /** Loop mode selection */
#define TIMER_CTRL_LMOD (1 << 28) #define TIMER_CTRL_LMOD (1 << 28)
/** Timer Output Mode Mask */
#define TIMER_CTRL_OUTMOD_MASK 0x3
#define TIMER_CTRL_OUTMOD_SHIFT 12
/** Timer Operation Mode Mask */
#define TIMER_CTRL_WMOD_MASK 0x3
#define TIMER_CTRL_WMOD_SHIFT 4
/** Interrupt mask */ /** Interrupt mask */
#define TIMER_INTCTL_INTMSK (1 << 1) #define TIMER_INTCTL_INTMSK (1 << 1)
/** Interrupt enable */ /** Interrupt enable */

8
lib/swm050/timer.c
View File

@ -233,8 +233,8 @@ void timer_clock_enable(uint32_t timer, bool en)
*/ */
void timer_operation_mode(uint32_t timer, enum timer_operation_modes mode) void timer_operation_mode(uint32_t timer, enum timer_operation_modes mode)
{ {
mode = (mode << 4); uint32_t reg = TIMER_CTRL(timer) & ~(TIMER_CTRL_OUTMOD_MASK << TIMER_CTRL_OUTMOD_SHIFT);
TIMER_CTRL(timer) = (~TIMER_OPER_MODE_MASK & TIMER_CTRL(timer)) | mode; TIMER_CTRL(timer) = reg | (mode << TIMER_CTRL_OUTMOD_SHIFT);
} }
/** /**
@ -251,8 +251,8 @@ void timer_operation_mode(uint32_t timer, enum timer_operation_modes mode)
*/ */
void timer_output_mode(uint32_t timer, enum timer_output_modes mode) void timer_output_mode(uint32_t timer, enum timer_output_modes mode)
{ {
mode = (mode << 12); uint32_t reg = TIMER_CTRL(timer) & ~(TIMER_CTRL_WMOD_MASK << TIMER_CTRL_WMOD_SHIFT);
TIMER_CTRL(timer) = (~TIMER_OUTP_MODE_MASK & TIMER_CTRL(timer)) | mode; TIMER_CTRL(timer) = reg | (mode << TIMER_CTRL_WMOD_SHIFT);
} }
/** /**