4 files changed, 26 insertions, 5 deletions

diff --git a/embassy-macros/src/chip/nrf.rs b/embassy-macros/src/chip/nrf.rs
index d89223415..b2d1c322f 100644
--- a/embassy-macros/src/chip/nrf.rs
+++ b/embassy-macros/src/chip/nrf.rs
@@ -58,5 +58,6 @@ pub fn generate(args: Args) -> TokenStream {
         unsafe { embassy::time::set_clock(rtc) };
 
         let alarm = unsafe { make_static(&mut alarm) };
+        executor.set_alarm(alarm);
     )
 }
diff --git a/embassy-macros/src/chip/rp.rs b/embassy-macros/src/chip/rp.rs
new file mode 100644
index 000000000..25c6705cd
--- /dev/null
+++ b/embassy-macros/src/chip/rp.rs
@@ -0,0 +1,16 @@
+use darling::FromMeta;
+use proc_macro2::TokenStream;
+use quote::{format_ident, quote};
+use syn::spanned::Spanned;
+
+#[derive(Debug, FromMeta)]
+pub struct Args {}
+
+pub fn generate(args: Args) -> TokenStream {
+    quote!(
+        use embassy_rp::{interrupt, peripherals};
+
+        let mut config = embassy_rp::system::Config::default();
+        unsafe { embassy_rp::system::configure(config) };
+    )
+}
diff --git a/embassy-macros/src/chip/stm32.rs b/embassy-macros/src/chip/stm32.rs
index e94c21a97..2476a9623 100644
--- a/embassy-macros/src/chip/stm32.rs
+++ b/embassy-macros/src/chip/stm32.rs
@@ -53,5 +53,6 @@ pub fn generate(args: Args) -> TokenStream {
         unsafe { embassy::time::set_clock(rtc) };
 
         let alarm = unsafe { make_static(&mut alarm) };
+        executor.set_alarm(alarm);
     )
 }
diff --git a/embassy-macros/src/lib.rs b/embassy-macros/src/lib.rs
index 145714f22..72f0b0eca 100644
--- a/embassy-macros/src/lib.rs
+++ b/embassy-macros/src/lib.rs
@@ -125,7 +125,7 @@ pub fn interrupt_declare(item: TokenStream) -> TokenStream {
             type Priority = crate::interrupt::Priority;
             fn number(&self) -> u16 {
                 use cortex_m::interrupt::InterruptNumber;
-                let irq = crate::pac::interrupt::#name;
+                let irq = crate::pac::Interrupt::#name;
                 irq.number() as u16
             }
             unsafe fn steal() -> Self {
@@ -199,7 +199,11 @@ mod chip;
 #[path = "chip/stm32.rs"]
 mod chip;
 
-#[cfg(any(feature = "nrf", feature = "stm32"))]
+#[cfg(feature = "rp")]
+#[path = "chip/rp.rs"]
+mod chip;
+
+#[cfg(any(feature = "nrf", feature = "stm32", feature = "rp"))]
 #[proc_macro_attribute]
 pub fn main(args: TokenStream, item: TokenStream) -> TokenStream {
     let macro_args = syn::parse_macro_input!(args as syn::AttributeArgs);
@@ -267,11 +271,10 @@ pub fn main(args: TokenStream, item: TokenStream) -> TokenStream {
                 ::core::mem::transmute(t)
             }
 
-            #chip_setup
-
             let mut executor = ::embassy::executor::Executor::new();
             let executor = unsafe { make_static(&mut executor) };
-            executor.set_alarm(alarm);
+
+            #chip_setup
 
             executor.run(|spawner| {
                 spawner.spawn(__embassy_main(spawner)).unwrap();