update to nrfxlib 2.7 and nrfx 3.6

- Move ECB functionality into mpsl
- Adapt to API changes

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.6-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.6-branch"
+	branch = "v2.7-branch"

nrf-mpsl-sys/build.rs

@@ -80,6 +80,7 @@ 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_temp.h")

nrf-mpsl-sys/third_party/nordic/nrfx

@@ -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/nrfxlib

@@ -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))

nrf-mpsl/src/mpsl.rs

@@ -402,8 +402,6 @@ impl Builder {
             "SoftdeviceController already initialized!"
         );
         let rand_source = raw::sdc_rand_source_t {
-            rand_prio_low_get: None,
-            rand_prio_high_get: None,
             rand_poll: Some(rand_blocking::<R>),
         };
         let ret = unsafe { raw::sdc_rand_source_register(&rand_source) };
@@ -474,7 +472,8 @@ impl<'d> SoftdeviceController<'d> {
     pub fn try_hci_get(&self, buf: &mut [u8]) -> Result<bt_hci::PacketKind, Error> {
         assert!(buf.len() >= raw::HCI_MSG_BUFFER_MAX_SIZE as usize);
         let mut msg_type: raw::sdc_hci_msg_type_t = 0;
-        let ret = unsafe { raw::sdc_hci_get(buf.as_mut_ptr(), &mut msg_type) };
+
+        let ret = unsafe { raw::sdc_hci_get(buf.as_mut_ptr(), (&mut msg_type) as *mut _ as *mut u8) };
         RetVal::from(ret).to_result()?;
         let kind = match msg_type {
             raw::SDC_HCI_MSG_TYPE_DATA => bt_hci::PacketKind::AclData,
@@ -517,13 +516,6 @@ impl<'d> SoftdeviceController<'d> {
         WAKER.register(waker);
     }
 
-    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);
-        let ret = unsafe { raw::sdc_soc_ecb_block_encrypt(key.as_ptr(), cleartext.as_ptr(), ciphertext.as_mut_ptr()) };
-        RetVal::from(ret).to_result().and(Ok(()))
-    }
-
     #[inline(always)]
     unsafe fn raw_cmd(&self, f: unsafe extern "C" fn() -> u8) -> Result<(), bt_hci::param::Error> {
         bt_hci::param::Status::from(f()).to_result()