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

Merge pull request #27 from jhoenicke/master

Browse Source 
New usbDelay that delays and handles USB requests
This commit is contained in:
Pavol Rusnak 2015-05-25 10:57:40 +02:00
commit b4728e6cf9
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/protect.c
View File

@ -57,7 +57,7 @@ bool protectButton(ButtonRequestType type, bool confirm_only)
// button acked - check buttons // button acked - check buttons
if (acked) { if (acked) {
delay(100000); usbDelay(3500);
buttonUpdate(); buttonUpdate();
if (button.YesUp) { if (button.YesUp) {
result = true; result = true;
@ -165,7 +165,7 @@ bool protectPin(bool use_cached)
} }
layoutDialog(DIALOG_ICON_INFO, NULL, NULL, NULL, "Wrong PIN entered", NULL, "Please wait", secstr, "to continue ...", NULL); layoutDialog(DIALOG_ICON_INFO, NULL, NULL, NULL, "Wrong PIN entered", NULL, "Please wait", secstr, "to continue ...", NULL);
// wait one second // wait one second
delay(24000000); usbDelay(840000);
} }
} }
const char *pin; const char *pin;

7
firmware/usb.c
View File

@ -332,3 +332,10 @@ void usbTiny(char set)
{ {
tiny = set; tiny = set;
} }
void usbDelay(int cycles)
{
while (cycles--) {
usbd_poll(usbd_dev);
}
}

1
firmware/usb.h
View File

@ -24,5 +24,6 @@ void usbInit(void);
void usbPoll(void); void usbPoll(void);
void usbReconnect(void); void usbReconnect(void);
void usbTiny(char set); void usbTiny(char set);
void usbDelay(int cycles);
#endif #endif