g15tools-commits Mailing List for g15tools (Page 5)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 220
          http://svn.sourceforge.net/g15tools/?rev=220&view=rev
Author:   mlampard
Date:     2006-12-27 00:38:19 -0800 (Wed, 27 Dec 2006)

Log Message:
-----------
add g15 device struct to simplify adding newly available devices.  add capabilities function to allow apps to retrieve data on available features of connected device.

Modified Paths:
--------------
    trunk/libg15/debian/changelog
    trunk/libg15/libg15.c
    trunk/libg15/libg15.h

Modified: trunk/libg15/debian/changelog
===================================================================

--- trunk/libg15/debian/changelog	2006-12-19 20:55:27 UTC (rev 219)
+++ trunk/libg15/debian/changelog	2006-12-27 08:38:19 UTC (rev 220)
@@ -1,3 +1,20 @@
+libg15 (1.2.0) edgy; urgency=low
+  * Add debugging function to enable/disable extra output
+  * All debugging output is now prefixed with libg15 to aid localising
+    problems.
+  * debugging function now also controls libusb debugging output.
+  * Try to claim usb interface up to 10 times before failing
+  * Slow down initialisation, to allow keyboard to come out of usb
+    auto-suspend on newer kernels.
+  * Attempt to combat ENOSPC by slowing down writes to the lcd if ENOSPC is
+    received.  Unless that error occurs at least once, transfers are sent as normal.
+  * Add function to change keyboard backlight (independant of lcd backlight).
+  * Add re-initialising function, which will attempt to reconnect a keyboard
+    that was previously removed and replugged.
+  * libg15 now uses pthread mutexes to force sequential access to the bus via
+    libusb.  Control message URBs are no longer being lost if sent by a different
+    thread in the middle of a screen transfer etc.
+
 libg15 (1.1.1-1) edgy; urgency=low
 
   * Add basic support for the G11 keyboard

Modified: trunk/libg15/libg15.c
===================================================================
--- trunk/libg15/libg15.c	2006-12-19 20:55:27 UTC (rev 219)
+++ trunk/libg15/libg15.c	2006-12-27 08:38:19 UTC (rev 220)
@@ -28,11 +28,27 @@
 static int libg15_debugging_enabled = 0;
 static int enospc_slowdown = 0;
 
+static int found_devicetype = -1;
+
 static pthread_mutex_t libusb_mutex;
 
+/* to add a new device, simply create a new DEVICE() in this list */
+/* Fields are: "Name",VendorID,ProductID,Capabilities */
+const libg15_devices_t g15_devices[] = {
+  DEVICE("Logitech G15",0x46d,0xc222,G15_LCD|G15_KEYS),
+  DEVICE("Logitech G11",0x46d,0xc225,G15_KEYS),
+  DEVICE(NULL,0,0,0)
+};
 
+int g15DeviceCapabilities() {
+    if(found_devicetype>-1)
+      return g15_devices[found_devicetype].caps;
+    else
+      return -1;
+}
+
 /* enable or disable debugging */
-void libg15Debug(int option ) {
+void libg15Debug(int option) {
 
   libg15_debugging_enabled = option;
   usb_set_debug(option);
@@ -69,8 +85,7 @@
   return G15_NO_ERROR;
 }
 
-
-static usb_dev_handle * findAndOpenG15()
+static usb_dev_handle * findAndOpenDevice(libg15_devices_t handled_device)
 {
   struct usb_bus *bus = 0;
   struct usb_device *dev = 0;
@@ -79,15 +94,13 @@
   {
     for (dev = bus->devices; dev; dev = dev->next)
     {
-
-      if ((dev->descriptor.idVendor == 0x046d && dev->descriptor.idProduct == 0x0c222)  //G15 
-        ||(dev->descriptor.idVendor == 0x046d && dev->descriptor.idProduct == 0x0c225)) //G11 keyboard
+      if ((dev->descriptor.idVendor == handled_device.vendorid && dev->descriptor.idProduct == handled_device.productid)) 
       {
         int ret=0;
         char name_buffer[65535];
         name_buffer[0] = 0;
         usb_dev_handle *devh = 0;
-        g15_log(stderr,"Found %s, trying to open it\n",dev->descriptor.idProduct == 0x0c222?"G15":"G11");
+        g15_log(stderr,"Found %s, trying to open it\n",handled_device.name);
 
         devh = usb_open(dev);
         if (!devh)
@@ -125,7 +138,6 @@
           }
 
         }
-
 #endif  
         usleep(50*1000);
 
@@ -156,10 +168,25 @@
       }
     }  
   }
-  g15_log(stderr, "Error, keyboard not found, is it plugged in?\n");
   return 0;
 }
 
+
+static usb_dev_handle * findAndOpenG15() {
+  int i;
+  for (i=0; g15_devices[i].name !=NULL  ;i++){
+    g15_log(stderr,"Trying to find %s\n",g15_devices[i].name);
+    if(keyboard_device = findAndOpenDevice(g15_devices[i])){
+        found_devicetype = i;
+        break;
+    }
+    else
+      g15_log(stderr,"%s not found\n",g15_devices[i].name);
+  }
+  return keyboard_device;
+}
+
+
 int re_initLibG15()
 {
 
@@ -281,6 +308,9 @@
   unsigned char lcd_buffer[G15_BUFFER_LEN];
   memset(lcd_buffer,0,G15_BUFFER_LEN);
   dumpPixmapIntoLCDFormat(lcd_buffer, data);
+
+  if(!(g15_devices[found_devicetype].caps & G15_LCD))
+    return 0;
   
   /* the keyboard needs this magic byte */
   lcd_buffer[0] = 0x03;

Modified: trunk/libg15/libg15.h
===================================================================
--- trunk/libg15/libg15.h	2006-12-19 20:55:27 UTC (rev 219)
+++ trunk/libg15/libg15.h	2006-12-27 08:38:19 UTC (rev 220)
@@ -24,6 +24,25 @@
 {
 #endif
 
+#define G15_LCD 1
+#define G15_KEYS 2
+
+typedef struct libg15_devices_t libg15_devices_t;
+
+struct libg15_devices_t {
+  const char *name;	// name - can be anything, only used for informational purposes
+  unsigned int vendorid;
+  unsigned int productid;
+  unsigned int caps; // capability bitfield - G15_LCD|G15_KEYS;
+};
+
+#define DEVICE(name, vendorid, productid, caps) { \
+    name, \
+    vendorid, \
+    productid, \
+    caps \
+}
+
   /* allow for api changes */
 #define LIBG15_VERSION 1200
 	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (23)	Dec (26)
2007	Jan (2)	Feb (7)	Mar (5)	Apr	May	Jun	Jul (2)	Aug (7)	Sep (8)	Oct (5)	Nov (11)	Dec (2)
2008	Jan (8)	Feb (2)	Mar	Apr	May	Jun	Jul (3)	Aug	Sep	Oct	Nov (4)	Dec
2009	Jan (1)	Feb (2)	Mar (1)	Apr (16)	May	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec
2010	Jan	Feb (3)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2011	Jan (2)	Feb (1)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

g15tools-commits Mailing List for g15tools (Page 5)

g15tools-commits — Commit messages for g15tools-svn