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

[no changelog]
trezor · Nov 5, 2024 · 7b6f444 · 7b6f444
1 parent 6d41c56
commit 7b6f444
Show file tree

Hide file tree

Showing 240 changed files with 603 additions and 693 deletions.
diff --git a/core/embed/boardloader/main.c b/core/embed/boardloader/main.c
@@ -17,27 +17,26 @@
  * 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"
 #include "rng.h"
 #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"

diff --git a/core/embed/bootloader/bootui.c b/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_BOARD
+#include <trezor_rtl.h>
 
 #include "bootui.h"
 #include "colors.h"

diff --git a/core/embed/bootloader/bootui.h b/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,

diff --git a/core/embed/bootloader/emulator.c b/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"
 

diff --git a/core/embed/bootloader/emulator.h b/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>
-#include <stdio.h>
+#undef FIRMWARE_START
 
 extern uint8_t *FIRMWARE_START;
 

diff --git a/core/embed/bootloader/main.c b/core/embed/bootloader/main.c
@@ -17,12 +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 <sys/types.h>
 
 #include "bootargs.h"
 #include "bootutils.h"
-#include "common.h"
 #include "display.h"
 #include "display_utils.h"
 #include "flash.h"
@@ -35,9 +36,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 +67,6 @@
 #include "hash_processor.h"
 #endif
 
-#include "model.h"
 #include "usb.h"
 #include "version.h"
 

diff --git a/core/embed/bootloader/messages.c b/core/embed/bootloader/messages.c
@@ -17,19 +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 <pb.h>
 #include <pb_decode.h>
 #include <pb_encode.h>
 #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"

diff --git a/core/embed/bootloader/messages.h b/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

diff --git a/core/embed/bootloader/version_check.c b/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);

diff --git a/core/embed/bootloader/version_check.h b/core/embed/bootloader/version_check.h
@@ -19,8 +19,7 @@
 
 #pragma once
 
-#include <stdint.h>
-#include "secbool.h"
+#include <trezor_types.h>
 
 // Protection against bootloader downgrade
 

diff --git a/core/embed/bootloader_ci/bootui.c b/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"

diff --git a/core/embed/bootloader_ci/bootui.h b/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);
 

diff --git a/core/embed/bootloader_ci/main.c b/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 <sys/types.h>
+#include <trezor_model.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

diff --git a/core/embed/bootloader_ci/messages.c b/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"
 

diff --git a/core/embed/bootloader_ci/messages.h b/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

diff --git a/core/embed/extmod/modtrezorconfig/modtrezorconfig.c b/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"

diff --git a/core/embed/extmod/modtrezorconfig/norcow_config.h b/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

diff --git a/core/embed/extmod/modtrezorcrypto/crc.h b/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);
 

diff --git a/core/embed/extmod/modtrezorcrypto/modtrezorcrypto.c b/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 <stdio.h>
-#include <string.h>
-
-#include "common.h"
+#include <trezor_rtl.h>
 
 #include "py/runtime.h"
 
-#include TREZOR_BOARD
-
 #if MICROPY_PY_TREZORCRYPTO
 
 static mp_obj_t ui_wait_callback = mp_const_none;

diff --git a/core/embed/extmod/modtrezorio/ff.c b/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 */
 

diff --git a/core/embed/extmod/modtrezorio/modtrezorio-poll.h b/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

diff --git a/core/embed/extmod/modtrezorio/modtrezorio.c b/core/embed/extmod/modtrezorio/modtrezorio.c
@@ -17,17 +17,16 @@
  * 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"
 #include "py/runtime.h"
 
 #if MICROPY_PY_TREZORIO
 
-#include <unistd.h>
-
-#include TREZOR_BOARD
 #include "button.h"
 #include "touch.h"
 #include "usb.h"