Ticket #3744: wacom_bamboo2.patch

src/add-ons/kernel/drivers/input/wacom/wacom.c

@@ -115 +115 @@
 
     // we need these four for a Wacom tablet
     size_t controlTransferLength;
-    int i;
+    int tryCount;
     char repData[2] = { 0x02, 0x02 };
     char retData[2] = { 0x00, 0x00 };
 
@@ -227 +227 @@
             // absolute mode, pressure data, etc.)
             controlTransferLength = 2;
 
-            for (i = 0; i < 5; i++) {
+            for (tryCount = 0; tryCount < 5; tryCount++) {
                 // HID Class-Specific Request, Host to device (=0x21):
                 // SET_REPORT (=0x09) type Feature (=3) with ID 2 (=2) of
                 // Interface #0 (=0) to repData (== { 0x02, 0x02 })
@@ -235 +235 @@
                     repData, &controlTransferLength);
 
                 if (st < B_OK) {
-                    dprintf(ID "add_device() - control transfer 2 failed: %ld\
-                        \n", st);
+                    dprintf(ID "add_device() - control transfer 2 failed: %ld"
+                        "\n", st);
                 }
 
                 // check if registers are set correctly
@@ -248 +248 @@
                     retData, &controlTransferLength);
 
                 if (st < B_OK) {
-                    dprintf(ID "add_device() - control transfer 3 failed: %ld\
-                        \n", st);
+                    dprintf(ID "add_device() - control transfer 3 failed: %ld"
+                        "\n", st);
                 }
 
-                dprintf(ID "retData: %u - %u\n", retData[0], retData[1]);
-                dprintf("====================================\n");
+                DPRINTF_INFO((ID "add_device() - retData: %u - %u\n",
+                    retData[0], retData[1]));
 
-                if (retData[0] == repData[0] && retData[1] == repData[1]) break;
-
+                if (retData[0] == repData[0] && retData[1] == repData[1]) {
+                    DPRINTF_INFO((ID "add_device() - successfully set "
+                        "'Wacom'-mode\n"));
+                    break;
+                }
             }
 
-            dprintf(ID "count: %u\n", i);
+            DPRINTF_INFO((ID "add_device() - number of tries: %u\n",
+                tryCount + 1));
 
-            if (i > 4) {
+            if (tryCount > 4) {
                 dprintf(ID "add_device() - set 'Wacom'-mode failed\n");
             }
         }

src/add-ons/input_server/devices/wacom/TabletDevice.h

@@ -75 +75 @@
         DEVICE_VOLITO,
         DEVICE_PENSTATION,
         DEVICE_CINTIQ,
+        DEVICE_BAMBOO,
     };
 
     enum {

src/add-ons/input_server/devices/wacom/TabletDevice.cpp

@@ -134 +134 @@
         case 0x16:  // Graphire 4 6x8 (tested)
             SetDevice(16704.0, 12064.0, DEVICE_GRAPHIRE);
             break;
+        case 0x17:  // BambooFun 4x5 (from Linux Wacom Project)
+            SetDevice(14760.0, 9225.0, DEVICE_BAMBOO);
+            break;
+        case 0x18:  // BambooFun 6x8 (from Linux Wacom Project)
+            SetDevice(21648.0, 13530.0, DEVICE_BAMBOO);
+            break;
         case 0x20:
             SetDevice(12700.0, 10600.0, DEVICE_INTUOS);
             break;
@@ -202 +208 @@
 //          SetDevice(3450.0, 2100.0, DEVICE_PENSTATION);
             SetDevice(3248.0, 2320.0, DEVICE_PENSTATION);
             break;
+        case 0x65:  // Bamboo (from Linux Wacom Project)
+            SetDevice(14760.0, 9225.0, DEVICE_BAMBOO);
+            break;
+        case 0x69:  // Bamboo1 (from Linux Wacom Project)
+            SetDevice(5104.0,  3712.0, DEVICE_BAMBOO);
+            break;
         case 0xB0:
             SetDevice(25400.0, 20320.0, DEVICE_INTUOS3);
             break;
@@ -264 +276 @@
             hasContact = true;
             break;
         }
-        case DEVICE_GRAPHIRE: {
+        case DEVICE_GRAPHIRE:
+        case DEVICE_BAMBOO:
+        {
             xPos = data[3] << 8 | data[2];
             yPos = data[5] << 8 | data[4];
 
@@ -658 +672 @@
         case 0x16:
             *name = "Wacom Graphire4 6x8\" USB";
             break;
+        case 0x17:
+            *name = "Wacom BambooFun 4x5\" USB";
+            break;
+        case 0x18:
+            *name = "Wacom BambooFun 6x8\" USB";
+            break;
         case 0x20:
             *name = "Wacom Intuos 4x5\" USB";
             break;
@@ -727 +747 @@
         case 0x64:
             *name = "Wacom PenPartner.1 USB";
             break;
+        case 0x65:
+            *name = "Wacom Bamboo USB";
+            break;
+        case 0x69:
+            *name = "Wacom Bamboo1 USB";
+            break;
 
         case 0xB0:
             *name = "Wacom Intuos3 4x5 USB";