lkml.org 
[lkml]   [2010]   [Mar]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/7] HID: N-trig MTM Driver fix And cleanup patch 5
    Date
    From: micki <micki@micki-laptop.(none)>

    udpate ntrig_probe - add call to ntrig_send_report function
    to initialize firmware to switch to Multi-touch mode.
    Delete input-name our driver don't distinguish pen and touch.
    Will be inserted in next version.

    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@n-trig.com>
    ---
    drivers/hid/hid-ntrig.c | 41 ++++++-----------------------------------
    1 files changed, 6 insertions(+), 35 deletions(-)

    diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c
    index 8cdb3c2..8bf796c 100644
    --- a/drivers/hid/hid-ntrig.c
    +++ b/drivers/hid/hid-ntrig.c
    @@ -19,6 +19,8 @@
    * 1.3 - N-trig - Change ntrig_input_mapped
    * 1.4 - N-trig - Add ntrig_send_report function
    * send set feature command to firmware
    + * 1.5 - N-trig udpate ntrig_probe
    + * add call to ntrig_send_report function
    */

    /*
    @@ -415,11 +417,6 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id)
    {
    int ret;
    struct ntrig_data *nd;
    - struct hid_input *hidinput;
    - struct input_dev *input;
    -
    - if (id->driver_data)
    - hdev->quirks |= HID_QUIRK_MULTI_INPUT;

    nd = kmalloc(sizeof(struct ntrig_data), GFP_KERNEL);
    if (!nd) {
    @@ -427,7 +424,6 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id)
    return -ENOMEM;
    }

    - nd->reading_mt = 0;
    hid_set_drvdata(hdev, nd);

    ret = hid_parse(hdev);
    @@ -442,35 +438,10 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id)
    goto err_free;
    }

    -
    - list_for_each_entry(hidinput, &hdev->inputs, list) {
    - input = hidinput->input;
    - switch (hidinput->report->field[0]->application) {
    - case HID_DG_PEN:
    - input->name = "N-Trig Pen";
    - break;
    - case HID_DG_TOUCHSCREEN:
    - __clear_bit(BTN_TOOL_PEN, input->keybit);
    - /*
    - * A little something special to enable
    - * two and three finger taps.
    - */
    - __set_bit(BTN_TOOL_DOUBLETAP, input->keybit);
    - __set_bit(BTN_TOOL_TRIPLETAP, input->keybit);
    - __set_bit(BTN_TOOL_QUADTAP, input->keybit);
    - /*
    - * The physical touchscreen (single touch)
    - * input has a value for physical, whereas
    - * the multitouch only has logical input
    - * fields.
    - */
    - input->name =
    - (hidinput->report->field[0]
    - ->physical) ?
    - "N-Trig Touchscreen" :
    - "N-Trig MultiTouch";
    - break;
    - }
    + ret = ntrig_send_report(hdev);
    + if (ret) {
    + dev_err(&hdev->dev, "send set feature failed\n");
    + goto err_free;
    }

    return 0;
    --
    1.6.3.3
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2010-03-08 22:17    [W:0.024 / U:30.828 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site