refactor(core): introduce global trezor_rtl/bsp/model headers

[no changelog]

core/embed/boardloader/main.c

@@ -17,20 +17,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
+#include <trezor_model.h>
+#include <trezor_rtl.h>
 
-#include TREZOR_BOARD
 #include "board_capabilities.h"
 #include "bootutils.h"
 #include "buffers.h"
-#include "common.h"
 #include "compiler_traits.h"
 #include "display.h"
 #include "display_draw.h"
 #include "flash.h"
 #include "flash_utils.h"
 #include "image.h"
-#include "model.h"
 #include "mpu.h"
 #include "pvd.h"
 #include "reset_flags.h"
@@ -38,6 +36,7 @@
 #include "rsod.h"
 #include "secret.h"
 #include "system.h"
+#include "systick.h"
 #include "terminal.h"
 
 #ifdef USE_SD_CARD
@@ -59,7 +58,6 @@
 #endif
 
 #include "memzero.h"
-#include "model.h"
 #include "monoctr.h"
 #include "option_bytes.h"
 #include "tamper.h"

core/embed/bootloader/bootui.c

@@ -17,9 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
+#include <trezor_rtl.h>
-
-#include TREZOR_BOARD
 
 #include "bootui.h"
 #include "colors.h"

core/embed/bootloader/bootui.h

@@ -20,10 +20,9 @@
 #ifndef __BOOTUI_H__
 #define __BOOTUI_H__
 
+#include <trezor_types.h>
+
 #include "image.h"
-#include "secbool.h"
-#include "stdbool.h"
-#include TREZOR_BOARD
 
 typedef enum {
   SCREEN_INTRO = 0,

core/embed/bootloader/emulator.c

@@ -1,20 +1,20 @@
-#include <stdio.h>
+#include <trezor_model.h>
+#include <trezor_rtl.h>
+
 #include <unistd.h>
 
 #include <SDL.h>
 
-#include TREZOR_BOARD
 #include "bootargs.h"
 #include "bootui.h"
-#include "common.h"
 #include "display.h"
 #include "flash.h"
 #include "flash_otp.h"
-#include "model.h"
 #include "rust_ui.h"
 #ifdef USE_OPTIGA
 #include "secret.h"
 #endif
+#include "systick.h"
 
 #include "emulator.h"
 

core/embed/bootloader/emulator.h

@@ -1,10 +1,9 @@
 #ifndef __EMULATOR_H__
 #define __EMULATOR_H__
 
-#undef FIRMWARE_START
+#include <trezor_types.h>
 
-#include <stdint.h>
+#undef FIRMWARE_START
-#include <stdio.h>
 
 extern uint8_t *FIRMWARE_START;
 

core/embed/bootloader/main.c

@@ -17,12 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
+#include <trezor_bsp.h>
+#include <trezor_model.h>
+#include <trezor_rtl.h>
+
 #include <sys/types.h>
 
 #include "bootargs.h"
 #include "bootutils.h"
-#include "common.h"
 #include "display.h"
 #include "display_utils.h"
 #include "flash.h"
@@ -35,9 +37,9 @@
 #include "pvd.h"
 #include "random_delays.h"
 #include "rsod.h"
-#include "secbool.h"
 #include "secret.h"
 #include "system.h"
+#include "systick.h"
 #include "systimer.h"
 
 #ifdef USE_DMA2D
@@ -66,7 +68,6 @@
 #include "hash_processor.h"
 #endif
 
-#include "model.h"
 #include "usb.h"
 #include "version.h"
 

core/embed/bootloader/messages.c

@@ -17,7 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
+#include <trezor_model.h>
+#include <trezor_rtl.h>
 
 #include <pb.h>
 #include <pb_decode.h>
@@ -25,11 +26,9 @@
 #include "messages.pb.h"
 
 #include "bootargs.h"
-#include "common.h"
 #include "flash.h"
 #include "flash_utils.h"
 #include "image.h"
-#include "secbool.h"
 #include "secret.h"
 #include "unit_properties.h"
 #include "usb.h"
@@ -41,7 +40,6 @@
 #include "version_check.h"
 
 #include "memzero.h"
-#include "model.h"
 
 #ifdef TREZOR_EMULATOR
 #include "emulator.h"

core/embed/bootloader/messages.h

@@ -20,10 +20,9 @@
 #ifndef __MESSAGES_H__
 #define __MESSAGES_H__
 
-#include <stdint.h>
+#include <trezor_types.h>
+
 #include "image.h"
-#include "secbool.h"
-#include TREZOR_BOARD
 
 #define USB_TIMEOUT 500
 #define USB_PACKET_SIZE 64

core/embed/bootloader/version_check.c

@@ -17,13 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
+#include <trezor_rtl.h>
 
-#include "version_check.h"
-
-#include "error_handling.h"
 #include "model_version.h"
 #include "monoctr.h"
+#include "version_check.h"
 
 void ensure_bootloader_min_version(void) {
   monoctr_write(MONOCTR_BOOTLOADER_VERSION, BOOTLOADER_MONOTONIC_VERSION);

core/embed/bootloader/version_check.h

@@ -19,8 +19,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <trezor_types.h>
-#include "secbool.h"
 
 // Protection against bootloader downgrade
 

core/embed/bootloader_ci/bootui.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
+#include <trezor_rtl.h>
 
 #include "bootui.h"
 #include "display.h"

core/embed/bootloader_ci/bootui.h

@@ -20,7 +20,7 @@
 #ifndef __BOOTUI_H__
 #define __BOOTUI_H__
 
-#include "secbool.h"
+#include <trezor_types.h>
 
 void ui_screen_welcome_third(void);
 

core/embed/bootloader_ci/main.c

@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
+#include <trezor_model.h>
-#include <sys/types.h>
+#include <trezor_rtl.h>
 
+#include <sys/types.h>
 #include "bootutils.h"
-#include "common.h"
 #include "display.h"
 #include "display_draw.h"
 #include "flash.h"
@@ -32,8 +32,8 @@
 #include "random_delays.h"
 #include "rng.h"
 #include "rsod.h"
-#include "secbool.h"
 #include "system.h"
+#include "systick.h"
 #ifdef USE_TOUCH
 #include "touch.h"
 #endif
@@ -42,7 +42,6 @@
 
 #include "bootui.h"
 #include "messages.h"
-#include "model.h"
 #include "version_check.h"
 
 #ifdef USE_HASH_PROCESSOR

core/embed/bootloader_ci/messages.c

@@ -17,19 +17,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
+#include <trezor_model.h>
+#include <trezor_rtl.h>
 
 #include <pb.h>
 #include <pb_decode.h>
 #include <pb_encode.h>
 #include "messages.pb.h"
 
-#include "common.h"
 #include "flash.h"
 #include "flash_utils.h"
 #include "image.h"
-#include "model.h"
-#include "secbool.h"
 #include "usb.h"
 #include "version.h"
 

core/embed/bootloader_ci/messages.h

@@ -20,9 +20,9 @@
 #ifndef __MESSAGES_H__
 #define __MESSAGES_H__
 
-#include <stdint.h>
+#include <trezor_types.h>
+
 #include "image.h"
-#include "secbool.h"
 
 #define USB_TIMEOUT 500
 #define USB_PACKET_SIZE 64

core/embed/extmod/modtrezorconfig/modtrezorconfig.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
+#include <trezor_rtl.h>
 
 #include "py/mphal.h"
 #include "py/objstr.h"
@@ -27,7 +27,6 @@
 
 #include "embed/extmod/trezorobj.h"
 
-#include "common.h"
 #include "entropy.h"
 #include "memzero.h"
 #include "storage.h"

core/embed/extmod/modtrezorconfig/norcow_config.h

@@ -20,9 +20,10 @@
 #ifndef __NORCOW_CONFIG_H__
 #define __NORCOW_CONFIG_H__
 
-#include TREZOR_BOARD
+#include <trezor_model.h>
+#include <trezor_types.h>
+
 #include "flash.h"
-#include "model.h"
 
 #define NORCOW_HEADER_LEN 0
 #define NORCOW_SECTOR_COUNT 2

core/embed/extmod/modtrezorcrypto/crc.h

@@ -20,7 +20,7 @@
 #ifndef __CRC_H__
 #define __CRC_H__
 
-#include <stdint.h>
+#include <trezor_types.h>
 
 uint32_t checksum_crc32(const uint8_t *data, uint32_t length, uint32_t crc);
 

core/embed/extmod/modtrezorcrypto/modtrezorcrypto.c

@@ -17,16 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdint.h>
+#include <trezor_rtl.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "common.h"
 
 #include "py/runtime.h"
 
-#include TREZOR_BOARD
-
 #if MICROPY_PY_TREZORCRYPTO
 
 static mp_obj_t ui_wait_callback = mp_const_none;

core/embed/extmod/modtrezorio/ff.c

@@ -21,7 +21,8 @@
 /----------------------------------------------------------------------------*/
 
 
-#include <string.h>
+#include <trezor_rtl.h>
+
 #include "ff.h"			/* Declarations of FatFs API */
 #include "diskio.h"		/* Declarations of device I/O functions */
 

core/embed/extmod/modtrezorio/modtrezorio-poll.h

@@ -17,11 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
+#include <trezor_types.h>
 
 #include "button.h"
-#include "common.h"
 #include "display.h"
+#include "systick.h"
+
 #include "embed/extmod/trezorobj.h"
 
 #ifdef TREZOR_EMULATOR

core/embed/extmod/modtrezorio/modtrezorio.c

@@ -17,7 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
+#include <trezor_rtl.h>
+
+#include <unistd.h>
 
 #include "py/mphal.h"
 #include "py/objstr.h"
@@ -25,9 +27,6 @@
 
 #if MICROPY_PY_TREZORIO
 
-#include <unistd.h>
-
-#include TREZOR_BOARD
 #include "button.h"
 #include "touch.h"
 #include "usb.h"

core/embed/extmod/modtrezorui/modtrezorui.c

@@ -17,9 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdint.h>
+#include <trezor_rtl.h>
-#include <stdio.h>
-#include <string.h>
 
 #include "py/runtime.h"
 

core/embed/extmod/modtrezorutils/modtrezorutils-meminfo.h

@@ -22,6 +22,8 @@
 
 #else
 
+#include <trezor_types.h>
+
 #include "py/bc.h"
 #include "py/gc.h"
 #include "py/nlr.h"
@@ -36,9 +38,6 @@
 #include "embed/rust/librust.h"
 #include "embed/trezorhal/usb.h"
 
-#include <stdio.h>
-#include <string.h>
-
 #define WORDS_PER_BLOCK ((MICROPY_BYTES_PER_GC_BLOCK) / MP_BYTES_PER_OBJ_WORD)
 #define BYTES_PER_BLOCK (MICROPY_BYTES_PER_GC_BLOCK)
 

core/embed/extmod/modtrezorutils/modtrezorutils.c

@@ -17,6 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <trezor_model.h>
+#include <trezor_rtl.h>
+
 #include "py/objstr.h"
 #include "py/runtime.h"
 
@@ -28,15 +31,11 @@
 #include "embed/extmod/modtrezorutils/modtrezorutils-meminfo.h"
 #include "embed/extmod/trezorobj.h"
 
-#include <string.h>
 #include "blake2s.h"
 #include "bootutils.h"
-#include "error_handling.h"
 #include "fwutils.h"
 #include "unit_properties.h"
 #include "usb.h"
-#include TREZOR_BOARD
-#include "model.h"
 
 #if USE_OPTIGA && !defined(TREZOR_EMULATOR)
 #include "secret.h"

core/embed/extmod/trezorobj.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
+#include <trezor_rtl.h>
 
 #include "memzero.h"
 #include "py/obj.h"

core/embed/firmware/main.c

@@ -17,11 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include STM32_HAL_H
+#include <trezor_rtl.h>
-
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
 
 #include "py/builtin.h"
 #include "py/compile.h"
@@ -36,10 +32,8 @@
 #include "ports/stm32/gccollect.h"
 #include "ports/stm32/pendsv.h"
 
-#include "error_handling.h"
 #include "rsod.h"
 #include "rust_ui_common.h"
-#include "secbool.h"
 #include "systask.h"
 #include "system.h"
 

core/embed/firmware/mphalport.c

@@ -17,7 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "common.h"
+#include <trezor_rtl.h>
+
 #include "py/mphal.h"
 
 #include "systick.h"

core/embed/firmware/systemview.c

@@ -19,9 +19,10 @@
 
 #ifdef SYSTEM_VIEW
 
-#include "systemview.h"
+#include <trezor_rtl.h>
-#include <string.h>
+
 #include "mpconfigport.h"
+#include "systemview.h"
 
 #include "SEGGER_SYSVIEW.h"
 #include "SEGGER_SYSVIEW_Conf.h"

core/embed/kernel/main.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
+#include <trezor_rtl.h>
 
 #include "applet.h"
 #include "bl_check.h"

core/embed/lib/bl_check.c

@@ -17,15 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdint.h>
+#include <trezor_model.h>
-#include <string.h>
+#include <trezor_rtl.h>
+
 #include "blake2s.h"
 #include "board_capabilities.h"
-#include "common.h"
 #include "flash.h"
 #include "image.h"
 #include "memzero.h"
-#include "model.h"
 #include "mpu.h"
 #include "uzlib.h"
 

core/embed/lib/buffers.c

@@ -17,8 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <trezor_rtl.h>
+
 #include "buffers.h"
-#include "common.h"
 #include "fonts/fonts.h"
 #include "memzero.h"
 

core/embed/lib/buffers.h

@@ -20,11 +20,8 @@
 #ifndef _BUFFERS_H
 #define _BUFFERS_H
 
-#include <stdbool.h>
+#include <trezor_model.h>
-
+#include <trezor_types.h>
-#include "common.h"
-#include "model.h"
-#include TREZOR_BOARD
 
 #define BUFFER_PIXELS DISPLAY_RESX
 

core/embed/lib/colors.h

@@ -20,8 +20,7 @@
 #ifndef _COLORS_H
 #define _COLORS_H
 
-#include "common.h"
+#include <trezor_types.h>
-#include TREZOR_BOARD
 
 #ifdef USE_RGB_COLORS
 #define RGB16(R, G, B) ((R & 0xF8) << 8) | ((G & 0xFC) << 3) | ((B & 0xF8) >> 3)

core/embed/lib/common.h

@@ -0,0 +1,31 @@
+/*
+ * This file is part of the Trezor project, https://trezor.io/
+ *
+ * Copyright (c) SatoshiLabs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIB_COMMON_H
+
+// This header is included in storage modules that expect to find common
+// functions like `ensure()`, `error_shutdown()`, or `hal_delay()`.
+//
+// Do not include this header or add dependencies to it unless required by
+// storage.
+
+#include "error_handling.h"
+#include "systick.h"
+
+#endif  // LIB_COMMON_H

core/embed/lib/display_draw.c

@@ -19,23 +19,20 @@
 
 #define _GNU_SOURCE
 
-#include "display_draw.h"
+#include <trezor_rtl.h>
+
+#include <stdarg.h>
+
 #include "buffers.h"
-#include "common.h"
+#include "display.h"
+#include "display_draw.h"
+#include "fonts/fonts.h"
+#include "memzero.h"
 
 #ifdef USE_DMA2D
 #include "dma2d.h"
 #endif
 
-#include "fonts/fonts.h"
-
-#include <stdarg.h>
-#include <string.h>
-
-#include "memzero.h"
-
-#include "display.h"
-
 static struct {
   int x, y;
 } DISPLAY_OFFSET;

core/embed/lib/display_draw.h

@@ -20,13 +20,10 @@
 #ifndef __DISPLAY_DRAW_H__
 #define __DISPLAY_DRAW_H__
 
-#include <stdbool.h>
+#include <trezor_types.h>
-#include <stddef.h>
-#include <stdint.h>
 
 #include "buffers.h"
 #include "colors.h"
-#include TREZOR_BOARD
 #include "fonts/fonts.h"
 
 // provided by common

core/embed/lib/display_utils.c

@@ -17,8 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "common.h"
+#include <trezor_rtl.h>
+
 #include "display.h"
+#include "systick.h"
 
 void display_fade(int start, int end, int delay) {
 #ifdef USE_BACKLIGHT

core/embed/lib/error_handling.c

@@ -17,10 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stddef.h>
+#include <trezor_rtl.h>
-#include <stdint.h>
 
-#include "error_handling.h"
 #include "system.h"
 
 #ifndef TREZOR_EMULATOR

core/embed/lib/flash_utils.c

@@ -17,14 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include TREZOR_BOARD
+#include <trezor_model.h>
+#include <trezor_rtl.h>
 
-#include "flash_utils.h"
-#include "common.h"
 #include "flash_area.h"
-#include "model.h"
+#include "flash_utils.h"
 #include "mpu.h"
-#include "secbool.h"
 
 typedef struct {
   const flash_area_t* area;

core/embed/lib/flash_utils.h

@@ -20,7 +20,7 @@
 #ifndef LIB_FLASH_UTILS_H
 #define LIB_FLASH_UTILS_H
 
-#include "secbool.h"
+#include <trezor_types.h>
 
 #ifdef KERNEL_MODE
 

core/embed/lib/fonts/font_bitmap.h

@@ -1,3 +1,3 @@
-#include <stdint.h>
+#include <trezor_types.h>
 
 extern const uint8_t* const Font_Bitmap;

core/embed/lib/fonts/fonts.c

@@ -17,11 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <trezor_rtl.h>
+
 #include "fonts.h"
-#include <assert.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <string.h>
 #ifdef TRANSLATIONS
 #include "librust_fonts.h"
 #endif

core/embed/lib/fonts/fonts.h

@@ -23,7 +23,6 @@
 #include <stdbool.h>
 
 #include "fonts/font_bitmap.h"
-#include TREZOR_BOARD
 
 #ifdef USE_RGB_COLORS
 #define TREZOR_FONT_BPP 4

core/embed/lib/gfx_bitblt.h

@@ -20,8 +20,7 @@
 #ifndef GFX_BITBLT_H
 #define GFX_BITBLT_H
 
-#include <stdbool.h>
+#include <trezor_types.h>
-#include <stdint.h>
 
 #include "gfx_color.h"
 

core/embed/lib/gfx_color.h

@@ -20,7 +20,7 @@
 #ifndef GFX_COLOR_H
 #define GFX_COLOR_H
 
-#include <stdint.h>
+#include <trezor_types.h>
 
 #ifdef UI_COLOR_32BIT
 #define GFX_COLOR_32BIT

core/embed/lib/gfx_draw.c

@@ -17,8 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <display.h>
+#include <trezor_rtl.h>
 
+#include "display.h"
 #include "display_draw.h"
 #include "fonts/fonts.h"
 #include "gfx_draw.h"

core/embed/lib/image.c

@@ -17,14 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
+#include <trezor_model.h>
+#include <trezor_rtl.h>
 
 #include "ed25519-donna/ed25519.h"
 
-#include "common.h"
 #include "flash.h"
 #include "image.h"
-#include "model.h"
 
 _Static_assert(VENDOR_HEADER_MAX_SIZE + IMAGE_HEADER_SIZE <= IMAGE_CHUNK_SIZE,
                "The size of the firmware headers must be less than or equal to "

core/embed/lib/image.h

@@ -20,12 +20,12 @@
 #ifndef __TREZORHAL_IMAGE_H__
 #define __TREZORHAL_IMAGE_H__
 
-#include <stdint.h>
+#include <trezor_model.h>
+#include <trezor_types.h>
+
 #include "blake2s.h"
 #include "flash.h"
 #include "image_hash_conf.h"
-#include "model.h"
-#include "secbool.h"
 
 #define VENDOR_HEADER_MAX_SIZE (64 * 1024)
 #define IMAGE_HEADER_SIZE 0x400  // size of the bootloader or firmware header

core/embed/lib/image_hash_conf.h

@@ -1,8 +1,8 @@
 #ifndef LIB_IMAGE_HASH_H_
 #define LIB_IMAGE_HASH_H_
 
-#include "model.h"
+#include <trezor_model.h>
-#include TREZOR_BOARD
+#include <trezor_types.h>
 
 #ifdef IMAGE_HASH_SHA256
 #include "sha2.h"

core/embed/lib/mini_printf.c

@@ -43,8 +43,8 @@
  *
  */
 
-#include <string.h>
+#include <trezor_rtl.h>
-#include <stdarg.h>
+
 #include "mini_printf.h"
 
 static unsigned int

core/embed/lib/mini_printf.h

@@ -33,12 +33,14 @@
 #ifndef __MINI_PRINTF__
 #define __MINI_PRINTF__
 
+#include <trezor_types.h>
+
+#include <stdarg.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <stdarg.h>
-
 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)));
 

core/embed/lib/terminal.c

@@ -17,11 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include TREZOR_BOARD
+#include <trezor_model.h>
-
+#include <trezor_rtl.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <string.h>
 
 #include "display.h"
 #include "fonts/fonts.h"

core/embed/lib/translations.c

@@ -1,11 +1,9 @@
-#include "translations.h"
+#include <trezor_model.h>
-#include <assert.h>
+#include <trezor_rtl.h>
-#include <stdbool.h>
+
-#include <string.h>
-#include "common.h"
 #include "flash.h"
-#include "model.h"
 #include "mpu.h"
+#include "translations.h"
 
 #ifdef KERNEL_MODE
 

core/embed/lib/translations.h

@@ -20,8 +20,7 @@
 #ifndef LIB_TRANSLATIONS_H
 #define LIB_TRANSLATIONS_H
 
-#include <stdbool.h>
+#include <trezor_types.h>
-#include <stdint.h>
 
 bool translations_write(const uint8_t* data, uint32_t offset, uint32_t len);
 

core/embed/lib/trezor_rtl.h

@@ -17,15 +17,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __TREZORHAL_COMMON_H__
+#ifndef TREZOR_RTL_H
-#define __TREZORHAL_COMMON_H__
+#define TREZOR_RTL_H
 
-#include <stddef.h>
+// `trezor_rtl.h` consolidates common includes for implementation files
-#include <stdint.h>
+// (.c files) and provides essential types and functions.
-#include "secbool.h"
+//
+// Do not include `trezor_rtl.h` in interface headers to prevent global
+// namespace pollution; use `trezor_types.h` instead.
+
+#include <trezor_types.h>
+
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
 
 #include "error_handling.h"
-#include "systick.h"
 
 #ifndef MIN_8bits
 #define MIN_8bits(a, b)                  \
@@ -54,4 +61,4 @@
 
 #define ARRAY_LENGTH(x) (sizeof(x) / sizeof((x)[0]))
 
-#endif
+#endif  // TREZOR_RTL_H

core/embed/lib/trezor_types.h

@@ -0,0 +1,35 @@
+/*
+ * This file is part of the Trezor project, https://trezor.io/
+ *
+ * Copyright (c) SatoshiLabs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TREZOR_TYPES_H
+#define TREZOR_TYPES_H
+
+// `trezor_types.h` consolidates commonly needed includes for interface
+// header files and provides essential types required in most files.
+//
+// Avoid adding additional includes here unless absolutely necessary,
+// as it may pollute the global namespace across the project.
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#include "secbool.h"
+
+#endif  // TREZOR_TYPES_H

core/embed/models/trezor_bsp.h

@@ -0,0 +1,36 @@
+/*
+ * This file is part of the Trezor project, https://trezor.io/
+ *
+ * Copyright (c) SatoshiLabs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TREZOR_BSP_H
+#define TREZOR_BSP_H
+
+// Trezor 'board support package' (BSP) header file that includes
+// all necessary headers for the specific board including STM32 HAL and
+// pin definitions.
+//
+// This file should by only included by driver implementations and
+// should not be included by application code.
+
+#include TREZOR_BOARD
+
+#ifndef TREZOR_EMULATOR
+#include STM32_HAL_H
+#endif
+
+#endif  // TREZOR_BOARD_H

core/embed/prodtest/main.c

@@ -17,17 +17,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <trezor_bsp.h>
+#include <trezor_model.h>
+#include <trezor_rtl.h>
+
 #include <ctype.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/types.h>
 
-#include STM32_HAL_H
-
 #include "board_capabilities.h"
 #include "bootutils.h"
 #include "button.h"
-#include "common.h"
 #include "display.h"
 #include "display_draw.h"
 #include "display_utils.h"
@@ -35,15 +35,14 @@
 #include "flash_otp.h"
 #include "fwutils.h"
 #include "image.h"
-#include "model.h"
 #include "mpu.h"
 #include "prodtest_common.h"
 #include "random_delays.h"
 #include "rsod.h"
 #include "sbu.h"
 #include "sdcard.h"
-#include "secbool.h"
 #include "system.h"
+#include "systick.h"
 #include "systimer.h"
 #include "touch.h"
 #include "usb.h"

core/embed/prodtest/optiga_prodtest.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
+#include <trezor_rtl.h>
 
 #include "aes/aes.h"
 #include "buffer.h"
@@ -33,8 +33,6 @@
 #include "secret.h"
 #include "sha2.h"
 
-#include TREZOR_BOARD
-
 #ifdef USE_STORAGE_HWKEY
 #include "secure_aes.h"
 #endif

core/embed/prodtest/optiga_prodtest.h

@@ -20,9 +20,7 @@
 #ifndef PRODTEST_OPTIGA_PRODTEST_H
 #define PRODTEST_OPTIGA_PRODTEST_H
 
-#include <stdbool.h>
+#include <trezor_types.h>
-#include <stddef.h>
-#include <stdint.h>
 
 #define OID_CERT_INF (OPTIGA_OID_CERT + 0)
 #define OID_CERT_DEV (OPTIGA_OID_CERT + 1)

core/embed/prodtest/prodtest_common.h

@@ -20,8 +20,7 @@
 #ifndef PRODTEST_COMMON_H
 #define PRODTEST_COMMON_H
 
-#include <stdint.h>
+#include <trezor_types.h>
-#include <stdlib.h>
 
 enum { VCP_IFACE = 0x00 };
 

core/embed/reflash/main.c

@@ -17,24 +17,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdlib.h>
+#include <trezor_bsp.h>
-#include <string.h>
+#include <trezor_model.h>
-#include <sys/types.h>
+#include <trezor_rtl.h>
 
-#include STM32_HAL_H
+#include <sys/types.h>
+#include <trezor_rtl.h>
 
 #include "bootutils.h"
-#include "common.h"
 #include "display.h"
 #include "display_draw.h"
 #include "flash.h"
 #include "image.h"
-#include "model.h"
 #include "rng.h"
 #include "rsod.h"
 #include "sbu.h"
 #include "sdcard.h"
-#include "secbool.h"
 #include "system.h"
 #include "systimer.h"
 #include "terminal.h"

core/embed/rust/rust_ui.h

@@ -1,6 +1,2 @@
-#include <stdbool.h>
-
-#include "common.h"
-
 #include "rust_ui_bootloader.h"
 #include "rust_ui_common.h"

core/embed/rust/rust_ui_bootloader.h

@@ -1,4 +1,4 @@
-#include "common.h"
+#include <trezor_types.h>
 
 uint32_t screen_install_confirm(const char* vendor_str, uint8_t vendor_str_len,
                                 const char* version_str,

core/embed/rust/rust_ui_common.h

@@ -1,4 +1,4 @@
-#include "common.h"
+#include <trezor_types.h>
 
 void display_rsod_rust(const char* title, const char* message,
                        const char* footer);

core/embed/rust/trezorhal.h

@@ -1,8 +1,8 @@
-#include TREZOR_BOARD
+#include <trezor_bsp.h>
+#include <trezor_model.h>
 
 #include "buffers.h"
 #include "button.h"
-#include "common.h"
 #include "display.h"
 #include "display_draw.h"
 #include "dma2d.h"
@@ -12,10 +12,10 @@
 #include "fonts/fonts.h"
 #include "gfx_bitblt.h"
 #include "haptic.h"
-#include "model.h"
 #include "rgb_led.h"
 #include "secbool.h"
 #include "storage.h"
+#include "systick.h"
 #include "touch.h"
 #include "translations.h"
 #include "usb.h"

core/embed/trezorhal/applet.h

@@ -20,8 +20,7 @@
 #ifndef TREZORHAL_APPLET_H
 #define TREZORHAL_APPLET_H
 
-#include <stddef.h>
+#include <trezor_types.h>
-#include <stdint.h>
 
 #ifdef SYSCALL_DISPATCH
 

core/embed/trezorhal/bg_copy.h

@@ -2,9 +2,7 @@
 #ifndef TREZORHAL_BG_COPY_H
 #define TREZORHAL_BG_COPY_H
 
-#include <stdbool.h>
+#include <trezor_types.h>
-#include <stddef.h>
-#include <stdint.h>
 
 #ifdef KERNEL_MODE
 

core/embed/trezorhal/board_capabilities.h

@@ -33,7 +33,7 @@ Simple key-tag-length-value structure at fixed boardloader address.
 Last tag must be terminator or all space used.
 */
 
-#include <stdint.h>
+#include <trezor_types.h>
 
 #ifdef KERNEL_MODE
 

core/embed/trezorhal/bootargs.h

@@ -20,8 +20,7 @@
 #ifndef TREZORHAL_BOOTARGS_H
 #define TREZORHAL_BOOTARGS_H
 
-#include <stddef.h>
+#include <trezor_types.h>
-#include <stdint.h>
 
 // Defines boot command processed in bootloader on next reboot
 typedef enum {

core/embed/trezorhal/bootutils.h

@@ -20,8 +20,7 @@
 #ifndef TREZORHAL_BOOTUTILS_H
 #define TREZORHAL_BOOTUTILS_H
 
-#include <stddef.h>
+#include <trezor_types.h>
-#include <stdint.h>
 
 // Immediately resets the device and initiates the normal boot sequence.
 void __attribute__((noreturn)) reboot_device(void);

core/embed/trezorhal/button.h

@@ -20,7 +20,7 @@
 #ifndef TREZORHAL_BUTTON_H
 #define TREZORHAL_BUTTON_H
 
-#include <stdint.h>
+#include <trezor_types.h>
 
 #define BTN_EVT_DOWN (1U << 24)
 #define BTN_EVT_UP (1U << 25)

core/embed/trezorhal/display.h

@@ -24,10 +24,8 @@
 #include <xdisplay.h>
 #else
 
-#include <stdint.h>
+#include <trezor_bsp.h>
-#include "common.h"
+#include <trezor_types.h>
-
-#include TREZOR_BOARD
 
 #ifdef DISPLAY_LEGACY_HEADER
 #include DISPLAY_LEGACY_HEADER

core/embed/trezorhal/dma2d.h

@@ -20,7 +20,7 @@
 #ifndef TREZORHAL_DMA2D_H
 #define TREZORHAL_DMA2D_H
 
-#include "common.h"
+#include <trezor_types.h>
 
 void dma2d_init(void);
 

core/embed/trezorhal/entropy.h

@@ -20,7 +20,7 @@
 #ifndef TREZORHAL_ENTROPY_H
 #define TREZORHAL_ENTROPY_H
 
-#include <stdint.h>
+#include <trezor_types.h>
 
 #ifdef KERNEL_MODE
 

core/embed/trezorhal/flash.h

@@ -20,11 +20,9 @@
 #ifndef TREZORHAL_FLASH_H
 #define TREZORHAL_FLASH_H
 
-#include <stdint.h>
+#include <trezor_types.h>
-#include <stdlib.h>
 
 #include "flash_ll.h"
-#include "secbool.h"
 
 #ifdef USE_FLASH_BURST
 

core/embed/trezorhal/flash_otp.h

@@ -1,7 +1,7 @@
 #ifndef TREZORHAL_FLASH_OTP_H
 #define TREZORHAL_FLASH_OTP_H
 
-#include <common.h>
+#include <trezor_types.h>
 
 #ifdef KERNEL_MODE
 

core/embed/trezorhal/fwutils.h

@@ -20,9 +20,7 @@
 #ifndef TREZORHAL_FWUTILS_H
 #define TREZORHAL_FWUTILS_H
 
-#include <stdint.h>
+#include <trezor_types.h>
-
-#include "secbool.h"
 
 // Callback function for firmware hash calculation.
 typedef void (*firmware_hash_callback_t)(void* context, uint32_t progress,

core/embed/trezorhal/haptic.h

@@ -20,8 +20,7 @@
 #ifndef TREZORHAL_HAPTIC_H
 #define TREZORHAL_HAPTIC_H
 
-#include <stdbool.h>
+#include <trezor_types.h>
-#include <stdint.h>
 
 typedef enum {
   // Effect at the start of a button press

core/embed/trezorhal/hash_processor.h

@@ -1,7 +1,7 @@
 #ifndef TREZORHAL_HASH_PROCESSOR_H_
 #define TREZORHAL_HASH_PROCESSOR_H_
 
-#include <stdint.h>
+#include <trezor_types.h>
 
 #ifdef KERNEL_MODE
 

core/embed/trezorhal/i2c_bus.h

@@ -20,9 +20,7 @@
 #ifndef TREZORHAL_I2C_BUS_H
 #define TREZORHAL_I2C_BUS_H
 
-#include <stdbool.h>
+#include <trezor_types.h>
-#include <stddef.h>
-#include <stdint.h>
 
 #ifdef KERNEL_MODE
 

core/embed/trezorhal/monoctr.h

@@ -22,13 +22,12 @@
 
 #ifdef KERNEL_MODE
 
+#include <trezor_types.h>
+
 // Monoctr module provides monotonic counter functionality
 
 #define MONOCTR_MAX_VALUE 63
 
-#include <stdint.h>
-#include "secbool.h"
-
 typedef enum {
   MONOCTR_BOOTLOADER_VERSION = 0,
   MONOCTR_FIRMWARE_VERSION = 1,

core/embed/trezorhal/mpu.h

@@ -20,7 +20,7 @@
 #ifndef TREZORHAL_MPU_H
 #define TREZORHAL_MPU_H
 
-#include <stddef.h>
+#include <trezor_types.h>
 
 #ifdef KERNEL_MODE
 

core/embed/trezorhal/optiga.h

@@ -20,9 +20,8 @@
 #ifndef TREZORHAL_OPTIGA_H
 #define TREZORHAL_OPTIGA_H
 
-#include <stdbool.h>
+#include <trezor_types.h>
-#include <stddef.h>
+
-#include <stdint.h>
 #include "optiga_common.h"
 #include "storage.h"
 

core/embed/trezorhal/optiga/optiga.c

@@ -17,11 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "optiga.h"
+#include <trezor_rtl.h>
-#include <string.h>
+
 #include "hash_to_curve.h"
 #include "hmac.h"
 #include "memzero.h"
+#include "optiga.h"
 #include "optiga_commands.h"
 #include "optiga_transport.h"
 #include "rand.h"

core/embed/trezorhal/optiga/optiga_commands.c

@@ -23,13 +23,14 @@
  * https://github.com/Infineon/optiga-trust-m/blob/develop/documents/Infineon_I2C_Protocol_v2.03.pdf
  */
 
-#include "optiga_commands.h"
+#include <trezor_rtl.h>
-#include <string.h>
+
 #include "der.h"
 #include "ecdsa.h"
 #include "hmac.h"
 #include "memzero.h"
 #include "nist256p1.h"
+#include "optiga_commands.h"
 #include "optiga_transport.h"
 #include "sha2.h"
 

core/embed/trezorhal/optiga/optiga_transport.c

@@ -22,19 +22,19 @@
  * https://github.com/Infineon/optiga-trust-m/blob/develop/documents/Infineon_I2C_Protocol_v2.03.pdf
  */
 
-#include "optiga_transport.h"
+#include <trezor_bsp.h>
-#include <string.h>
+#include <trezor_rtl.h>
+
 #include "aes/aesccm.h"
-#include "common.h"
 #include "i2c_bus.h"
 #include "memzero.h"
 #include "optiga_hal.h"
+#include "optiga_transport.h"
+#include "systick.h"
 #include "tls_prf.h"
 
 #ifdef KERNEL_MODE
 
-#include TREZOR_BOARD
-
 // Maximum possible packet size that can be transmitted.
 #define OPTIGA_MAX_PACKET_SIZE (OPTIGA_DATA_REG_LEN - 5)
 

core/embed/trezorhal/optiga_commands.h

@@ -20,9 +20,8 @@
 #ifndef TREZORHAL_OPTIGA_COMMANDS_H
 #define TREZORHAL_OPTIGA_COMMANDS_H
 
-#include <stdbool.h>
+#include <trezor_types.h>
-#include <stddef.h>
+
-#include <stdint.h>
 #include "optiga_common.h"
 
 // Data object identifiers.

core/embed/trezorhal/optiga_common.h

@@ -20,7 +20,7 @@
 #ifndef TREZORHAL_OPTIGA_COMMON_H
 #define TREZORHAL_OPTIGA_COMMON_H
 
-#include "secbool.h"
+#include <trezor_types.h>
 
 typedef enum _optiga_result {
   OPTIGA_SUCCESS = 0,     // Operation completed successfully.

core/embed/trezorhal/optiga_hal.h

@@ -2,8 +2,7 @@
 #ifndef CORE_OPTIGA_HAL_H
 #define CORE_OPTIGA_HAL_H
 
-#include <stdint.h>
+#include <trezor_types.h>
-#include "secbool.h"
 
 void optiga_hal_init(void);
 

core/embed/trezorhal/optiga_transport.h

@@ -20,9 +20,8 @@
 #ifndef TREZORHAL_OPTIGA_TRANSPORT_H
 #define TREZORHAL_OPTIGA_TRANSPORT_H
 
-#include <stdbool.h>
+#include <trezor_types.h>
-#include <stddef.h>
+
-#include <stdint.h>
 #include "optiga_common.h"
 
 // Maximum data register length supported by OPTIGA.

core/embed/trezorhal/option_bytes.h

@@ -20,7 +20,7 @@
 #ifndef TREZORHAL_OPTION_BYTES_H
 #define TREZORHAL_OPTION_BYTES_H
 
-#include "secbool.h"
+#include <trezor_types.h>
 
 #ifdef KERNEL_MODE
 

core/embed/trezorhal/random_delays.h

@@ -20,7 +20,7 @@
 #ifndef TREZORHAL_RANDOM_DELAYS_H
 #define TREZORHAL_RANDOM_DELAYS_H
 
-#include <stdint.h>
+#include <trezor_types.h>
 
 /*
 Random delay interrupts (RDI) is a contermeasure against side channel attacks.

core/embed/trezorhal/reset_flags.h

@@ -20,7 +20,7 @@
 #ifndef TREZORHAL_RESET_FLAGS_H
 #define TREZORHAL_RESET_FLAGS_H
 
-#include "secbool.h"
+#include <trezor_types.h>
 
 #ifdef KERNEL_MODE
 

core/embed/trezorhal/rgb_led.h

@@ -20,7 +20,7 @@
 #ifndef TREZORHAL_RGB_LED_H
 #define TREZORHAL_RGB_LED_H
 
-#include <stdint.h>
+#include <trezor_types.h>
 
 #ifdef KERNEL_MODE
 

core/embed/trezorhal/rng.h

@@ -20,7 +20,7 @@
 #ifndef TREZORHAL_RNG_H
 #define TREZORHAL_RNG_H
 
-#include <stdint.h>
+#include <trezor_types.h>
 
 #ifdef KERNEL_MODE
 

core/embed/trezorhal/sbu.h

@@ -20,7 +20,7 @@
 #ifndef __TREZORHAL_SBU_H__
 #define __TREZORHAL_SBU_H__
 
-#include "secbool.h"
+#include <trezor_types.h>
 
 #if KERNEL_MODE
 

core/embed/trezorhal/sdcard.h

@@ -46,8 +46,7 @@
 #ifndef __TREZORHAL_SDCARD_H__
 #define __TREZORHAL_SDCARD_H__
 
-#include <stdbool.h>
+#include <trezor_types.h>
-#include "secbool.h"
 
 // this is a fixed size and should not be changed
 #define SDCARD_BLOCK_SIZE (512)