diff options
| author | homunkulus <homunkulus@gmx.com> | 2017-12-09 12:09:35 +0000 |
|---|---|---|
| committer | homunkulus <homunkulus@gmx.com> | 2017-12-09 12:09:35 +0000 |
| commit | e78ca98c42a2af1ca9c04d176441b045cd5e8c65 (patch) | |
| tree | 36287f0622b3ea691e9fa83781c6308c5ad490e3 /Cargo.toml | |
| parent | e620b1e57a39f342cf73ad6ac8ab0e179b97bfd5 (diff) | |
| parent | 1830bdbe5c10814031e5022552a09147d5c534fc (diff) | |
Auto merge of #50 - japaric:singletons, r=japaric
Peripherals as scoped singletons
See this RFC for details: japaric/svd2rust#157
- The first commit adapts this crate to the changes in japaric/cortex-m#65 and japaric/svd2rust#158
- ~~The second commit is an alternative implementation of RFC #47 (there's another implementation in #49. This second commit is not required for RFC157 but let us experiment with safe DMA abstractions.~~ postponed
### TODO
- [x] un-bless peripherals as resources. Peripherals as resources were special cased: if resource listed in e.g. `app.tasks.FOO.resources` didn't appear in `app.resources` then it was assumed to be a peripheral and special code was generated for it. This is no longer required under RFC157.
~~This depends on PR japaric/rtfm-syntax#2~~ postponed
Diffstat (limited to 'Cargo.toml')
| -rw-r--r-- | Cargo.toml | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -10,13 +10,13 @@ keywords = ["arm", "cortex-m"] license = "MIT OR Apache-2.0" name = "cortex-m-rtfm" repository = "https://github.com/japaric/cortex-m-rtfm" -version = "0.2.2" +version = "0.3.0" [dependencies] -cortex-m = "0.3.1" +cortex-m = { git = "https://github.com/japaric/cortex-m" } untagged-option = "0.1.1" rtfm-core = "0.1.0" -cortex-m-rtfm-macros = "0.2.1" +cortex-m-rtfm-macros = { path = "macros" } [target.'cfg(target_arch = "x86_64")'.dev-dependencies] compiletest_rs = "0.3.3" @@ -27,7 +27,8 @@ version = "0.3.3" [dev-dependencies.stm32f103xx] features = ["rt"] -version = "0.7.5" +git = "https://github.com/japaric/stm32f103xx" +# version = "0.8.0" [profile.release] lto = true |