aboutsummaryrefslogtreecommitdiff
path: root/drivers/input/tablet
AgeCommit message (Collapse)AuthorFilesLines
2010-08-02Merge branch 'next' into for-linusDmitry Torokhov2-0/+45
2010-06-28Input: wacom - add support for DTU2231 and DTU1631Ping Cheng2-0/+45
Add support for the two new devices: DTU2231 and DTU1631. Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-06-22Input: wacom - fix serial number handling on Cintiq 21UX2Ping Cheng1-4/+5
Cintiq 21UX2 added 8 more bits for the tool serial number and more buttons for the expresskey. We did not enable them properly in the last patch. Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-06-04Input: wacom - add Cintiq 21UX2 and Intuos4 WLPing Cheng3-15/+60
Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-05-20Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6Linus Torvalds5-23/+23
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (229 commits) USB: remove unused usb_buffer_alloc and usb_buffer_free macros usb: musb: update gfp/slab.h includes USB: ftdi_sio: fix legacy SIO-device header USB: kl5usb105: reimplement using generic framework USB: kl5usb105: minor clean ups USB: kl5usb105: fix memory leak USB: io_ti: use kfifo to implement write buffering USB: io_ti: remove unsused private counter USB: ti_usb: use kfifo to implement write buffering USB: ir-usb: fix incorrect write-buffer length USB: aircable: fix incorrect write-buffer length USB: safe_serial: straighten out read processing USB: safe_serial: reimplement read using generic framework USB: safe_serial: reimplement write using generic framework usb-storage: always print quirks USB: usb-storage: trivial debug improvements USB: oti6858: use port write fifo USB: oti6858: use kfifo to implement write buffering USB: cypress_m8: use kfifo to implement write buffering USB: cypress_m8: remove unused drain define ... Fix up conflicts (due to usb_buffer_alloc/free renaming) in drivers/input/tablet/acecad.c drivers/input/tablet/kbtab.c drivers/input/tablet/wacom_sys.c drivers/media/video/gspca/gspca.c sound/usb/usbaudio.c
2010-05-20USB: rename usb_buffer_alloc() and usb_buffer_free() usersDaniel Mack5-24/+24
For more clearance what the functions actually do, usb_buffer_alloc() is renamed to usb_alloc_coherent() usb_buffer_free() is renamed to usb_free_coherent() They should only be used in code which really needs DMA coherency. All call sites have been changed accordingly, except for staging drivers. Signed-off-by: Daniel Mack <[email protected]> Cc: Alan Stern <[email protected]> Cc: Pedro Ribeiro <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-04-20Input: kbtab - do not advertise unsupported eventsDmitry Torokhov1-24/+15
The device does not emit EV_MSC/MSC_SERIAL nor EV_KEY/BTN_MIDDLE events so it should not mark them as supported in capabilities bitmaps. This still leaves BTN_TOOL_PEN and BTN_TOUCH events being processed in a funky manner. Signed-off-by: Dmitry Torokhov <[email protected]>
2010-04-20Input: kbtab - simplify kbtab_disconnect()Dmitry Torokhov1-7/+5
There is no need to check whether kbtab structure is attached to the interface; if it isn't and we are called we have much bigger problems. Also no need to call usb_kill_urb() in kbtab_disconnect() since it is being called in kbtab_close(). Signed-off-by: Dmitry Torokhov <[email protected]>
2010-04-20Input: kbtab - fix incorrect size parameter in usb_buffer_freeAxel Lin1-2/+2
The size allocated by usb_buffer_alloc() is 8, however the size passed to usb_buffer_free() is 10. Signed-off-by: Axel Lin <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-04-20Input: acecad - don't advertise mouse eventsDmitry Torokhov1-2/+0
The device does not emit events for left/right/middle mouse buttons so it should not mark them as supported in capabilities bitmaps. Signed-off-by: Dmitry Torokhov <[email protected]>
2010-04-20Input: acecad - fix some formatting issuesDmitry Torokhov1-40/+36
Also switch to using input_set_abd_params() helper. Signed-off-by: Dmitry Torokhov <[email protected]>
2010-04-20Input: acecad - simplify usb_acecad_disconnect()Dmitry Torokhov1-7/+5
There is no need to check whether acecad structure is attached to the interface; if it isn't and we are called we have much bigger problems. Also no need to call usb_kill_urb() in usb_acecad_disconnect() since it is being called in usb_acecad_close(). Signed-off-by: Dmitry Torokhov <[email protected]>
2010-04-20Input: acecad - fix incorrect size parameter in usb_buffer_freeAxel Lin1-1/+1
The size allocated by usb_buffer_alloc() is 8, however the size passed to usb_buffer_free() in usb_acecad_disconnect() is 10. Signed-off-by: Axel Lin <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-04-15Merge branch 'for-linus' of ↵Linus Torvalds2-64/+111
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: wacom - switch mode upon system resume Revert "Input: wacom - merge out and in prox events" Input: matrix_keypad - allow platform to disable key autorepeat Input: ALPS - add signature for HP Pavilion dm3 laptops Input: i8042 - spelling fix Input: sparse-keymap - implement safer freeing of the keymap Input: update the status of the Multitouch X driver project Input: clarify the no-finger event in multitouch protocol Input: bcm5974 - retract efi-broken suspend_resume Input: sparse-keymap - free the right keymap on error
2010-04-15Input: wacom - switch mode upon system resumePing Cheng1-5/+7
When Wacom devices wake up from a sleep, the switch mode command (wacom_query_tablet_data) is needed before wacom_open is called. wacom_query_tablet_data should not be executed inside wacom_open since wacom_open is called more than once during probe. wacom_retrieve_hid_descriptor is removed from wacom_resume due to the fact that the required descriptors are stored properly upon system resume. Reported-and-tested-by: Anton Anikin <[email protected]> Signed-off-by: Ping Cheng <[email protected]> Cc: [email protected] Signed-off-by: Dmitry Torokhov <[email protected]>
2010-04-13Input: wacom - streamline 2-finger touch supportPing Cheng2-73/+80
Clean up 2-finger touch support. This still needs to be converted to proper multi-touch protocol. Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-04-13Input: wacom - use get_unaligned to access unaligned dataDmitry Torokhov3-47/+28
Also get rid of wacom_le16_to_cpu() and wacom_be16_to_cpu() helpers and ise le16_to_cpup() and be16_to_cpup() directly. Signed-off-by: Dmitry Torokhov <[email protected]>
2010-04-13Input: wacom - get rid of wacom_combo structureDmitry Torokhov3-53/+47
Now that we moved input device from struct wacom to struct wacom_wac, presence of wacom_combo just complicats things for no good reason. Let's get rid of it and simply pass URB length to wacom_wac_irq(). Signed-off-by: Dmitry Torokhov <[email protected]>
2010-04-13Input: wacom - get rid of input event wrappersDmitry Torokhov4-405/+347
Input event interface is pretty stable so let's get rig of wrappers for input_event() and fiends and call them directly. This will simplify and speed up code a bit. Signed-off-by: Dmitry Torokhov <[email protected]>
2010-04-13Input: wacom - fix some formatting issuesDmitry Torokhov2-201/+222
Fix identation of switch/case statements so they follow style used by the rest of the kernel. Signed-off-by: Dmitry Torokhov <[email protected]>
2010-04-13Input: wacom - do not allocate wacom_wac separatelyDmitry Torokhov4-15/+15
There is no reason for allocating struct wacom_wac separately from struct wacom since both have the same lifetime rules and are not shared. Also make 'open' field a boolean. Signed-off-by: Dmitry Torokhov <[email protected]>
2010-04-13Input: wacom - share pen info with touch of the same IDPing Cheng3-22/+99
Touch enbaled devices share the same product ID with pen. However, we do not want to post touch events while pen is in prox. To do so, we used to keep a local static variable to keep track of if pen is in prox or not. This works fine for Tablet PC devices since there is only one device attached. With the newer touch enabled regular tablets, we can not make this assumption any more, i.e, one system may have more than one identical tablet plugged in. This patch adds an new entry, shared, into the struct wacom_wac so touch data can access pen data to locally. This solution assumes the two tools (touch and pen) of the same ID will be probed one after the other without interruption in between by another Wacom device of the same ID.
2010-04-13Input: wacom - merge out and in prox eventsPing Cheng1-104/+59
Process out and in prox events for Graphire and Tablet PC devices in the same loop to simplify the data parsing logic. [re-applying after revert since other patches are based on this one] Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-04-13Merge branch 'for-linus' into nextDmitry Torokhov2-64/+111
2010-04-13Input: wacom - switch mode upon system resumePing Cheng1-5/+7
When Wacom devices wake up from a sleep, the switch mode command (wacom_query_tablet_data) is needed before wacom_open is called. wacom_query_tablet_data should not be executed inside wacom_open since wacom_open is called more than once during probe. wacom_retrieve_hid_descriptor is removed from wacom_resume due to the fact that the required descriptors are stored properly upon system resume. Signed-off-by: Ping Cheng <[email protected]> Reported-and-tested-by: Anton Anikin <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-04-13Revert "Input: wacom - merge out and in prox events"Dmitry Torokhov1-59/+104
This reverts commit 776943fd6f104a6e8457dc95a17282e69e963666 as it causes issues with ISDv4 E3 touchscreens: https://bugzilla.kernel.org/show_bug.cgi?id=15670 Signed-off-by: Dmitry Torokhov <[email protected]>
2010-03-14Merge branch 'for-linus' of ↵Linus Torvalds3-108/+62
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: i8042 - add ALDI/MEDION netbook E1222 to qurik reset table Input: ALPS - fix stuck buttons on some touchpads Input: wm831x-on - convert to use genirq Input: ads7846 - add wakeup support Input: appletouch - fix integer overflow issue Input: ad7877 - increase pen up imeout Input: ads7846 - add support for AD7843 parts Input: bf54x-keys - fix system hang when pressing a key Input: alps - add support for the touchpad on Toshiba Tecra A11-11L Input: remove BKL, fix input_open_file() locking Input: serio_raw - remove BKL Input: mousedev - remove BKL Input: add driver for TWL4030 vibrator device Input: enable remote wakeup for PNP i8042 keyboard ports Input: scancode in get/set_keycodes should be unsigned Input: i8042 - use platfrom_create_bundle() helper Input: wacom - merge out and in prox events Input: gamecon - fix off by one range check Input: wacom - replace WACOM_PKGLEN_PENABLED
2010-03-08Merge branch 'for-next' into for-linusJiri Kosina1-1/+1
Conflicts: Documentation/filesystems/proc.txt arch/arm/mach-u300/include/mach/debug-macro.S drivers/net/qlge/qlge_ethtool.c drivers/net/qlge/qlge_main.c drivers/net/typhoon.c
2010-03-05Input: wacom - merge out and in prox eventsPing Cheng1-104/+59
Process out and in prox events for Graphire and Tablet PC devices in the same loop to simplify the data parsing logic. Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-03-01Input: wacom - replace WACOM_PKGLEN_PENABLEDPing Cheng3-4/+3
Replacing WACOM_PKGLEN_PENABLED with WACOM_PKGLEN_GRAPHIRE since they both represent the same value, 8. This value will be used for both Tablet PC and Bamboo with touch devices. Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-02-20Input: wacom - add device type to device name stringPing Cheng2-4/+15
Devices supporting both pen and touch features share the same product ID, but presented as 2 separate input devices. By adding device type to device name string we can help userspace applications and users differentiate between them. 'Finger' is used for the touch since touch has been used as a suffix by userland hotplugging services. Signed-off-by: Jason Childs <[email protected]> Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-02-19Input: wacom - constify product features dataDmitry Torokhov1-63/+63
Features are not supposed to be modified; devices use their own private copies, so let's mark them const. Signed-off-by: Dmitry Torokhov <[email protected]>
2010-02-19Input: wacom - use per-device instance of wacom_featuresJason Childs3-56/+78
Since we mangle data in wacom_features when dealing with certain devices let's use a private (per-device) instance of wacom_features in wacom_wac. This way same product ID can support more than one type of device, such as pen and touch, and not interfere with each other. Signed-off-by: Jason Childs <[email protected]> Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-02-10Input: wacom - get features from driver infoBastian Blank3-152/+205
Get the features information from the driver info of the usb device id structure provided by the caller. The device ids and feature structs are strong coupled using indices. Signed-off-by: Bastian Blank <[email protected]> Tested-by: Jason Childs <[email protected]> Acked-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2010-02-05Fix misspelling of "should" and "shouldn't" in comments.Adam Buchbinder1-1/+1
Some comments misspell "should" or "shouldn't"; this fixes them. No code changes. Signed-off-by: Adam Buchbinder <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2010-01-11Input: make USB device ids constantMárton Németh1-1/+1
The id_table field of the struct usb_device_id is constant in <linux/usb.h> so it makes sense to mark the initialization data also constant. Signed-off-by: Márton Németh <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2009-12-15Input: wacom - separate pen from express keys on GraphirePing Cheng1-4/+23
Since Graphire/Bamboo devices report pen and expresskeys in the same data packet, we need to send a input_sync event to separate pen data from expresskeys for X11 driver to process them properly. Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2009-12-15Input: wacom - add defines for data packet report IDsPing Cheng2-13/+22
Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2009-12-15Input: wacom - add support for new LCD tabletsPing Cheng4-132/+311
This adds support for the foolowing Wacom devices: - 0x9F - a single touch only LCD tablet; - 0xE2 - a two finger touch only LCD tablet; - 0xE3 - a two finger touch, penabled LCD tablet. Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2009-12-15Input: wacom - add defines for packet lengths of various devicesPing Cheng3-64/+76
Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2009-12-15Input: wacom - ensure the device is initialized properly upon resumePing Cheng2-6/+8
Call wacom_query_tablet_data() from wacom_resume() so the device will be switched to Wacom mode upon resume. Devices that require this are: regular tablets and two finger touch devices. Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2009-08-21Input: wacom - don't use on-stack memory for report buffersDmitry Torokhov1-14/+29
Tested-by: Martin Capitanio <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2009-06-28Input: wacom - add DTF720a support and fix rotation on Intuos3Ping Cheng1-1/+5
This patch adds DTF720a support and fixes an Intuos3 rotation pen out-proximity bug. Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2009-06-03Input: wacom - clear Intuos4 wheel data when finger leaves proximityPing Cheng1-0/+3
Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2009-05-08Input: wacom - add support for Intuos4 tabletsPing Cheng4-41/+148
Signed-oof-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2009-05-08Merge commit 'v2.6.30-rc5' into nextDmitry Torokhov2-4/+14
2009-04-28Input: wacom - fix TabletPC touch bugPing Cheng2-4/+14
This patch fixed a bug that was introduced in kernel 2.6.28 for TabletPC touch data. The wacom_parse_hid routine in wacom_sys.c should always return 0 even when usb_control_msg got an error. Signed-off-by: Ping Cheng <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2009-04-17Input: gtco - add MODULE_DESCRIPTION()Dmitry Torokhov1-0/+1
Signed-off-by: Dmitry Torokhov <[email protected]>
2008-12-30Input: gtco - use USB endpoint APIJulia Lawall1-1/+1
Use usb_endpoint_xfer_int(epd) instead of open-conding the check. Signed-off-by: Julia Lawall <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2008-12-20Input: make some variables and functions staticRoel Kluin1-1/+1
Signed-off-by: Roel Kluin <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.