Skip to contentSkip to conversation

add support for PANJIT TouchSet USB Touchscreen Device

PATCH Daniel Ritz 3 participants 6 messages Mar 8, 2006 – Mar 10, 2006 USB

lore
Share & tools
lore
#0 lore raw
Quoted 1 line

And what about merging with the existing driver?

something like this? it's compile tested only. not even tested on an egalax screen since i don't have it around...
if this is ok, we could also merge itmtouch and mtouchusb into a single driver.

rgds
-daniel

---

drivers/usb/input/Kconfig +15 -4
index 5246b35..e1caeb5 100644
@@ -224,12 +224,13 @@ config USB_ITMTOUCH
 	  To compile this driver as a module, choose M here: the
 	  module will be called itmtouch.
 
-config USB_EGALAX
-	tristate "eGalax TouchKit USB Touchscreen Driver"
+config USB_TOUCHKIT
+	tristate "TouchKit USB Touchscreen Driver"
 	depends on USB && INPUT
 	---help---
-	  Say Y here if you want to use a eGalax TouchKit USB
-	  Touchscreen controller.
+	  USB Touchscreen driver for:
+	  - eGalax Touchkit USB
+	  - PanJit TouchSet USB
 
 	  The driver has been tested on a Xenarc 700TSV monitor
 	  with eGalax touchscreen.
@@ -240,6 +241,16 @@ config USB_EGALAX
 	  To compile this driver as a module, choose M here: the
 	  module will be called touchkitusb.
 
+config USB_TOUCHKIT_EGALAX
+	default y
+	bool "eGalax device support" if EMBEDDED
+	depends on USB_TOUCHKIT
+
+config USB_TOUCHKIT_PANJIT
+	default y
+	bool "PanJit device support" if EMBEDDED
+	depends on USB_TOUCHKIT
+
 config USB_YEALINK
 	tristate "Yealink usb-p1k voip phone"
 	depends on USB && INPUT && EXPERIMENTAL
drivers/usb/input/Makefile +1 -1
index d512d9f..c630ac9 100644
@@ -36,7 +36,7 @@ obj-$(CONFIG_USB_KEYSPAN_REMOTE)	+= keys
 obj-$(CONFIG_USB_MOUSE)		+= usbmouse.o
 obj-$(CONFIG_USB_MTOUCH)	+= mtouchusb.o
 obj-$(CONFIG_USB_ITMTOUCH)	+= itmtouch.o
-obj-$(CONFIG_USB_EGALAX)	+= touchkitusb.o
+obj-$(CONFIG_USB_TOUCHKIT)	+= touchkitusb.o
 obj-$(CONFIG_USB_POWERMATE)	+= powermate.o
 obj-$(CONFIG_USB_WACOM)		+= wacom.o
 obj-$(CONFIG_USB_ACECAD)	+= acecad.o
drivers/usb/input/touchkitusb.c +133 -66

323 lines not on this page · raw message

drivers/usb/input/hid-core.c +11 -0
index 07a012f..2155513 100644
@@ -1460,6 +1460,12 @@ void hid_init_reports(struct hid_device 
 #define USB_VENDOR_ID_HP		0x03f0
 #define USB_DEVICE_ID_HP_USBHUB_KB	0x020c
 
+#define USB_VENDOR_ID_TOUCHSET		0x134c
+#define USB_DEVICE_ID_TOUCHSET_INITIAL	0x0001
+#define USB_DEVICE_ID_TOUCHSET_JUNIOR	0x0002
+#define USB_DEVICE_ID_TOUCHSET_TRIAD	0x0003
+#define USB_DEVICE_ID_TOUCHSET_QUATA	0x0004
+
 /*
  * Alphabetically sorted blacklist by quirk type.
  */
@@ -1605,6 +1611,11 @@ static const struct hid_blacklist {
 	{ USB_VENDOR_ID_APPLE, 0x030A, HID_QUIRK_POWERBOOK_HAS_FN },
 	{ USB_VENDOR_ID_APPLE, 0x030B, HID_QUIRK_POWERBOOK_HAS_FN },
 
+	{ USB_VENDOR_ID_TOUCHSET, USB_DEVICE_ID_TOUCHSET_INITIAL, HID_QUIRK_BADPAD },
+	{ USB_VENDOR_ID_TOUCHSET, USB_DEVICE_ID_TOUCHSET_JUNIOR, HID_QUIRK_BADPAD },
+	{ USB_VENDOR_ID_TOUCHSET, USB_DEVICE_ID_TOUCHSET_TRIAD, HID_QUIRK_BADPAD },
+	{ USB_VENDOR_ID_TOUCHSET, USB_DEVICE_ID_TOUCHSET_QUATA, HID_QUIRK_BADPAD },
+
 	{ 0, 0 }
 };
 
#1 lore raw
Quoted 6 lines · Daniel Ritz
Quoted 1 line

And what about merging with the existing driver?

something like this? it's compile tested only. not even tested on an egalax screen since i don't have it around...
if this is ok, we could also merge itmtouch and mtouchusb into a single driver.

Looks ok to me. Would be nice to get a verification from someone who has the device :)

thanks,

greg k-h

#5 lore raw

Re: Re: [PATCH] add support for TouchSet USB Touchscreen Device

In reply to Daniel Ritz

Hi,

repost the patch.

thx for all.

Lanslot Gish

=====================================================================

drivers/usb/input/hid-core.c +8 -0
diff -u -N linux-2.6.16-rc5/drivers/usb/input/hid-core.c linux-2.6.16-rc5.modi/drivers/usb/input/hid-core.c
@@ -1459,6 +1459,9 @@
 #define USB_VENDOR_ID_HP		0x03f0
 #define USB_DEVICE_ID_HP_USBHUB_KB	0x020c
 
+#define USB_VENDOR_ID_TOUCHSET	0x134c
+#define USB_DEVICE_ID_TOUCHSET	0x0001
+
 /*
  * Alphabetically sorted blacklist by quirk type.
  */
@@ -1603,6 +1609,11 @@
 	{ USB_VENDOR_ID_APPLE, 0x030A, HID_QUIRK_POWERBOOK_HAS_FN },
 	{ USB_VENDOR_ID_APPLE, 0x030B, HID_QUIRK_POWERBOOK_HAS_FN },
 
+	{ USB_VENDOR_ID_TOUCHSET, USB_DEVICE_ID_TOUCHSET, HID_QUIRK_IGNORE },
+	{ USB_VENDOR_ID_TOUCHSET, USB_DEVICE_ID_TOUCHSET + 1, HID_QUIRK_IGNORE },
+	{ USB_VENDOR_ID_TOUCHSET, USB_DEVICE_ID_TOUCHSET + 2, HID_QUIRK_IGNORE },
+	{ USB_VENDOR_ID_TOUCHSET, USB_DEVICE_ID_TOUCHSET + 3, HID_QUIRK_IGNORE },
+
 	{ 0, 0 }
 };
 
drivers/usb/input/Kconfig +13 -0
diff -u -N linux-2.6.16-rc5/drivers/usb/input/Kconfig linux-2.6.16-rc5.modi/drivers/usb/input/Kconfig
@@ -330,3 +330,16 @@
 
 	  To compile this driver as a module, choose M here: the
 	  module will be called appletouch.
+
+config USB_TOUCHSET
+	tristate "TouchSet USB Device Driver"
+	depends on USB && INPUT
+	---help---
+	  Say Y here if you want to use a TouchSet USB
+	  Touchscreen controller.
+
+	  Have a look at <http://linux.chapter7.ch/touchkit/> for
+	  a usage description and the required user-space stuff.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called usbtouchset.
drivers/usb/input/Makefile +1 -0
diff -u -N linux-2.6.16-rc5/drivers/usb/input/Makefile linux-2.6.16-rc5.modi/drivers/usb/input/Makefile
@@ -43,6 +43,7 @@
 obj-$(CONFIG_USB_YEALINK)	+= yealink.o
 obj-$(CONFIG_USB_XPAD)		+= xpad.o
 obj-$(CONFIG_USB_APPLETOUCH)	+= appletouch.o
+obj-$(CONFIG_USB_TOUCHSET)	+= usbtouchset.o
 
 ifeq ($(CONFIG_USB_DEBUG),y)
 EXTRA_CFLAGS += -DDEBUG
drivers/usb/input/usbtouchset.c +303 -0

303 lines not on this page · raw message

=====================================================================

--
This message was sent on behalf of [email protected] at openSubscriber.com
http://www.opensubscriber.com/message/[email protected]/3535239.html

#2 lore raw
In reply to Greg KH

Hi,

merging is the wonderful way. i love all in one :))

but, every vendor has their own USB Vendor ID.
How to overcome the issue?

Lanslott Gish

Quoted 8 lines · Greg KH
Quoted 6 lines · Daniel Ritz
Quoted 1 line

And what about merging with the existing driver?

something like this? it's compile tested only. not even tested on an egalax screen since i don't have it around...
if this is ok, we could also merge itmtouch and mtouchusb into a single driver.

Quoted 7 lines

Looks ok to me. Would be nice to get a verification from someone who has the device :)

thanks,

greg k-h

--
L.G, Life's Good~

#3 lore raw
Quoted 6 lines · Lanslott Gish

Hi,

merging is the wonderful way. i love all in one :))

but, every vendor has their own USB Vendor ID.
How to overcome the issue?

Keep adding them to the device table? Just like other drivers that support more than one type of device :)

thanks,

greg k-h

#4 lore raw

look great!
i got the TouchSet usb hardware and could help to test about this.

Lanslott Gish

Quoted 8 lines · Greg KH
Quoted 6 lines · Lanslott Gish

Hi,

merging is the wonderful way. i love all in one :))

but, every vendor has their own USB Vendor ID.
How to overcome the issue?

Quoted 7 lines

Keep adding them to the device table? Just like other drivers that support more than one type of device :)

thanks,

greg k-h

--
L.G, Life's Good~