arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-23 06:48:16 +00:00
Code Issues Releases Wiki Activity

USB: Compile-time USB string checking

Browse Source 
Generate `enum` for USB string indexes, this is far more robust
This commit is contained in:
Saleem Rashid 2017-01-29 18:05:36 +00:00 committed by Pavol Rusnak
parent 228a109e5f
commit 0c039b3e14
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
firmware/usb.c
View File

@ -44,6 +44,24 @@
#define ENDPOINT_ADDRESS_U2F_IN (0x83) #define ENDPOINT_ADDRESS_U2F_IN (0x83)
#define ENDPOINT_ADDRESS_U2F_OUT (0x03) #define ENDPOINT_ADDRESS_U2F_OUT (0x03)
#define USB_STRINGS \
X(MANUFACTURER, "SatoshiLabs") \
X(PRODUCT, "TREZOR") \
X(SERIAL_NUMBER, storage_uuid_str)
#define X(name, value) USB_STRING_##name,
enum {
USB_STRING_LANGID_CODES, // LANGID code array
USB_STRINGS
};
#undef X
#define X(name, value) value,
static const char *usb_strings[] = {
USB_STRINGS
};
#undef X
static const struct usb_device_descriptor dev_descr = { static const struct usb_device_descriptor dev_descr = {
.bLength = USB_DT_DEVICE_SIZE, .bLength = USB_DT_DEVICE_SIZE,
.bDescriptorType = USB_DT_DEVICE, .bDescriptorType = USB_DT_DEVICE,
@ -55,9 +73,9 @@ static const struct usb_device_descriptor dev_descr = {
.idVendor = 0x534c, .idVendor = 0x534c,
.idProduct = 0x0001, .idProduct = 0x0001,
.bcdDevice = 0x0100, .bcdDevice = 0x0100,
.iManufacturer = 1, .iManufacturer = USB_STRING_MANUFACTURER,
.iProduct = 2, .iProduct = USB_STRING_PRODUCT,
.iSerialNumber = 3, .iSerialNumber = USB_STRING_SERIAL_NUMBER,
.bNumConfigurations = 1, .bNumConfigurations = 1,
}; };
@ -285,12 +303,6 @@ static const struct usb_config_descriptor config = {
.interface = ifaces, .interface = ifaces,
}; };
static const char *usb_strings[] = {
"SatoshiLabs",
"TREZOR",
(const char *)storage_uuid_str,
};
static int hid_control_request(usbd_device *dev, struct usb_setup_data *req, uint8_t **buf, uint16_t *len, usbd_control_complete_callback *complete) static int hid_control_request(usbd_device *dev, struct usb_setup_data *req, uint8_t **buf, uint16_t *len, usbd_control_complete_callback *complete)
{ {
(void)complete; (void)complete;
@ -388,7 +400,7 @@ static uint8_t usbd_control_buffer[128];
void usbInit(void) void usbInit(void)
{ {
usbd_dev = usbd_init(&otgfs_usb_driver, &dev_descr, &config, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer)); usbd_dev = usbd_init(&otgfs_usb_driver, &dev_descr, &config, usb_strings, sizeof(usb_strings) / sizeof(*usb_strings), usbd_control_buffer, sizeof(usbd_control_buffer));
usbd_register_set_config_callback(usbd_dev, hid_set_config); usbd_register_set_config_callback(usbd_dev, hid_set_config);
} }