From: micki <micki@micki-laptop.(none)> Update struct hid_driver ntrig_driver. add debug module parameters N-trig is changing the way people interact with computers by providing a dual-mode pen and true multi-touch input device, specifically designed for today's advanced computing world. N-trig DuoSense® solution provides a real Hands-on computing® experience, and sets the stage for OEMs and ISVs to introduce innovative computer products and applications for an intuitive, Hands-on® experience directly onscreen. DuoSense digitizers are easily integrated into existing technologies, support all LCDs, keep devices slim and light, and can be implemented in a broad range of products, ranging from small notebooks to large LCDs. N-trig has offices in Israel, the US, Taiwan and Japan. Signed-off-by: Micki Balanga <micki@xxxxxxxxxx> --- drivers/hid/hid-ntrig.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c index 8bf796c..f88533e 100644 --- a/drivers/hid/hid-ntrig.c +++ b/drivers/hid/hid-ntrig.c @@ -21,6 +21,9 @@ * send set feature command to firmware * 1.5 - N-trig udpate ntrig_probe * add call to ntrig_send_report function + * 1.6 - N-trig Update ntrig_init print version number + * update struct hid_driver + * update struct hid_device_id */ /* @@ -458,15 +461,11 @@ static void ntrig_remove(struct hid_device *hdev) static const struct hid_device_id ntrig_devices[] = { { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN), - .driver_data = NTRIG_DUPLICATE_USAGES }, + .driver_data = NTRIG_USB_DEVICE_ID }, { } }; MODULE_DEVICE_TABLE(hid, ntrig_devices); -static const struct hid_usage_id ntrig_grabbed_usages[] = { - { HID_ANY_ID, HID_ANY_ID, HID_ANY_ID }, - { HID_ANY_ID - 1, HID_ANY_ID - 1, HID_ANY_ID - 1 } -}; static struct hid_driver ntrig_driver = { .name = MODULE_NAME, @@ -475,12 +474,12 @@ static struct hid_driver ntrig_driver = { .remove = ntrig_remove, .input_mapping = ntrig_input_mapping, .input_mapped = ntrig_input_mapped, - .usage_table = ntrig_grabbed_usages, .event = ntrig_event, }; static int __init ntrig_init(void) { + info("N-trig Driver Version 1.6\n"); return hid_register_driver(&ntrig_driver); } -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html