diff options
| author | Perry Hung <iperry@gmail.com> | 2011-03-21 02:45:58 -0400 |
|---|---|---|
| committer | Perry Hung <iperry@gmail.com> | 2011-03-21 02:47:53 -0400 |
| commit | 7241820179bb729d14900676fbff943f7f44cb97 (patch) | |
| tree | d60a38f908eda00b934b6d3452f6a777c4277be6 /libmaple/exc.S | |
| parent | 1591fc9e3f851327c16bbcb88e6abee1706f9cfc (diff) | |
| parent | c73306508820705eef4f2cb9f8542acdba599cd8 (diff) | |
| download | librambutan-7241820179bb729d14900676fbff943f7f44cb97.tar.gz librambutan-7241820179bb729d14900676fbff943f7f44cb97.zip | |
Merge branch 'i2c-wip' into refactor
Conflicts:
examples/test-fsmc.cpp
libmaple/rules.mk
wirish/boards.h
Diffstat (limited to 'libmaple/exc.S')
| -rw-r--r-- | libmaple/exc.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmaple/exc.S b/libmaple/exc.S index f31fccd..7631e48 100644 --- a/libmaple/exc.S +++ b/libmaple/exc.S @@ -76,8 +76,8 @@ __exc_usagefault: .thumb_func __default_exc: - ldr r2, NVIC_CCR @ Enabling returning to thread mode from an - mov r1 ,#1 @ exception. See flag NONEBASETHRDENA. + ldr r2, NVIC_CCR @ Enable returning to thread mode even if there are + mov r1 ,#1 @ pending exceptions. See flag NONEBASETHRDENA. str r1, [r2] cpsid i @ Disable global interrupts ldr r2, SYSTICK_CSR @ Disable systick handler |