Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
firmware
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
François Revol
firmware
Commits
4b847348
Commit
4b847348
authored
5 years ago
by
Mateusz Zalega
Browse files
Options
Downloads
Patches
Plain Diff
faultscreen: coding style
Signed-off-by:
Mateusz Zalega
<
mateusz@appliedsourcery.com
>
parent
16dda79a
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/card10/faultscreen.c
+58
-46
58 additions, 46 deletions
lib/card10/faultscreen.c
lib/card10/faultsplash.c
+28
-28
28 additions, 28 deletions
lib/card10/faultsplash.c
with
86 additions
and
74 deletions
lib/card10/faultscreen.c
+
58
−
46
View file @
4b847348
...
@@ -22,12 +22,10 @@ struct regs_t {
...
@@ -22,12 +22,10 @@ struct regs_t {
"ldr %0, [sp, #24] \n" \
"ldr %0, [sp, #24] \n" \
"ldr %1, [sp, #20] \n" \
"ldr %1, [sp, #20] \n" \
"mov %2, sp \n" \
"mov %2, sp \n" \
: "=r" (regs.pc), \
: "=r"(regs.pc), "=r"(regs.lr), "=r"(regs.sp))
"=r" (regs.lr), \
"=r" (regs.sp) \
)
static
void
generic_handler
(
const
char
*
reason
)
{
static
void
generic_handler
(
const
char
*
reason
)
{
char
lines
[
3
][
64
];
char
lines
[
3
][
64
];
Core1_Stop
();
Core1_Stop
();
...
@@ -37,8 +35,16 @@ static void generic_handler(const char *reason) {
...
@@ -37,8 +35,16 @@ static void generic_handler(const char *reason) {
snprintf
(
lines
[
1
],
sizeof
(
lines
[
1
]),
"sp: 0x%08x"
,
regs
.
sp
);
snprintf
(
lines
[
1
],
sizeof
(
lines
[
1
]),
"sp: 0x%08x"
,
regs
.
sp
);
snprintf
(
lines
[
2
],
sizeof
(
lines
[
2
]),
"lr: 0x%08x"
,
regs
.
lr
);
snprintf
(
lines
[
2
],
sizeof
(
lines
[
2
]),
"lr: 0x%08x"
,
regs
.
lr
);
gfx_copy_region
(
&
display_screen
,
0
,
0
,
160
,
80
,
GFX_RLE_MONO
,
gfx_copy_region
(
faultsplash_rle_len
,
faultsplash_rle
);
&
display_screen
,
0
,
0
,
160
,
80
,
GFX_RLE_MONO
,
faultsplash_rle_len
,
faultsplash_rle
);
Color
black
=
gfx_color
(
&
display_screen
,
BLACK
);
Color
black
=
gfx_color
(
&
display_screen
,
BLACK
);
Color
white
=
gfx_color
(
&
display_screen
,
WHITE
);
Color
white
=
gfx_color
(
&
display_screen
,
WHITE
);
...
@@ -50,32 +56,38 @@ static void generic_handler(const char *reason) {
...
@@ -50,32 +56,38 @@ static void generic_handler(const char *reason) {
gfx_update
(
&
display_screen
);
gfx_update
(
&
display_screen
);
}
}
static
void
NMI_Handler_
(
void
)
{
static
void
NMI_Handler_
(
void
)
{
LOAD_REGS
();
LOAD_REGS
();
generic_handler
(
"NMI Fault"
);
generic_handler
(
"NMI Fault"
);
}
}
static
void
HardFault_Handler_
(
void
)
{
static
void
HardFault_Handler_
(
void
)
{
LOAD_REGS
();
LOAD_REGS
();
generic_handler
(
"HardFault"
);
generic_handler
(
"HardFault"
);
}
}
static
void
MemManage_Handler_
(
void
)
{
static
void
MemManage_Handler_
(
void
)
{
LOAD_REGS
();
LOAD_REGS
();
generic_handler
(
"MemMgmtFault"
);
generic_handler
(
"MemMgmtFault"
);
}
}
static
void
BusFault_Handler_
(
void
)
{
static
void
BusFault_Handler_
(
void
)
{
LOAD_REGS
();
LOAD_REGS
();
generic_handler
(
"BusFault"
);
generic_handler
(
"BusFault"
);
}
}
static
void
UsageFault_Handler_
(
void
)
{
static
void
UsageFault_Handler_
(
void
)
{
LOAD_REGS
();
LOAD_REGS
();
generic_handler
(
"UsageFault"
);
generic_handler
(
"UsageFault"
);
}
}
void
card10_set_fault_handlers
(
void
)
{
void
card10_set_fault_handlers
(
void
)
{
NVIC_SetVector
(
NonMaskableInt_IRQn
,
NMI_Handler_
);
NVIC_SetVector
(
NonMaskableInt_IRQn
,
NMI_Handler_
);
NVIC_SetVector
(
HardFault_IRQn
,
HardFault_Handler_
);
NVIC_SetVector
(
HardFault_IRQn
,
HardFault_Handler_
);
NVIC_SetVector
(
MemoryManagement_IRQn
,
MemManage_Handler_
);
NVIC_SetVector
(
MemoryManagement_IRQn
,
MemManage_Handler_
);
...
...
This diff is collapsed.
Click to expand it.
lib/card10/faultsplash.c
+
28
−
28
View file @
4b847348
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment