Re: [Linuxwacom-devel] [PATCH] Revert "Adjust N-Trig pattern."

[Rafi R. <ra...@ug...>]

I rebased to 0.10.8, the change is pretty much the same.

---

Add ntrig vendor and device codes.

---
 src/wcmUSB.c        |    5 ++++-
 src/xf86WacomDefs.h |    1 +
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/wcmUSB.c b/src/wcmUSB.c
index 169ad26..1d4c243 100644
--- a/src/wcmUSB.c
+++ b/src/wcmUSB.c
@@ -471,7 +471,10 @@ static struct
 	{ WALTOP_VENDOR_ID, 0x500, 2540, 2540, &usbBamboo    },
 	{ WALTOP_VENDOR_ID, 0x501, 2540, 2540, &usbBamboo    },
 	{ WALTOP_VENDOR_ID, 0x502, 5080, 5080, &usbIntuos4   },
-	{ WALTOP_VENDOR_ID, 0x503, 5080, 5080, &usbIntuos4   }
+	{ WALTOP_VENDOR_ID, 0x503, 5080, 5080, &usbIntuos4   },
+
+	/* N-Trig devices */
+	{ NTRIG_VENDOR_ID,  0x01, 1122, 934, &usbTabletPC    }
 };

 static Bool usbWcmInit(LocalDevicePtr local, char* id, float *version)
diff --git a/src/xf86WacomDefs.h b/src/xf86WacomDefs.h
index 7b5a34c..a527547 100644
--- a/src/xf86WacomDefs.h
+++ b/src/xf86WacomDefs.h
@@ -30,6 +30,7 @@
 /* vendor IDs on the kernel device */
 #define WACOM_VENDOR_ID 0x056a
 #define WALTOP_VENDOR_ID 0x172F
+#define NTRIG_VENDOR_ID 0x1b96

 #define DEFAULT_SUPPRESS 2      /* default suppress */
 #define MAX_SUPPRESS 100        /* max value of suppress */
-- 
1.7.1