Merge pull request #102 from chrysn-pull-requests/published-cc2538-hal

Update dependencies that broke CI
openwsn-berkeley · Sep 30, 2023 · 337c47c · 337c47c
2 parents e5cca6e + 25964b6
commit 337c47c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/crypto/edhoc-crypto-cc2538/Cargo.toml b/crypto/edhoc-crypto-cc2538/Cargo.toml
@@ -13,8 +13,8 @@ cortex-m = { version = "0.7.4" }
 cortex-m-rt = { version = "0.7.1" }
 cortex-m-semihosting = { version = "0.5.0" }
 panic-semihosting = { version = "0.6.0", features = ["exit"] }
-cc2538-pac = { version = "0.1.0", features = ["rt"] }
-cc2538-hal = { git = "https://github.com/thvdveld/cc2538-hal/", branch = "crypto" }
+cc2538-pac = { version = "0.4.0", features = ["rt"] }
+cc2538-hal = "0.2.0"
 
 # depend on an allocator
 static-alloc = { version = "0.2.3", optional = true }
diff --git a/examples/coap/Cargo.toml b/examples/coap/Cargo.toml
@@ -5,5 +5,5 @@ edition = "2021"
 
 [dependencies]
 edhoc-rs = { path = "../../lib", features = [ "hacspec-hacspec" ] }
-coap = { version = "0.12" }
-coap-lite = { version = "0.9.1" }
+coap = { version = "0.13" }
+coap-lite = { version = "0.11.3" }
diff --git a/examples/edhoc-rs-cc2538/Cargo.toml b/examples/edhoc-rs-cc2538/Cargo.toml
@@ -11,8 +11,8 @@ edhoc-rs = { path = "../../lib", default-features = false }
 # depend on an allocator
 embedded-alloc = "0.5.0"
 hexlit = "0.5.3"
-cc2538-pac = { version = "0.1.0", features = ["rt"] }
-cc2538-hal = { git = "https://github.com/thvdveld/cc2538-hal/", branch = "crypto" }
+cc2538-pac = { version = "0.4.0", features = ["rt"] }
+cc2538-hal = "0.2.0"
 cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] }
 cortex-m-rt = { version = "0.7", features = ["device"] }
 panic-rtt-target = { version = "0.1.2", features = ["cortex-m"] }

diff --git a/examples/edhoc-rs-cc2538/src/main.rs b/examples/edhoc-rs-cc2538/src/main.rs
@@ -65,7 +65,7 @@ fn inner_main() -> Result<(), &'static str> {
     const G_R: &str = "bbc34960526ea4d32e940cad2a234148ddc21791a12afbcbac93622046dd44f0";
     const C_R_TV: [u8; 1] = hex!("27");
 
-    let mut periph = pac::Peripherals::take().ok_or("unable to get peripherals")?;
+    let mut periph = unsafe { pac::Peripherals::steal() };
 
     let mut core_periph = cortex_m::Peripherals::take().unwrap();
     core_periph.DCB.enable_trace();