refactor(core): use std snprintf in emulator

[no changelog]
trezor · Oct 2, 2024 · 6376ea9 · 6376ea9
1 parent 730b6f2
commit 6376ea9
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/core/SConscript.bootloader_emu b/core/SConscript.bootloader_emu
@@ -84,7 +84,6 @@ SOURCE_MOD += [
  'embed/lib/gfx_bitblt_rgb565.c',
  'embed/lib/gfx_bitblt_rgba8888.c',
  'embed/lib/image.c',
- 'embed/lib/mini_printf.c',
  'embed/lib/rsod.c',
  'embed/lib/terminal.c',
  'embed/lib/unit_variant.c',

diff --git a/core/SConscript.unix b/core/SConscript.unix
@@ -215,7 +215,6 @@ SOURCE_MOD += [
  'embed/lib/gfx_bitblt_rgba8888.c',
  'embed/lib/gfx_bitblt_mono8.c',
  'embed/lib/image.c',
- 'embed/lib/mini_printf.c',
  'embed/lib/rsod.c',
  'embed/lib/terminal.c',
  'embed/lib/translations.c',

diff --git a/core/embed/bootloader/bootui.c b/core/embed/bootloader/bootui.c
@@ -27,11 +27,7 @@
 #include "display_draw.h"
 #include "display_utils.h"
 #include "fonts/fonts.h"
-#ifdef TREZOR_EMULATOR
-#include "emulator.h"
-#else
 #include "mini_printf.h"
-#endif
 #include "rust_ui.h"
 #include "version.h"
 

diff --git a/core/embed/bootloader/emulator.h b/core/embed/bootloader/emulator.h
@@ -2,7 +2,6 @@
 #define __EMULATOR_H__
 
 #define CLOCK_180_MHZ 0
-#define mini_snprintf snprintf
 
 #undef FIRMWARE_START
 

diff --git a/core/embed/lib/mini_printf.h b/core/embed/lib/mini_printf.h
@@ -39,9 +39,20 @@ extern "C" {
 
 #include <stdarg.h>
 
+#ifdef TREZOR_EMULATOR
+
+#include <stdio.h>
+
+#define mini_vsnprintf vsnprintf
+#define mini_snprintf snprintf
+
+#else
+
 int mini_vsnprintf(char* buffer, unsigned int buffer_len, const char *fmt, va_list va) __attribute__ ((__format__ (__printf__, 3, 0)));
 int mini_snprintf(char* buffer, unsigned int buffer_len, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 3, 4)));
 
+#endif
+
 #ifdef __cplusplus
 }
 #endif