Skip to content

Commit cc5969b

Browse files
committed
Remove printf completely and fix the optimization check
1 parent 16e544d commit cc5969b

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

platform/mbed_error.c

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -211,24 +211,16 @@ mbed_error_status_t mbed_error_initialize(void)
211211
//Read report_error_ctx and check if CRC is correct, and with valid status code
212212
if ((report_error_ctx->crc_error_ctx == crc_val) && (report_error_ctx->is_error_processed == 0)) {
213213
is_reboot_error_valid = true;
214-
//Report the error info
215-
#ifndef NDEBUG
216-
printf("\n== The system has been rebooted due to a fatal error. ==\n");
217-
#endif
218214

219215
//Call the mbed_error_reboot_callback, this enables applications to do some handling before we do the handling
220216
mbed_error_reboot_callback(report_error_ctx);
221217

222218
//We let the callback reset the error info, so check if its still valid and do the rest only if its still valid.
223-
if (report_error_ctx->error_reboot_count < 0) {
219+
if (report_error_ctx->error_reboot_count > 0) {
224220

225221
//Enforce max-reboot only if auto reboot is enabled
226222
#if MBED_CONF_PLATFORM_FATAL_ERROR_AUTO_REBOOT_ENABLED
227223
if (report_error_ctx->error_reboot_count >= MBED_CONF_PLATFORM_ERROR_REBOOT_MAX) {
228-
//We have rebooted more than enough, hold the system here.
229-
#ifndef NDEBUG
230-
printf("\n== Reboot count(=%ld) exceeded maximum, system halting ==\n", report_error_ctx->error_reboot_count);
231-
#endif
232224
mbed_halt_system();
233225
}
234226
#endif
@@ -300,6 +292,11 @@ WEAK MBED_NORETURN mbed_error_status_t mbed_error(mbed_error_status_t error_stat
300292
core_util_critical_section_exit();
301293
//We need not call delete_mbed_crc(crc_obj) here as we are going to reset the system anyway, and calling delete while handling a fatal error may cause nested exception
302294
#if MBED_CONF_PLATFORM_FATAL_ERROR_AUTO_REBOOT_ENABLED && (MBED_CONF_PLATFORM_ERROR_REBOOT_MAX > 0)
295+
mbed_error_printf("\n= System will be rebooted due to a fatal error =\n");
296+
if (report_error_ctx->error_reboot_count >= MBED_CONF_PLATFORM_ERROR_REBOOT_MAX) {
297+
//We have rebooted more than enough, hold the system here.
298+
mbed_error_printf("= Reboot count(=%ld) reached maximum, system will halt after rebooting =\n", report_error_ctx->error_reboot_count);
299+
}
303300
system_reset();//do a system reset to get the system rebooted
304301
#endif
305302
#endif

0 commit comments

Comments
 (0)