From 87c860e46de29c2d2b557c75f7cd10f96db4b235 Mon Sep 17 00:00:00 2001 From: Tim Docker <tim@dockerz.net> Date: Tue, 25 Sep 2018 19:15:21 +1000 Subject: [PATCH] Reference PR version of rtfm in order to be compatible other packages --- minimal-rtfm/Cargo.lock | 64 +++++++--------------------------------- minimal-rtfm/Cargo.toml | 18 ++++------- minimal-rtfm/src/main.rs | 4 ++- 3 files changed, 20 insertions(+), 66 deletions(-) diff --git a/minimal-rtfm/Cargo.lock b/minimal-rtfm/Cargo.lock index c20b4f2..3392c05 100644 --- a/minimal-rtfm/Cargo.lock +++ b/minimal-rtfm/Cargo.lock @@ -1,8 +1,3 @@ -[[package]] -name = "aligned" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "aligned" version = "0.2.0" @@ -29,21 +24,11 @@ dependencies = [ "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "bare-metal" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "bare-metal" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "cast" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "cc" version = "1.0.25" @@ -54,17 +39,6 @@ name = "cfg-if" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "cortex-m" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "aligned 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "bare-metal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "untagged-option 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "volatile-register 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "cortex-m" version = "0.5.7" @@ -107,10 +81,10 @@ dependencies = [ [[package]] name = "cortex-m-rtfm" version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/ykomatsu/cortex-m-rtfm?branch=update#20f73844a4cfd7edaa8303c826ca235d82ffc067" dependencies = [ - "cortex-m 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "cortex-m-rtfm-macros 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "cortex-m 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", + "cortex-m-rtfm-macros 0.3.2 (git+https://github.com/ykomatsu/cortex-m-rtfm?branch=update)", "rtfm-core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "untagged-option 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -118,7 +92,7 @@ dependencies = [ [[package]] name = "cortex-m-rtfm-macros" version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/ykomatsu/cortex-m-rtfm?branch=update#20f73844a4cfd7edaa8303c826ca235d82ffc067" dependencies = [ "failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)", @@ -127,11 +101,6 @@ dependencies = [ "syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "cortex-m-semihosting" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "either" version = "1.5.0" @@ -166,23 +135,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "minimal-rtfm" version = "0.0.1" dependencies = [ - "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "cortex-m 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", "cortex-m-rt 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", - "cortex-m-rtfm 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "cortex-m-semihosting 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "panic-semihosting 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cortex-m-rtfm 0.3.4 (git+https://github.com/ykomatsu/cortex-m-rtfm?branch=update)", + "panic-abort 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "stm32f4 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "panic-semihosting" -version = "0.3.0" +name = "panic-abort" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cortex-m 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", - "cortex-m-semihosting 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "proc-macro2" @@ -315,28 +278,23 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" [metadata] -"checksum aligned 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0211cd15e6a84c97c3815bd8808e499b490ca386cf9beaf1985f49d5e3ef0f38" "checksum aligned 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d39da9b88ae1a81c03c9c082b8db83f1d0e93914126041962af61034ab44c4a5" "checksum backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "89a47830402e9981c5c41223151efcced65a0510c13097c769cede7efb34782a" "checksum backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "c66d56ac8dabd07f6aacdaf633f4b8262f5b3601a810a0dcddffd5c22c69daa0" -"checksum bare-metal 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "df3088b133d843768dbcd67d4443703f81eaaba50d30ed81467048de713f24f4" "checksum bare-metal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1bdcf9294ed648c7cd29b11db06ea244005aeef50ae8f605b1a3af2940bf8f92" -"checksum cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427" "checksum cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "f159dfd43363c4d08055a07703eb7a3406b0dac4d0584d96965a3262db3c9d16" "checksum cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4e7bb64a8ebb0d856483e1e682ea3422f883c5f5615a90d51a2c82fe87fdd3" -"checksum cortex-m 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2864dd1e83344abe7a6192befbeb8cd88bf763cfc560e28680d5b06a8ce9b7f7" "checksum cortex-m 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)" = "4573199c5b1e9b0eeae418b46f7c0af5fdf11b3057f83880810dfef68dd1dcb5" "checksum cortex-m-rt 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)" = "09fd585ab79330179866e2fdb18ad1083dada4244a72df81ecf63f012aa4f86f" "checksum cortex-m-rt 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9dea4ad5f88b4ccfba2b738ebe42f9452b80481c44aae42c594cc66cf2c5f3c0" "checksum cortex-m-rt-macros 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f96e6af14f78ca987ba5487592a199878a7b17ee65b60e0b4aa563fc00965f4f" -"checksum cortex-m-rtfm 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d95549247ed1e9d12a0d99db78a5bb7fdb1ff85cd1d8060f66cd01cfdb7b9543" -"checksum cortex-m-rtfm-macros 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c73efe9c6cffd3b1ecd3b3f60de88b25e5e29c8e1a5baced342a1f44232549db" -"checksum cortex-m-semihosting 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "54d46ec4730314a01de4504328ef4ed6b2c51b63815caac4847ac9e70f88c9e5" +"checksum cortex-m-rtfm 0.3.4 (git+https://github.com/ykomatsu/cortex-m-rtfm?branch=update)" = "<none>" +"checksum cortex-m-rtfm-macros 0.3.2 (git+https://github.com/ykomatsu/cortex-m-rtfm?branch=update)" = "<none>" "checksum either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0" "checksum failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7efb22686e4a466b1ec1a15c2898f91fa9cb340452496dca654032de20ff95b9" "checksum failure_derive 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "946d0e98a50d9831f5d589038d2ca7f8f455b1c21028c0db0e84116a12696426" "checksum libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "76e3a3ef172f1a0b9a9ff0dd1491ae5e6c948b94479a3021819ba7d860c8645d" -"checksum panic-semihosting 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "52f64dcd9aebf9d40f8c40ab4400bab503c89997330b8d775c20f373bf0e13fc" +"checksum panic-abort 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2c14a66511ed17b6a8b4256b868d7fd207836d891db15eea5195dbcaf87e630f" "checksum proc-macro2 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)" = "ffe022fb8c8bd254524b0b3305906c1921fa37a84a644e29079a9e62200c3901" "checksum quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "dd636425967c33af890042c483632d33fa7a18f19ad1d7ea72e8998c6ef8dea5" "checksum r0 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2a38df5b15c8d5c7e8654189744d8e396bddc18ad48041a500ce52d6948941f" diff --git a/minimal-rtfm/Cargo.toml b/minimal-rtfm/Cargo.toml index 4ceed8c..b3c3d8f 100644 --- a/minimal-rtfm/Cargo.toml +++ b/minimal-rtfm/Cargo.toml @@ -20,25 +20,19 @@ categories = ["embedded", "no-std"] license = "MIT OR Apache-2.0" repository = "https://github.com/timbod7/..." -[dependencies] -cortex-m-rtfm = "0.3.4" - -[dependencies.cast] -version = "0.2.2" -default-features = false - [dependencies.stm32f4] version = "0.2.3" features = ["stm32f407", "rt"] [dependencies.cortex-m] -version = "0.5.6" +version = "0.5.7" [dependencies.cortex-m-rt] -version = "0.5.1" +version = "0.5.7" -[dependencies.cortex-m-semihosting] -version = "0.3.1" +[dependencies.cortex-m-rtfm] +git = "https://github.com/ykomatsu/cortex-m-rtfm" +branch = "update" -[dependencies.panic-semihosting] +[dependencies.panic-abort] version = "0.3.0" diff --git a/minimal-rtfm/src/main.rs b/minimal-rtfm/src/main.rs index a740343..959c663 100644 --- a/minimal-rtfm/src/main.rs +++ b/minimal-rtfm/src/main.rs @@ -4,9 +4,11 @@ #![no_main] #![no_std] +#[macro_use] +extern crate cortex_m_rt as rt; extern crate cortex_m_rtfm as rtfm; // IMPORTANT always do this rename extern crate stm32f4; -extern crate panic_semihosting; +extern crate panic_abort; // import the procedural macro use rtfm::app; -- GitLab