lkml.org 
[lkml]   [2008]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] Input: adbhid - capslock and power button fix
    If the adbhid module parameter restore_capslock_events is used,
    pressing the power button may confuse the capslock state. This is
    because the power button release scancode (0xff) is sometimes the same
    as the capslock press/release scancode.

    This fix adds yet another flag to track the state of the power button
    so that it works independently of capslock.

    Signed-off-by: Rodney Lorrimar <rodney@rodney.id.au>
    ---

    This patch applies on top of the previous patch in the thread.

    ---
    drivers/macintosh/adbhid.c | 15 ++++++++++++---
    1 files changed, 12 insertions(+), 3 deletions(-)

    diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
    index 19d0984..72b9011 100644
    --- a/drivers/macintosh/adbhid.c
    +++ b/drivers/macintosh/adbhid.c
    @@ -225,6 +225,7 @@ struct adbhid {
    #define FLAG_CAPSLOCK_TRANSLATE 0x00000008
    #define FLAG_CAPSLOCK_DOWN 0x00000010
    #define FLAG_CAPSLOCK_IGNORE_NEXT 0x00000020
    +#define FLAG_POWER_KEY_PRESSED 0x00000040

    static struct adbhid *adbhid[16];

    @@ -301,9 +302,11 @@ adbhid_input_keycode(int id, int scancode, int repeat)
    ahid->flags |= FLAG_CAPSLOCK_TRANSLATE
    | FLAG_CAPSLOCK_DOWN;
    }
    - } else if (scancode == 0xff) {
    + } else if (scancode == 0xff &&
    + !(ahid->flags & FLAG_POWER_KEY_PRESSED)) {
    /* Scancode 0xff usually signifies that the capslock
    - * key was either pressed or released. */
    + * key was either pressed or released, or that the
    + * power button was released. */
    if (ahid->flags & FLAG_CAPSLOCK_TRANSLATE) {
    keycode = ADB_KEY_CAPSLOCK;
    if (ahid->flags & FLAG_CAPSLOCK_DOWN) {
    @@ -317,7 +320,7 @@ adbhid_input_keycode(int id, int scancode, int repeat)
    }
    } else {
    printk(KERN_INFO "Spurious caps lock event "
    - "(scancode 0xff).");
    + "(scancode 0xff).\n");
    }
    }
    }
    @@ -344,6 +347,12 @@ adbhid_input_keycode(int id, int scancode, int repeat)
    }
    break;
    case ADB_KEY_POWER:
    + /* Keep track of the power key state */
    + if (up_flag)
    + ahid->flags &= ~FLAG_POWER_KEY_PRESSED;
    + else
    + ahid->flags |= FLAG_POWER_KEY_PRESSED;
    +
    /* Fn + Command will produce a bogus "power" keycode */
    if (ahid->flags & FLAG_FN_KEY_PRESSED) {
    keycode = ADB_KEY_CMD;
    --
    1.5.4.5
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2008-04-10 12:37    [W:0.046 / U:118.628 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site