Alexander Ponyatykh
7d071c32b7
Upstream libg15 propagates any error code from libusb to the caller, and legacy libusb-0.1 uses standard codes from errno.h with minus sign resulting in negative integers. Previous version of reinit-on-any-error patch uses this fact and calls re_initLibG15() on any negative return value of getPressedKeys(). The new libusb-1.0 uses its own error codes, not compatible with the old ones. While rewriting libg15 to use the new library, I decided to translate LIBUSB_ERROR_* codes to G15_ERROR_*, which are positive integers. This change requires us to modify reinit-on-any-error patch to call re_initLibG15() on any error code, not just a negative one.
24 lines
1.1 KiB
Diff
24 lines
1.1 KiB
Diff
Description: Reinitialize on any libusb error.
|
|
This allows g15daemon to correctly recover after suspend/resume.
|
|
Author: Alexander Ponyatykh <lazyranma@gmail.com>
|
|
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libusb/+bug/1357556
|
|
Forwarded: no
|
|
Last-Update: 2015-05-18
|
|
===================================================================
|
|
--- a/g15daemon/main.c
|
|
+++ b/g15daemon/main.c
|
|
@@ -203,11 +203,10 @@
|
|
g15daemon_send_event(masterlist->current->lcd,
|
|
G15_EVENT_KEYPRESS, keypresses);
|
|
lastkeys = keypresses;
|
|
-
|
|
- }else if(retval == -ENODEV && LIBG15_VERSION>=1200) {
|
|
+ }else if(retval != G15_NO_ERROR && retval != G15_ERROR_TIMEOUT && LIBG15_VERSION>=1200) {
|
|
+ g15daemon_log(LOG_WARNING,"Keyboard error (%d).. Reinitializing\n", retval);
|
|
pthread_mutex_lock(&g15lib_mutex);
|
|
while((retval=re_initLibG15() != G15_NO_ERROR) && !leaving){
|
|
- g15daemon_log(LOG_WARNING,"Keyboard has gone.. Retrying\n");
|
|
sleep(1);
|
|
}
|
|
if(!leaving) {
|