Re: usb hid: reset NumLock

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Dmitry Torokhov
Date: Monday, April 2, 2007 - 10:04 pm

On Monday 02 April 2007 19:12, Pete Zaitcev wrote:

Actually I think I will be adding the patch below, but it has to wait
till 2.6.22 as it requires input core to struct device conversion
patch.

What do you think?

-- 
Dmitry

Input: add generic suspend and resume for uinput devices

Automatically turn off leds and sound effects as part of suspend
process and restore led state, sounds and repeat rate at resume.

Also synchronize hardware state with logical state at device
registration.

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

 drivers/input/input.c |   80 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 80 insertions(+)

Index: work/drivers/input/input.c
===================================================================
--- work.orig/drivers/input/input.c
+++ work/drivers/input/input.c
@@ -997,10 +997,88 @@ static int input_dev_uevent(struct devic
 	return 0;
 }
 
+static void input_dev_toggle(struct input_dev *dev,
+			     unsigned int type, unsigned int code,
+			     unsigned long *cap_bits, unsigned long *bits,
+			     int force_off)
+{
+	if (test_bit(code, cap_bits)) {
+		if (!force_off)
+			dev->event(dev, type, code, test_bit(code, bits));
+		else if (test_bit(code, bits))
+			dev->event(dev, type, code, 0);
+	}
+}
+
+static void input_dev_reset(struct input_dev *dev, int force_off)
+{
+	int i;
+
+	if (!dev->event)
+		return;
+
+	/* synchronize led state */
+	if (test_bit(EV_LED, dev->evbit))
+		for (i = 0; i <= LED_MAX; i++)
+			input_dev_toggle(dev, EV_LED, i,
+					 dev->ledbit, dev->led, force_off);
+
+	/* restore sound */
+	if (test_bit(EV_SND, dev->evbit))
+		for (i = 0; i <= SND_MAX; i++)
+			input_dev_toggle(dev, EV_SND, i,
+					 dev->sndbit, dev->snd, force_off);
+
+	if (!force_off && test_bit(EV_REP, dev->evbit)) {
+		dev->event(dev, EV_REP, REP_PERIOD, dev->rep[REP_PERIOD]);
+		dev->event(dev, EV_REP, REP_DELAY, dev->rep[REP_DELAY]);
+	}
+}
+
+#ifdef CONFIG_PM
+static int input_dev_suspend(struct device *dev, pm_message_t state)
+{
+	struct input_dev *input_dev = to_input_dev(dev);
+
+	mutex_lock(&input_dev->mutex);
+
+	if (dev->power.power_state.event != state.event) {
+		if (state.event == PM_EVENT_SUSPEND)
+			input_dev_reset(input_dev, 1);
+
+		dev->power.power_state = state;
+	}
+
+	mutex_unlock(&input_dev->mutex);
+
+	return 0;
+}
+
+static int input_dev_resume(struct device *dev)
+{
+	struct input_dev *input_dev = to_input_dev(dev);
+
+	mutex_lock(&input_dev->mutex);
+
+	if (dev->power.power_state.event != PM_EVENT_ON)
+		input_dev_reset(to_input_dev(dev), 0);
+
+	dev->power.power_state = PMSG_ON;
+
+	mutex_unlock(&input_dev->mutex);
+
+	return 0;
+}
+#endif /* CONFIG_PM */
+
 static struct device_type input_dev_type = {
 	.groups		= input_dev_attr_groups,
 	.release	= input_dev_release,
 	.uevent		= input_dev_uevent,
+#ifdef CONFIG_PM
+	.suspend	= input_dev_suspend,
+	.resume		= input_dev_resume,
+#endif
 };
 
 struct class input_class = {
@@ -1080,6 +1158,8 @@ int input_register_device(struct input_d
 		dev->rep[REP_PERIOD] = 33;
 	}
 
+	input_dev_reset(dev, 0);
+
 	if (!dev->getkeycode)
 		dev->getkeycode = input_default_getkeycode;
 
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
usb hid: reset NumLock, Pete Zaitcev, (Fri Mar 30, 10:59 am)
Re: usb hid: reset NumLock, Dmitry Torokhov, (Fri Mar 30, 11:14 am)
Re: usb hid: reset NumLock, Pete Zaitcev, (Fri Mar 30, 12:54 pm)
Re: usb hid: reset NumLock, Dmitry Torokhov, (Fri Mar 30, 1:29 pm)
Re: usb hid: reset NumLock, Jiri Kosina, (Sat Mar 31, 12:35 pm)
Re: usb hid: reset NumLock, Pete Zaitcev, (Sat Mar 31, 3:43 pm)
Re: usb hid: reset NumLock, Pekka Enberg, (Sun Apr 1, 4:49 am)
Re: usb hid: reset NumLock, Pete Zaitcev, (Sun Apr 1, 9:16 am)
Re: usb hid: reset NumLock, Dmitry Torokhov, (Sun Apr 1, 9:10 pm)
Re: usb hid: reset NumLock, Pete Zaitcev, (Sun Apr 1, 10:24 pm)
Re: usb hid: reset NumLock, Jiri Kosina, (Mon Apr 2, 7:48 am)
Re: usb hid: reset NumLock, Pete Zaitcev, (Mon Apr 2, 4:12 pm)
Re: usb hid: reset NumLock, Dmitry Torokhov, (Mon Apr 2, 10:04 pm)
Re: usb hid: reset NumLock, Pete Zaitcev, (Mon Apr 2, 11:24 pm)
Re: usb hid: reset NumLock, Jiri Kosina, (Tue Apr 3, 1:52 am)
Re: [linux-usb-devel] usb hid: reset NumLock, Robert Marquardt, (Tue Apr 3, 1:57 am)
Re: usb hid: reset NumLock, Jiri Kosina, (Tue Apr 3, 2:32 am)
Re: usb hid: reset NumLock, Dmitry Torokhov, (Wed Apr 4, 8:24 pm)
Re: usb hid: reset NumLock, Jiri Kosina, (Thu Apr 5, 1:50 am)
Re: usb hid: reset NumLock, Pete Zaitcev, (Thu Apr 5, 1:38 pm)
Re: usb hid: reset NumLock, Dmitry Torokhov, (Thu Apr 5, 1:54 pm)
Re: usb hid: reset NumLock, Pete Zaitcev, (Thu Apr 5, 2:22 pm)