Android-x86
Fork
Faire un don

  • R/O
  • HTTP
  • SSH
  • HTTPS

bionic: Commit

bionic


Commit MetaInfo

Révision217e95bd572b38bdd4d4c4b472bbc165356908b0 (tree)
l'heure2011-06-10 00:18:09
AuteurChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Message de Log

input.h: update to EV_VERSION 0x010001

This is required by newer kernel(>=2.6.37).

Change Summary

Modification

--- a/libc/kernel/common/linux/input.h
+++ b/libc/kernel/common/linux/input.h
@@ -24,7 +24,7 @@ struct input_event {
2424 __s32 value;
2525 };
2626
27-#define EV_VERSION 0x010000
27+#define EV_VERSION 0x010001
2828
2929 struct input_id {
3030 __u16 bustype;
@@ -39,18 +39,31 @@ struct input_absinfo {
3939 __s32 maximum;
4040 __s32 fuzz;
4141 __s32 flat;
42+ __s32 resolution;
4243 };
4344
45+struct input_keymap_entry {
46+ __u8 flags;
47+ __u8 len;
48+ __u16 index;
49+ __u32 keycode;
50+ __u8 scancode[32];
51+};
52+
53+
4454 #define EVIOCGVERSION _IOR('E', 0x01, int)
4555 #define EVIOCGID _IOR('E', 0x02, struct input_id)
46-#define EVIOCGREP _IOR('E', 0x03, int[2])
47-#define EVIOCSREP _IOW('E', 0x03, int[2])
48-#define EVIOCGKEYCODE _IOR('E', 0x04, int[2])
49-#define EVIOCSKEYCODE _IOW('E', 0x04, int[2])
56+#define EVIOCGREP _IOR('E', 0x03, unsigned int[2])
57+#define EVIOCSREP _IOW('E', 0x03, unsigned int[2])
58+#define EVIOCGKEYCODE _IOR('E', 0x04, unsigned int[2])
59+#define EVIOCGKEYCODE_V2 _IOR('E', 0x04, struct input_keymap_entry)
60+#define EVIOCSKEYCODE _IOW('E', 0x04, unsigned int[2])
61+#define EVIOCSKEYCODE_V2 _IOW('E', 0x04, struct input_keymap_entry)
5062
5163 #define EVIOCGNAME(len) _IOC(_IOC_READ, 'E', 0x06, len)
5264 #define EVIOCGPHYS(len) _IOC(_IOC_READ, 'E', 0x07, len)
5365 #define EVIOCGUNIQ(len) _IOC(_IOC_READ, 'E', 0x08, len)
66+#define EVIOCGPROP(len) _IOC(_IOC_READ, 'E', 0x09, len)
5467
5568 #define EVIOCGKEY(len) _IOC(_IOC_READ, 'E', 0x18, len)
5669 #define EVIOCGLED(len) _IOC(_IOC_READ, 'E', 0x19, len)
@@ -204,6 +217,7 @@ struct input_absinfo {
204217 #define KEY_KPEQUAL 117
205218 #define KEY_KPPLUSMINUS 118
206219 #define KEY_PAUSE 119
220+#define KEY_SCALE 120
207221
208222 #define KEY_KPCOMMA 121
209223 #define KEY_HANGEUL 122
@@ -239,6 +253,7 @@ struct input_absinfo {
239253 #define KEY_WWW 150
240254 #define KEY_MSDOS 151
241255 #define KEY_COFFEE 152
256+#define KEY_SCREENLOCK KEY_COFFEE
242257 #define KEY_DIRECTION 153
243258 #define KEY_CYCLEWINDOWS 154
244259 #define KEY_MAIL 155
@@ -333,8 +348,21 @@ struct input_absinfo {
333348
334349 #define KEY_BATTERY 236
335350
351+#define KEY_BLUETOOTH 237
352+#define KEY_WLAN 238
353+#define KEY_UWB 239
354+
336355 #define KEY_UNKNOWN 240
337356
357+#define KEY_VIDEO_NEXT 241
358+#define KEY_VIDEO_PREV 242
359+#define KEY_BRIGHTNESS_CYCLE 243
360+#define KEY_BRIGHTNESS_ZERO 244
361+#define KEY_DISPLAY_OFF 245
362+
363+#define KEY_WIMAX 246
364+#define KEY_RFKILL 247
365+
338366 #define BTN_MISC 0x100
339367 #define BTN_0 0x100
340368 #define BTN_1 0x101
@@ -403,6 +431,7 @@ struct input_absinfo {
403431 #define BTN_STYLUS2 0x14c
404432 #define BTN_TOOL_DOUBLETAP 0x14d
405433 #define BTN_TOOL_TRIPLETAP 0x14e
434+#define BTN_TOOL_QUADTAP 0x14f
406435
407436 #define BTN_WHEEL 0x150
408437 #define BTN_GEAR_DOWN 0x150
@@ -472,6 +501,34 @@ struct input_absinfo {
472501 #define KEY_DIGITS 0x19d
473502 #define KEY_TEEN 0x19e
474503 #define KEY_TWEN 0x19f
504+#define KEY_VIDEOPHONE 0x1a0
505+#define KEY_GAMES 0x1a1
506+#define KEY_ZOOMIN 0x1a2
507+#define KEY_ZOOMOUT 0x1a3
508+#define KEY_ZOOMRESET 0x1a4
509+#define KEY_WORDPROCESSOR 0x1a5
510+#define KEY_EDITOR 0x1a6
511+#define KEY_SPREADSHEET 0x1a7
512+#define KEY_GRAPHICSEDITOR 0x1a8
513+#define KEY_PRESENTATION 0x1a9
514+#define KEY_DATABASE 0x1aa
515+#define KEY_NEWS 0x1ab
516+#define KEY_VOICEMAIL 0x1ac
517+#define KEY_ADDRESSBOOK 0x1ad
518+#define KEY_MESSENGER 0x1ae
519+#define KEY_DISPLAYTOGGLE 0x1af
520+#define KEY_SPELLCHECK 0x1b0
521+#define KEY_LOGOFF 0x1b1
522+
523+#define KEY_DOLLAR 0x1b2
524+#define KEY_EURO 0x1b3
525+
526+#define KEY_FRAMEBACK 0x1b4
527+#define KEY_FRAMEFORWARD 0x1b5
528+#define KEY_CONTEXT_MENU 0x1b6
529+#define KEY_MEDIA_REPEAT 0x1b7
530+#define KEY_10CHANNELSUP 0x1b8
531+#define KEY_10CHANNELSDOWN 0x1b9
475532
476533 #define KEY_DEL_EOL 0x1c0
477534 #define KEY_DEL_EOS 0x1c1
@@ -508,6 +565,8 @@ struct input_absinfo {
508565 #define KEY_BRL_DOT6 0x1f6
509566 #define KEY_BRL_DOT7 0x1f7
510567 #define KEY_BRL_DOT8 0x1f8
568+#define KEY_BRL_DOT9 0x1f9
569+#define KEY_BRL_DOT10 0x1fa
511570
512571 #define KEY_MIN_INTERESTING KEY_MUTE
513572 #define KEY_MAX 0x1ff
Afficher sur ancien navigateur de dépôt.