Salastil/ckb-next
1
0
Fork 0
mirror of https://github.com/ckb-next/ckb-next.git synced 2026-10-10 12:27:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'improved-cond-error'

Browse Source
This commit is contained in:
Tasos Sahanidis
2018-10-25 02:58:01 +03:00
parent 84ffa8153d 72626f3c16
commit fe933d1740
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/daemon/usb_linux.c
+4 -1
View File
@@ -147,7 +147,10 @@ int os_usbrecv(usbdevice* kb, uchar* in_msg, const char* file, int line){
if(condret != 0){
if(pthread_mutex_unlock(intmutex(kb)))
ckb_fatal("Error unlocking interrupt mutex in os_usbrecv()\n");
ckb_warn_fn("Interrupt cond error %i\n", file, line, condret);
if(condret == ETIMEDOUT)
ckb_warn_fn("ckb%d: Timeout while waiting for response\n", file, line, INDEX_OF(kb, keyboard));
else
ckb_warn_fn("Interrupt cond error %i\n", file, line, condret);
return -1;
}
memcpy(in_msg, kb->interruptbuf, MSG_SIZE);
src/daemon/usb_mac.c
+4 -1
View File
@@ -159,7 +159,10 @@ int os_usbrecv(usbdevice* kb, uchar* in_msg, const char* file, int line){
if(condret != 0){
if(pthread_mutex_unlock(intmutex(kb)))
ckb_fatal("Error unlocking interrupt mutex in os_usbrecv()\n");
ckb_warn_fn("Interrupt cond error %i\n", file, line, condret);
if(condret == ETIMEDOUT)
ckb_warn_fn("ckb%d: Timeout while waiting for response\n", file, line, INDEX_OF(kb, keyboard));
else
ckb_warn_fn("Interrupt cond error %i\n", file, line, condret);
return -1;
}
memcpy(in_msg, kb->interruptbuf, MSG_SIZE);