From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S263178AbTLGHab (ORCPT ); Sun, 7 Dec 2003 02:30:31 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S263447AbTLGHab (ORCPT ); Sun, 7 Dec 2003 02:30:31 -0500 Received: from smtp806.mail.sc5.yahoo.com ([66.163.168.185]:53364 "HELO smtp806.mail.sc5.yahoo.com") by vger.kernel.org with SMTP id S263178AbTLGHa2 (ORCPT ); Sun, 7 Dec 2003 02:30:28 -0500 From: Dmitry Torokhov To: linux-kernel@vger.kernel.org Subject: Re: [PATCH 2.6 2/3] Take 2: resume support for i8042 (atkbd & psmouse) Date: Sun, 7 Dec 2003 02:28:30 -0500 User-Agent: KMail/1.5.4 Cc: Vojtech Pavlik , Pavel Machek , Brian Perkins , Karol Kozimor References: <200312070227.21460.dtor_core@ameritech.net> In-Reply-To: <200312070227.21460.dtor_core@ameritech.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200312070228.31969.dtor_core@ameritech.net> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org =================================================================== ChangeSet@1.1515, 2003-12-07 01:57:52-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 | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+) =================================================================== diff -Nru a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c --- a/drivers/input/keyboard/atkbd.c Sun Dec 7 02:18:19 2003 +++ b/drivers/input/keyboard/atkbd.c Sun Dec 7 02:18:19 2003 @@ -686,10 +686,56 @@ printk(KERN_INFO "input: %s on %s\n", atkbd->name, serio->phys); } +/* + * atkbd_reconnect() tries to restore keyboard into 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); + + return 0; +} static struct serio_dev atkbd_dev = { .interrupt = atkbd_interrupt, .connect = atkbd_connect, + .reconnect = atkbd_reconnect, .disconnect = atkbd_disconnect, .cleanup = atkbd_cleanup, };