Import Upstream version 1.2.6

libg15.c

@@ -17,7 +17,7 @@
 
     (c) 2006-2007 The G15tools Project - g15tools.sf.net
     
-    $Revision: 278 $ -  $Date: 2008-01-02 14:26:25 +1030 (Wed, 02 Jan 2008) $ $Author: mlampard $
+    $Revision: 282 $ -  $Date: 2008-01-20 06:32:00 +1030 (Sun, 20 Jan 2008) $ $Author: mlampard $
 */
 
 #include <pthread.h>
@@ -45,7 +45,8 @@ const libg15_devices_t g15_devices[] = {
     DEVICE("Logitech G15",0x46d,0xc222,G15_LCD|G15_KEYS),
     DEVICE("Logitech G11",0x46d,0xc225,G15_KEYS),
     DEVICE("Logitech Z-10",0x46d,0x0a07,G15_LCD|G15_KEYS|G15_DEVICE_IS_SHARED),
-    DEVICE("Logitech G15 v2",0x46d,0xc227,G15_LCD|G15_KEYS),
+    DEVICE("Logitech G15 v2",0x46d,0xc227,G15_LCD|G15_KEYS|G15_DEVICE_5BYTE_RETURN),
+    DEVICE("Logitech Gamepanel",0x46d,0xc251,G15_LCD|G15_KEYS|G15_DEVICE_IS_SHARED),
     DEVICE(NULL,0,0,0)
 };
 
@@ -777,6 +778,11 @@ int getPressedKeys(unsigned int *pressed_keys, unsigned int timeout)
       if(buffer[0] == 1)
         return G15_ERROR_TRY_AGAIN;    
     }
+
+    if(g15DeviceCapabilities() & G15_DEVICE_5BYTE_RETURN) {
+      processKeyEvent5Byte(pressed_keys, buffer);
+      return G15_NO_ERROR;  
+    }
     
     switch(ret) {
       case 5: