From 921780e6bfb9bcb2cd087b8aa8b094d792c99fa2 Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Thu, 8 Jun 2023 16:08:40 +0200
Subject: Make interrupt module more standard.

- Move typelevel interrupts to a special-purpose mod: `embassy_xx::interrupt::typelevel`.
- Reexport the PAC interrupt enum in `embassy_xx::interrupt`.

This has a few advantages:
- The `embassy_xx::interrupt` module is now more "standard".
  - It works with `cortex-m` functions for manipulating interrupts, for example.
  - It works with RTIC.
- the interrupt enum allows holding value that can be "any interrupt at runtime", this can't be done with typelevel irqs.
- When "const-generics on enums" is stable, we can remove the typelevel interrupts without disruptive changes to `embassy_xx::interrupt`.
---
 embassy-stm32/build.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'embassy-stm32/build.rs')

diff --git a/embassy-stm32/build.rs b/embassy-stm32/build.rs
index 730c78f5e..267fec387 100644
--- a/embassy-stm32/build.rs
+++ b/embassy-stm32/build.rs
@@ -160,13 +160,11 @@ fn main() {
     }
 
     g.extend(quote! {
-        pub mod interrupt {
-            use crate::pac::Interrupt as InterruptEnum;
-            use embassy_cortex_m::interrupt::_export::declare;
+        embassy_cortex_m::interrupt_mod!(
             #(
-                declare!(#irqs);
+                #irqs,
             )*
-        }
+        );
     });
 
     // ========
-- 
cgit 


From 8c93805ab5a13c784e072c8e6e59b354ee902d99 Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Thu, 8 Jun 2023 18:00:19 +0200
Subject: Add `rt` feature to HALs, cfg out interrupt handling when not set.

---
 embassy-stm32/build.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'embassy-stm32/build.rs')

diff --git a/embassy-stm32/build.rs b/embassy-stm32/build.rs
index 267fec387..ba5f91ccf 100644
--- a/embassy-stm32/build.rs
+++ b/embassy-stm32/build.rs
@@ -295,6 +295,7 @@ fn main() {
         let channels = channels.iter().map(|(_, dma, ch)| format_ident!("{}_{}", dma, ch));
 
         g.extend(quote! {
+            #[cfg(feature = "rt")]
             #[crate::interrupt]
             unsafe fn #irq () {
                 #(
-- 
cgit 


From 98c821ac39c65903057c2d8ed320d1616e9f23ae Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Fri, 9 Jun 2023 16:14:13 +0200
Subject: Remove embassy-cortex-m crate, move stuff to embassy-hal-common.

---
 embassy-stm32/build.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'embassy-stm32/build.rs')

diff --git a/embassy-stm32/build.rs b/embassy-stm32/build.rs
index ba5f91ccf..9e597f187 100644
--- a/embassy-stm32/build.rs
+++ b/embassy-stm32/build.rs
@@ -160,7 +160,7 @@ fn main() {
     }
 
     g.extend(quote! {
-        embassy_cortex_m::interrupt_mod!(
+        embassy_hal_common::interrupt_mod!(
             #(
                 #irqs,
             )*
-- 
cgit