lkml.org 
[lkml]   [2013]   [Jan]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 25/25] HID: multitouch: make MT_CLS_ALWAYS_TRUE the new default class
    Date
    By running a test on all the traces of the devices I have,
    I noticed that the class MT_CLS_ALWAYS_TRUE could handle all
    the devices I've seen so far without any other quirks.
    I guess this is the behavior Win 7 requires in its driver.

    We can change the default class then and keep the existing classes
    for backward compatibility and performances for some of them.

    Two operations have been done:
    - replaced MT_CLS_DEFAULT by MT_CLS_NSMU
    - then replaced MT_CLS_ALWAYS_TRUE by MT_CLS_DEFAULT

    Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
    ---
    drivers/hid/hid-multitouch.c | 53 ++++++++++++++++++++++----------------------
    1 file changed, 27 insertions(+), 26 deletions(-)

    diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
    index e3f0bf7..25b1d2c 100644
    --- a/drivers/hid/hid-multitouch.c
    +++ b/drivers/hid/hid-multitouch.c
    @@ -117,7 +117,7 @@ struct mt_device {
    #define MT_CLS_DUAL_INRANGE_CONTACTID 0x0006
    #define MT_CLS_DUAL_INRANGE_CONTACTNUMBER 0x0007
    #define MT_CLS_INRANGE_CONTACTNUMBER 0x0009
    -#define MT_CLS_ALWAYS_TRUE 0x000a
    +#define MT_CLS_NSMU 0x000a
    #define MT_CLS_CONTACT_ID 0x0011
    #define MT_CLS_MINUS_ONE 0x0012
    #define MT_CLS_DUAL_CONTACT_ID 0x0013
    @@ -155,6 +155,9 @@ static int cypress_compute_slot(struct mt_device *td)

    static struct mt_class mt_classes[] = {
    { .name = MT_CLS_DEFAULT,
    + .quirks = MT_QUIRK_ALWAYS_VALID |
    + MT_QUIRK_CONTACT_CNT_ACCURATE },
    + { .name = MT_CLS_NSMU,
    .quirks = MT_QUIRK_NOT_SEEN_MEANS_UP },
    { .name = MT_CLS_SERIAL,
    .quirks = MT_QUIRK_ALWAYS_VALID},
    @@ -177,9 +180,7 @@ static struct mt_class mt_classes[] = {
    { .name = MT_CLS_INRANGE_CONTACTNUMBER,
    .quirks = MT_QUIRK_VALID_IS_INRANGE |
    MT_QUIRK_SLOT_IS_CONTACTNUMBER },
    - { .name = MT_CLS_ALWAYS_TRUE,
    - .quirks = MT_QUIRK_ALWAYS_VALID |
    - MT_QUIRK_CONTACT_CNT_ACCURATE },
    +
    { .name = MT_CLS_CONTACT_ID,
    .quirks = MT_QUIRK_ALWAYS_VALID |
    MT_QUIRK_CONTACT_CNT_ACCURATE |
    @@ -963,7 +964,7 @@ static const struct hid_device_id mt_devices[] = {
    USB_DEVICE_ID_ATMEL_MXT_DIGITIZER) },

    /* Baanto multitouch devices */
    - { .driver_data = MT_CLS_DEFAULT,
    + { .driver_data = MT_CLS_NSMU,
    MT_USB_DEVICE(USB_VENDOR_ID_BAANTO,
    USB_DEVICE_ID_BAANTO_MT_190W2) },
    /* Cando panels */
    @@ -981,12 +982,12 @@ static const struct hid_device_id mt_devices[] = {
    USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) },

    /* Chunghwa Telecom touch panels */
    - { .driver_data = MT_CLS_DEFAULT,
    + { .driver_data = MT_CLS_NSMU,
    MT_USB_DEVICE(USB_VENDOR_ID_CHUNGHWAT,
    USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH) },

    /* CVTouch panels */
    - { .driver_data = MT_CLS_DEFAULT,
    + { .driver_data = MT_CLS_NSMU,
    MT_USB_DEVICE(USB_VENDOR_ID_CVTOUCH,
    USB_DEVICE_ID_CVTOUCH_SCREEN) },

    @@ -1075,12 +1076,12 @@ static const struct hid_device_id mt_devices[] = {
    USB_DEVICE_ID_GENERAL_TOUCH_WIN8_PWT_TENFINGERS) },

    /* Gametel game controller */
    - { .driver_data = MT_CLS_DEFAULT,
    + { .driver_data = MT_CLS_NSMU,
    MT_BT_DEVICE(USB_VENDOR_ID_FRUCTEL,
    USB_DEVICE_ID_GAMETEL_MT_MODE) },

    /* GoodTouch panels */
    - { .driver_data = MT_CLS_DEFAULT,
    + { .driver_data = MT_CLS_NSMU,
    MT_USB_DEVICE(USB_VENDOR_ID_GOODTOUCH,
    USB_DEVICE_ID_GOODTOUCH_000f) },

    @@ -1098,7 +1099,7 @@ static const struct hid_device_id mt_devices[] = {
    USB_DEVICE_ID_IDEACOM_IDC6651) },

    /* Ilitek dual touch panel */
    - { .driver_data = MT_CLS_DEFAULT,
    + { .driver_data = MT_CLS_NSMU,
    MT_USB_DEVICE(USB_VENDOR_ID_ILITEK,
    USB_DEVICE_ID_ILITEK_MULTITOUCH) },

    @@ -1145,7 +1146,7 @@ static const struct hid_device_id mt_devices[] = {
    USB_DEVICE_ID_PANABOARD_UBT880) },

    /* Novatek Panel */
    - { .driver_data = MT_CLS_DEFAULT,
    + { .driver_data = MT_CLS_NSMU,
    MT_USB_DEVICE(USB_VENDOR_ID_NOVATEK,
    USB_DEVICE_ID_NOVATEK_PCT) },

    @@ -1185,13 +1186,13 @@ static const struct hid_device_id mt_devices[] = {
    USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008) },

    /* Stantum panels */
    - { .driver_data = MT_CLS_ALWAYS_TRUE,
    + { .driver_data = MT_CLS_DEFAULT,
    MT_USB_DEVICE(USB_VENDOR_ID_STANTUM,
    USB_DEVICE_ID_MTP)},
    { .driver_data = MT_CLS_CONFIDENCE,
    MT_USB_DEVICE(USB_VENDOR_ID_STANTUM_STM,
    USB_DEVICE_ID_MTP_STM)},
    - { .driver_data = MT_CLS_ALWAYS_TRUE,
    + { .driver_data = MT_CLS_DEFAULT,
    MT_USB_DEVICE(USB_VENDOR_ID_STANTUM_SITRONIX,
    USB_DEVICE_ID_MTP_SITRONIX)},

    @@ -1201,48 +1202,48 @@ static const struct hid_device_id mt_devices[] = {
    USB_DEVICE_ID_TOPSEED2_PERIPAD_701) },

    /* Touch International panels */
    - { .driver_data = MT_CLS_DEFAULT,
    + { .driver_data = MT_CLS_NSMU,
    MT_USB_DEVICE(USB_VENDOR_ID_TOUCH_INTL,
    USB_DEVICE_ID_TOUCH_INTL_MULTI_TOUCH) },

    /* Unitec panels */
    - { .driver_data = MT_CLS_DEFAULT,
    + { .driver_data = MT_CLS_NSMU,
    MT_USB_DEVICE(USB_VENDOR_ID_UNITEC,
    USB_DEVICE_ID_UNITEC_USB_TOUCH_0709) },
    - { .driver_data = MT_CLS_DEFAULT,
    + { .driver_data = MT_CLS_NSMU,
    MT_USB_DEVICE(USB_VENDOR_ID_UNITEC,
    USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19) },
    /* XAT */
    - { .driver_data = MT_CLS_DEFAULT,
    + { .driver_data = MT_CLS_NSMU,
    MT_USB_DEVICE(USB_VENDOR_ID_XAT,
    USB_DEVICE_ID_XAT_CSR) },

    /* Xiroku */
    - { .driver_data = MT_CLS_DEFAULT,
    + { .driver_data = MT_CLS_NSMU,
    MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
    USB_DEVICE_ID_XIROKU_SPX) },
    - { .driver_data = MT_CLS_DEFAULT,
    + { .driver_data = MT_CLS_NSMU,
    MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
    USB_DEVICE_ID_XIROKU_MPX) },
    - { .driver_data = MT_CLS_DEFAULT,
    + { .driver_data = MT_CLS_NSMU,
    MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
    USB_DEVICE_ID_XIROKU_CSR) },
    - { .driver_data = MT_CLS_DEFAULT,
    + { .driver_data = MT_CLS_NSMU,
    MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
    USB_DEVICE_ID_XIROKU_SPX1) },
    - { .driver_data = MT_CLS_DEFAULT,
    + { .driver_data = MT_CLS_NSMU,
    MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
    USB_DEVICE_ID_XIROKU_MPX1) },
    - { .driver_data = MT_CLS_DEFAULT,
    + { .driver_data = MT_CLS_NSMU,
    MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
    USB_DEVICE_ID_XIROKU_CSR1) },
    - { .driver_data = MT_CLS_DEFAULT,
    + { .driver_data = MT_CLS_NSMU,
    MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
    USB_DEVICE_ID_XIROKU_SPX2) },
    - { .driver_data = MT_CLS_DEFAULT,
    + { .driver_data = MT_CLS_NSMU,
    MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
    USB_DEVICE_ID_XIROKU_MPX2) },
    - { .driver_data = MT_CLS_DEFAULT,
    + { .driver_data = MT_CLS_NSMU,
    MT_USB_DEVICE(USB_VENDOR_ID_XIROKU,
    USB_DEVICE_ID_XIROKU_CSR2) },

    --
    1.8.1


    \
     
     \ /
      Last update: 2013-01-25 15:01    [W:4.123 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site