This is an automated email from the ASF dual-hosted git repository.
andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
The following commit(s) were added to refs/heads/master by this push:
new a9db4b187 kernel/os: Update os_assert_cb to match assert_func
a9db4b187 is described below
commit a9db4b1875ccea99bd82f277d2debbd433b6b38f
Author: Andrzej Kaczmarek <[email protected]>
AuthorDate: Mon Nov 25 11:04:13 2024 +0100
kernel/os: Update os_assert_cb to match assert_func
This updates os_assert_cb prototype to match assert_func. This allows to
get proper assert information in callback e.g. for logging.
---
kernel/os/include/os/arch/common.h | 2 +-
kernel/os/src/arch/arc/os_fault.c | 2 +-
kernel/os/src/arch/cortex_m0/os_fault.c | 2 +-
kernel/os/src/arch/cortex_m3/os_fault.c | 2 +-
kernel/os/src/arch/cortex_m33/os_fault.c | 2 +-
kernel/os/src/arch/cortex_m4/os_fault.c | 2 +-
kernel/os/src/arch/cortex_m7/os_fault.c | 2 +-
kernel/os/src/arch/mips/os_fault.c | 2 +-
kernel/os/src/arch/pic32/os_fault.c | 2 +-
kernel/os/src/arch/rv32imac/os_fault.c | 2 +-
kernel/os/src/arch/sim-armv7/os_arch.c | 2 +-
kernel/os/src/arch/sim-mips/os_arch.c | 2 +-
kernel/os/src/arch/sim/os_arch.c | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/kernel/os/include/os/arch/common.h
b/kernel/os/include/os/arch/common.h
index c5f09f3a7..64ff55a79 100644
--- a/kernel/os/include/os/arch/common.h
+++ b/kernel/os/include/os/arch/common.h
@@ -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
diff --git a/kernel/os/src/arch/arc/os_fault.c
b/kernel/os/src/arch/arc/os_fault.c
index 7f18d80b4..099b7d483 100644
--- a/kernel/os/src/arch/arc/os_fault.c
+++ b/kernel/os/src/arch/arc/os_fault.c
@@ -135,7 +135,7 @@ __assert_func(const char *file, int line, const char *func,
const char *e)
OS_PRINT_ASSERT(file, line, func, e);
#if MYNEWT_VAL(OS_ASSERT_CB)
- os_assert_cb();
+ os_assert_cb(file, line, func, e);
#endif
if (hal_debugger_connected()) {
/*
diff --git a/kernel/os/src/arch/cortex_m0/os_fault.c
b/kernel/os/src/arch/cortex_m0/os_fault.c
index 8365169d8..d50054acb 100644
--- a/kernel/os/src/arch/cortex_m0/os_fault.c
+++ b/kernel/os/src/arch/cortex_m0/os_fault.c
@@ -118,7 +118,7 @@ __assert_func(const char *file, int line, const char *func,
const char *e)
#if MYNEWT_VAL(OS_ASSERT_CB)
- os_assert_cb();
+ os_assert_cb(file, line, func, e);
#endif
SCB->ICSR = SCB_ICSR_NMIPENDSET_Msk;
diff --git a/kernel/os/src/arch/cortex_m3/os_fault.c
b/kernel/os/src/arch/cortex_m3/os_fault.c
index 6765c2924..df815fb46 100644
--- a/kernel/os/src/arch/cortex_m3/os_fault.c
+++ b/kernel/os/src/arch/cortex_m3/os_fault.c
@@ -131,7 +131,7 @@ __assert_func(const char *file, int line, const char *func,
const char *e)
#if MYNEWT_VAL(OS_ASSERT_CB)
- os_assert_cb();
+ os_assert_cb(file, line, func, e);
#endif
SCB->ICSR = SCB_ICSR_NMIPENDSET_Msk;
diff --git a/kernel/os/src/arch/cortex_m33/os_fault.c
b/kernel/os/src/arch/cortex_m33/os_fault.c
index a310b7f1d..7dc370360 100644
--- a/kernel/os/src/arch/cortex_m33/os_fault.c
+++ b/kernel/os/src/arch/cortex_m33/os_fault.c
@@ -192,7 +192,7 @@ __assert_func(const char *file, int line, const char *func,
const char *e)
#if MYNEWT_VAL(OS_ASSERT_CB)
- os_assert_cb();
+ os_assert_cb(file, line, func, e);
#endif
SCB->ICSR = SCB_ICSR_PENDNMISET_Msk;
diff --git a/kernel/os/src/arch/cortex_m4/os_fault.c
b/kernel/os/src/arch/cortex_m4/os_fault.c
index 7928d8a78..019c27fbf 100644
--- a/kernel/os/src/arch/cortex_m4/os_fault.c
+++ b/kernel/os/src/arch/cortex_m4/os_fault.c
@@ -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;
diff --git a/kernel/os/src/arch/cortex_m7/os_fault.c
b/kernel/os/src/arch/cortex_m7/os_fault.c
index 454da5ba0..9f3cb21d1 100644
--- a/kernel/os/src/arch/cortex_m7/os_fault.c
+++ b/kernel/os/src/arch/cortex_m7/os_fault.c
@@ -130,7 +130,7 @@ __assert_func(const char *file, int line, const char *func,
const char *e)
OS_PRINT_ASSERT(file, line, func, e);
#if MYNEWT_VAL(OS_ASSERT_CB)
- os_assert_cb();
+ os_assert_cb(file, line, func, e);
#endif
SCB->ICSR = SCB_ICSR_NMIPENDSET_Msk;
diff --git a/kernel/os/src/arch/mips/os_fault.c
b/kernel/os/src/arch/mips/os_fault.c
index 860dc5234..b48193d0d 100644
--- a/kernel/os/src/arch/mips/os_fault.c
+++ b/kernel/os/src/arch/mips/os_fault.c
@@ -32,7 +32,7 @@ __assert_func(const char *file, int line, const char *func,
const char *e)
OS_PRINT_ASSERT(file, line, func, e);
#if MYNEWT_VAL(OS_ASSERT_CB)
- os_assert_cb();
+ os_assert_cb(file, line, func, e);
#endif
hal_system_reset();
diff --git a/kernel/os/src/arch/pic32/os_fault.c
b/kernel/os/src/arch/pic32/os_fault.c
index f6a4da063..bf8edcfd8 100644
--- a/kernel/os/src/arch/pic32/os_fault.c
+++ b/kernel/os/src/arch/pic32/os_fault.c
@@ -33,7 +33,7 @@ __assert_func(const char *file, int line, const char *func,
const char *e)
OS_PRINT_ASSERT(file, line, func, e);
#if MYNEWT_VAL(OS_ASSERT_CB)
- os_assert_cb();
+ os_assert_cb(file, line, func, e);
#endif
hal_system_reset();
}
diff --git a/kernel/os/src/arch/rv32imac/os_fault.c
b/kernel/os/src/arch/rv32imac/os_fault.c
index cde956868..06b93a5c5 100644
--- a/kernel/os/src/arch/rv32imac/os_fault.c
+++ b/kernel/os/src/arch/rv32imac/os_fault.c
@@ -30,7 +30,7 @@ __assert_func(const char *file, int line, const char *func,
const char *e)
OS_PRINT_ASSERT(file, line, func, e);
#if MYNEWT_VAL(OS_ASSERT_CB)
- os_assert_cb();
+ os_assert_cb(file, line, func, e);
#endif
_exit(1);
}
diff --git a/kernel/os/src/arch/sim-armv7/os_arch.c
b/kernel/os/src/arch/sim-armv7/os_arch.c
index 4ebdaddcd..92a2b9fb0 100644
--- a/kernel/os/src/arch/sim-armv7/os_arch.c
+++ b/kernel/os/src/arch/sim-armv7/os_arch.c
@@ -93,7 +93,7 @@ __assert_func(const char *file, int line, const char *func,
const char *e)
OS_PRINT_ASSERT_SIM(file, line, func, e);
#if MYNEWT_VAL(OS_ASSERT_CB)
- os_assert_cb();
+ os_assert_cb(file, line, func, e);
#endif
_Exit(1);
}
diff --git a/kernel/os/src/arch/sim-mips/os_arch.c
b/kernel/os/src/arch/sim-mips/os_arch.c
index 5c938b2f3..5af710ab0 100644
--- a/kernel/os/src/arch/sim-mips/os_arch.c
+++ b/kernel/os/src/arch/sim-mips/os_arch.c
@@ -93,7 +93,7 @@ __assert_func(const char *file, int line, const char *func,
const char *e)
OS_PRINT_ASSERT_SIM(file, line, func, e);
#if MYNEWT_VAL(OS_ASSERT_CB)
- os_assert_cb();
+ os_assert_cb(file, line, func, e);
#endif
_Exit(1);
}
diff --git a/kernel/os/src/arch/sim/os_arch.c b/kernel/os/src/arch/sim/os_arch.c
index f2b7b98cb..0fb2b906b 100644
--- a/kernel/os/src/arch/sim/os_arch.c
+++ b/kernel/os/src/arch/sim/os_arch.c
@@ -93,7 +93,7 @@ __assert_func(const char *file, int line, const char *func,
const char *e)
OS_PRINT_ASSERT_SIM(file, line, func, e);
#if MYNEWT_VAL(OS_ASSERT_CB)
- os_assert_cb();
+ os_assert_cb(file, line, func, e);
#endif
_Exit(1);
}
