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

firmware: move nlr_jump_fail from common to firmware

Browse Source
This commit is contained in:
Pavol Rusnak 2017-10-11 20:01:22 +02:00
parent 32e48258e4
commit 10ebd43261
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
embed/firmware/main.c
View File

@ -93,7 +93,13 @@ int main(void) {
return 0; return 0;
} }
// Micropython file I/O stubs // MicroPython default exception handler
void __attribute__((noreturn)) nlr_jump_fail(void *val) {
__fatal_error("uncaught exception", NULL, 0, NULL);
}
// MicroPython file I/O stubs
mp_lexer_t *mp_lexer_new_from_file(const char *filename) { mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
return NULL; return NULL;

4
embed/trezorhal/common.c
View File

@ -26,10 +26,6 @@ void __assert_func(const char *file, int line, const char *func, const char *exp
} }
#endif #endif
void __attribute__((noreturn)) nlr_jump_fail(void *val) {
__fatal_error("uncaught exception", NULL, 0, NULL);
}
void periph_init(void) { void periph_init(void) {
// STM32F4xx HAL library initialization: // STM32F4xx HAL library initialization:

2
embed/trezorhal/common.h
View File

@ -16,8 +16,6 @@ void periph_init(void);
void __attribute__((noreturn)) __fatal_error(const char *msg, const char *file, int line, const char *func); void __attribute__((noreturn)) __fatal_error(const char *msg, const char *file, int line, const char *func);
void __attribute__((noreturn)) nlr_jump_fail(void *val);
void jump_to(uint32_t address); void jump_to(uint32_t address);
void hal_delay(uint32_t ms); void hal_delay(uint32_t ms);