Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kernel/os: Update os_assert_cb to match assert_func #3349

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

kernel/os: Update os_assert_cb to match assert_func #3349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kernel/os/include/os/arch/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ os_error_t os_arch_os_start(void);
void os_set_env(os_stack_t *);
void os_arch_init_task_stack(os_stack_t *sf);
void os_default_irq_asm(void);
void os_assert_cb(void);
void os_assert_cb(const char *file, int line, const char *func, const char *e);
void os_coredump_cb(void *tf);

#ifdef __cplusplus
Expand Down
2 changes: 1 addition & 1 deletion kernel/os/src/arch/cortex_m4/os_fault.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ __assert_func(const char *file, int line, const char *func, const char *e)
#endif

#if MYNEWT_VAL(OS_ASSERT_CB)
os_assert_cb();
os_assert_cb(file, line, func, e);
#endif

SCB->ICSR = SCB_ICSR_NMIPENDSET_Msk;
Expand Down