aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2023-02-21 22:19:06 +0100
committerDario Nieuwenhuis <[email protected]>2023-03-06 00:17:51 +0100
commita054891263cbd17315cdf85ecdcc6359313063bc (patch)
tree2f739e95c5467bb43a818e54e30182c0c97fa81f
parent403a83e08da67ebb20d04b1675a34c12752a94fc (diff)
cortex-m: rename Handler to DynHandler.
I want to use the name Handler for the new interrupt binding macro.
-rw-r--r--embassy-cortex-m/src/interrupt.rs6
-rw-r--r--embassy-macros/src/macros/cortex_m_interrupt_declare.rs4
-rw-r--r--embassy-macros/src/macros/cortex_m_interrupt_take.rs2
3 files changed, 6 insertions, 6 deletions
diff --git a/embassy-cortex-m/src/interrupt.rs b/embassy-cortex-m/src/interrupt.rs
index 1df8671b9..ead9d52fe 100644
--- a/embassy-cortex-m/src/interrupt.rs
+++ b/embassy-cortex-m/src/interrupt.rs
@@ -15,12 +15,12 @@ pub mod _export {
15 15
16/// Implementation detail, do not use outside embassy crates. 16/// Implementation detail, do not use outside embassy crates.
17#[doc(hidden)] 17#[doc(hidden)]
18pub struct Handler { 18pub struct DynHandler {
19 pub func: AtomicPtr<()>, 19 pub func: AtomicPtr<()>,
20 pub ctx: AtomicPtr<()>, 20 pub ctx: AtomicPtr<()>,
21} 21}
22 22
23impl Handler { 23impl DynHandler {
24 pub const fn new() -> Self { 24 pub const fn new() -> Self {
25 Self { 25 Self {
26 func: AtomicPtr::new(ptr::null_mut()), 26 func: AtomicPtr::new(ptr::null_mut()),
@@ -51,7 +51,7 @@ pub unsafe trait Interrupt: Peripheral<P = Self> {
51 51
52 /// Implementation detail, do not use outside embassy crates. 52 /// Implementation detail, do not use outside embassy crates.
53 #[doc(hidden)] 53 #[doc(hidden)]
54 unsafe fn __handler(&self) -> &'static Handler; 54 unsafe fn __handler(&self) -> &'static DynHandler;
55} 55}
56 56
57/// Represents additional behavior for all interrupts. 57/// Represents additional behavior for all interrupts.
diff --git a/embassy-macros/src/macros/cortex_m_interrupt_declare.rs b/embassy-macros/src/macros/cortex_m_interrupt_declare.rs
index ebbb47cd7..699883efa 100644
--- a/embassy-macros/src/macros/cortex_m_interrupt_declare.rs
+++ b/embassy-macros/src/macros/cortex_m_interrupt_declare.rs
@@ -21,9 +21,9 @@ pub fn run(name: syn::Ident) -> Result<TokenStream, TokenStream> {
21 unsafe fn steal() -> Self { 21 unsafe fn steal() -> Self {
22 Self(()) 22 Self(())
23 } 23 }
24 unsafe fn __handler(&self) -> &'static ::embassy_cortex_m::interrupt::Handler { 24 unsafe fn __handler(&self) -> &'static ::embassy_cortex_m::interrupt::DynHandler {
25 #[export_name = #name_handler] 25 #[export_name = #name_handler]
26 static HANDLER: ::embassy_cortex_m::interrupt::Handler = ::embassy_cortex_m::interrupt::Handler::new(); 26 static HANDLER: ::embassy_cortex_m::interrupt::DynHandler = ::embassy_cortex_m::interrupt::DynHandler::new();
27 &HANDLER 27 &HANDLER
28 } 28 }
29 } 29 }
diff --git a/embassy-macros/src/macros/cortex_m_interrupt_take.rs b/embassy-macros/src/macros/cortex_m_interrupt_take.rs
index d30189ce3..e2ebf98c7 100644
--- a/embassy-macros/src/macros/cortex_m_interrupt_take.rs
+++ b/embassy-macros/src/macros/cortex_m_interrupt_take.rs
@@ -30,7 +30,7 @@ pub fn run(name: syn::Ident) -> Result<TokenStream, TokenStream> {
30 pub unsafe extern "C" fn trampoline() { 30 pub unsafe extern "C" fn trampoline() {
31 extern "C" { 31 extern "C" {
32 #[link_name = #name_handler] 32 #[link_name = #name_handler]
33 static HANDLER: interrupt::Handler; 33 static HANDLER: interrupt::DynHandler;
34 } 34 }
35 35
36 let func = HANDLER.func.load(interrupt::_export::atomic::Ordering::Relaxed); 36 let func = HANDLER.func.load(interrupt::_export::atomic::Ordering::Relaxed);