Skip to content

Commit 3a706b7

Browse files
committed
Rename exceptions to match table B1-4 of the Arm v7-M reference manual
1 parent 798274f commit 3a706b7

File tree

1 file changed

+20
-18
lines changed
  • src/rp2_common/hardware_exception/include/hardware

1 file changed

+20
-18
lines changed

src/rp2_common/hardware_exception/include/hardware/exception.h

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,19 @@ extern "C" {
3939
*
4040
* On Arm these are vector table indices:
4141
*
42-
* Name | Value | Exception
43-
* ---------------------|-------|-----------------------
44-
* NMI_EXCEPTION | 2 | Non Maskable Interrupt
45-
* HARDFAULT_EXCEPTION | 3 | HardFault
42+
* Name | Value | Exception
43+
* ----------------------|-------|-----------------------
44+
* NMI_EXCEPTION | 2 | Non Maskable Interrupt
45+
* HARDFAULT_EXCEPTION | 3 | HardFault
4646
* \if rp2350_specific
47-
* MEMFAULT_EXCEPTION | 4 | MemFault
48-
* BUSFAULT_EXCEPTION | 5 | BusFault
49-
* USGFAULT_EXCEPTION | 6 | UsageFault
47+
* MEMMANAGE_EXCEPTION | 4 | MemManage
48+
* BUSFAULT_EXCEPTION | 5 | BusFault
49+
* USAGEFAULT_EXCEPTION | 6 | UsageFault
50+
* SECUREFAULT_EXCEPTION | 7 | SecureFault
5051
* \endif
51-
* SVCALL_EXCEPTION | 11 | SV Call
52-
* PENDSV_EXCEPTION | 14 | Pend SV
53-
* SYSTICK_EXCEPTION | 15 | System Tick
52+
* SVCALL_EXCEPTION | 11 | SV Call
53+
* PENDSV_EXCEPTION | 14 | Pend SV
54+
* SYSTICK_EXCEPTION | 15 | System Tick
5455
*
5556
* \if rp2350_specific
5657
* On RISC-V these are exception cause numbers:
@@ -93,16 +94,17 @@ enum exception_number {
9394
enum exception_number {
9495
// Assigned to VTOR indices
9596
MIN_EXCEPTION_NUM = 2,
96-
NMI_EXCEPTION = 2, ///< Non Maskable Interrupt
97-
HARDFAULT_EXCEPTION = 3, ///< HardFault Interrupt
97+
NMI_EXCEPTION = 2, ///< Non Maskable Interrupt
98+
HARDFAULT_EXCEPTION = 3, ///< HardFault Interrupt
9899
#if PICO_RP2350
99-
MEMFAULT_EXCEPTION = 4, ///< MemFault Interrupt
100-
BUSFAULT_EXCEPTION = 5, ///< BusFault Interrupt
101-
USGFAULT_EXCEPTION = 6, ///< UsageFault Interrupt
100+
MEMMANAGE_EXCEPTION = 4, ///< MemManage Interrupt
101+
BUSFAULT_EXCEPTION = 5, ///< BusFault Interrupt
102+
USAGEFAULT_EXCEPTION = 6, ///< UsageFault Interrupt
103+
SECUREFAULT_EXCEPTION = 7, ///< SecureFault Interrupt
102104
#endif
103-
SVCALL_EXCEPTION = 11, ///< SV Call Interrupt
104-
PENDSV_EXCEPTION = 14, ///< Pend SV Interrupt
105-
SYSTICK_EXCEPTION = 15, ///< System Tick Interrupt
105+
SVCALL_EXCEPTION = 11, ///< SV Call Interrupt
106+
PENDSV_EXCEPTION = 14, ///< Pend SV Interrupt
107+
SYSTICK_EXCEPTION = 15, ///< System Tick Interrupt
106108
MAX_EXCEPTION_NUM = 15
107109
};
108110
#endif

0 commit comments

Comments
 (0)