arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-06-19 06:28:45 +00:00
Code Issues Releases Wiki Activity

fix(core): unify bootloader_ci with bootloader

Browse Source
This commit is contained in:
Pavol Rusnak 2021-03-04 15:59:25 +01:00
parent b074404dcf
commit f3ae3615c7
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/embed/bootloader_ci/messages.c
View File

@ -153,13 +153,13 @@ static secbool _send_msg(uint8_t iface_num, uint16_t msg_id,
} }
#define MSG_SEND_INIT(TYPE) TYPE msg_send = TYPE##_init_default #define MSG_SEND_INIT(TYPE) TYPE msg_send = TYPE##_init_default
#define MSG_SEND_ASSIGN_REQUIRED_VALUE(FIELD, VALUE) \
{ msg_send.FIELD = VALUE; }
#define MSG_SEND_ASSIGN_VALUE(FIELD, VALUE) \ #define MSG_SEND_ASSIGN_VALUE(FIELD, VALUE) \
{ \ { \
msg_send.has_##FIELD = true; \ msg_send.has_##FIELD = true; \
msg_send.FIELD = VALUE; \ msg_send.FIELD = VALUE; \
} }
#define MSG_SEND_ASSIGN_REQUIRED_VALUE(FIELD, VALUE) \
{ msg_send.FIELD = VALUE; }
#define MSG_SEND_ASSIGN_STRING(FIELD, VALUE) \ #define MSG_SEND_ASSIGN_STRING(FIELD, VALUE) \
{ \ { \
msg_send.has_##FIELD = true; \ msg_send.has_##FIELD = true; \
@ -466,7 +466,7 @@ int process_msg_FirmwareUpload(uint8_t iface_num, uint32_t msg_size,
uint8_t *buf) { uint8_t *buf) {
MSG_RECV_INIT(FirmwareUpload); MSG_RECV_INIT(FirmwareUpload);
MSG_RECV_CALLBACK(payload, _read_payload, read_offset); MSG_RECV_CALLBACK(payload, _read_payload, read_offset);
secbool r = MSG_RECV(FirmwareUpload); const secbool r = MSG_RECV(FirmwareUpload);
if (sectrue != r || chunk_size != (chunk_requested + read_offset)) { if (sectrue != r || chunk_size != (chunk_requested + read_offset)) {
MSG_SEND_INIT(Failure); MSG_SEND_INIT(Failure);