arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-26 09:28:13 +00:00
Code Issues Releases Wiki Activity

trezorhal: use UNCONST macro in usb stack

Browse Source
This commit is contained in:
Pavol Rusnak 2017-03-28 00:42:24 +02:00
parent a78221fd22
commit 9fcd21922f
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
micropython/trezorhal/usb.c
View File

@ -5,6 +5,8 @@
#include "usb.h"
#include "usbd_core.h"
#define UNCONST(X) ((uint8_t *)(X))
#define USB_MAX_CONFIG_DESC_SIZE 128
#define USB_MAX_STR_DESC_SIZE 256
@ -94,27 +96,27 @@ static uint8_t *usb_get_langid_str_descriptor(USBD_SpeedTypeDef speed, uint16_t
}
static uint8_t *usb_get_manufacturer_str_descriptor(USBD_SpeedTypeDef speed, uint16_t *length) {
USBD_GetString((uint8_t *)usb_str_table.manufacturer_str, usb_str_buf, length);
USBD_GetString(UNCONST(usb_str_table.manufacturer_str), usb_str_buf, length);
return usb_str_buf;
}
static uint8_t *usb_get_product_str_descriptor(USBD_SpeedTypeDef speed, uint16_t *length) {
USBD_GetString((uint8_t *)usb_str_table.product_str, usb_str_buf, length);
USBD_GetString(UNCONST(usb_str_table.product_str), usb_str_buf, length);
return usb_str_buf;
}
static uint8_t *usb_get_serial_str_descriptor(USBD_SpeedTypeDef speed, uint16_t *length) {
USBD_GetString((uint8_t *)usb_str_table.serial_str, usb_str_buf, length);
USBD_GetString(UNCONST(usb_str_table.serial_str), usb_str_buf, length);
return usb_str_buf;
}
static uint8_t *usb_get_config_str_descriptor(USBD_SpeedTypeDef speed, uint16_t *length) {
USBD_GetString((uint8_t *)usb_str_table.config_str, usb_str_buf, length);
USBD_GetString(UNCONST(usb_str_table.config_str), usb_str_buf, length);
return usb_str_buf;
}
static uint8_t *usb_get_interface_str_descriptor(USBD_SpeedTypeDef speed, uint16_t *length) {
USBD_GetString((uint8_t *)usb_str_table.interface_str, usb_str_buf, length);
USBD_GetString(UNCONST(usb_str_table.interface_str), usb_str_buf, length);
return usb_str_buf;
}

2
micropython/trezorhal/usb_hid-impl.h
View File

@ -124,7 +124,7 @@ int usb_hid_write(uint8_t iface_num, const uint8_t *buf, uint32_t len) {
usb_hid_state_t *state = &usb_ifaces[iface_num].hid;
state->in_idle = 0;
USBD_LL_Transmit(&usb_dev_handle, state->ep_in, (uint8_t *)buf, (uint16_t)len);
USBD_LL_Transmit(&usb_dev_handle, state->ep_in, UNCONST(buf), (uint16_t)len);
return len;
}