Skip to content

Commit b8880d0

Browse files
committed
Move cortex-m crate into cortex-m directory
1 parent c52330f commit b8880d0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+106
-300
lines changed

.gitignore

-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
*.org
2-
*.rs.bk
32
.#*
43
Cargo.lock
5-
bin/*.after
6-
bin/*.before
7-
bin/*.o
84
target

Cargo.toml

+2-47
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,7 @@
1-
[package]
2-
authors = [
3-
"The Cortex-M Team <[email protected]>",
4-
"Jorge Aparicio <[email protected]>",
5-
]
6-
categories = ["embedded", "hardware-support", "no-std"]
7-
description = "Low level access to Cortex-M processors"
8-
documentation = "https://docs.rs/cortex-m"
9-
keywords = ["arm", "cortex-m", "register", "peripheral"]
10-
license = "MIT OR Apache-2.0"
11-
name = "cortex-m"
12-
readme = "README.md"
13-
repository = "https://github.com/rust-embedded/cortex-m"
14-
version = "0.7.4"
15-
edition = "2021"
16-
rust-version = "1.59"
17-
links = "cortex-m" # prevent multiple versions of this crate to be linked together
18-
19-
[dependencies]
20-
critical-section = "1.0.0"
21-
volatile-register = "0.2.0"
22-
bitfield = "0.13.2"
23-
embedded-hal = "0.2.4"
24-
25-
[dependencies.serde]
26-
version = "1"
27-
features = [ "derive" ]
28-
optional = true
29-
30-
[features]
31-
cm7 = []
32-
cm7-r0p1 = ["cm7"]
33-
linker-plugin-lto = []
34-
std = []
35-
critical-section-single-core = ["critical-section/restore-state-bool"]
36-
371
[workspace]
2+
resolver = "2"
383
members = [
4+
"cortex-m",
395
"cortex-m-rt",
406
"cortex-m-semihosting",
417
"panic-itm",
@@ -45,14 +11,3 @@ members = [
4511
"testsuite/minitest/macros",
4612
"xtask",
4713
]
48-
49-
[package.metadata.docs.rs]
50-
targets = [
51-
"thumbv8m.main-none-eabihf",
52-
"thumbv6m-none-eabi",
53-
"thumbv7em-none-eabi",
54-
"thumbv7em-none-eabihf",
55-
"thumbv7m-none-eabi",
56-
"thumbv8m.base-none-eabi",
57-
"thumbv8m.main-none-eabi"
58-
]

README.md

+19-23
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,23 @@
1-
[![crates.io](https://img.shields.io/crates/d/cortex-m.svg)](https://crates.io/crates/cortex-m)
2-
[![crates.io](https://img.shields.io/crates/v/cortex-m.svg)](https://crates.io/crates/cortex-m)
1+
# Cortex-M crates
32

4-
# `cortex-m`
3+
This repository contains various crates useful for writing Rust programs
4+
on Cortex-M microcontrollers:
55

6-
> Low level access to Cortex-M processors
6+
* [`cortex-m`]: CPU peripheral access and intrinsics
7+
* [`cortex-m-rt`]: Startup code and interrupt handling
8+
* [`cortex-m-semihosting`]: Support for semihosting debugging
9+
* [`cortex-m-interrupt-number`]: Shared trait for interacting with peripheral access crates
10+
* [`panic-itm`]: Panic handler that sends messages over the ITM/SWO output
11+
* [`panic-semihosting`]: Panic handler that sends messages over semihosting
712

8-
This project is developed and maintained by the [Cortex-M team][team].
9-
10-
## [Documentation](https://docs.rs/crate/cortex-m)
11-
12-
## Minimum Supported Rust Version (MSRV)
13-
14-
This crate is guaranteed to compile on stable Rust 1.59 and up. It might compile with older versions but that may change in any new patch release.
13+
[`cortex-m`]: https://crates.io/crates/cortex-m
14+
[`cortex-m-rt`]: https://crates.io/crates/cortex-m-rt
15+
[`cortex-m-semihosting`]: https://crates.io/crates/cortex-m-semihosting
16+
[`cortex-m-interrupt-number`]: https://crates.io/crates/cortex-m-interrupt-number
17+
[`panic-itm`]: https://crates.io/crates/panic-itm
18+
[`panic-semihosting`]: https://crates.io/crates/panic-semihosting
1519

16-
## License
17-
18-
Licensed under either of
19-
20-
- Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or
21-
http://www.apache.org/licenses/LICENSE-2.0)
22-
- MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
23-
24-
at your option.
20+
This project is developed and maintained by the [Cortex-M team][team].
2521

2622
### Contribution
2723

@@ -31,9 +27,9 @@ additional terms or conditions.
3127

3228
## Code of Conduct
3329

34-
Contribution to this crate is organized under the terms of the [Rust Code of
35-
Conduct][CoC], the maintainer of this crate, the [Cortex-M team][team], promises
36-
to intervene to uphold that code of conduct.
30+
Contribution to this repository is organized under the terms of the [Rust Code
31+
of Conduct][CoC], the maintainer of this crate, the [Cortex-M team][team],
32+
promises to intervene to uphold that code of conduct.
3733

3834
[CoC]: CODE_OF_CONDUCT.md
3935
[team]: https://github.com/rust-embedded/wg#the-cortex-m-team

cortex-m-rt/LICENSE-APACHE

-201
This file was deleted.

cortex-m-rt/LICENSE-MIT

-25
This file was deleted.
File renamed without changes.

cortex-m/Cargo.toml

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
[package]
2+
authors = [
3+
"The Cortex-M Team <[email protected]>",
4+
"Jorge Aparicio <[email protected]>",
5+
]
6+
categories = ["embedded", "hardware-support", "no-std"]
7+
description = "Low level access to Cortex-M processors"
8+
documentation = "https://docs.rs/cortex-m"
9+
keywords = ["arm", "cortex-m", "register", "peripheral"]
10+
license = "MIT OR Apache-2.0"
11+
name = "cortex-m"
12+
readme = "README.md"
13+
repository = "https://github.com/rust-embedded/cortex-m"
14+
version = "0.7.4"
15+
edition = "2021"
16+
rust-version = "1.59"
17+
links = "cortex-m" # prevent multiple versions of this crate to be linked together
18+
19+
[dependencies]
20+
critical-section = "1.0.0"
21+
volatile-register = "0.2.0"
22+
bitfield = "0.13.2"
23+
embedded-hal = "0.2.4"
24+
25+
[dependencies.serde]
26+
version = "1"
27+
features = [ "derive" ]
28+
optional = true
29+
30+
[features]
31+
cm7 = []
32+
cm7-r0p1 = ["cm7"]
33+
linker-plugin-lto = []
34+
std = []
35+
critical-section-single-core = ["critical-section/restore-state-bool"]
36+
37+
[package.metadata.docs.rs]
38+
targets = [
39+
"thumbv8m.main-none-eabihf",
40+
"thumbv6m-none-eabi",
41+
"thumbv7em-none-eabi",
42+
"thumbv7em-none-eabihf",
43+
"thumbv7m-none-eabi",
44+
"thumbv8m.base-none-eabi",
45+
"thumbv8m.main-none-eabi"
46+
]

0 commit comments

Comments
 (0)