Skip to content

Commit e557afa

Browse files
committed
Remove trailing whitespace
Fixes 5f876d5 ("Provide a structure with the debug information to debug_halt() handler")
1 parent aea9e2c commit e557afa

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

api/inc/halt_exports.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,15 @@ typedef struct {
8282
uint32_t lr;
8383
uint32_t control;
8484
uint32_t ipsr;
85-
85+
8686
/* Fault status registers. */
8787
uint32_t mmfar;
8888
uint32_t bfar;
8989
uint32_t cfsr;
9090
uint32_t hfsr;
9191
uint32_t dfsr;
9292
uint32_t afsr;
93-
93+
9494
/* Bitmask telling which of the above regions are valid. */
9595
uint32_t valid_data;
9696
} UVISOR_PACKED THaltInfo;

core/debug/src/debug.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ bool debug_collect_halt_info(uint32_t lr, uint32_t sp, THaltInfo *halt_info)
453453
halt_info->lr = lr;
454454
halt_info->ipsr = __get_IPSR();
455455
halt_info->control = __get_CONTROL();
456-
456+
457457
/* Save the status registers in the halt info. */
458458
halt_info->mmfar = SCB->MMFAR;
459459
halt_info->bfar = SCB->BFAR;
@@ -462,7 +462,7 @@ bool debug_collect_halt_info(uint32_t lr, uint32_t sp, THaltInfo *halt_info)
462462
halt_info->dfsr = SCB->DFSR;
463463
halt_info->afsr = SCB->AFSR;
464464
halt_info->valid_data |= HALT_INFO_REGISTERS;
465-
465+
466466
/* Copy the exception stack frame into the halt info.
467467
* Make sure that we're not dealing with stacking error in which case we
468468
* don't have a valid exception stack frame.

core/debug/src/debug_box.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ void debug_halt_error(THaltError reason, const THaltInfo *halt_info)
5959
} else {
6060
/* Remember that debug_deprivilege_and_return() has been called once. */
6161
debugged_once_before = 1;
62-
62+
6363
/* Place the halt info on the interrupt stack. */
6464
if (halt_info) {
6565
g_debug_interrupt_sp[g_debug_box.box_id] -= sizeof(THaltInfo);

core/vmpu/src/mpu_armv7m/vmpu_armv7m.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ uint32_t vmpu_sys_mux_handler(uint32_t lr, uint32_t msp)
130130
/* Determine the origin of the exception. */
131131
bool from_psp = EXC_FROM_PSP(lr);
132132
uint32_t sp = from_psp ? __get_PSP() : msp;
133-
133+
134134
/* Collect fault information that will be given to the halt handler in case of halt. */
135135
THaltInfo info, *halt_info = NULL;
136136
if (debug_collect_halt_info(lr, sp, &info)) {

core/vmpu/src/mpu_armv8m/vmpu_armv8m.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ uint32_t vmpu_sys_mux_handler(uint32_t lr, uint32_t msp_s)
119119
bool from_psp = EXC_FROM_PSP(lr);
120120
uint32_t sp = from_s ? (from_np ? (from_psp ? __get_PSP() : msp_s) : msp_s) :
121121
(from_np ? (from_psp ? __TZ_get_PSP_NS() : __TZ_get_MSP_NS()) : __TZ_get_MSP_NS());
122-
122+
123123
/* Collect fault information that will be given to the halt handler in case of halt. */
124124
THaltInfo info, *halt_info = NULL;
125125
if (debug_collect_halt_info(lr, sp, &info)) {

core/vmpu/src/mpu_kinetis/vmpu_kinetis.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ uint32_t vmpu_sys_mux_handler(uint32_t lr, uint32_t msp)
6565
bool from_np = EXC_FROM_NP(lr);
6666
bool from_psp = EXC_FROM_PSP(lr);
6767
uint32_t sp = from_np ? (from_psp ? __get_PSP() : msp) : msp;
68-
68+
6969
/* Collect fault information that will be given to the halt handler in case of halt. */
7070
THaltInfo info, *halt_info = NULL;
7171
if (debug_collect_halt_info(lr, sp, &info)) {
7272
halt_info = &info;
7373
}
74-
74+
7575
switch (ipsr) {
7676
case NonMaskableInt_IRQn:
7777
HALT_ERROR_EXTENDED(NOT_IMPLEMENTED, halt_info, "No NonMaskableInt IRQ handler registered.");

0 commit comments

Comments
 (0)