Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8f5dd22 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

Revert "ANDROID: input: misc: keychord: move header to uapi"

This reverts commit f4d1cf12.

Remove keychord driver, replaced in user space by
https://android-review.googlesource.com/c/677629

.

Signed-off-by: default avatarMark Salyzyn <salyzyn@google.com>
Cc: Colin Cross <ccross@android.com>
Bug: 64114943
Bug: 129556081
Change-Id: I788f3cc4bec226fcccdd84127599e291f570087d
parent b1233839
Loading
Loading
Loading
Loading
+30 −1
Original line number Diff line number Diff line
@@ -18,6 +18,35 @@
#ifndef __LINUX_KEYCHORD_H_
#define __LINUX_KEYCHORD_H_

#include <uapi/linux/keychord.h>
#include <linux/input.h>

#define KEYCHORD_VERSION		1

/*
 * One or more input_keychord structs are written to /dev/keychord
 * at once to specify the list of keychords to monitor.
 * Reading /dev/keychord returns the id of a keychord when the
 * keychord combination is pressed.  A keychord is signalled when
 * all of the keys in the keycode list are in the pressed state.
 * The order in which the keys are pressed does not matter.
 * The keychord will not be signalled if keys not in the keycode
 * list are pressed.
 * Keychords will not be signalled on key release events.
 */
struct input_keychord {
	/* should be KEYCHORD_VERSION */
	__u16 version;
	/*
	 * client specified ID, returned from read()
	 * when this keychord is pressed.
	 */
	__u16 id;

	/* number of keycodes in this keychord */
	__u16 count;

	/* variable length array of keycodes */
	__u16 keycodes[];
};

#endif	/* __LINUX_KEYCHORD_H_ */

include/uapi/linux/keychord.h

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line
/*
 *  Key chord input driver
 *
 * Copyright (C) 2008 Google, Inc.
 * Author: Mike Lockwood <lockwood@android.com>
 *
 * This software is licensed under the terms of the GNU General Public
 * License version 2, as published by the Free Software Foundation, and
 * may be copied, distributed, and modified under those terms.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
*/

#ifndef _UAPI_LINUX_KEYCHORD_H_
#define _UAPI_LINUX_KEYCHORD_H_

#include <linux/input.h>

#define KEYCHORD_VERSION		1

/*
 * One or more input_keychord structs are written to /dev/keychord
 * at once to specify the list of keychords to monitor.
 * Reading /dev/keychord returns the id of a keychord when the
 * keychord combination is pressed.  A keychord is signalled when
 * all of the keys in the keycode list are in the pressed state.
 * The order in which the keys are pressed does not matter.
 * The keychord will not be signalled if keys not in the keycode
 * list are pressed.
 * Keychords will not be signalled on key release events.
 */
struct input_keychord {
	/* should be KEYCHORD_VERSION */
	__u16 version;
	/*
	 * client specified ID, returned from read()
	 * when this keychord is pressed.
	 */
	__u16 id;

	/* number of keycodes in this keychord */
	__u16 count;

	/* variable length array of keycodes */
	__u16 keycodes[];
};

#endif	/* _UAPI_LINUX_KEYCHORD_H_ */