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

Merge pull request #491 from stevstrong/patch-12 

Update timer.h
This commit is contained in:
Roger Clark 2018-04-12 16:43:29 +10:00 committed by GitHub
parent 596dc0d78e 407df21dfb
commit 550e511566
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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