Allow processing soc events and ble events in separate tasks

nrf-softdevice/Cargo.toml

@@ -51,6 +51,7 @@ critical-section = { version = "1.0", optional = true }
 
 num_enum = { version = "0.6.1", default-features = false }
 embassy-sync = { version = "0.2.0" }
+embassy-futures = { version = "0.1.0" }
 cortex-m = "0.7.2"
 cortex-m-rt = ">=0.6.15,<0.8"
 heapless = "0.7.1"

nrf-softdevice/src/events.rs

@@ -8,7 +8,8 @@ use num_enum::{IntoPrimitive, TryFromPrimitive};
 use crate::pac::interrupt;
 use crate::{raw, RawError};
 
-static SWI2_WAKER: AtomicWaker = AtomicWaker::new();
+static SWI2_SOC_EVT_WAKER: AtomicWaker = AtomicWaker::new();
+static SWI2_BLE_EVT_WAKER: AtomicWaker = AtomicWaker::new();
 
 /// SoC events reported by the softdevice.
 #[rustfmt::skip]
@@ -58,9 +59,9 @@ const BLE_EVT_MAX_SIZE: u16 = 256;
 #[cfg(not(any(feature = "evt-max-size-256", feature = "evt-max-size-512")))]
 const BLE_EVT_MAX_SIZE: u16 = 128;
 
-pub(crate) async fn run<F: FnMut(SocEvent)>(mut soc_evt_handler: F) -> ! {
+pub(crate) async fn run_soc<F: FnMut(SocEvent)>(mut soc_evt_handler: F) -> ! {
     poll_fn(|cx| unsafe {
-        SWI2_WAKER.register(cx.waker());
+        SWI2_SOC_EVT_WAKER.register(cx.waker());
 
         let mut evt: u32 = 0;
         loop {
@@ -71,6 +72,14 @@ pub(crate) async fn run<F: FnMut(SocEvent)>(mut soc_evt_handler: F) -> ! {
             }
         }
 
+        Poll::Pending
+    })
+    .await
+}
+
+pub(crate) async fn run_ble() -> ! {
+    poll_fn(|cx| unsafe {
+        SWI2_BLE_EVT_WAKER.register(cx.waker());
         // Using u32 since the buffer has to be aligned to 4
         let mut evt: MaybeUninit<[u32; BLE_EVT_MAX_SIZE as usize / 4]> = MaybeUninit::uninit();
 
@@ -94,11 +103,13 @@ pub(crate) async fn run<F: FnMut(SocEvent)>(mut soc_evt_handler: F) -> ! {
 #[cfg(any(feature = "nrf52805", feature = "nrf52810", feature = "nrf52811"))]
 #[interrupt]
 unsafe fn SWI2() {
-    SWI2_WAKER.wake();
+    SWI2_SOC_EVT_WAKER.wake();
+    SWI2_BLE_EVT_WAKER.wake();
 }
 
 #[cfg(not(any(feature = "nrf52805", feature = "nrf52810", feature = "nrf52811")))]
 #[interrupt]
 unsafe fn SWI2_EGU2() {
-    SWI2_WAKER.wake();
+    SWI2_SOC_EVT_WAKER.wake();
+    SWI2_BLE_EVT_WAKER.wake();
 }

nrf-softdevice/src/softdevice.rs

@@ -307,7 +307,7 @@ impl Softdevice {
     /// It must be called in its own async task after enabling the softdevice
     /// and before doing any operation. Failure to doing so will cause async operations to never finish.
     pub async fn run(&self) -> ! {
-        self.run_with_callback(|_| {}).await
+        self.run_with_callback(|_| ()).await
     }
 
     /// Runs the softdevice event handling loop with a callback for [`SocEvent`]s.
@@ -316,6 +316,22 @@ impl Softdevice {
     /// version allows the application to provide a callback to receive SoC events
     /// from the softdevice (other than flash events which are handled by [`Flash`](crate::flash::Flash)).
     pub async fn run_with_callback<F: FnMut(SocEvent)>(&self, f: F) -> ! {
-        crate::events::run(f).await
+        embassy_futures::join::join(self.run_ble(), crate::events::run_soc(f)).await;
+        // Should never get here
+        loop {}
+    }
+
+    /// Runs the softdevice soc event handler only.
+    ///
+    /// It must be called under the same conditions as [`Softdevice::run()`].
+    pub async fn run_soc(&self) -> ! {
+        crate::events::run_soc(|_| ()).await
+    }
+
+    /// Runs the softdevice ble event handler only.
+    ///
+    /// It must be called under the same conditions as [`Softdevice::run()`].
+    pub async fn run_ble(&self) -> ! {
+        crate::events::run_ble().await
     }
 }