arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-22 22:38:08 +00:00
Code Issues Releases Wiki Activity

bootloader: make code smaller by changing the send_msg logic

Browse Source
This commit is contained in:
Pavol Rusnak 2019-01-31 22:18:08 +01:00
parent 11311da48a
commit 0ab3eee37d
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 41 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
bootloader/usb.c
View File

@ -139,24 +139,27 @@ static uint8_t meta_backup[FLASH_META_LEN];
static void send_msg_success(usbd_device *dev) static void send_msg_success(usbd_device *dev)
{ {
uint8_t response[64];
memzero(response, sizeof(response));
// response: Success message (id 2), payload len 0 // response: Success message (id 2), payload len 0
while ( usbd_ep_write_packet(dev, ENDPOINT_ADDRESS_IN, memcpy(response,
// header // header
"?##" "?##"
// msg_id // msg_id
"\x00\x02" "\x00\x02"
// msg_size // msg_size
"\x00\x00\x00\x00" "\x00\x00\x00\x00",
// padding 9);
"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" while (usbd_ep_write_packet(dev, ENDPOINT_ADDRESS_IN, response, 64) != 64) {}
, 64) != 64) {}
} }
static void send_msg_failure(usbd_device *dev) static void send_msg_failure(usbd_device *dev)
{ {
uint8_t response[64];
memzero(response, sizeof(response));
// response: Failure message (id 3), payload len 2 // response: Failure message (id 3), payload len 2
// - code = 99 (Failure_FirmwareError) // - code = 99 (Failure_FirmwareError)
while ( usbd_ep_write_packet(dev, ENDPOINT_ADDRESS_IN, memcpy(response,
// header // header
"?##" "?##"
// msg_id // msg_id
@ -164,15 +167,16 @@ static void send_msg_failure(usbd_device *dev)
// msg_size // msg_size
"\x00\x00\x00\x02" "\x00\x00\x00\x02"
// data // data
"\x08" "\x63" "\x08" "\x63",
// padding 11);
"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" while (usbd_ep_write_packet(dev, ENDPOINT_ADDRESS_IN, response, 64) != 64) {}
, 64) != 64) {}
} }
static void send_msg_features(usbd_device *dev) static void send_msg_features(usbd_device *dev)
{ {
// response: Features message (id 17), payload len 30 uint8_t response[64];
memzero(response, sizeof(response));
// response: Features message (id 17), payload len 25
// - vendor = "trezor.io" // - vendor = "trezor.io"
// - major_version = VERSION_MAJOR // - major_version = VERSION_MAJOR
// - minor_version = VERSION_MINOR // - minor_version = VERSION_MINOR
@ -180,8 +184,7 @@ static void send_msg_features(usbd_device *dev)
// - bootloader_mode = True // - bootloader_mode = True
// - firmware_present = True/False // - firmware_present = True/False
// - model = "1" // - model = "1"
if (brand_new_firmware) { memcpy(response,
while ( usbd_ep_write_packet(dev, ENDPOINT_ADDRESS_IN,
// header // header
"?##" "?##"
// msg_id // msg_id
@ -195,37 +198,19 @@ static void send_msg_features(usbd_device *dev)
"\x20" VERSION_PATCH_CHAR "\x20" VERSION_PATCH_CHAR
"\x28" "\x01" "\x28" "\x01"
"\x90\x01" "\x00" "\x90\x01" "\x00"
"\xaa" "\x01" "1" "\xaa" "\x01" "1",
// padding 34);
"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" response[30] = brand_new_firmware ? 0x01 : 0x00;
, 64) != 64) {} while (usbd_ep_write_packet(dev, ENDPOINT_ADDRESS_IN, response, 64) != 64) {}
} else {
while ( usbd_ep_write_packet(dev, ENDPOINT_ADDRESS_IN,
// header
"?##"
// msg_id
"\x00\x11"
// msg_size
"\x00\x00\x00\x16"
// data
"\x0a" "\x09" "trezor.io"
"\x10" VERSION_MAJOR_CHAR
"\x18" VERSION_MINOR_CHAR
"\x20" VERSION_PATCH_CHAR
"\x28" "\x01"
"\x90\x01" "\x01"
"\xaa" "\x01" "1"
// padding
"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
, 64) != 64) {}
}
} }
static void send_msg_buttonrequest_firmwarecheck(usbd_device *dev) static void send_msg_buttonrequest_firmwarecheck(usbd_device *dev)
{ {
uint8_t response[64];
memzero(response, sizeof(response));
// response: ButtonRequest message (id 26), payload len 2 // response: ButtonRequest message (id 26), payload len 2
// - code = ButtonRequest_FirmwareCheck (9) // - code = ButtonRequest_FirmwareCheck (9)
while ( usbd_ep_write_packet(dev, ENDPOINT_ADDRESS_IN, memcpy(response,
// header // header
"?##" "?##"
// msg_id // msg_id
@ -233,10 +218,10 @@ static void send_msg_buttonrequest_firmwarecheck(usbd_device *dev)
// msg_size // msg_size
"\x00\x00\x00\x02" "\x00\x00\x00\x02"
// data // data
"\x08" "\x09" "\x08" "\x09",
// padding 11
"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" );
, 64) != 64) {} while (usbd_ep_write_packet(dev, ENDPOINT_ADDRESS_IN, response, 64) != 64) {}
} }
static void backup_metadata(uint8_t *backup) static void backup_metadata(uint8_t *backup)
@ -551,8 +536,7 @@ void usbInit(void)
usbd_dev = usbd_init(&otgfs_usb_driver, &dev_descr, &config, usb_strings, sizeof(usb_strings)/sizeof(const char *), usbd_control_buffer, sizeof(usbd_control_buffer)); usbd_dev = usbd_init(&otgfs_usb_driver, &dev_descr, &config, usb_strings, sizeof(usb_strings)/sizeof(const char *), usbd_control_buffer, sizeof(usbd_control_buffer));
usbd_register_set_config_callback(usbd_dev, set_config); usbd_register_set_config_callback(usbd_dev, set_config);
usb21_setup(usbd_dev, &bos_descriptor); usb21_setup(usbd_dev, &bos_descriptor);
static const char* origin_url = "trezor.io/start"; webusb_setup(usbd_dev, "trezor.io/start");
webusb_setup(usbd_dev, origin_url);
winusb_setup(usbd_dev, USB_INTERFACE_INDEX_MAIN); winusb_setup(usbd_dev, USB_INTERFACE_INDEX_MAIN);
} }