Merge pull request #18 from Wassasin/nrfxlib-v1.4.2

Update to nrfxlib-sys v1.4.2

Author: Jonathan Pallant

.github/workflows/build.yml

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

Cargo.toml

@@ -7,10 +7,11 @@ license = "MIT OR Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/42-technology-ltd/nrfxlib"
 description = "Rust driver for the LTE stack on the Nordic nRF9160"
+resolver = "2"
 
 [dependencies]
-nrfxlib-sys = "1.2.0"
 nrf9160-pac = "0.2.1"
 cortex-m = "0.6"
 heapless = "0.5"
 log = "0.4"
+nrfxlib-sys = "1.4.2"

README.md

@@ -76,7 +76,7 @@ See [nrf9160-demo](https://github.com/42-technology-ltd/nrf9160-demo) for a demo
 
 ### 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))
 
-* None
+* 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.
 
 ### 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/at.rs

@@ -53,7 +53,7 @@ pub struct AtSocket(Socket);
 impl AtSocket {
 	/// Create a new AT socket.
 	pub fn new() -> Result<AtSocket, Error> {
-		let skt = Socket::new(SocketDomain::Lte, SocketType::None, SocketProtocol::At)?;
+		let skt = Socket::new(SocketDomain::Lte, SocketType::Datagram, SocketProtocol::At)?;
 		Ok(AtSocket(skt))
 	}
 

src/lib.rs

@@ -53,8 +53,8 @@ pub use ffi::get_last_error;
 pub use raw::{poll, PollEntry, PollFlags, PollResult, Pollable};
 
 use log::{debug, trace};
-use nrfxlib_sys as sys;
 use nrf9160_pac as cpu;
+use nrfxlib_sys as sys;
 
 //******************************************************************************
 // Types
@@ -132,12 +132,28 @@ pub enum Error {
 //******************************************************************************
 
 /// Start the BSD library
-pub fn init() {
+pub fn init(trace_on: bool) -> Result<(), Error> {
 	debug!("nrfxlib init");
-	unsafe {
-		sys::bsd_init();
+	let bsd_memory_size = if trace_on {
+		sys::BSD_RESERVED_MEMORY_SIZE
+	} else {
+		sys::BSD_RESERVED_MEMORY_SIZE_TRACE_DISABLED
+	};
+
+	let result = unsafe {
+		sys::bsd_init(&sys::bsd_init_params_t {
+			trace_on,
+			bsd_memory_address: sys::BSD_RESERVED_MEMORY_ADDRESS,
+			bsd_memory_size,
+		})
+	};
+
+	if result < 0 {
+		Err(Error::Nordic("init", result, ffi::get_last_error()))
+	} else {
+		trace!("nrfxlib init complete");
+		Ok(())
 	}
-	trace!("nrfxlib init complete");
 }
 
 /// Stop the BSD library
@@ -161,10 +177,10 @@ impl core::fmt::Display for NrfSockAddrIn {
 		write!(
 			f,
 			"{}.{}.{}.{}:{}",
-			octets[0],
-			octets[1],
-			octets[2],
 			octets[3],
+			octets[2],
+			octets[1],
+			octets[0],
 			u16::from_be(self.sin_port)
 		)
 	}

src/raw.rs

@@ -71,8 +71,6 @@ pub(crate) enum SocketDomain {
 /// The type of socket (Stream, Datagram, or neither)
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub(crate) enum SocketType {
-	/// Used with `SocketDomain::Lte`
-	None,
 	/// Used with `SocketDomain::Inet` for TCP and TLS streams
 	Stream,
 	/// Used with UDP sockets, and for GPS
@@ -323,7 +321,6 @@ impl Into<i32> for SocketType {
 	fn into(self) -> i32 {
 		use SocketType::*;
 		match self {
-			None => 0,
 			Stream => sys::NRF_SOCK_STREAM as i32,
 			Datagram => sys::NRF_SOCK_DGRAM as i32,
 		}
@@ -434,14 +431,14 @@ pub fn poll(poll_list: &mut [PollEntry], timeout_ms: u16) -> Result<i32, Error>
 	}
 
 	let mut poll_fds: [sys::nrf_pollfd; MAX_SOCKETS_POLL] = [sys::nrf_pollfd {
-		handle: 0,
-		requested: 0,
-		returned: 0,
+		fd: 0,
+		events: 0,
+		revents: 0,
 	}; MAX_SOCKETS_POLL];
 
 	for (poll_entry, pollfd) in poll_list.iter_mut().zip(poll_fds.iter_mut()) {
-		pollfd.handle = poll_entry.socket.get_fd();
-		pollfd.requested = poll_entry.flags as i16;
+		pollfd.fd = poll_entry.socket.get_fd();
+		pollfd.events = poll_entry.flags as i16;
 		count += 1;
 	}
 
@@ -452,7 +449,7 @@ pub fn poll(poll_list: &mut [PollEntry], timeout_ms: u16) -> Result<i32, Error>
 		0 => Ok(0),
 		n => {
 			for (poll_entry, pollfd) in poll_list.iter_mut().zip(poll_fds.iter()) {
-				poll_entry.result = PollResult(pollfd.returned as u32);
+				poll_entry.result = PollResult(pollfd.revents as u32);
 			}
 			Ok(n)
 		}