Merge pull request alexmoon#25 from alexmoon/nrfxlib-2.7

Nrfxlib 2.7

Author: lulf

.gitmodules

@@ -13,8 +13,8 @@
 [submodule "nrf-mpsl-sys/third_party/nordic/nrfxlib"]
 	path = nrf-mpsl-sys/third_party/nordic/nrfxlib
 	url = https://github.com/nrfconnect/sdk-nrfxlib.git
-	branch = "v2.5-branch"
+	branch = "v2.7-branch"
 [submodule "nrf-sdc-sys/third_party/nordic/nrfxlib"]
 	path = nrf-sdc-sys/third_party/nordic/nrfxlib
 	url = https://github.com/nrfconnect/sdk-nrfxlib.git
-	branch = "v2.5-branch"
+	branch = "v2.7-branch"

examples/src/bin/adv-simple.rs

@@ -6,18 +6,19 @@ use bt_hci::cmd::SyncCmd;
 use bt_hci::param::BdAddr;
 use defmt::unwrap;
 use embassy_executor::Spawner;
-use embassy_nrf::bind_interrupts;
 use embassy_nrf::gpio::{Level, Output, OutputDrive};
+use embassy_nrf::peripherals::RNG;
+use embassy_nrf::rng::Rng;
+use embassy_nrf::{bind_interrupts, rng};
 use embassy_time::{Duration, Timer};
 use nrf_sdc::{self as sdc, mpsl, pac};
 use sdc::mpsl::MultiprotocolServiceLayer;
-use sdc::rng_pool::RngPool;
 use sdc::vendor::ZephyrWriteBdAddr;
 use static_cell::StaticCell;
 use {defmt_rtt as _, panic_probe as _};
 
 bind_interrupts!(struct Irqs {
-    RNG => sdc::rng_pool::InterruptHandler;
+    RNG => rng::InterruptHandler<RNG>;
     SWI0_EGU0 => mpsl::LowPrioInterruptHandler;
     POWER_CLOCK => mpsl::ClockInterruptHandler;
     RADIO => mpsl::HighPrioInterruptHandler;
@@ -27,7 +28,7 @@ bind_interrupts!(struct Irqs {
 
 fn build_sdc<'d, const N: usize>(
     p: nrf_sdc::Peripherals<'d>,
-    rng: &'d RngPool,
+    rng: &'d mut Rng<RNG>,
     mpsl: &'d MultiprotocolServiceLayer,
     mem: &'d mut sdc::Mem<N>,
 ) -> Result<nrf_sdc::SoftdeviceController<'d>, nrf_sdc::Error> {
@@ -80,11 +81,10 @@ async fn main(spawner: Spawner) {
         p.PPI_CH25, p.PPI_CH26, p.PPI_CH27, p.PPI_CH28, p.PPI_CH29,
     );
 
-    let mut pool = [0; 256];
-    let rng = sdc::rng_pool::RngPool::new(p.RNG, Irqs, &mut pool, 64);
+    let mut rng = Rng::new(p.RNG, Irqs);
 
     let mut sdc_mem = sdc::Mem::<1648>::new();
-    let sdc = unwrap!(build_sdc(sdc_p, &rng, mpsl, &mut sdc_mem));
+    let sdc = unwrap!(build_sdc(sdc_p, &mut rng, mpsl, &mut sdc_mem));
 
     // Set the bluetooth address
     unwrap!(ZephyrWriteBdAddr::new(bd_addr()).exec(&sdc).await);

nrf-mpsl-sys/build.rs

@@ -80,9 +80,9 @@ fn main() {
         .header("./include/stdlib.h")
         .header("./third_party/nordic/nrfxlib/mpsl/include/mpsl.h")
         .header("./third_party/nordic/nrfxlib/mpsl/include/mpsl_clock.h")
+        .header("./third_party/nordic/nrfxlib/mpsl/include/mpsl_ecb.h")
         .header("./third_party/nordic/nrfxlib/mpsl/include/mpsl_coex.h")
         .header("./third_party/nordic/nrfxlib/mpsl/include/mpsl_cx_abstract_interface.h")
-        .header("./third_party/nordic/nrfxlib/mpsl/include/mpsl_radio_notification.h")
         .header("./third_party/nordic/nrfxlib/mpsl/include/mpsl_temp.h")
         .header("./third_party/nordic/nrfxlib/mpsl/include/mpsl_timeslot.h")
         .header("./third_party/nordic/nrfxlib/mpsl/include/mpsl_tx_power.h")

nrf-mpsl-sys/third_party/arm/CMSIS_5

@@ -145,6 +145,21 @@ impl<'d> MultiprotocolServiceLayer<'d> {
     pub async fn request_hfclk(&self) -> Result<hfclk::Hfclk, Error> {
         hfclk::Hfclk::new()
     }
+
+    pub fn ecb_block_encrypt(&self, key: &[u8; 16], cleartext: &[u8], ciphertext: &mut [u8]) -> Result<(), Error> {
+        assert_eq!(cleartext.len(), 16);
+        assert_eq!(ciphertext.len(), 16);
+        unsafe {
+            raw::mpsl_ecb_block_encrypt_extended(
+                key.as_ptr(),
+                cleartext.as_ptr(),
+                ciphertext.as_mut_ptr(),
+                // TODO: Support flags
+                0,
+            )
+        };
+        Ok(())
+    }
 }
 
 #[repr(align(4))]

nrf-mpsl-sys/third_party/nordic/nrfx

@@ -178,6 +178,7 @@ fn bindgen(target: &Target, mem_fns: Rc<RefCell<Vec<u8>>>) -> bindgen::Builder {
         .clang_arg(format!("-mfloat-abi={}", target.float_abi))
         .clang_arg("-mthumb")
         .clang_arg("-I./third_party/arm/CMSIS_5/CMSIS/Core/Include")
+        .clang_arg("-I./third_party/nordic/nrfx")
         .clang_arg("-I./third_party/nordic/nrfx/mdk")
         .clang_arg("-I./third_party/nordic/nrfxlib/softdevice_controller/include")
         .clang_arg(format!("-D{}", target.chip))