diff options
| author | Dario Nieuwenhuis <[email protected]> | 2023-06-08 16:39:05 +0200 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2023-06-08 18:07:49 +0200 |
| commit | 5c2f02c73505cf630c2fbe9b098707a33293d702 (patch) | |
| tree | da5c19576d0337edca735e290306e28a0bd4f8d0 /embassy-nrf/src | |
| parent | bce24e800516402a3a3991ebde0432e5167be174 (diff) | |
Reexport NVIC_PRIO_BITS at HAL root.
This allows using RTIC with `#[rtic::app(device = embassy_nrf, ...)]`
Diffstat (limited to 'embassy-nrf/src')
| -rw-r--r-- | embassy-nrf/src/chips/nrf5340_app.rs | 2 | ||||
| -rw-r--r-- | embassy-nrf/src/chips/nrf5340_net.rs | 2 | ||||
| -rw-r--r-- | embassy-nrf/src/chips/nrf9160.rs | 2 | ||||
| -rw-r--r-- | embassy-nrf/src/lib.rs | 5 |
4 files changed, 9 insertions, 2 deletions
diff --git a/embassy-nrf/src/chips/nrf5340_app.rs b/embassy-nrf/src/chips/nrf5340_app.rs index c10520051..cb879f736 100644 --- a/embassy-nrf/src/chips/nrf5340_app.rs +++ b/embassy-nrf/src/chips/nrf5340_app.rs | |||
| @@ -5,6 +5,8 @@ pub mod pac { | |||
| 5 | // The nRF5340 has a secure and non-secure (NS) mode. | 5 | // The nRF5340 has a secure and non-secure (NS) mode. |
| 6 | // To avoid cfg spam, we remove _ns or _s suffixes here. | 6 | // To avoid cfg spam, we remove _ns or _s suffixes here. |
| 7 | 7 | ||
| 8 | pub use nrf5340_app_pac::NVIC_PRIO_BITS; | ||
| 9 | |||
| 8 | #[doc(no_inline)] | 10 | #[doc(no_inline)] |
| 9 | pub use nrf5340_app_pac::{ | 11 | pub use nrf5340_app_pac::{ |
| 10 | interrupt, | 12 | interrupt, |
diff --git a/embassy-nrf/src/chips/nrf5340_net.rs b/embassy-nrf/src/chips/nrf5340_net.rs index a6fb1d4cc..6e2c0bb67 100644 --- a/embassy-nrf/src/chips/nrf5340_net.rs +++ b/embassy-nrf/src/chips/nrf5340_net.rs | |||
| @@ -5,6 +5,8 @@ pub mod pac { | |||
| 5 | // The nRF5340 has a secure and non-secure (NS) mode. | 5 | // The nRF5340 has a secure and non-secure (NS) mode. |
| 6 | // To avoid cfg spam, we remove _ns or _s suffixes here. | 6 | // To avoid cfg spam, we remove _ns or _s suffixes here. |
| 7 | 7 | ||
| 8 | pub use nrf5340_net_pac::NVIC_PRIO_BITS; | ||
| 9 | |||
| 8 | #[doc(no_inline)] | 10 | #[doc(no_inline)] |
| 9 | pub use nrf5340_net_pac::{ | 11 | pub use nrf5340_net_pac::{ |
| 10 | interrupt, | 12 | interrupt, |
diff --git a/embassy-nrf/src/chips/nrf9160.rs b/embassy-nrf/src/chips/nrf9160.rs index b6ae78bbe..9944ac4af 100644 --- a/embassy-nrf/src/chips/nrf9160.rs +++ b/embassy-nrf/src/chips/nrf9160.rs | |||
| @@ -5,6 +5,8 @@ pub mod pac { | |||
| 5 | // The nRF9160 has a secure and non-secure (NS) mode. | 5 | // The nRF9160 has a secure and non-secure (NS) mode. |
| 6 | // To avoid cfg spam, we remove _ns or _s suffixes here. | 6 | // To avoid cfg spam, we remove _ns or _s suffixes here. |
| 7 | 7 | ||
| 8 | pub use nrf9160_pac::NVIC_PRIO_BITS; | ||
| 9 | |||
| 8 | #[doc(no_inline)] | 10 | #[doc(no_inline)] |
| 9 | pub use nrf9160_pac::{ | 11 | pub use nrf9160_pac::{ |
| 10 | interrupt, | 12 | interrupt, |
diff --git a/embassy-nrf/src/lib.rs b/embassy-nrf/src/lib.rs index a73d22a63..ddabf93a9 100644 --- a/embassy-nrf/src/lib.rs +++ b/embassy-nrf/src/lib.rs | |||
| @@ -93,8 +93,6 @@ pub mod wdt; | |||
| 93 | #[cfg_attr(feature = "_nrf9160", path = "chips/nrf9160.rs")] | 93 | #[cfg_attr(feature = "_nrf9160", path = "chips/nrf9160.rs")] |
| 94 | mod chip; | 94 | mod chip; |
| 95 | 95 | ||
| 96 | pub use crate::chip::interrupt; | ||
| 97 | |||
| 98 | /// Macro to bind interrupts to handlers. | 96 | /// Macro to bind interrupts to handlers. |
| 99 | /// | 97 | /// |
| 100 | /// This defines the right interrupt handlers, and creates a unit struct (like `struct Irqs;`) | 98 | /// This defines the right interrupt handlers, and creates a unit struct (like `struct Irqs;`) |
| @@ -132,6 +130,9 @@ pub use chip::{peripherals, Peripherals, EASY_DMA_SIZE}; | |||
| 132 | pub use embassy_cortex_m::executor; | 130 | pub use embassy_cortex_m::executor; |
| 133 | pub use embassy_hal_common::{into_ref, Peripheral, PeripheralRef}; | 131 | pub use embassy_hal_common::{into_ref, Peripheral, PeripheralRef}; |
| 134 | 132 | ||
| 133 | pub use crate::chip::interrupt; | ||
| 134 | pub use crate::pac::NVIC_PRIO_BITS; | ||
| 135 | |||
| 135 | pub mod config { | 136 | pub mod config { |
| 136 | //! Configuration options used when initializing the HAL. | 137 | //! Configuration options used when initializing the HAL. |
| 137 | 138 | ||
