Update packaging:
* Remove watch file. * Сonformant to policy 4.4.1.1. * Remove obsolete variable from debian/rules. * Add Vcs fileds to debian/control
This commit is contained in:
1 parent
63fce22fd8
commit
854430b9b8
5 files changed
+27
-28
No files matched your search
Vendored
+17
-17
@@ -6,18 +6,25 @@ Last-Update: 2015-05-17
|
||||
===================================================================
|
||||
--- a/libg15.c
|
||||
+++ b/libg15.c
|
||||
@@ -275,19 +275,36 @@
|
||||
@@ -283,19 +283,36 @@
|
||||
return keyboard_device;
|
||||
}
|
||||
|
||||
-
|
||||
-int re_initLibG15()
|
||||
+/* reset the keyboard, returning it to a known state */
|
||||
+static int closeKeyboardDevice()
|
||||
+{
|
||||
{
|
||||
+ int retval = G15_NO_ERROR;
|
||||
+
|
||||
|
||||
- usb_init();
|
||||
+ enospc_slowdown = shared_device = g15_keys_endpoint = g15_lcd_endpoint = 0;
|
||||
+ found_devicetype = -1;
|
||||
+
|
||||
|
||||
- /**
|
||||
- * 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 (keyboard_device){
|
||||
+#ifndef SUN_LIBUSB
|
||||
+ retval = usb_release_interface (keyboard_device, 0);
|
||||
@@ -34,25 +41,18 @@ Last-Update: 2015-05-17
|
||||
+ 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;
|
||||
+int re_initLibG15()
|
||||
+{
|
||||
+ closeKeyboardDevice();
|
||||
+
|
||||
+ usb_find_busses();
|
||||
+ usb_find_devices();
|
||||
|
||||
|
||||
keyboard_device = findAndOpenG15();
|
||||
if (!keyboard_device)
|
||||
@@ -319,28 +336,12 @@
|
||||
@@ -327,28 +344,12 @@
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user