From 7a31dfb8277016ea23c8d7619b72457cdc38fdc9 Mon Sep 17 00:00:00 2001 From: t-moe Date: Wed, 15 Nov 2023 17:20:01 +0100 Subject: [PATCH] Replace cortex_semihosting crate with semihosting to support risc-v --- firmware/defmt-test/CHANGELOG.md | 1 + firmware/defmt-test/Cargo.toml | 3 +-- firmware/defmt-test/src/export.rs | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/firmware/defmt-test/CHANGELOG.md b/firmware/defmt-test/CHANGELOG.md index 3bbef6e0..b1a6664d 100644 --- a/firmware/defmt-test/CHANGELOG.md +++ b/firmware/defmt-test/CHANGELOG.md @@ -1,4 +1,5 @@ # [Unreleased] +- [#796] Add support for risc-v # [v0.3.1] diff --git a/firmware/defmt-test/Cargo.toml b/firmware/defmt-test/Cargo.toml index 8dae5137..138ce6d0 100644 --- a/firmware/defmt-test/Cargo.toml +++ b/firmware/defmt-test/Cargo.toml @@ -11,7 +11,6 @@ repository = "https://github.com/knurling-rs/defmt" version = "0.3.1" [dependencies] -cortex-m-rt = "0.7" -cortex-m-semihosting = "0.5" +semihosting = "0.1.4" defmt = { version = "0.3", path = "../../defmt" } defmt-test-macros = { version = "=0.3.0", path = "macros" } diff --git a/firmware/defmt-test/src/export.rs b/firmware/defmt-test/src/export.rs index 543bd9ff..663300e0 100644 --- a/firmware/defmt-test/src/export.rs +++ b/firmware/defmt-test/src/export.rs @@ -1,5 +1,3 @@ -use cortex_m_rt as _; -use cortex_m_semihosting::debug; pub use defmt::info; use crate::TestOutcome; @@ -8,7 +6,7 @@ use crate::TestOutcome; /// with status code 0. pub fn exit() -> ! { loop { - debug::exit(debug::EXIT_SUCCESS); + semihosting::process::exit(0); } }