arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-08 22:40:59 +00:00
Code Issues Releases Wiki Activity

Improve __fatal_error() layout.

Browse Source
This commit is contained in:
andrew 2019-02-06 19:02:51 +01:00 committed by Pavol Rusnak
parent 03e9ea4f5c
commit 5d4fb55561
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
2 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
common.c
View File

@ -21,34 +21,51 @@
#include "common.h" #include "common.h"
#include "rng.h" #include "rng.h"
#include "layout.h" #include "layout.h"
#include "oled.h"
#include "firmware/usb.h" #include "firmware/usb.h"
void shutdown(void); static void __attribute__((noreturn)) shutdown(void)
{
for (;;);
}
void __attribute__((noreturn)) __fatal_error(const char *expr, const char *msg, const char *file, int line_num, const char *func) { void __attribute__((noreturn)) __fatal_error(const char *expr, const char *msg, const char *file, int line_num, const char *func) {
char line[4][128] = {{0}}; const BITMAP *icon = &bmp_icon_error;
int i = 0; char line[128] = {0};
if (expr != NULL) { int y = icon->height + 3;
snprintf(line[i], sizeof(line[0]), "Expr: %s", expr); oledClear();
i++;
} oledDrawBitmap(0, 0, icon);
if (msg != NULL) { oledDrawStringCenter((icon->height - FONT_HEIGHT)/2 + 1, "FATAL ERROR", FONT_STANDARD);
snprintf(line[i], sizeof(line[0]), "Msg: %s", msg);
i++; snprintf(line, sizeof(line), "Expr: %s", expr ? expr : "(null)");
} oledDrawString(0, y, line, FONT_STANDARD);
if (file != NULL) { y += FONT_HEIGHT + 1;
snprintf(line[i], sizeof(line[0]), "File: %s:%d", file, line_num);
i++; snprintf(line, sizeof(line), "Msg: %s", msg ? msg : "(null)");
} oledDrawString(0, y, line, FONT_STANDARD);
if (func != NULL) { y += FONT_HEIGHT + 1;
snprintf(line[i], sizeof(line[0]), "Func: %s", func);
i++; const char *label = "File: ";
} snprintf(line, sizeof(line), "%s:%d", file ? file : "(null)", line_num);
error_shutdown("FATAL ERROR:", NULL, line[0], line[1], line[2], line[3]); oledDrawStringRight(OLED_WIDTH - 1, y, line, FONT_STANDARD);
oledBox(0, y, oledStringWidth(label, FONT_STANDARD), y + FONT_HEIGHT, false);
oledDrawString(0, y, label, FONT_STANDARD);
y += FONT_HEIGHT + 1;
snprintf(line, sizeof(line), "Func: %s", func ? func : "(null)");
oledDrawString(0, y, line, FONT_STANDARD);
y += FONT_HEIGHT + 1;
oledDrawString(0, y, "Please unplug the device.", FONT_STANDARD);
oledRefresh();
shutdown();
for (;;);
} }
void __attribute__((noreturn)) error_shutdown(const char *line1, const char *line2, const char *line3, const char *line4, const char *line5, const char *line6) { void __attribute__((noreturn)) error_shutdown(const char *line1, const char *line2, const char *line3, const char *line4) {
layoutDialog(&bmp_icon_error, NULL, NULL, NULL, line1, line2, line3, line4, line5, line6); layoutDialog(&bmp_icon_error, NULL, NULL, NULL, line1, line2, line3, line4, "Please unplug", "the device.");
shutdown(); shutdown();
for (;;); for (;;);
} }

2
common.h
View File

@ -34,7 +34,7 @@
#endif #endif
void __attribute__((noreturn)) __fatal_error(const char *expr, const char *msg, const char *file, int line, const char *func); void __attribute__((noreturn)) __fatal_error(const char *expr, const char *msg, const char *file, int line, const char *func);
void __attribute__((noreturn)) error_shutdown(const char *line1, const char *line2, const char *line3, const char *line4, const char *line5, const char *line6); void __attribute__((noreturn)) error_shutdown(const char *line1, const char *line2, const char *line3, const char *line4);
#define ensure(expr, msg) (((expr) == sectrue) ? (void)0 : __fatal_error(#expr, msg, __FILE__, __LINE__, __func__)) #define ensure(expr, msg) (((expr) == sectrue) ? (void)0 : __fatal_error(#expr, msg, __FILE__, __LINE__, __func__))