arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-24 07:18:09 +00:00
Code Issues Releases Wiki Activity

modtrezormsg: fix last commit

Browse Source
This commit is contained in:
Pavol Rusnak 2016-11-14 15:32:00 +01:00
parent 69add20cc8
commit 5253bdef1d
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extmod/modtrezormsg/modtrezormsg.c
View File

@ -116,7 +116,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_TrezorMsg_Msg_send_obj, mod_TrezorMsg_Msg_s
/// ''' /// '''
STATIC mp_obj_t mod_TrezorMsg_Msg_select(mp_obj_t self, mp_obj_t timeout_us) { STATIC mp_obj_t mod_TrezorMsg_Msg_select(mp_obj_t self, mp_obj_t timeout_us) {
mp_obj_Msg_t *o = MP_OBJ_TO_PTR(self); mp_obj_Msg_t *o = MP_OBJ_TO_PTR(self);
uint8_t ping_array[64] = { [0 ... 63] = 255 };
int timeout = mp_obj_get_int(timeout_us); int timeout = mp_obj_get_int(timeout_us);
if (timeout < 0) { if (timeout < 0) {
timeout = 0; timeout = 0;
@ -137,8 +136,8 @@ STATIC mp_obj_t mod_TrezorMsg_Msg_select(mp_obj_t self, mp_obj_t timeout_us) {
uint8_t recvbuf[64]; uint8_t recvbuf[64];
ssize_t l = msg_recv(&iface, recvbuf, 64); ssize_t l = msg_recv(&iface, recvbuf, 64);
if (l > 0 && iface < o->interface_count) { if (l > 0 && iface < o->interface_count) {
if (memcmp(ping_array, recvbuf, 64) == 0) { if (l == 8 && memcmp("PINGPING", recvbuf, 8) == 0) {
msg_send(iface, ping_array, 64); msg_send(iface, (const uint8_t *)"PONGPONG", 8);
return mp_const_none; return mp_const_none;
} else { } else {
uint16_t iface_usage_page = o->usage_pages[iface]; uint16_t iface_usage_page = o->usage_pages[iface];