Merge pull request #280 from alexmoon/fix-irq

Fix SWI2 IRQ handler with `nrf_pac`
embassy-rs · Nov 17, 2024 · b53991e · b53991e
2 parents 6ff8113 + d554940
commit b53991e
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/nrf-softdevice/src/events.rs b/nrf-softdevice/src/events.rs
@@ -105,9 +105,18 @@ pub(crate) async fn run_ble() -> ! {
 )]
 #[cfg_attr(
     not(any(feature = "nrf52805", feature = "nrf52810", feature = "nrf52811")),
-    export_name = "SWI2_EGU2"
+    export_name = "EGU2_SWI2"
 )]
 unsafe extern "C" fn swi2_irq_handler() {
     SWI2_SOC_EVT_WAKER.wake();
     SWI2_BLE_EVT_WAKER.wake();
 }
+
+/// `nrf528xx_pac` and early versions of `nrf_pac` name the SWI2 interrupt `SWI2_EGU2` instead of `EGU2_SWI2`
+#[cfg(not(any(feature = "nrf52805", feature = "nrf52810", feature = "nrf52811")))]
+#[allow(dead_code)]
+#[export_name = "SWI2_EGU2"]
+unsafe extern "C" fn old_swi2_irq_handler() {
+    SWI2_SOC_EVT_WAKER.wake();
+    SWI2_BLE_EVT_WAKER.wake();
+}