arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-02-18 10:32:02 +00:00
Code Issues Releases Wiki Activity

bootloader: restart into firmware after update, don't shutdown

Browse Source
This commit is contained in:
Pavol Rusnak 2017-10-17 18:29:03 +02:00
parent c689b1f2cd
commit e10d40f846
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
embed/bootloader/main.c
View File

@ -42,16 +42,28 @@ void display_footer(const char *text, uint16_t color)
display_text_center(120, 220, text, -1, FONT_BOLD, color, COLOR_BLACK); display_text_center(120, 220, text, -1, FONT_BOLD, color, COLOR_BLACK);
} }
void display_done(void) void display_done(int restart)
{ {
if (restart == 0 || restart == 3) {
display_loader(1000, 0, COLOR_BL_GREEN, COLOR_BLACK, icon_tick, sizeof(icon_tick), COLOR_WHITE); display_loader(1000, 0, COLOR_BL_GREEN, COLOR_BLACK, icon_tick, sizeof(icon_tick), COLOR_WHITE);
display_footer("Done", COLOR_BL_GREEN); }
if (restart == 3) {
display_footer("Done! Restarting in 3s", COLOR_BL_GREEN);
} else
if (restart == 2) {
display_footer("Done! Restarting in 2s", COLOR_BL_GREEN);
} else
if (restart == 1) {
display_footer("Done! Restarting in 1s", COLOR_BL_GREEN);
} else {
display_footer("Done! Unplug the device", COLOR_BL_GREEN);
}
} }
void display_error(void) void display_error(void)
{ {
display_loader(1000, 0, COLOR_BL_RED, COLOR_BLACK, icon_cross, sizeof(icon_cross), COLOR_WHITE); display_loader(1000, 0, COLOR_BL_RED, COLOR_BLACK, icon_cross, sizeof(icon_cross), COLOR_WHITE);
display_footer("Error", COLOR_BL_RED); display_footer("Error! Unplug the device", COLOR_BL_RED);
} }
void display_vendor(const uint8_t *vimg, const char *vstr, uint32_t vstr_len, uint32_t fw_version) void display_vendor(const uint8_t *vimg, const char *vstr, uint32_t vstr_len, uint32_t fw_version)
@ -141,7 +153,7 @@ int usb_init_all(void) {
return 0; return 0;
} }
void bootloader_loop(void) bool bootloader_loop(void)
{ {
ensure(0 == flash_init(), NULL); ensure(0 == flash_init(), NULL);
ensure(0 == usb_init_all(), NULL); ensure(0 == usb_init_all(), NULL);
@ -180,8 +192,10 @@ void bootloader_loop(void)
r = process_msg_WipeDevice(USB_IFACE_NUM, msg_size, buf); r = process_msg_WipeDevice(USB_IFACE_NUM, msg_size, buf);
if (r < 0) { // error if (r < 0) { // error
display_error(); display_error();
return false; // shutdown
} else { // success } else { // success
display_done(); display_done(0);
return false; // shutdown
} }
break; break;
case 6: // FirmwareErase case 6: // FirmwareErase
@ -196,9 +210,14 @@ void bootloader_loop(void)
r = process_msg_FirmwareUpload(USB_IFACE_NUM, msg_size, buf); r = process_msg_FirmwareUpload(USB_IFACE_NUM, msg_size, buf);
if (r < 0) { // error if (r < 0) { // error
display_error(); display_error();
return false; // shutdown
} else } else
if (r == 0) { // last chunk received if (r == 0) { // last chunk received
display_done(); display_done(3); hal_delay(1000);
display_done(2); hal_delay(1000);
display_done(1); hal_delay(1000);
display_fade(BACKLIGHT_NORMAL, 0, 500);
return true; // jump to firmware
} }
break; break;
default: default:
@ -250,9 +269,10 @@ int main(void)
// start the bootloader if user touched the screen or no firmware installed // start the bootloader if user touched the screen or no firmware installed
if (touched || !vendor_parse_header((const uint8_t *)FIRMWARE_START, NULL)) { if (touched || !vendor_parse_header((const uint8_t *)FIRMWARE_START, NULL)) {
bootloader_loop(); if (!bootloader_loop()) {
shutdown(); shutdown();
} }
}
vendor_header vhdr; vendor_header vhdr;

4
embed/bootloader/messages.c
View File

@ -58,7 +58,7 @@ static bool _usb_write(pb_ostream_t *stream, const pb_byte_t *buf, size_t count)
memcpy(state->buf + state->packet_pos, buf + written, USB_PACKET_SIZE - state->packet_pos); memcpy(state->buf + state->packet_pos, buf + written, USB_PACKET_SIZE - state->packet_pos);
written += USB_PACKET_SIZE - state->packet_pos; written += USB_PACKET_SIZE - state->packet_pos;
// send packet // send packet
usb_hid_write_blocking(state->iface_num, state->buf, USB_PACKET_SIZE, 1); usb_hid_write_blocking(state->iface_num, state->buf, USB_PACKET_SIZE, 100);
// prepare new packet // prepare new packet
state->packet_index++; state->packet_index++;
memset(state->buf, 0, USB_PACKET_SIZE); memset(state->buf, 0, USB_PACKET_SIZE);
@ -78,7 +78,7 @@ static void _usb_write_flush(usb_write_state *state)
memset(state->buf + state->packet_pos, 0, USB_PACKET_SIZE - state->packet_pos); memset(state->buf + state->packet_pos, 0, USB_PACKET_SIZE - state->packet_pos);
} }
// send packet // send packet
usb_hid_write_blocking(state->iface_num, state->buf, USB_PACKET_SIZE, 1); usb_hid_write_blocking(state->iface_num, state->buf, USB_PACKET_SIZE, 100);
} }
static bool _send_msg(uint8_t iface_num, uint16_t msg_id, const pb_field_t fields[], const void *msg) static bool _send_msg(uint8_t iface_num, uint16_t msg_id, const pb_field_t fields[], const void *msg)