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

fix bld

Browse Source
This commit is contained in:
tychovrahe 2023-04-04 12:39:42 +02:00
parent 75db03ce74
commit 7f26761304
3 changed files with 74 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/embed/bootloader/messages.c
View File

@ -24,6 +24,8 @@
#include <pb_encode.h> #include <pb_encode.h>
#include "messages.pb.h" #include "messages.pb.h"
#include TREZOR_BOARD
#ifdef USE_BLE #ifdef USE_BLE
#include "ble/comm.h" #include "ble/comm.h"
#endif #endif

126
core/embed/bootloader/protob/messages.pb.h
View File

@ -10,129 +10,129 @@
#endif #endif
/* Enum definitions */ /* Enum definitions */
typedef enum _MessageType { typedef enum _MessageType {
MessageType_MessageType_Initialize = 0, MessageType_MessageType_Initialize = 0,
MessageType_MessageType_Ping = 1, MessageType_MessageType_Ping = 1,
MessageType_MessageType_Success = 2, MessageType_MessageType_Success = 2,
MessageType_MessageType_Failure = 3, MessageType_MessageType_Failure = 3,
MessageType_MessageType_FirmwareErase = 6, MessageType_MessageType_FirmwareErase = 6,
MessageType_MessageType_FirmwareUpload = 7, MessageType_MessageType_FirmwareUpload = 7,
MessageType_MessageType_FirmwareRequest = 8, MessageType_MessageType_FirmwareRequest = 8,
MessageType_MessageType_Features = 17, MessageType_MessageType_Features = 17,
MessageType_MessageType_ButtonRequest = 26, MessageType_MessageType_ButtonRequest = 26,
MessageType_MessageType_ButtonAck = 27, MessageType_MessageType_ButtonAck = 27,
MessageType_MessageType_GetFeatures = 55, MessageType_MessageType_GetFeatures = 55,
MessageType_MessageType_PairingRequest = 8003, MessageType_MessageType_PairingRequest = 8003,
MessageType_MessageType_AuthKey = 8004, MessageType_MessageType_AuthKey = 8004,
MessageType_MessageType_RepairRequest = 8005 MessageType_MessageType_RepairRequest = 8005
} MessageType; } MessageType;
typedef enum _FailureType { typedef enum _FailureType {
FailureType_Failure_UnexpectedMessage = 1, FailureType_Failure_UnexpectedMessage = 1,
FailureType_Failure_DataError = 3, FailureType_Failure_DataError = 3,
FailureType_Failure_ActionCancelled = 4, FailureType_Failure_ActionCancelled = 4,
FailureType_Failure_ProcessError = 9 FailureType_Failure_ProcessError = 9
} FailureType; } FailureType;
typedef enum _ButtonRequestType { typedef enum _ButtonRequestType {
ButtonRequestType_ButtonRequest_Other = 1 ButtonRequestType_ButtonRequest_Other = 1
} ButtonRequestType; } ButtonRequestType;
/* Struct definitions */ /* Struct definitions */
typedef struct _AuthKey { typedef struct _AuthKey {
pb_callback_t key; pb_callback_t key;
} AuthKey; } AuthKey;
typedef struct _ButtonAck { typedef struct _ButtonAck {
char dummy_field; char dummy_field;
} ButtonAck; } ButtonAck;
typedef struct _GetFeatures { typedef struct _GetFeatures {
char dummy_field; char dummy_field;
} GetFeatures; } GetFeatures;
typedef struct _Initialize { typedef struct _Initialize {
char dummy_field; char dummy_field;
} Initialize; } Initialize;
typedef struct _PairingRequest { typedef struct _PairingRequest {
char dummy_field; char dummy_field;
} PairingRequest; } PairingRequest;
typedef struct _RepairRequest { typedef struct _RepairRequest {
char dummy_field; char dummy_field;
} RepairRequest; } RepairRequest;
typedef struct _ButtonRequest { typedef struct _ButtonRequest {
bool has_code; bool has_code;
ButtonRequestType code; ButtonRequestType code;
} ButtonRequest; } ButtonRequest;
typedef struct _Failure { typedef struct _Failure {
bool has_code; bool has_code;
FailureType code; FailureType code;
bool has_message; bool has_message;
char message[256]; char message[256];
} Failure; } Failure;
typedef PB_BYTES_ARRAY_T(20) Features_revision_t; typedef PB_BYTES_ARRAY_T(20) Features_revision_t;
typedef struct _Features { typedef struct _Features {
bool has_vendor; bool has_vendor;
char vendor[33]; char vendor[33];
uint32_t major_version; uint32_t major_version;
uint32_t minor_version; uint32_t minor_version;
uint32_t patch_version; uint32_t patch_version;
bool has_bootloader_mode; bool has_bootloader_mode;
bool bootloader_mode; bool bootloader_mode;
bool has_device_id; bool has_device_id;
char device_id[25]; char device_id[25];
bool has_language; bool has_language;
char language[17]; char language[17];
bool has_label; bool has_label;
char label[33]; char label[33];
bool has_initialized; bool has_initialized;
bool initialized; bool initialized;
bool has_revision; bool has_revision;
Features_revision_t revision; Features_revision_t revision;
bool has_firmware_present; bool has_firmware_present;
bool firmware_present; bool firmware_present;
bool has_model; bool has_model;
char model[17]; char model[17];
bool has_fw_major; bool has_fw_major;
uint32_t fw_major; uint32_t fw_major;
bool has_fw_minor; bool has_fw_minor;
uint32_t fw_minor; uint32_t fw_minor;
bool has_fw_patch; bool has_fw_patch;
uint32_t fw_patch; uint32_t fw_patch;
bool has_fw_vendor; bool has_fw_vendor;
char fw_vendor[256]; char fw_vendor[256];
} Features; } Features;
typedef struct _FirmwareErase { typedef struct _FirmwareErase {
bool has_length; bool has_length;
uint32_t length; uint32_t length;
} FirmwareErase; } FirmwareErase;
typedef struct _FirmwareRequest { typedef struct _FirmwareRequest {
uint32_t offset; uint32_t offset;
uint32_t length; uint32_t length;
} FirmwareRequest; } FirmwareRequest;
typedef PB_BYTES_ARRAY_T(32) FirmwareUpload_hash_t; typedef PB_BYTES_ARRAY_T(32) FirmwareUpload_hash_t;
typedef struct _FirmwareUpload { typedef struct _FirmwareUpload {
pb_callback_t payload; pb_callback_t payload;
bool has_hash; bool has_hash;
FirmwareUpload_hash_t hash; FirmwareUpload_hash_t hash;
} FirmwareUpload; } FirmwareUpload;
typedef struct _Ping { typedef struct _Ping {
bool has_message; bool has_message;
char message[256]; char message[256];
} Ping; } Ping;
typedef struct _Success { typedef struct _Success {
bool has_message; bool has_message;
char message[256]; char message[256];
} Success; } Success;

15
core/embed/rust/src/ui/model_tt/bootloader/mod.rs
View File

@ -40,7 +40,7 @@ use confirm::Confirm;
use intro::Intro; use intro::Intro;
use menu::Menu; use menu::Menu;
use crate::ui::model_tt::bootloader::theme::TEXT_NORMAL; use crate::ui::model_tt::bootloader::theme::TEXT_NORMAL;
use crate::ui::model_tt::component::PinKeyboard; use crate::ui::model_tt::component::{PinKeyboard, PinKeyboardMsg};
use crate::ui::model_tt::theme::button_cancel; use crate::ui::model_tt::theme::button_cancel;
use self::theme::{RESULT_FW_INSTALL, RESULT_INITIAL, RESULT_WIPE}; use self::theme::{RESULT_FW_INSTALL, RESULT_INITIAL, RESULT_WIPE};
@ -434,9 +434,12 @@ extern "C" fn screen_pairing_confirm(buffer: *const cty::uint8_t) -> u32 {
let mut pin = PinKeyboard::new("Enter passkey", "", None, true); let mut pin = PinKeyboard::new("Enter passkey", "", None, true);
let res = run(&mut pin, true); let res = run(&mut pin, true);
let pin = pin.pin().as_bytes(); if res == 2 {
let pin = pin.pin().as_bytes();
pin_slice.copy_from_slice(&pin[0..6]); if pin.len() == 6 {
pin_slice.copy_from_slice(&pin[0..6]);
}
}
res res
} }
@ -449,8 +452,8 @@ extern "C" fn screen_repair_confirm() -> u32 {
Alignment::Center, Alignment::Center,
TEXT_NORMAL, TEXT_NORMAL,
); );
let right = Button::with_text("DENY").styled(button_confirm()); let right = Button::with_text("ALLOW").styled(button_confirm());
let left = Button::with_text("ALLOW").styled(button_cancel()); let left = Button::with_text("DENY").styled(button_bld());
let title = Label::new("REPAIR", Alignment::Start, theme::TEXT_BOLD) let title = Label::new("REPAIR", Alignment::Start, theme::TEXT_BOLD)
.vertically_aligned(Alignment::Center); .vertically_aligned(Alignment::Center);