Merge branch 'release/v0.6.0' into main

Author: Jonathan Pallant (42 Technology)

.github/workflows/build.yml

@@ -11,12 +11,12 @@ jobs:
     strategy:
       matrix:
         target:
-          - thumbv8m.main-none-eabi
+          - thumbv8m.main-none-eabihf
     steps:
       - uses: actions/checkout@v1
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: stable
           target: ${{ matrix.target }}
           override: true
       - uses: actions-rs/cargo@v1

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nrfxlib"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Jonathan Pallant (42 Technology) <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"
@@ -12,6 +12,7 @@ resolver = "2"
 [dependencies]
 nrf9160-pac = "0.2.1"
 cortex-m = "0.6"
-heapless = "0.5"
+heapless = "0.7"
+linked_list_allocator = { version="0.9.0", default-features=false, features=["use_spin"] }
 log = "0.4"
-nrfxlib-sys = "1.4.2"
+nrfxlib-sys = "=1.5.1"

README.md

@@ -23,13 +23,12 @@ baseband, and a GNSS socket so you can read GPS data.
 
 ## Getting the static library
 
-We use a crate called `nrfxlib-sys` to link to the library. This crate
-includes Nordic's header files and static library as a git sub-module (from
-their [Github page](https://github.com/NordicPlayground/nrfxlib)) and runs
-[`bindgen`] to generate Rust 'headers' which correspond to the functions and
-constants in the relevant header files. You will need bindgen and LLVM to
-be installed for [`bindgen`] to work, so please do see their
-[documentation](https://github.com/rust-lang/rust-bindgen).
+We use a crate called `nrfxlib-sys` to link to the library. This crate includes
+Nordic's header files and static library as a git sub-module (from their [Github
+page](https://github.com/NordicPlayground/nrfxlib)) and runs [`bindgen`] to
+generate Rust 'headers' which correspond to the functions and constants in the
+relevant header files. You no longer need to install `bindgen` - it gets pulled
+in as a crate - but you do need to use Rust 1.51 or higher.
 
 [`bindgen`]: https://crates.io/crates/bindgen
 
@@ -74,9 +73,19 @@ See [nrf9160-demo](https://github.com/42-technology-ltd/nrf9160-demo) for a demo
 
 ## Changelog
 
-### Unreleased Changes ([Source](https://github.com/42-technology-ltd/nrfxlib/tree/master) | [Changes](https://github.com/42-technology-ltd/nrfxlib/compare/v0.5.0...master))
+### Unreleased Changes ([Source](https://github.com/42-technology-ltd/nrfxlib/tree/develop) | [Changes](https://github.com/42-technology-ltd/nrfxlib/compare/v0.6.0...develop))
 
-* Updated to nrfxlib version 1.4.2. This requires Rust v1.51 as we use the new resolver to allow bindgen as a build-dep.
+* None
+
+### v0.6.0 ([Source](https://github.com/42-technology-ltd/nrfxlib/tree/v0.6.0) | [Changes](https://github.com/42-technology-ltd/nrfxlib/compare/v0.5.0...v0.6.0))
+
+* Updated to nrfxlib-sys v1.5.1.
+  * Requires Rust v1.51 as we use the new resolver to allow bindgen as a build-dep
+  * Rename FFI exports from `bsd_X` to `nrf_modem_X`
+  * Implement IPC functionality
+  * Implement library and transmit heaps
+  * Supply hard-float libraries by default. The nRF9160 has an FPU so we might as well use the VFP registers.
+* Update to latest heapless - no more `heapless::consts::Uxx`
 
 ### v0.5.0 ([Source](https://github.com/42-technology-ltd/nrfxlib/tree/v0.5.0) | [Changes](https://github.com/42-technology-ltd/nrfxlib/compare/v0.4.0...v0.5.0))
 

src/api.rs

@@ -51,23 +51,22 @@ use nrfxlib_sys as sys;
 /// You must call this when an EGU1 interrupt occurs.
 pub fn application_irq_handler() {
 	unsafe {
-		sys::bsd_os_application_irq_handler();
+		sys::nrf_modem_os_application_irq_handler();
 	}
 }
 
 /// Trampoline into the BSD library function `bsd_os_trace_irq_handler`. You
 /// must call this when an EGU2 interrupt occurs.
 pub fn trace_irq_handler() {
 	unsafe {
-		sys::bsd_os_trace_irq_handler();
+		sys::nrf_modem_os_trace_irq_handler();
 	}
 }
 
-/// Trampoline into the BSD library function `IPC_IRQHandler`. You must call
-/// this when an IPC interrupt occurs.
+/// IPC code now lives outside `lib_modem`, so call our IPC handler function.
 pub fn ipc_irq_handler() {
 	unsafe {
-		crate::ffi::IPC_IRQHandler();
+		crate::ffi::ipc_irq_handler();
 	}
 }
 

src/dtls.rs

@@ -121,8 +121,7 @@ impl DtlsSocket {
 
 		let mut result;
 		// Now, make a null-terminated hostname
-		let mut hostname_smallstring: heapless::String<heapless::consts::U64> =
-			heapless::String::new();
+		let mut hostname_smallstring: heapless::String<64> = heapless::String::new();
 		write!(hostname_smallstring, "{}\0", hostname).map_err(|_| Error::HostnameTooLong)?;
 		// Now call getaddrinfo with some hints
 		let hints = sys::nrf_addrinfo {
@@ -161,7 +160,7 @@ impl DtlsSocket {
 					sin_len: core::mem::size_of::<sys::nrf_sockaddr_in>() as u8,
 					sin_family: sys::NRF_AF_INET as i32,
 					sin_port: htons(port),
-					sin_addr: dns_addr.sin_addr.clone(),
+					sin_addr: dns_addr.sin_addr,
 				};
 
 				debug!("Trying IP address {}", &crate::NrfSockAddrIn(connect_addr));