Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input (fb00f762) · Commits · 戴 / test

Documentation/input/notifier.txt

0 → 100644

+52 −0

Original line number	Diff line number	Diff line
		Keyboard notifier

		One can use register_keyboard_notifier to get called back on keyboard
		events (see kbd_keycode() function for details). The passed structure is
		keyboard_notifier_param:

		- 'vc' always provide the VC for which the keyboard event applies;
		- 'down' is 1 for a key press event, 0 for a key release;
		- 'shift' is the current modifier state, mask bit indexes are KG_*;
		- 'value' depends on the type of event.

		- KBD_KEYCODE events are always sent before other events, value is the keycode.
		- KBD_UNBOUND_KEYCODE events are sent if the keycode is not bound to a keysym.
		value is the keycode.
		- KBD_UNICODE events are sent if the keycode -> keysym translation produced a
		unicode character. value is the unicode value.
		- KBD_KEYSYM events are sent if the keycode -> keysym translation produced a
		non-unicode character. value is the keysym.
		- KBD_POST_KEYSYM events are sent after the treatment of non-unicode keysyms.
		That permits one to inspect the resulting LEDs for instance.

		For each kind of event but the last, the callback may return NOTIFY_STOP in
		order to "eat" the event: the notify loop is stopped and the keyboard event is
		dropped.

		In a rough C snippet, we have:

		kbd_keycode(keycode) {
		...
		params.value = keycode;
		if (notifier_call_chain(KBD_KEYCODE,&params) == NOTIFY_STOP)
		\|\| !bound) {
		notifier_call_chain(KBD_UNBOUND_KEYCODE,&params);
		return;
		}

		if (unicode) {
		param.value = unicode;
		if (notifier_call_chain(KBD_UNICODE,&params) == NOTIFY_STOP)
		return;
		emit unicode;
		return;
		}

		params.value = keysym;
		if (notifier_call_chain(KBD_KEYSYM,&params) == NOTIFY_STOP)
		return;
		apply keysym;
		notifier_call_chain(KBD_POST_KEYSYM,&params);
		}

		NOTE: This notifier is usually called from interrupt context.

Documentation/kernel-parameters.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -732,6 +732,8 @@ and is between 256 and 4096 characters. It is defined in the file
		(Don't attempt to blink the leds)
		i8042.noaux [HW] Don't check for auxiliary (== mouse) port
		i8042.nokbd [HW] Don't check/create keyboard port
		i8042.noloop [HW] Disable the AUX Loopback command while probing
		for the AUX port
		i8042.nomux [HW] Don't check presence of an active multiplexing
		controller
		i8042.nopnp [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX

drivers/input/misc/cobalt_btns.c

+8 −8

Original line number	Diff line number	Diff line
		/*
		* Cobalt button interface driver.
		*
		* Copyright (C) 2007 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
		* Copyright (C) 2007-2008 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		@@ -55,7 +55,7 @@ static void handle_buttons(struct input_polled_dev *dev)
		status = ~readl(bdev->reg) >> 24;

		for (i = 0; i < ARRAY_SIZE(bdev->keymap); i++) {
		if (status & (1UL << i)) {
		if (status & (1U << i)) {
		if (++bdev->count[i] == BUTTONS_COUNT_THRESHOLD) {
		input_event(input, EV_MSC, MSC_SCAN, i);
		input_report_key(input, bdev->keymap[i], 1);
		@@ -97,16 +97,16 @@ static int __devinit cobalt_buttons_probe(struct platform_device *pdev)
		input->name = "Cobalt buttons";
		input->phys = "cobalt/input0";
		input->id.bustype = BUS_HOST;
		input->cdev.dev = &pdev->dev;
		input->dev.parent = &pdev->dev;

		input->keycode = pdev->keymap;
		input->keycodemax = ARRAY_SIZE(pdev->keymap);
		input->keycode = bdev->keymap;
		input->keycodemax = ARRAY_SIZE(bdev->keymap);
		input->keycodesize = sizeof(unsigned short);

		input_set_capability(input, EV_MSC, MSC_SCAN);
		__set_bit(EV_KEY, input->evbit);
		for (i = 0; i < ARRAY_SIZE(buttons_map); i++)
		__set_bit(input->keycode[i], input->keybit);
		for (i = 0; i < ARRAY_SIZE(cobalt_map); i++)
		__set_bit(bdev->keymap[i], input->keybit);
		__clear_bit(KEY_RESERVED, input->keybit);

		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

drivers/input/mouse/alps.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -116,8 +116,8 @@ static void alps_process_packet(struct psmouse *psmouse)
		}

		if (priv->i->flags & ALPS_FW_BK_1) {
		back = packet[2] & 4;
		forward = packet[0] & 0x10;
		back = packet[0] & 0x10;
		forward = packet[2] & 4;
		}

		if (priv->i->flags & ALPS_FW_BK_2) {
		@@ -483,6 +483,7 @@ int alps_init(struct psmouse *psmouse)
		dev2->id.vendor = 0x0002;
		dev2->id.product = PSMOUSE_ALPS;
		dev2->id.version = 0x0000;
		dev2->dev.parent = &psmouse->ps2dev.serio->dev;

		dev2->evbit[0] = BIT_MASK(EV_KEY) \| BIT_MASK(EV_REL);
		dev2->relbit[BIT_WORD(REL_X)] \|= BIT_MASK(REL_X) \| BIT_MASK(REL_Y);

drivers/input/serio/i8042-snirm.h

0 → 100644

+75 −0

Original line number	Diff line number	Diff line
		#ifndef _I8042_SNIRM_H
		#define _I8042_SNIRM_H

		#include <asm/sni.h>

		/*
		* This program is free software; you can redistribute it and/or modify it
		* under the terms of the GNU General Public License version 2 as published by
		* the Free Software Foundation.
		*/

		/*
		* Names.
		*/

		#define I8042_KBD_PHYS_DESC "onboard/serio0"
		#define I8042_AUX_PHYS_DESC "onboard/serio1"
		#define I8042_MUX_PHYS_DESC "onboard/serio%d"

		/*
		* IRQs.
		*/
		static int i8042_kbd_irq;
		static int i8042_aux_irq;
		#define I8042_KBD_IRQ i8042_kbd_irq
		#define I8042_AUX_IRQ i8042_aux_irq

		static void __iomem *kbd_iobase;

		#define I8042_COMMAND_REG (kbd_iobase + 0x64UL)
		#define I8042_DATA_REG (kbd_iobase + 0x60UL)

		static inline int i8042_read_data(void)
		{
		return readb(kbd_iobase + 0x60UL);
		}

		static inline int i8042_read_status(void)
		{
		return readb(kbd_iobase + 0x64UL);
		}

		static inline void i8042_write_data(int val)
		{
		writeb(val, kbd_iobase + 0x60UL);
		}

		static inline void i8042_write_command(int val)
		{
		writeb(val, kbd_iobase + 0x64UL);
		}
		static inline int i8042_platform_init(void)
		{
		/* RM200 is strange ... */
		if (sni_brd_type == SNI_BRD_RM200) {
		kbd_iobase = ioremap(0x16000000, 4);
		i8042_kbd_irq = 33;
		i8042_aux_irq = 44;
		} else {
		kbd_iobase = ioremap(0x14000000, 4);
		i8042_kbd_irq = 1;
		i8042_aux_irq = 12;
		}
		if (!kbd_iobase)
		return -ENOMEM;

		return 0;
		}

		static inline void i8042_platform_exit(void)
		{

		}

		#endif /* _I8042_SNIRM_H */

Admin message