noisymime
/
Arduino_STM32
mirror of https://github.com/noisymime/Arduino_STM32.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch-12' of https://github.com/stevstrong/Arduino_STM32 into stevstrong-patch-12

This commit is contained in:
Roger Clark 2018-05-27 14:35:10 +10:00
parent 2208bcbc5b cd4085b239
commit 6cdcbf0bb7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
STM32F1/system/libmaple/include/libmaple/timer.h
View File

@ -843,7 +843,8 @@ static inline void timer_dma_disable_req(timer_dev *dev, uint8 channel) {
*/ */
static inline void timer_enable_irq(timer_dev *dev, uint8 interrupt) { static inline void timer_enable_irq(timer_dev *dev, uint8 interrupt) {
// clear interrupt flag, use different masks for reserved bits // clear interrupt flag, use different masks for reserved bits
*bb_perip(&(dev->regs).adv->SR, interrupt) = 0; // clear interrupt flag (dev->regs).adv->SR = (~BIT(interrupt)) & ( (dev->type==TIMER_ADVANCED) ? 0x1EFF :
( (dev->type==TIMER_GENERAL) ? 0x1E5F : 0x0001) );
*bb_perip(&(dev->regs).adv->DIER, interrupt) = 1; *bb_perip(&(dev->regs).adv->DIER, interrupt) = 1;
} }