Skip to content

Commit 461a2b1

Browse files
committed
arch: change cortex-m33 to use cortex-v7m
This commit changes the `cortex-m33` crate to use `cortex-v7m`, because the v7m is compatible with v8m, and there is no reason to just have 2 crates with the same code.
1 parent 1ed66b7 commit 461a2b1

6 files changed

Lines changed: 6 additions & 621 deletions

File tree

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
members = [
77
"arch/cortex-m",
88
"arch/cortex-v7m",
9-
"arch/cortex-v8m",
109
"arch/cortex-m0",
1110
"arch/cortex-m0p",
1211
"arch/cortex-m3",

arch/cortex-m33/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ edition.workspace = true
1111
[dependencies]
1212
kernel = { path = "../../kernel" }
1313
cortexm = { path = "../cortex-m" }
14-
cortexv8m = { path = "../cortex-v8m" }
14+
cortexv7m = { path = "../cortex-v7m" }
1515

1616
[lints]
1717
workspace = true

arch/cortex-m33/src/lib.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@ pub use cortexm::CortexMVariant;
3535
pub enum CortexM33 {}
3636

3737
impl cortexm::CortexMVariant for CortexM33 {
38-
const GENERIC_ISR: unsafe extern "C" fn() = cortexv8m::generic_isr_arm_v8m;
39-
const SYSTICK_HANDLER: unsafe extern "C" fn() = cortexv8m::systick_handler_arm_v8m;
40-
const SVC_HANDLER: unsafe extern "C" fn() = cortexv8m::svc_handler_arm_v8m;
41-
const HARD_FAULT_HANDLER: unsafe extern "C" fn() = cortexv8m::hard_fault_handler_arm_v8m;
38+
const GENERIC_ISR: unsafe extern "C" fn() = cortexv7m::generic_isr_arm_v7m;
39+
const SYSTICK_HANDLER: unsafe extern "C" fn() = cortexv7m::systick_handler_arm_v7m;
40+
const SVC_HANDLER: unsafe extern "C" fn() = cortexv7m::svc_handler_arm_v7m;
41+
const HARD_FAULT_HANDLER: unsafe extern "C" fn() = cortexv7m::hard_fault_handler_arm_v7m;
4242

4343
#[cfg(all(target_arch = "arm", target_os = "none"))]
4444
unsafe fn switch_to_user(
4545
user_stack: *const usize,
4646
process_regs: &mut [usize; 8],
4747
) -> *const usize {
48-
cortexv8m::switch_to_user_arm_v8m(user_stack, process_regs)
48+
cortexv7m::switch_to_user_arm_v7m(user_stack, process_regs)
4949
}
5050

5151
#[cfg(not(all(target_arch = "arm", target_os = "none")))]

arch/cortex-v8m/Cargo.toml

Lines changed: 0 additions & 15 deletions
This file was deleted.

arch/cortex-v8m/README.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)