aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTitanMKD2012-06-03 18:55:42 +0200
committerTitanMKD2012-06-03 18:55:42 +0200
commit646e8f20f1cdefe49142fd626ac7558f7a4ebfea (patch)
tree46048b039ef8ab18d510965f0f029463855829dc
parentcb1cd9d9d6eca9b8f4d05a3b1490f9b875265a32 (diff)
parent154f67598bb06c0c152bf121979c2292f7f10a84 (diff)
Merge branch 'master' of git://github.com/libopencm3/libopencm3
-rw-r--r--lib/stm32/nvic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stm32/nvic.c b/lib/stm32/nvic.c
index cd823e1..c9cf48b 100644
--- a/lib/stm32/nvic.c
+++ b/lib/stm32/nvic.c
@@ -57,7 +57,7 @@ u8 nvic_get_irq_enabled(u8 irqn)
void nvic_set_priority(u8 irqn, u8 priority)
{
- NVIC_IPR(irqn / 4) |= (priority << ((irqn % 4) * 8));
+ NVIC_IPR(irqn) = priority;
}
void nvic_generate_software_interrupt(u8 irqn)