Add embassy-cortex-m crate.

- Move Interrupt and InterruptExecutor from `embassy` to `embassy-cortex-m`.
- Move Unborrow from `embassy` to `embassy-hal-common` (nothing in `embassy` requires it anymore)
- Move PeripheralMutex from `embassy-hal-common` to `embassy-cortex-m`.

5 files changed, 20 insertions, 15 deletions

diff --git a/embassy-macros/src/lib.rs b/embassy-macros/src/lib.rs
index 085f7889d..50f442438 100644
--- a/embassy-macros/src/lib.rs
+++ b/embassy-macros/src/lib.rs
@@ -22,16 +22,20 @@ pub fn main(args: TokenStream, item: TokenStream) -> TokenStream {
 }
 
 #[proc_macro_attribute]
-pub fn interrupt(args: TokenStream, item: TokenStream) -> TokenStream {
+pub fn cortex_m_interrupt(args: TokenStream, item: TokenStream) -> TokenStream {
     let args = syn::parse_macro_input!(args as syn::AttributeArgs);
     let f = syn::parse_macro_input!(item as syn::ItemFn);
-    interrupt::run(args, f).unwrap_or_else(|x| x).into()
+    cortex_m_interrupt::run(args, f)
+        .unwrap_or_else(|x| x)
+        .into()
 }
 
 #[proc_macro]
-pub fn interrupt_declare(item: TokenStream) -> TokenStream {
+pub fn cortex_m_interrupt_declare(item: TokenStream) -> TokenStream {
     let name = syn::parse_macro_input!(item as syn::Ident);
-    interrupt_declare::run(name).unwrap_or_else(|x| x).into()
+    cortex_m_interrupt_declare::run(name)
+        .unwrap_or_else(|x| x)
+        .into()
 }
 
 /// # interrupt_take procedural macro
@@ -40,7 +44,9 @@ pub fn interrupt_declare(item: TokenStream) -> TokenStream {
 /// We are aware that this brings bloat in the form of core::fmt, but the bloat is already included with e.g. array indexing panics.
 /// To get rid of this bloat, use the compiler flags `-Zbuild-std=core -Zbuild-std-features=panic_immediate_abort`.
 #[proc_macro]
-pub fn interrupt_take(item: TokenStream) -> TokenStream {
+pub fn cortex_m_interrupt_take(item: TokenStream) -> TokenStream {
     let name = syn::parse_macro_input!(item as syn::Ident);
-    interrupt_take::run(name).unwrap_or_else(|x| x).into()
+    cortex_m_interrupt_take::run(name)
+        .unwrap_or_else(|x| x)
+        .into()
 }
diff --git a/embassy-macros/src/macros/interrupt.rs b/embassy-macros/src/macros/cortex_m_interrupt.rs
index 32cc0e010..32cc0e010 100644
--- a/embassy-macros/src/macros/interrupt.rs
+++ b/embassy-macros/src/macros/cortex_m_interrupt.rs
diff --git a/embassy-macros/src/macros/interrupt_declare.rs b/embassy-macros/src/macros/cortex_m_interrupt_declare.rs
index 0059936d9..eeed5d483 100644
--- a/embassy-macros/src/macros/interrupt_declare.rs
+++ b/embassy-macros/src/macros/cortex_m_interrupt_declare.rs
@@ -9,8 +9,7 @@ pub fn run(name: syn::Ident) -> Result<TokenStream, TokenStream> {
     let result = quote! {
         #[allow(non_camel_case_types)]
         pub struct #name_interrupt(());
-        unsafe impl ::embassy::interrupt::Interrupt for #name_interrupt {
-            type Priority = crate::interrupt::Priority;
+        unsafe impl ::embassy_cortex_m::interrupt::Interrupt for #name_interrupt {
             fn number(&self) -> u16 {
                 use cortex_m::interrupt::InterruptNumber;
                 let irq = InterruptEnum::#name;
@@ -19,14 +18,14 @@ pub fn run(name: syn::Ident) -> Result<TokenStream, TokenStream> {
             unsafe fn steal() -> Self {
                 Self(())
             }
-            unsafe fn __handler(&self) -> &'static ::embassy::interrupt::Handler {
+            unsafe fn __handler(&self) -> &'static ::embassy_cortex_m::interrupt::Handler {
                 #[export_name = #name_handler]
-                static HANDLER: ::embassy::interrupt::Handler = ::embassy::interrupt::Handler::new();
+                static HANDLER: ::embassy_cortex_m::interrupt::Handler = ::embassy_cortex_m::interrupt::Handler::new();
                 &HANDLER
             }
         }
 
-        unsafe impl ::embassy::util::Unborrow for #name_interrupt {
+        unsafe impl ::embassy_hal_common::Unborrow for #name_interrupt {
             type Target = #name_interrupt;
             unsafe fn unborrow(self) -> #name_interrupt {
                 self
diff --git a/embassy-macros/src/macros/interrupt_take.rs b/embassy-macros/src/macros/cortex_m_interrupt_take.rs
index 230b9c741..29dca12fd 100644
--- a/embassy-macros/src/macros/interrupt_take.rs
+++ b/embassy-macros/src/macros/cortex_m_interrupt_take.rs
@@ -13,7 +13,7 @@ pub fn run(name: syn::Ident) -> Result<TokenStream, TokenStream> {
             pub unsafe extern "C" fn trampoline() {
                 extern "C" {
                     #[link_name = #name_handler]
-                    static HANDLER: ::embassy::interrupt::Handler;
+                    static HANDLER: interrupt::Handler;
                 }
 
                 let func = HANDLER.func.load(::embassy::export::atomic::Ordering::Relaxed);
diff --git a/embassy-macros/src/macros/mod.rs b/embassy-macros/src/macros/mod.rs
index 4350f229f..e547736fc 100644
--- a/embassy-macros/src/macros/mod.rs
+++ b/embassy-macros/src/macros/mod.rs
@@ -1,5 +1,5 @@
-pub mod interrupt;
-pub mod interrupt_declare;
-pub mod interrupt_take;
+pub mod cortex_m_interrupt;
+pub mod cortex_m_interrupt_declare;
+pub mod cortex_m_interrupt_take;
 pub mod main;
 pub mod task;