lkml.org 
[lkml]   [2004]   [Jul]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 7/8] New set of input patches
    Date

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


    ChangeSet@1.1826, 2004-07-08 01:28:44-05:00, dtor_core@ameritech.net
    Input: synaptics - do not try to process packets from slave device
    as if they were coming form the touchpad itself if pass-through
    port is disconnected, just pass them to serio core and it will
    attempt to bind proper driver to the port

    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>


    synaptics.c | 26 ++++++++++++--------------
    1 files changed, 12 insertions(+), 14 deletions(-)


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



    diff -Nru a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
    --- a/drivers/input/mouse/synaptics.c 2004-07-08 01:35:41 -05:00
    +++ b/drivers/input/mouse/synaptics.c 2004-07-08 01:35:41 -05:00
    @@ -233,17 +233,14 @@
    {
    struct psmouse *child = ptport->private;

    - if (child) {
    - if (child->state == PSMOUSE_ACTIVATED) {
    - serio_interrupt(ptport, packet[1], 0, NULL);
    - serio_interrupt(ptport, packet[4], 0, NULL);
    - serio_interrupt(ptport, packet[5], 0, NULL);
    - if (child->type >= PSMOUSE_GENPS)
    - serio_interrupt(ptport, packet[2], 0, NULL);
    - } else if (child->state != PSMOUSE_IGNORE) {
    - serio_interrupt(ptport, packet[1], 0, NULL);
    - }
    - }
    + if (child && child->state == PSMOUSE_ACTIVATED) {
    + serio_interrupt(ptport, packet[1], 0, NULL);
    + serio_interrupt(ptport, packet[4], 0, NULL);
    + serio_interrupt(ptport, packet[5], 0, NULL);
    + if (child->type >= PSMOUSE_GENPS)
    + serio_interrupt(ptport, packet[2], 0, NULL);
    + } else
    + serio_interrupt(ptport, packet[1], 0, NULL);
    }

    static void synaptics_pt_activate(struct psmouse *psmouse)
    @@ -472,9 +469,10 @@
    if (unlikely(priv->pkt_type == SYN_NEWABS))
    priv->pkt_type = synaptics_detect_pkt_type(psmouse);

    - if (psmouse->serio->child && psmouse->serio->child->drv && synaptics_is_pt_packet(psmouse->packet))
    - synaptics_pass_pt_packet(psmouse->serio->child, psmouse->packet);
    - else
    + if (SYN_CAP_PASS_THROUGH(priv->capabilities) && synaptics_is_pt_packet(psmouse->packet)) {
    + if (psmouse->serio->child)
    + synaptics_pass_pt_packet(psmouse->serio->child, psmouse->packet);
    + } else
    synaptics_process_packet(psmouse);

    return PSMOUSE_FULL_PACKET;
    -
    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: 2005-03-22 14:04    [W:0.023 / U:1.872 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site