diff options
author | 2017-03-10 23:37:22 -0500 | |
---|---|---|
committer | 2017-03-10 23:37:22 -0500 | |
commit | a9d701ecc888400ac269a55303388f0feec6f294 (patch) | |
tree | 64fcc50451ef59637e2839d34a13e5f582b350c2 /src/exception.rs | |
parent | f6615b0fb8172e7b4d42f153d7a4f6afe6d8350c (diff) | |
download | cortex-m-a9d701ecc888400ac269a55303388f0feec6f294.tar.gz cortex-m-a9d701ecc888400ac269a55303388f0feec6f294.tar.zst cortex-m-a9d701ecc888400ac269a55303388f0feec6f294.zip |
add a Local.borrow_mut method, default_handler now takes the context token by
value
Diffstat (limited to 'src/exception.rs')
-rw-r--r-- | src/exception.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/exception.rs b/src/exception.rs index d32d61f..2c4b1be 100644 --- a/src/exception.rs +++ b/src/exception.rs @@ -54,25 +54,25 @@ impl Exception { #[repr(C)] pub struct Handlers { /// Non-maskable interrupt - pub nmi: unsafe extern "C" fn(&Nmi), + pub nmi: unsafe extern "C" fn(Nmi), /// All class of fault - pub hard_fault: unsafe extern "C" fn(&HardFault), + pub hard_fault: unsafe extern "C" fn(HardFault), /// Memory management - pub mem_manage: unsafe extern "C" fn(&MemManage), + pub mem_manage: unsafe extern "C" fn(MemManage), /// Pre-fetch fault, memory access fault - pub bus_fault: unsafe extern "C" fn(&BusFault), + pub bus_fault: unsafe extern "C" fn(BusFault), /// Undefined instruction or illegal state - pub usage_fault: unsafe extern "C" fn(&UsageFault), + pub usage_fault: unsafe extern "C" fn(UsageFault), /// Reserved spots in the vector table pub _reserved0: [Reserved; 4], /// System service call via SWI instruction - pub svcall: unsafe extern "C" fn(&Svcall), + pub svcall: unsafe extern "C" fn(Svcall), /// Reserved spots in the vector table pub _reserved1: [Reserved; 2], /// Pendable request for system service - pub pendsv: unsafe extern "C" fn(&Pendsv), + pub pendsv: unsafe extern "C" fn(Pendsv), /// System tick timer - pub sys_tick: unsafe extern "C" fn(&SysTick), + pub sys_tick: unsafe extern "C" fn(SysTick), } /// Non-maskable interrupt @@ -150,7 +150,7 @@ pub const DEFAULT_HANDLERS: Handlers = Handlers { // This needs asm!, #[naked] and unreachable() to avoid modifying the stack // pointer (MSP), that way it points to the stacked registers #[naked] -pub unsafe extern "C" fn default_handler<T>(_token: &T) { +pub unsafe extern "C" fn default_handler<T>(_token: T) { // This is the actual exception handler. `_sf` is a pointer to the previous // stack frame #[cfg(target_arch = "arm")] |