Messages in this thread Patch in this message | | | From | Dmitry Torokhov <> | Subject | [RFC/PATCH 2/3] Input: resume support for i8042 (atkbd & psmouse) | Date | Mon, 1 Dec 2003 02:17:14 -0500 |
| |
===================================================================
ChangeSet@1.1515, 2003-12-01 01:43:05-05:00, dtor_core@ameritech.net Input: Add reconnect method to atkbd to restore keyboard state after suspend (to be called from i8042 resume function)
atkbd.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+)
===================================================================
diff -Nru a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c --- a/drivers/input/keyboard/atkbd.c Mon Dec 1 01:45:48 2003 +++ b/drivers/input/keyboard/atkbd.c Mon Dec 1 01:45:48 2003 @@ -686,10 +686,60 @@ printk(KERN_INFO "input: %s on %s\n", atkbd->name, serio->phys); } +/* + * atkbd_reconnect() tries to restore keyboard in a sane state and is + * most likely called on resume. + */ + +static int atkbd_reconnect(struct serio *serio) +{ + struct atkbd *atkbd = serio->private; + struct serio_dev *dev = serio->dev; + int i; + + if (!dev) { + printk(KERN_DEBUG "atkbd: reconnect request, but serio is disconnected, ignoring...\n"); + return -1; + } + + if (atkbd->write) { + if (atkbd_probe(atkbd)) + return -1; + + atkbd->set = atkbd_set_3(atkbd); + atkbd_enable(atkbd); + } else { + atkbd->set = 2; + atkbd->id = 0xab00; + } + + /* + * Here we probably should check if the keyboard has the same set that + * it had before and bail out if it's different. But this will most likely + * cause new keyboard device be created... and for the user it will look + * like keyboard is lost + */ + + if (atkbd->set == 3) + memcpy(atkbd->keycode, atkbd_set3_keycode, sizeof(atkbd->keycode)); + else + memcpy(atkbd->keycode, atkbd_set2_keycode, sizeof(atkbd->keycode)); + + for (i = 0; i < 512; i++) + if (atkbd->keycode[i] && atkbd->keycode[i] < 255) + set_bit(atkbd->keycode[i], atkbd->dev.keybit); + + printk(KERN_INFO "input: %s on %s (reconnected)\n", atkbd->name, serio->phys); + + return 0; +} + + static struct serio_dev atkbd_dev = { .interrupt = atkbd_interrupt, .connect = atkbd_connect, + .reconnect = atkbd_reconnect, .disconnect = atkbd_disconnect, .cleanup = atkbd_cleanup, }; - 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/
| |