From 3e3162e3af5bed8e8885b07b4f305a2793d46b04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= <superstippi@gmx.de>
Date: Mon, 17 May 2010 15:39:42 +0000
Subject: [PATCH] Patch by idefix: Add support for four different Bamboo
 devices. Closes ticket #3744, thanks a bunch!

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36843 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../devices/wacom/TabletDevice.cpp            | 28 ++++++++++++++++++-
 .../input_server/devices/wacom/TabletDevice.h |  1 +
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/add-ons/input_server/devices/wacom/TabletDevice.cpp b/src/add-ons/input_server/devices/wacom/TabletDevice.cpp
index 5635522e78..7d6a57060c 100644
--- a/src/add-ons/input_server/devices/wacom/TabletDevice.cpp
+++ b/src/add-ons/input_server/devices/wacom/TabletDevice.cpp
@@ -134,6 +134,12 @@ TabletDevice::DetectDevice(const DeviceReader* reader)
 		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,6 +208,12 @@ TabletDevice::DetectDevice(const DeviceReader* reader)
 //			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;
@@ -261,7 +273,9 @@ TabletDevice::ReadData(const uchar* data, bool& hasContact, uint32& mode,
 			hasContact = true;
 			break;
 		}
-		case DEVICE_GRAPHIRE: {
+		case DEVICE_GRAPHIRE:
+		case DEVICE_BAMBOO:
+		{
 			xPos = data[3] << 8 | data[2];
 			yPos = data[5] << 8 | data[4];
 
@@ -661,6 +675,12 @@ TabletDevice::_GetName(uint16 productID, const char** name) const
 		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;
@@ -730,6 +750,12 @@ TabletDevice::_GetName(uint16 productID, const char** name) const
 		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";
diff --git a/src/add-ons/input_server/devices/wacom/TabletDevice.h b/src/add-ons/input_server/devices/wacom/TabletDevice.h
index 8f4a1c1fca..0e4b33e8ce 100644
--- a/src/add-ons/input_server/devices/wacom/TabletDevice.h
+++ b/src/add-ons/input_server/devices/wacom/TabletDevice.h
@@ -75,6 +75,7 @@ class TabletDevice : public PointingDevice {
 		DEVICE_VOLITO,
 		DEVICE_PENSTATION,
 		DEVICE_CINTIQ,
+		DEVICE_BAMBOO,
 	};
 
 	enum {