diff options
| author | Michael Wright <michaelwr@google.com> | 2013-08-14 20:45:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-08-14 20:45:45 +0000 |
| commit | f5da24b04e97cd58fc0b528acf0197436aee7e2e (patch) | |
| tree | 03b4fb64c4e20098b9b0a67353611e156110c7ed | |
| parent | 54b217e18dff4402c100125cf47bc67e86062791 (diff) | |
| parent | fe2c8959f5c0b553da356314fbbbf126dd1dce55 (diff) | |
| download | kernel-headers-tools_r22.2.tar.gz | |
Merge "Update kernel input headers"tools_r22.2
| -rw-r--r-- | original/linux/input.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/original/linux/input.h b/original/linux/input.h index 49fb20e..3d45b48 100644 --- a/original/linux/input.h +++ b/original/linux/input.h @@ -198,6 +198,8 @@ struct input_keymap_entry { #define SYN_CONFIG 1 #define SYN_MT_REPORT 2 #define SYN_DROPPED 3 +#define SYN_TIME_SEC 4 +#define SYN_TIME_NSEC 5 /* * Keys and buttons @@ -691,7 +693,7 @@ struct input_keymap_entry { #define KEY_NUMERIC_9 0x209 #define KEY_NUMERIC_STAR 0x20a #define KEY_NUMERIC_POUND 0x20b - +#define KEY_CAMERA_SNAPSHOT 0x2fe #define KEY_CAMERA_FOCUS 0x210 #define KEY_WPS_BUTTON 0x211 /* WiFi Protected Setup key */ @@ -846,7 +848,10 @@ struct input_keymap_entry { #define SW_FRONT_PROXIMITY 0x0b /* set = front proximity sensor active */ #define SW_ROTATE_LOCK 0x0c /* set = rotate locked/disabled */ #define SW_LINEIN_INSERT 0x0d /* set = inserted */ -#define SW_MAX 0x0f +#define SW_HPHL_OVERCURRENT 0x0e /* set = over current on left hph */ +#define SW_HPHR_OVERCURRENT 0x0f /* set = over current on right hph */ +#define SW_UNSUPPORT_INSERT 0x10 /* set = unsupported device inserted */ +#define SW_MAX 0x20 #define SW_CNT (SW_MAX+1) /* @@ -1310,7 +1315,9 @@ struct input_dev { struct mutex mutex; unsigned int users; + unsigned int users_private; bool going_away; + bool disabled; bool sync; |