From d2fe906de6d1d1195a7cab5468f5b8bf807b681e Mon Sep 17 00:00:00 2001 From: Xiaohui Tao Date: Mon, 26 Aug 2013 14:42:43 -0700 Subject: input: Add MSC_TIMESEC/_TIMEUSEC for android Eventhub defines two entries: MSC_ANDROID_TIME_SEC 0x6 MSC_ANDROID_TIME_USEC 0x7 to pass the timestamp from the linux kernel to android if the input devices have a better concetp of the time. These two entries conflict with MSC_ACTIVITY which is used for CPU_BOOST, which causes the first touc does not work after lp0. Add the two entries in input.h to match with android layer. Bug 1354400 Change-Id: I5cc9b2605db609cebad96ad1b95433fa333e77f7 Signed-off-by: Xiaohui Tao Reviewed-on: http://git-master/r/266219 Reviewed-by: Mitch Luban Tested-by: Mitch Luban --- include/uapi/linux/input.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'include/uapi/linux') diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h index fefb330db869..9ac65fba5cdb 100644 --- a/include/uapi/linux/input.h +++ b/include/uapi/linux/input.h @@ -860,8 +860,10 @@ struct input_keymap_entry { #define MSC_RAW 0x03 #define MSC_SCAN 0x04 #define MSC_TIMESTAMP 0x05 -#define MSC_ACTIVITY 0x06 -#define MSC_MAX 0x07 +#define MSC_TIMESEC 0x06 +#define MSC_TIMEUSEC 0x07 +#define MSC_ACTIVITY 0x08 +#define MSC_MAX 0x09 #define MSC_CNT (MSC_MAX+1) /* -- cgit v1.2.3