Merge lp:~lazyranma/ubuntu/wily/libg15/libg15 into lp:ubuntu/wily/libg15

[Alexander Ponyatykh]

Original re_initLibG15() doesn't properly reset internal state of the library, and therefore device cannot be reopened after replugging or suspend/resume. This patch adds code from exitLibG15() to re_initLibG15() allowing it to correctly reopen device. (LP: #1357556)

[Martin Pitt (pitti)]

Please forward the patches to upstream (http://sourceforge.net/projects/g15tools). Thanks!

[Alexander Ponyatykh (lazyranma)]

Upstream seems to be dead - last release was in 2007, and last commit was in 2011, but I've posted it anyway.
https://sourceforge.net/p/g15tools/patches/5/

[Łukasz Zemczak (sil2100)]

First of all, thank you for your contribution to this project! Indeed the upstream seems to be inactive, but at least now we know that your patch will not be forgotten and if the developers ever decide to resume work they'll have your changes for review.

The changes generally seem sane to me, although I could only check the code as I don't own a keyboard that would be compatible. All in all, I'll upload the package to wily shortly.

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-01 22:26:54 +0000
+++ debian/changelog	2015-05-21 10:18:23 +0000
@@ -1,3 +1,11 @@
+libg15 (1.2.7-2ubuntu1ppa1) wily; urgency=medium
+
+  * debian/patches/00-fix-reinit.patch: fixed re_initLibG15() to properly reset
+    internal state, allowing g15daemon to continue working after keyboard was
+    replugged and after suspend or hibernate. (LP: #1357556)
+
+ -- Alexander Ponyatykh <[e-mail]>  Sun, 17 May 2015 21:35:48 +0300
+
 libg15 (1.2.7-2ubuntu1) trusty; urgency=medium
 
   * Use dh-autoreconf instead of autotools-dev to also fix FTBFS on ppc64el by

=== modified file 'debian/control'
--- debian/control	2014-01-01 22:26:54 +0000
+++ debian/control	2015-05-21 10:18:23 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Giacomo Catenazzi <[e-mail]>
 Build-Depends: cdbs, debhelper (>= 5), dh-autoreconf, libusb-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.9.6
 Homepage: http://www.g15tools.com/
 
 Package: libg15-1

=== added directory 'debian/patches'
=== added file 'debian/patches/00-fix-reinit.patch'
--- debian/patches/00-fix-reinit.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/00-fix-reinit.patch	2015-05-21 10:18:23 +0000
@@ -0,0 +1,85 @@
+Description: fix re_initLibG15() to properly reset internal state.
+Author: Alexander Ponyatykh <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libusb/+bug/1357556
+Forwarded: no
+Last-Update: 2015-05-17
+===================================================================
+--- a/libg15.c
++++ b/libg15.c
+@@ -275,19 +275,36 @@
+     return keyboard_device;
+ }
+ 
++/* reset the keyboard, returning it to a known state */
++static int closeKeyboardDevice()
++{
++    int retval = G15_NO_ERROR;
++    
++    enospc_slowdown = shared_device = g15_keys_endpoint = g15_lcd_endpoint = 0;
++    found_devicetype = -1;
++    
++    if (keyboard_device){
++#ifndef SUN_LIBUSB
++        retval = usb_release_interface (keyboard_device, 0);
++        usleep(50*1000);
++#endif
++#if 0
++        retval = usb_reset(keyboard_device);
++        usleep(50*1000);
++#endif
++        usb_close(keyboard_device);
++        keyboard_device=0;
++        return retval;
++    }
++    return -1;
++}
+ 
+ int re_initLibG15()
+ {
++    closeKeyboardDevice();
+ 
+-    usb_init();
+-
+-  /**
+-     *  usb_find_busses and usb_find_devices both report the number of devices
+-     *  / busses added / removed since the last call. since this is the first
+-   *  call we have to return values != 0 or else we didnt find anything */
+-     
+-    if (!usb_find_devices())
+-        return G15_ERROR_OPENING_USB_DEVICE;
++    usb_find_busses();
++    usb_find_devices();
+   
+     keyboard_device = findAndOpenG15();
+     if (!keyboard_device)
+@@ -319,28 +336,12 @@
+     return retval;
+ }
+ 
+-/* reset the keyboard, returning it to a known state */
+ int exitLibG15()
+ {
+-    int retval = G15_NO_ERROR;
+-    if (keyboard_device){
+-#ifndef SUN_LIBUSB
+-        retval = usb_release_interface (keyboard_device, 0);
+-        usleep(50*1000);
+-#endif
+-#if 0
+-        retval = usb_reset(keyboard_device);
+-        usleep(50*1000);
+-#endif
+-        usb_close(keyboard_device);
+-        keyboard_device=0;
+-        pthread_mutex_destroy(&libusb_mutex);
+-        return retval;
+-    }
+-    return -1;
++    pthread_mutex_destroy(&libusb_mutex);
++    return closeKeyboardDevice();
+ }
+ 
+-
+ static void dumpPixmapIntoLCDFormat(unsigned char *lcd_buffer, unsigned char const *data)
+ {
+ /*

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2015-05-21 10:18:23 +0000
@@ -0,0 +1,1 @@
+00-fix-reinit.patch

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2015-05-21 10:18:23 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)