Skip to content

Commit 6653f26

Browse files
DirbaioDirbaio
committed
examples: use nicer InterrupExt to set irq priority in multprio.
1 parent 98c821a commit 6653f26

File tree

5 files changed

+25
-47
lines changed

5 files changed

+25
-47
lines changed

‎examples/nrf52840/src/bin/multiprio.rs‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,11 @@
5757
#![no_main]
5858
#![feature(type_alias_impl_trait)]
5959

60-
use core::mem;
61-
62-
use cortex_m::peripheral::NVIC;
6360
use cortex_m_rt::entry;
6461
use defmt::{info, unwrap};
6562
use embassy_executor::{Executor, InterruptExecutor};
6663
use embassy_nrf::interrupt;
67-
use embassy_nrf::pac::Interrupt;
64+
use embassy_nrf::interrupt::{InterruptExt, Priority};
6865
use embassy_time::{Duration, Instant, Timer};
6966
use static_cell::StaticCell;
7067
use {defmt_rtt as _, panic_probe as _};
@@ -130,16 +127,15 @@ fn main() -> ! {
130127
info!("Hello World!");
131128

132129
let _p = embassy_nrf::init(Default::default());
133-
let mut nvic: NVIC = unsafe { mem::transmute(()) };
134130

135131
// High-priority executor: SWI1_EGU1, priority level 6
136-
unsafe { nvic.set_priority(Interrupt::SWI1_EGU1, 6 << 5) };
137-
let spawner = EXECUTOR_HIGH.start(Interrupt::SWI1_EGU1);
132+
interrupt::SWI1_EGU1.set_priority(Priority::P6);
133+
let spawner = EXECUTOR_HIGH.start(interrupt::SWI1_EGU1);
138134
unwrap!(spawner.spawn(run_high()));
139135

140136
// Medium-priority executor: SWI0_EGU0, priority level 7
141-
unsafe { nvic.set_priority(Interrupt::SWI0_EGU0, 7 << 5) };
142-
let spawner = EXECUTOR_MED.start(Interrupt::SWI0_EGU0);
137+
interrupt::SWI0_EGU0.set_priority(Priority::P7);
138+
let spawner = EXECUTOR_MED.start(interrupt::SWI0_EGU0);
143139
unwrap!(spawner.spawn(run_med()));
144140

145141
// Low priority executor: runs in thread mode, using WFE/SEV

‎examples/rp/src/bin/multiprio.rs‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,11 @@
5757
#![no_main]
5858
#![feature(type_alias_impl_trait)]
5959

60-
use core::mem;
61-
62-
use cortex_m::peripheral::NVIC;
6360
use cortex_m_rt::entry;
6461
use defmt::{info, unwrap};
6562
use embassy_executor::{Executor, InterruptExecutor};
6663
use embassy_rp::interrupt;
67-
use embassy_rp::pac::Interrupt;
64+
use embassy_rp::interrupt::{InterruptExt, Priority};
6865
use embassy_time::{Duration, Instant, Timer, TICK_HZ};
6966
use static_cell::StaticCell;
7067
use {defmt_rtt as _, panic_probe as _};
@@ -130,18 +127,15 @@ fn main() -> ! {
130127
info!("Hello World!");
131128

132129
let _p = embassy_rp::init(Default::default());
133-
let mut nvic: NVIC = unsafe { mem::transmute(()) };
134130

135131
// High-priority executor: SWI_IRQ_1, priority level 2
136-
unsafe { nvic.set_priority(Interrupt::SWI_IRQ_1, 2 << 6) };
137-
info!("bla: {}", NVIC::get_priority(Interrupt::SWI_IRQ_1));
138-
let spawner = EXECUTOR_HIGH.start(Interrupt::SWI_IRQ_1);
132+
interrupt::SWI_IRQ_1.set_priority(Priority::P2);
133+
let spawner = EXECUTOR_HIGH.start(interrupt::SWI_IRQ_1);
139134
unwrap!(spawner.spawn(run_high()));
140135

141136
// Medium-priority executor: SWI_IRQ_0, priority level 3
142-
unsafe { nvic.set_priority(Interrupt::SWI_IRQ_0, 3 << 6) };
143-
info!("bla: {}", NVIC::get_priority(Interrupt::SWI_IRQ_0));
144-
let spawner = EXECUTOR_MED.start(Interrupt::SWI_IRQ_0);
137+
interrupt::SWI_IRQ_0.set_priority(Priority::P3);
138+
let spawner = EXECUTOR_MED.start(interrupt::SWI_IRQ_0);
145139
unwrap!(spawner.spawn(run_med()));
146140

147141
// Low priority executor: runs in thread mode, using WFE/SEV

‎examples/stm32f0/src/bin/multiprio.rs‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,11 @@
5757
#![no_main]
5858
#![feature(type_alias_impl_trait)]
5959

60-
use core::mem;
61-
62-
use cortex_m::peripheral::NVIC;
6360
use cortex_m_rt::entry;
6461
use defmt::*;
6562
use embassy_executor::{Executor, InterruptExecutor};
6663
use embassy_stm32::interrupt;
67-
use embassy_stm32::pac::Interrupt;
64+
use embassy_stm32::interrupt::{InterruptExt, Priority};
6865
use embassy_time::{Duration, Instant, Timer};
6966
use static_cell::StaticCell;
7067
use {defmt_rtt as _, panic_probe as _};
@@ -129,16 +126,15 @@ unsafe fn USART2() {
129126
fn main() -> ! {
130127
// Initialize and create handle for devicer peripherals
131128
let _p = embassy_stm32::init(Default::default());
132-
let mut nvic: NVIC = unsafe { mem::transmute(()) };
133129

134130
// High-priority executor: USART1, priority level 6
135-
unsafe { nvic.set_priority(Interrupt::USART1, 6 << 4) };
136-
let spawner = EXECUTOR_HIGH.start(Interrupt::USART1);
131+
interrupt::USART1.set_priority(Priority::P6);
132+
let spawner = EXECUTOR_HIGH.start(interrupt::USART1);
137133
unwrap!(spawner.spawn(run_high()));
138134

139135
// Medium-priority executor: USART2, priority level 7
140-
unsafe { nvic.set_priority(Interrupt::USART2, 7 << 4) };
141-
let spawner = EXECUTOR_MED.start(Interrupt::USART2);
136+
interrupt::USART2.set_priority(Priority::P7);
137+
let spawner = EXECUTOR_MED.start(interrupt::USART2);
142138
unwrap!(spawner.spawn(run_med()));
143139

144140
// Low priority executor: runs in thread mode, using WFE/SEV

‎examples/stm32f3/src/bin/multiprio.rs‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,11 @@
5757
#![no_main]
5858
#![feature(type_alias_impl_trait)]
5959

60-
use core::mem;
61-
62-
use cortex_m::peripheral::NVIC;
6360
use cortex_m_rt::entry;
6461
use defmt::*;
6562
use embassy_executor::{Executor, InterruptExecutor};
6663
use embassy_stm32::interrupt;
67-
use embassy_stm32::pac::Interrupt;
64+
use embassy_stm32::interrupt::{InterruptExt, Priority};
6865
use embassy_time::{Duration, Instant, Timer};
6966
use static_cell::StaticCell;
7067
use {defmt_rtt as _, panic_probe as _};
@@ -130,16 +127,15 @@ fn main() -> ! {
130127
info!("Hello World!");
131128

132129
let _p = embassy_stm32::init(Default::default());
133-
let mut nvic: NVIC = unsafe { mem::transmute(()) };
134130

135131
// High-priority executor: UART4, priority level 6
136-
unsafe { nvic.set_priority(Interrupt::UART4, 6 << 4) };
137-
let spawner = EXECUTOR_HIGH.start(Interrupt::UART4);
132+
interrupt::UART4.set_priority(Priority::P6);
133+
let spawner = EXECUTOR_HIGH.start(interrupt::UART4);
138134
unwrap!(spawner.spawn(run_high()));
139135

140136
// Medium-priority executor: UART5, priority level 7
141-
unsafe { nvic.set_priority(Interrupt::UART5, 7 << 4) };
142-
let spawner = EXECUTOR_MED.start(Interrupt::UART5);
137+
interrupt::UART5.set_priority(Priority::P7);
138+
let spawner = EXECUTOR_MED.start(interrupt::UART5);
143139
unwrap!(spawner.spawn(run_med()));
144140

145141
// Low priority executor: runs in thread mode, using WFE/SEV

‎examples/stm32f4/src/bin/multiprio.rs‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,11 @@
5757
#![no_main]
5858
#![feature(type_alias_impl_trait)]
5959

60-
use core::mem;
61-
62-
use cortex_m::peripheral::NVIC;
6360
use cortex_m_rt::entry;
6461
use defmt::*;
6562
use embassy_executor::{Executor, InterruptExecutor};
6663
use embassy_stm32::interrupt;
67-
use embassy_stm32::pac::Interrupt;
64+
use embassy_stm32::interrupt::{InterruptExt, Priority};
6865
use embassy_time::{Duration, Instant, Timer};
6966
use static_cell::StaticCell;
7067
use {defmt_rtt as _, panic_probe as _};
@@ -130,16 +127,15 @@ fn main() -> ! {
130127
info!("Hello World!");
131128

132129
let _p = embassy_stm32::init(Default::default());
133-
let mut nvic: NVIC = unsafe { mem::transmute(()) };
134130

135131
// High-priority executor: UART4, priority level 6
136-
unsafe { nvic.set_priority(Interrupt::UART4, 6 << 4) };
137-
let spawner = EXECUTOR_HIGH.start(Interrupt::UART4);
132+
interrupt::UART4.set_priority(Priority::P6);
133+
let spawner = EXECUTOR_HIGH.start(interrupt::UART4);
138134
unwrap!(spawner.spawn(run_high()));
139135

140136
// Medium-priority executor: UART5, priority level 7
141-
unsafe { nvic.set_priority(Interrupt::UART5, 7 << 4) };
142-
let spawner = EXECUTOR_MED.start(Interrupt::UART5);
137+
interrupt::UART5.set_priority(Priority::P7);
138+
let spawner = EXECUTOR_MED.start(interrupt::UART5);
143139
unwrap!(spawner.spawn(run_med()));
144140

145141
// Low priority executor: runs in thread mode, using WFE/SEV

0 commit comments

Comments
 (0)