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

trezorhal: add usb_hid_read_select

Browse Source
This commit is contained in:
Jan Pochyla 2017-03-30 22:06:59 +02:00 committed by Pavol Rusnak
parent 1f837c4572
commit a54293b808
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
micropython/extmod/modtrezormsg/modtrezormsg-stmhal.h
View File

@ -5,8 +5,7 @@
* see LICENSE file for details * see LICENSE file for details
*/ */
extern int usb_hid_read_blocking(uint8_t iface_num, uint8_t *buf, uint32_t len, uint32_t timeout); #include "usb.h"
extern int usb_hid_write_blocking(uint8_t iface_num, const uint8_t *buf, uint32_t len, uint32_t timeout);
void msg_init(void) void msg_init(void)
{ {
@ -14,15 +13,15 @@ void msg_init(void)
ssize_t msg_recv(uint8_t *iface, uint8_t *buf, size_t len) ssize_t msg_recv(uint8_t *iface, uint8_t *buf, size_t len)
{ {
*iface = 0; // TODO: return proper interface int i = usb_hid_read_select(1); // 1ms timeout
return usb_hid_read_blocking(0x00, buf, len, 1); if (i < 0) {
return 0;
}
*iface = i;
return usb_hid_read(i, buf, len);
} }
ssize_t msg_send(uint8_t iface, const uint8_t *buf, size_t len) ssize_t msg_send(uint8_t iface, const uint8_t *buf, size_t len)
{ {
(void)iface; // TODO: ignore interface for now return usb_hid_write_blocking(iface, buf, len, 1); // 1ms timeout
if (len > 0) {
usb_hid_write_blocking(0x00, buf, len, 1);
}
return len;
} }

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

@ -164,8 +164,24 @@ int usb_hid_write(uint8_t iface_num, const uint8_t *buf, uint32_t len) {
return len; return len;
} }
int usb_hid_read_select(uint32_t timeout) {
const uint32_t start = HAL_GetTick();
for (;;) {
for (int i = 0; i < USBD_MAX_NUM_INTERFACES; i++) {
if (usb_hid_can_read(i)) {
return i;
}
}
if (HAL_GetTick() - start >= timeout) {
break;
}
__WFI(); // Enter sleep mode, waiting for interrupt
}
return -1; // Timeout
}
int usb_hid_read_blocking(uint8_t iface_num, uint8_t *buf, uint32_t len, uint32_t timeout) { int usb_hid_read_blocking(uint8_t iface_num, uint8_t *buf, uint32_t len, uint32_t timeout) {
uint32_t start = HAL_GetTick(); const uint32_t start = HAL_GetTick();
while (!usb_hid_can_read(iface_num)) { while (!usb_hid_can_read(iface_num)) {
if (HAL_GetTick() - start >= timeout) { if (HAL_GetTick() - start >= timeout) {
return 0; // Timeout return 0; // Timeout
@ -176,7 +192,7 @@ int usb_hid_read_blocking(uint8_t iface_num, uint8_t *buf, uint32_t len, uint32_
} }
int usb_hid_write_blocking(uint8_t iface_num, const uint8_t *buf, uint32_t len, uint32_t timeout) { int usb_hid_write_blocking(uint8_t iface_num, const uint8_t *buf, uint32_t len, uint32_t timeout) {
uint32_t start = HAL_GetTick(); const uint32_t start = HAL_GetTick();
while (!usb_hid_can_write(iface_num)) { while (!usb_hid_can_write(iface_num)) {
if (HAL_GetTick() - start >= timeout) { if (HAL_GetTick() - start >= timeout) {
return 0; // Timeout return 0; // Timeout