Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
Cargo.lock
/build-script-target
Cargo.build.lock

.DS_Store
5 changes: 2 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "2.7.1"
authors = [
"Jonathan 'theJPster' Pallant <[email protected]>",
"42 Technology Ltd <[email protected]>",
"Dion Dokter <[email protected]>"
"Dion Dokter <[email protected]>",
]
edition = "2021"
description = "Rust bindings to the Nordic nRF91* Socket Library."
Expand Down Expand Up @@ -37,7 +37,7 @@ include = [

[build-dependencies]
regex = "1"
bindgen = "0.66.1"
bindgen = "0.70"
llvm-tools = { version = "0.1.1", optional = true }

[features]
Expand All @@ -50,4 +50,3 @@ nrf9151 = ["nrf9120"]
nrf9161 = ["nrf9120"]
# The nrf9120 is the part number of the SoC internal to the nrf9151 and nrf9161 SiPs
nrf9120 = []

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ In your own program or library, you can depend on this crate in the usual fashio
```toml
[dependencies]
# A chip feature must be selected
nrfxlib-sys = { version = "=2.7.1", feature = ["nrf9160"] }
nrfxlib-sys = { version = "=2.7.1", features = ["nrf9160"] }
```

Because the modem library has its debug sections compressed and Rust's tooling doesn't have support for
Expand Down
9 changes: 9 additions & 0 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ fn main() {
.clang_arg("-I./include")
// Add extra paths that the C files assume are searched
.clang_arg("-I./third_party/nordic/nrfxlib/crypto/nrf_cc310_platform/include")
.clang_arg("-I./third_party/nordic/nrfxlib/crypto/nrf_cc310_mbedcrypto/include")
.clang_arg("-I./third_party/nordic/nrfxlib/crypto/nrf_oberon")
// Disable standard includes (they belong to the host)
.clang_arg("-nostdinc")
Expand Down Expand Up @@ -155,6 +156,14 @@ fn main() {
.join("crypto/nrf_oberon/lib/cortex-m33/hard-float")
.display()
);
// the no interrupt version of the library does not use mutexes, it is easier to handle
println!(
"cargo:rustc-link-search={}",
Path::new(&nrfxlib_path)
.join("crypto/nrf_cc310_platform/lib/cortex-m33/hard-float/no-interrupts")
.display()
);
println!("cargo:rustc-link-lib=static=modem");
println!("cargo:rustc-link-lib=static=oberon_3.0.15");
println!("cargo:rustc-link-lib=static=nrf_cc310_platform_0.9.19");
}
1 change: 1 addition & 0 deletions wrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "crypto/nrf_cc310_platform/include/nrf_cc3xx_platform_defines.h"
#include "crypto/nrf_cc310_platform/include/nrf_cc3xx_platform_entropy.h"
#include "crypto/nrf_cc310_platform/include/nrf_cc3xx_platform_mutex.h"
#include "crypto/nrf_cc310_platform/include/nrf_cc3xx_platform_ctr_drbg.h"

/*
* Crypto Cell 310 (CC310) mbedTLS integration headers
Expand Down
Loading