arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-07-05 14:22:33 +00:00
Code Issues Releases Wiki Activity

chore: fix problems from CI

Browse Source
This commit is contained in:
obrusvit 2024-01-10 14:50:28 +01:00
parent f35ffa0c18
commit a0ef80baeb
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/embed/extmod/modtrezorio/modtrezorio-sdcard_switcher.h
View File

@ -27,7 +27,7 @@
/// def insert( /// def insert(
/// card_sn: int, /// card_sn: int,
/// capacity_bytes: int | None = 122_945_536, /// capacity_bytes: int | None = 122_945_536,
/// manuf_id: int | None = 27, /// manuf_id: int | None = 39,
/// ) -> None: /// ) -> None:
/// """ /// """
/// Inserts SD card to the emulator. /// Inserts SD card to the emulator.
@ -40,7 +40,7 @@ STATIC mp_obj_t mod_trezorio_sdcard_switcher_insert(size_t n_args,
{MP_QSTR_capacity_bytes, {MP_QSTR_capacity_bytes,
MP_ARG_OBJ, MP_ARG_OBJ,
{.u_rom_obj = MP_ROM_INT(122945536)}}, {.u_rom_obj = MP_ROM_INT(122945536)}},
{MP_QSTR_manuf_id, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_INT(27)}}, {MP_QSTR_manuf_id, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_INT(39)}},
}; };
mp_arg_val_t vals[MP_ARRAY_SIZE(allowed_args)] = {0}; mp_arg_val_t vals[MP_ARRAY_SIZE(allowed_args)] = {0};
@ -60,7 +60,7 @@ STATIC mp_obj_t mod_trezorio_sdcard_switcher_insert(size_t n_args,
mp_int_t manuf_id; mp_int_t manuf_id;
if (vals[2].u_obj == mp_const_none) { if (vals[2].u_obj == mp_const_none) {
/* manuf_id = mp_obj_get_int(vals[2].u_rom_obj); */ /* manuf_id = mp_obj_get_int(vals[2].u_rom_obj); */
manuf_id = 27; manuf_id = 39;
} else { } else {
manuf_id = mp_obj_get_int(vals[2].u_obj); manuf_id = mp_obj_get_int(vals[2].u_obj);
} }

7
core/embed/extmod/modtrezorio/modtrezorio.c
View File

@ -54,8 +54,10 @@ bool usb_connected_previously = true;
#ifdef USE_SD_CARD #ifdef USE_SD_CARD
#include "modtrezorio-fatfs.h" #include "modtrezorio-fatfs.h"
#include "modtrezorio-sdcard.h" #include "modtrezorio-sdcard.h"
#ifdef TREZOR_EMULATOR
#include "modtrezorio-sdcard_switcher.h" #include "modtrezorio-sdcard_switcher.h"
#endif #endif
#endif
/// package: trezorio.__init__ /// package: trezorio.__init__
/// from . import fatfs, sdcard, sdcard_switcher /// from . import fatfs, sdcard, sdcard_switcher
@ -88,7 +90,10 @@ STATIC const mp_rom_map_elem_t mp_module_trezorio_globals_table[] = {
#ifdef USE_SD_CARD #ifdef USE_SD_CARD
{MP_ROM_QSTR(MP_QSTR_fatfs), MP_ROM_PTR(&mod_trezorio_fatfs_module)}, {MP_ROM_QSTR(MP_QSTR_fatfs), MP_ROM_PTR(&mod_trezorio_fatfs_module)},
{MP_ROM_QSTR(MP_QSTR_sdcard), MP_ROM_PTR(&mod_trezorio_sdcard_module)}, {MP_ROM_QSTR(MP_QSTR_sdcard), MP_ROM_PTR(&mod_trezorio_sdcard_module)},
{MP_ROM_QSTR(MP_QSTR_sdcard_switcher), MP_ROM_PTR(&mod_trezorio_sdcard_switcher_module)}, #ifdef TREZOR_EMULATOR
{MP_ROM_QSTR(MP_QSTR_sdcard_switcher),
MP_ROM_PTR(&mod_trezorio_sdcard_switcher_module)},
#endif
#endif #endif
#ifdef USE_TOUCH #ifdef USE_TOUCH

2
legacy/firmware/protob/Makefile
View File

@ -3,7 +3,7 @@ Q := @
endif endif
SKIPPED_MESSAGES := Binance Cardano DebugMonero Eos Monero Ontology Ripple SdProtect Tezos WebAuthn \ SKIPPED_MESSAGES := Binance Cardano DebugMonero Eos Monero Ontology Ripple SdProtect Tezos WebAuthn \
DebugLinkRecordScreen DebugLinkEraseSdCard DebugLinkWatchLayout \ DebugLinkRecordScreen DebugLinkEraseSdCard DebugLinkInsertSdCard DebugLinkWatchLayout \
DebugLinkLayout DebugLinkResetDebugEvents GetNonce \ DebugLinkLayout DebugLinkResetDebugEvents GetNonce \
TxAckInput TxAckOutput TxAckPrev TxAckPaymentRequest \ TxAckInput TxAckOutput TxAckPrev TxAckPaymentRequest \
EthereumSignTypedData EthereumTypedDataStructRequest EthereumTypedDataStructAck \ EthereumSignTypedData EthereumTypedDataStructRequest EthereumTypedDataStructAck \