summaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
authorXiaohui Tao <xtao@nvidia.com>2013-08-26 14:42:43 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2013-09-14 13:43:27 -0700
commitd2fe906de6d1d1195a7cab5468f5b8bf807b681e (patch)
treeff0b3810ab1d27608f02527f4d2c0b61b1c5b776 /include/uapi
parent8bae8acb0013cee202bd47bbe2246ed7be497b8d (diff)
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 <xtao@nvidia.com> Reviewed-on: http://git-master/r/266219 Reviewed-by: Mitch Luban <mluban@nvidia.com> Tested-by: Mitch Luban <mluban@nvidia.com>
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/input.h6
1 files changed, 4 insertions, 2 deletions
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)
/*