aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--Cargo.toml49
-rw-r--r--README.md42
-rw-r--r--cortex-m-rt/Cargo.toml2
-rw-r--r--cortex-m-rt/LICENSE-APACHE201
-rw-r--r--cortex-m-rt/LICENSE-MIT25
-rw-r--r--cortex-m-semihosting/Cargo.toml2
-rw-r--r--cortex-m/CHANGELOG.md (renamed from CHANGELOG.md)0
-rw-r--r--cortex-m/Cargo.toml46
-rw-r--r--cortex-m/README.md39
-rw-r--r--cortex-m/build.rs (renamed from build.rs)0
-rw-r--r--cortex-m/src/asm.rs (renamed from src/asm.rs)0
-rw-r--r--cortex-m/src/cmse.rs (renamed from src/cmse.rs)0
-rw-r--r--cortex-m/src/critical_section.rs (renamed from src/critical_section.rs)0
-rw-r--r--cortex-m/src/delay.rs (renamed from src/delay.rs)0
-rw-r--r--cortex-m/src/interrupt.rs (renamed from src/interrupt.rs)0
-rw-r--r--cortex-m/src/itm.rs (renamed from src/itm.rs)0
-rw-r--r--cortex-m/src/lib.rs (renamed from src/lib.rs)0
-rw-r--r--cortex-m/src/macros.rs (renamed from src/macros.rs)0
-rw-r--r--cortex-m/src/peripheral/ac.rs (renamed from src/peripheral/ac.rs)0
-rw-r--r--cortex-m/src/peripheral/cbp.rs (renamed from src/peripheral/cbp.rs)0
-rw-r--r--cortex-m/src/peripheral/cpuid.rs (renamed from src/peripheral/cpuid.rs)0
-rw-r--r--cortex-m/src/peripheral/dcb.rs (renamed from src/peripheral/dcb.rs)0
-rw-r--r--cortex-m/src/peripheral/dwt.rs (renamed from src/peripheral/dwt.rs)0
-rw-r--r--cortex-m/src/peripheral/fpb.rs (renamed from src/peripheral/fpb.rs)0
-rw-r--r--cortex-m/src/peripheral/fpu.rs (renamed from src/peripheral/fpu.rs)0
-rw-r--r--cortex-m/src/peripheral/icb.rs (renamed from src/peripheral/icb.rs)0
-rw-r--r--cortex-m/src/peripheral/itm.rs (renamed from src/peripheral/itm.rs)0
-rw-r--r--cortex-m/src/peripheral/mod.rs (renamed from src/peripheral/mod.rs)0
-rw-r--r--cortex-m/src/peripheral/mpu.rs (renamed from src/peripheral/mpu.rs)0
-rw-r--r--cortex-m/src/peripheral/nvic.rs (renamed from src/peripheral/nvic.rs)0
-rw-r--r--cortex-m/src/peripheral/sau.rs (renamed from src/peripheral/sau.rs)0
-rw-r--r--cortex-m/src/peripheral/scb.rs (renamed from src/peripheral/scb.rs)0
-rw-r--r--cortex-m/src/peripheral/syst.rs (renamed from src/peripheral/syst.rs)0
-rw-r--r--cortex-m/src/peripheral/test.rs (renamed from src/peripheral/test.rs)0
-rw-r--r--cortex-m/src/peripheral/tpiu.rs (renamed from src/peripheral/tpiu.rs)0
-rw-r--r--cortex-m/src/register/apsr.rs (renamed from src/register/apsr.rs)0
-rw-r--r--cortex-m/src/register/basepri.rs (renamed from src/register/basepri.rs)0
-rw-r--r--cortex-m/src/register/basepri_max.rs (renamed from src/register/basepri_max.rs)0
-rw-r--r--cortex-m/src/register/control.rs (renamed from src/register/control.rs)0
-rw-r--r--cortex-m/src/register/faultmask.rs (renamed from src/register/faultmask.rs)0
-rw-r--r--cortex-m/src/register/fpscr.rs (renamed from src/register/fpscr.rs)0
-rw-r--r--cortex-m/src/register/lr.rs (renamed from src/register/lr.rs)0
-rw-r--r--cortex-m/src/register/mod.rs (renamed from src/register/mod.rs)0
-rw-r--r--cortex-m/src/register/msp.rs (renamed from src/register/msp.rs)0
-rw-r--r--cortex-m/src/register/msplim.rs (renamed from src/register/msplim.rs)0
-rw-r--r--cortex-m/src/register/pc.rs (renamed from src/register/pc.rs)0
-rw-r--r--cortex-m/src/register/primask.rs (renamed from src/register/primask.rs)0
-rw-r--r--cortex-m/src/register/psp.rs (renamed from src/register/psp.rs)0
-rw-r--r--cortex-m/src/register/psplim.rs (renamed from src/register/psplim.rs)0
-rw-r--r--panic-itm/Cargo.toml2
-rw-r--r--panic-semihosting/Cargo.toml2
-rw-r--r--testsuite/Cargo.toml2
-rw-r--r--testsuite/minitest/Cargo.toml2
-rw-r--r--xtask/Cargo.toml2
55 files changed, 113 insertions, 307 deletions
diff --git a/.gitignore b/.gitignore
index 9c3fcb4..49841bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,4 @@
*.org
-*.rs.bk
.#*
Cargo.lock
-bin/*.after
-bin/*.before
-bin/*.o
target
diff --git a/Cargo.toml b/Cargo.toml
index f6ac580..059853a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,41 +1,7 @@
-[package]
-authors = [
- "The Cortex-M Team <cortex-m@teams.rust-embedded.org>",
- "Jorge Aparicio <jorge@japaric.io>",
-]
-categories = ["embedded", "hardware-support", "no-std"]
-description = "Low level access to Cortex-M processors"
-documentation = "https://docs.rs/cortex-m"
-keywords = ["arm", "cortex-m", "register", "peripheral"]
-license = "MIT OR Apache-2.0"
-name = "cortex-m"
-readme = "README.md"
-repository = "https://github.com/rust-embedded/cortex-m"
-version = "0.7.4"
-edition = "2021"
-rust-version = "1.59"
-links = "cortex-m" # prevent multiple versions of this crate to be linked together
-
-[dependencies]
-critical-section = "1.0.0"
-volatile-register = "0.2.0"
-bitfield = "0.13.2"
-embedded-hal = "0.2.4"
-
-[dependencies.serde]
-version = "1"
-features = [ "derive" ]
-optional = true
-
-[features]
-cm7 = []
-cm7-r0p1 = ["cm7"]
-linker-plugin-lto = []
-std = []
-critical-section-single-core = ["critical-section/restore-state-bool"]
-
[workspace]
+resolver = "2"
members = [
+ "cortex-m",
"cortex-m-rt",
"cortex-m-semihosting",
"panic-itm",
@@ -45,14 +11,3 @@ members = [
"testsuite/minitest/macros",
"xtask",
]
-
-[package.metadata.docs.rs]
-targets = [
- "thumbv8m.main-none-eabihf",
- "thumbv6m-none-eabi",
- "thumbv7em-none-eabi",
- "thumbv7em-none-eabihf",
- "thumbv7m-none-eabi",
- "thumbv8m.base-none-eabi",
- "thumbv8m.main-none-eabi"
-]
diff --git a/README.md b/README.md
index a045765..b4885bf 100644
--- a/README.md
+++ b/README.md
@@ -1,27 +1,23 @@
-[![crates.io](https://img.shields.io/crates/d/cortex-m.svg)](https://crates.io/crates/cortex-m)
-[![crates.io](https://img.shields.io/crates/v/cortex-m.svg)](https://crates.io/crates/cortex-m)
+# Cortex-M crates
-# `cortex-m`
+This repository contains various crates useful for writing Rust programs
+on Cortex-M microcontrollers:
-> Low level access to Cortex-M processors
+* [`cortex-m`]: CPU peripheral access and intrinsics
+* [`cortex-m-rt`]: Startup code and interrupt handling
+* [`cortex-m-semihosting`]: Support for semihosting debugging
+* [`cortex-m-interrupt-number`]: Shared trait for interacting with peripheral access crates
+* [`panic-itm`]: Panic handler that sends messages over the ITM/SWO output
+* [`panic-semihosting`]: Panic handler that sends messages over semihosting
-This project is developed and maintained by the [Cortex-M team][team].
-
-## [Documentation](https://docs.rs/crate/cortex-m)
-
-## Minimum Supported Rust Version (MSRV)
-
-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.
+[`cortex-m`]: https://crates.io/crates/cortex-m
+[`cortex-m-rt`]: https://crates.io/crates/cortex-m-rt
+[`cortex-m-semihosting`]: https://crates.io/crates/cortex-m-semihosting
+[`cortex-m-interrupt-number`]: https://crates.io/crates/cortex-m-interrupt-number
+[`panic-itm`]: https://crates.io/crates/panic-itm
+[`panic-semihosting`]: https://crates.io/crates/panic-semihosting
-## License
-
-Licensed under either of
-
-- Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or
- http://www.apache.org/licenses/LICENSE-2.0)
-- MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
-
-at your option.
+This project is developed and maintained by the [Cortex-M team][team].
### Contribution
@@ -31,9 +27,9 @@ additional terms or conditions.
## Code of Conduct
-Contribution to this crate is organized under the terms of the [Rust Code of
-Conduct][CoC], the maintainer of this crate, the [Cortex-M team][team], promises
-to intervene to uphold that code of conduct.
+Contribution to this repository is organized under the terms of the [Rust Code
+of Conduct][CoC], the maintainer of this crate, the [Cortex-M team][team],
+promises to intervene to uphold that code of conduct.
[CoC]: CODE_OF_CONDUCT.md
[team]: https://github.com/rust-embedded/wg#the-cortex-m-team
diff --git a/cortex-m-rt/Cargo.toml b/cortex-m-rt/Cargo.toml
index 3305d34..a5e34b5 100644
--- a/cortex-m-rt/Cargo.toml
+++ b/cortex-m-rt/Cargo.toml
@@ -22,7 +22,7 @@ rust-version = "1.59"
cortex-m-rt-macros = { path = "macros", version = "=0.7.0" }
[dev-dependencies]
-cortex-m = { version = "0.7.4", path = ".." }
+cortex-m = { version = "0.7.4", path = "../cortex-m" }
panic-halt = "0.2.0"
cortex-m-semihosting = { path = "../cortex-m-semihosting" }
diff --git a/cortex-m-rt/LICENSE-APACHE b/cortex-m-rt/LICENSE-APACHE
deleted file mode 100644
index 16fe87b..0000000
--- a/cortex-m-rt/LICENSE-APACHE
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/cortex-m-rt/LICENSE-MIT b/cortex-m-rt/LICENSE-MIT
deleted file mode 100644
index a128ba4..0000000
--- a/cortex-m-rt/LICENSE-MIT
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2017 Jorge Aparicio
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/cortex-m-semihosting/Cargo.toml b/cortex-m-semihosting/Cargo.toml
index ac0afa5..ae43e8f 100644
--- a/cortex-m-semihosting/Cargo.toml
+++ b/cortex-m-semihosting/Cargo.toml
@@ -20,5 +20,5 @@ jlink-quirks = []
no-semihosting = []
[dependencies]
-cortex-m = { path = "..", version = ">= 0.5.8, < 0.8" }
+cortex-m = { path = "../cortex-m", version = ">= 0.5.8, < 0.8" }
critical-section = "1.0.0"
diff --git a/CHANGELOG.md b/cortex-m/CHANGELOG.md
index db2827f..db2827f 100644
--- a/CHANGELOG.md
+++ b/cortex-m/CHANGELOG.md
diff --git a/cortex-m/Cargo.toml b/cortex-m/Cargo.toml
new file mode 100644
index 0000000..cdd63bd
--- /dev/null
+++ b/cortex-m/Cargo.toml
@@ -0,0 +1,46 @@
+[package]
+authors = [
+ "The Cortex-M Team <cortex-m@teams.rust-embedded.org>",
+ "Jorge Aparicio <jorge@japaric.io>",
+]
+categories = ["embedded", "hardware-support", "no-std"]
+description = "Low level access to Cortex-M processors"
+documentation = "https://docs.rs/cortex-m"
+keywords = ["arm", "cortex-m", "register", "peripheral"]
+license = "MIT OR Apache-2.0"
+name = "cortex-m"
+readme = "README.md"
+repository = "https://github.com/rust-embedded/cortex-m"
+version = "0.7.4"
+edition = "2021"
+rust-version = "1.59"
+links = "cortex-m" # prevent multiple versions of this crate to be linked together
+
+[dependencies]
+critical-section = "1.0.0"
+volatile-register = "0.2.0"
+bitfield = "0.13.2"
+embedded-hal = "0.2.4"
+
+[dependencies.serde]
+version = "1"
+features = [ "derive" ]
+optional = true
+
+[features]
+cm7 = []
+cm7-r0p1 = ["cm7"]
+linker-plugin-lto = []
+std = []
+critical-section-single-core = ["critical-section/restore-state-bool"]
+
+[package.metadata.docs.rs]
+targets = [
+ "thumbv8m.main-none-eabihf",
+ "thumbv6m-none-eabi",
+ "thumbv7em-none-eabi",
+ "thumbv7em-none-eabihf",
+ "thumbv7m-none-eabi",
+ "thumbv8m.base-none-eabi",
+ "thumbv8m.main-none-eabi"
+]
diff --git a/cortex-m/README.md b/cortex-m/README.md
new file mode 100644
index 0000000..a045765
--- /dev/null
+++ b/cortex-m/README.md
@@ -0,0 +1,39 @@
+[![crates.io](https://img.shields.io/crates/d/cortex-m.svg)](https://crates.io/crates/cortex-m)
+[![crates.io](https://img.shields.io/crates/v/cortex-m.svg)](https://crates.io/crates/cortex-m)
+
+# `cortex-m`
+
+> Low level access to Cortex-M processors
+
+This project is developed and maintained by the [Cortex-M team][team].
+
+## [Documentation](https://docs.rs/crate/cortex-m)
+
+## Minimum Supported Rust Version (MSRV)
+
+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.
+
+## License
+
+Licensed under either of
+
+- Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or
+ http://www.apache.org/licenses/LICENSE-2.0)
+- MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
+
+at your option.
+
+### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the
+work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any
+additional terms or conditions.
+
+## Code of Conduct
+
+Contribution to this crate is organized under the terms of the [Rust Code of
+Conduct][CoC], the maintainer of this crate, the [Cortex-M team][team], promises
+to intervene to uphold that code of conduct.
+
+[CoC]: CODE_OF_CONDUCT.md
+[team]: https://github.com/rust-embedded/wg#the-cortex-m-team
diff --git a/build.rs b/cortex-m/build.rs
index f81072b..f81072b 100644
--- a/build.rs
+++ b/cortex-m/build.rs
diff --git a/src/asm.rs b/cortex-m/src/asm.rs
index 3a3485a..3a3485a 100644
--- a/src/asm.rs
+++ b/cortex-m/src/asm.rs
diff --git a/src/cmse.rs b/cortex-m/src/cmse.rs
index 7826bb8..7826bb8 100644
--- a/src/cmse.rs
+++ b/cortex-m/src/cmse.rs
diff --git a/src/critical_section.rs b/cortex-m/src/critical_section.rs
index e3d57d1..e3d57d1 100644
--- a/src/critical_section.rs
+++ b/cortex-m/src/critical_section.rs
diff --git a/src/delay.rs b/cortex-m/src/delay.rs
index 66a63bf..66a63bf 100644
--- a/src/delay.rs
+++ b/cortex-m/src/delay.rs
diff --git a/src/interrupt.rs b/cortex-m/src/interrupt.rs
index f6ce990..f6ce990 100644
--- a/src/interrupt.rs
+++ b/cortex-m/src/interrupt.rs
diff --git a/src/itm.rs b/cortex-m/src/itm.rs
index 72cb0d9..72cb0d9 100644
--- a/src/itm.rs
+++ b/cortex-m/src/itm.rs
diff --git a/src/lib.rs b/cortex-m/src/lib.rs
index 7c1599c..7c1599c 100644
--- a/src/lib.rs
+++ b/cortex-m/src/lib.rs
diff --git a/src/macros.rs b/cortex-m/src/macros.rs
index 2cf4f89..2cf4f89 100644
--- a/src/macros.rs
+++ b/cortex-m/src/macros.rs
diff --git a/src/peripheral/ac.rs b/cortex-m/src/peripheral/ac.rs
index 1ac5be1..1ac5be1 100644
--- a/src/peripheral/ac.rs
+++ b/cortex-m/src/peripheral/ac.rs
diff --git a/src/peripheral/cbp.rs b/cortex-m/src/peripheral/cbp.rs
index 5aee544..5aee544 100644
--- a/src/peripheral/cbp.rs
+++ b/cortex-m/src/peripheral/cbp.rs
diff --git a/src/peripheral/cpuid.rs b/cortex-m/src/peripheral/cpuid.rs
index db85566..db85566 100644
--- a/src/peripheral/cpuid.rs
+++ b/cortex-m/src/peripheral/cpuid.rs
diff --git a/src/peripheral/dcb.rs b/cortex-m/src/peripheral/dcb.rs
index a4db9fc..a4db9fc 100644
--- a/src/peripheral/dcb.rs
+++ b/cortex-m/src/peripheral/dcb.rs
diff --git a/src/peripheral/dwt.rs b/cortex-m/src/peripheral/dwt.rs
index 72575d3..72575d3 100644
--- a/src/peripheral/dwt.rs
+++ b/cortex-m/src/peripheral/dwt.rs
diff --git a/src/peripheral/fpb.rs b/cortex-m/src/peripheral/fpb.rs
index b86b8b2..b86b8b2 100644
--- a/src/peripheral/fpb.rs
+++ b/cortex-m/src/peripheral/fpb.rs
diff --git a/src/peripheral/fpu.rs b/cortex-m/src/peripheral/fpu.rs
index 9a047d8..9a047d8 100644
--- a/src/peripheral/fpu.rs
+++ b/cortex-m/src/peripheral/fpu.rs
diff --git a/src/peripheral/icb.rs b/cortex-m/src/peripheral/icb.rs
index e1de33b..e1de33b 100644
--- a/src/peripheral/icb.rs
+++ b/cortex-m/src/peripheral/icb.rs
diff --git a/src/peripheral/itm.rs b/cortex-m/src/peripheral/itm.rs
index 7291ae0..7291ae0 100644
--- a/src/peripheral/itm.rs
+++ b/cortex-m/src/peripheral/itm.rs
diff --git a/src/peripheral/mod.rs b/cortex-m/src/peripheral/mod.rs
index bf18151..bf18151 100644
--- a/src/peripheral/mod.rs
+++ b/cortex-m/src/peripheral/mod.rs
diff --git a/src/peripheral/mpu.rs b/cortex-m/src/peripheral/mpu.rs
index 3a5f5b4..3a5f5b4 100644
--- a/src/peripheral/mpu.rs
+++ b/cortex-m/src/peripheral/mpu.rs
diff --git a/src/peripheral/nvic.rs b/cortex-m/src/peripheral/nvic.rs
index fccd6a2..fccd6a2 100644
--- a/src/peripheral/nvic.rs
+++ b/cortex-m/src/peripheral/nvic.rs
diff --git a/src/peripheral/sau.rs b/cortex-m/src/peripheral/sau.rs
index 6b8477f..6b8477f 100644
--- a/src/peripheral/sau.rs
+++ b/cortex-m/src/peripheral/sau.rs
diff --git a/src/peripheral/scb.rs b/cortex-m/src/peripheral/scb.rs
index b9cf0e4..b9cf0e4 100644
--- a/src/peripheral/scb.rs
+++ b/cortex-m/src/peripheral/scb.rs
diff --git a/src/peripheral/syst.rs b/cortex-m/src/peripheral/syst.rs
index 345acc2..345acc2 100644
--- a/src/peripheral/syst.rs
+++ b/cortex-m/src/peripheral/syst.rs
diff --git a/src/peripheral/test.rs b/cortex-m/src/peripheral/test.rs
index cab064a..cab064a 100644
--- a/src/peripheral/test.rs
+++ b/cortex-m/src/peripheral/test.rs
diff --git a/src/peripheral/tpiu.rs b/cortex-m/src/peripheral/tpiu.rs
index 14dd35c..14dd35c 100644
--- a/src/peripheral/tpiu.rs
+++ b/cortex-m/src/peripheral/tpiu.rs
diff --git a/src/register/apsr.rs b/cortex-m/src/register/apsr.rs
index edb8737..edb8737 100644
--- a/src/register/apsr.rs
+++ b/cortex-m/src/register/apsr.rs
diff --git a/src/register/basepri.rs b/cortex-m/src/register/basepri.rs
index cffb379..cffb379 100644
--- a/src/register/basepri.rs
+++ b/cortex-m/src/register/basepri.rs
diff --git a/src/register/basepri_max.rs b/cortex-m/src/register/basepri_max.rs
index 2881c4f..2881c4f 100644
--- a/src/register/basepri_max.rs
+++ b/cortex-m/src/register/basepri_max.rs
diff --git a/src/register/control.rs b/cortex-m/src/register/control.rs
index d781913..d781913 100644
--- a/src/register/control.rs
+++ b/cortex-m/src/register/control.rs
diff --git a/src/register/faultmask.rs b/cortex-m/src/register/faultmask.rs
index 1d32709..1d32709 100644
--- a/src/register/faultmask.rs
+++ b/cortex-m/src/register/faultmask.rs
diff --git a/src/register/fpscr.rs b/cortex-m/src/register/fpscr.rs
index bffed6c..bffed6c 100644
--- a/src/register/fpscr.rs
+++ b/cortex-m/src/register/fpscr.rs
diff --git a/src/register/lr.rs b/cortex-m/src/register/lr.rs
index 02708ae..02708ae 100644
--- a/src/register/lr.rs
+++ b/cortex-m/src/register/lr.rs
diff --git a/src/register/mod.rs b/cortex-m/src/register/mod.rs
index aee7d21..aee7d21 100644
--- a/src/register/mod.rs
+++ b/cortex-m/src/register/mod.rs
diff --git a/src/register/msp.rs b/cortex-m/src/register/msp.rs
index 22ce7d9..22ce7d9 100644
--- a/src/register/msp.rs
+++ b/cortex-m/src/register/msp.rs
diff --git a/src/register/msplim.rs b/cortex-m/src/register/msplim.rs
index 7b45b33..7b45b33 100644
--- a/src/register/msplim.rs
+++ b/cortex-m/src/register/msplim.rs
diff --git a/src/register/pc.rs b/cortex-m/src/register/pc.rs
index 3460664..3460664 100644
--- a/src/register/pc.rs
+++ b/cortex-m/src/register/pc.rs
diff --git a/src/register/primask.rs b/cortex-m/src/register/primask.rs
index e95276f..e95276f 100644
--- a/src/register/primask.rs
+++ b/cortex-m/src/register/primask.rs
diff --git a/src/register/psp.rs b/cortex-m/src/register/psp.rs
index c8f53b9..c8f53b9 100644
--- a/src/register/psp.rs
+++ b/cortex-m/src/register/psp.rs
diff --git a/src/register/psplim.rs b/cortex-m/src/register/psplim.rs
index 832f9c6..832f9c6 100644
--- a/src/register/psplim.rs
+++ b/cortex-m/src/register/psplim.rs
diff --git a/panic-itm/Cargo.toml b/panic-itm/Cargo.toml
index d03130b..5ff6d82 100644
--- a/panic-itm/Cargo.toml
+++ b/panic-itm/Cargo.toml
@@ -13,4 +13,4 @@ repository = "https://github.com/rust-embedded/cortex-m"
version = "0.4.2"
[dependencies]
-cortex-m = { path = "..", version = ">= 0.5.8, < 0.8" }
+cortex-m = { path = "../cortex-m", version = ">= 0.5.8, < 0.8" }
diff --git a/panic-semihosting/Cargo.toml b/panic-semihosting/Cargo.toml
index f096614..9970e7e 100644
--- a/panic-semihosting/Cargo.toml
+++ b/panic-semihosting/Cargo.toml
@@ -15,7 +15,7 @@ rust-version = "1.59"
edition = "2021"
[dependencies]
-cortex-m = { path = "..", version = ">= 0.5.6, < 0.8" }
+cortex-m = { path = "../cortex-m", version = ">= 0.5.6, < 0.8" }
cortex-m-semihosting = { path = "../cortex-m-semihosting", version = ">= 0.5.0, < 0.6" }
[features]
diff --git a/testsuite/Cargo.toml b/testsuite/Cargo.toml
index be3e43d..3e111bf 100644
--- a/testsuite/Cargo.toml
+++ b/testsuite/Cargo.toml
@@ -11,7 +11,7 @@ semihosting = ["cortex-m-semihosting", "minitest/semihosting"]
[dependencies]
cortex-m-rt.path = "../cortex-m-rt"
-cortex-m.path = ".."
+cortex-m.path = "../cortex-m"
minitest.path = "minitest"
critical-section = "1.0.0"
diff --git a/testsuite/minitest/Cargo.toml b/testsuite/minitest/Cargo.toml
index bf2c2eb..37a93f0 100644
--- a/testsuite/minitest/Cargo.toml
+++ b/testsuite/minitest/Cargo.toml
@@ -10,7 +10,7 @@ semihosting = ["cortex-m-semihosting", "minitest-macros/semihosting"]
rtt = ["rtt-target", "minitest-macros/rtt"]
[dependencies]
-cortex-m.path = "../.."
+cortex-m.path = "../../cortex-m"
cortex-m-rt.path = "../../cortex-m-rt"
minitest-macros.path = "macros"
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index b5b5c5f..73047ee 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -11,5 +11,5 @@ harness = false
[dependencies]
ar = "0.8.0"
-cortex-m = { path = "../", features = ["serde", "std"] }
+cortex-m = { path = "../cortex-m", features = ["serde", "std"] }
serde_json = "1"