History

Merge branch 'topic/cec' into topic/docs-next

* topic/cec: [media] DocBook/media: add CEC documentation [media] s5p_cec: get rid of an unused var [media] move s5p-cec to staging [media] vivid: add CEC emulation [media] cec: s5p-cec: Add s5p-cec driver [media] cec: adv7511: add cec support [media] cec: adv7842: add cec support [media] cec: adv7604: add cec support [media] cec: add compat32 ioctl support [media] cec/TODO: add TODO file so we know why this is still in staging [media] cec: add HDMI CEC framework (api) [media] cec: add HDMI CEC framework (adapter) [media] cec: add HDMI CEC framework (core) [media] cec-funcs.h: static inlines to pack/unpack CEC messages [media] cec.h: add cec header [media] cec-edid: add module for EDID CEC helper functions [media] cec.txt: add CEC framework documentation [media] rc: Add HDMI CEC protocol handling Input: add HDMI CEC specific keycodes Input: add BUS_CEC type

Mauro Carvalho Chehab committed 10 years ago

Commit 6a6e8092 parents d2c6815 c7169ad62 files · +10460 −129Browse files

Showing the changes to include/uapi (2 of 62 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/input-event-codes.h +31 −0
  2. include/uapi/linux/input.h +1 −0
include/uapi/linux/input-event-codes.h+31−0
@@ -611,6 +611,37 @@ · 610 unmodified lines
611611 #define KEY_KBDINPUTASSIST_ACCEPT 0x264
612612 #define KEY_KBDINPUTASSIST_CANCEL 0x265
613613
614+/* Diagonal movement keys */
615+#define KEY_RIGHT_UP 0x266
616+#define KEY_RIGHT_DOWN 0x267
617+#define KEY_LEFT_UP 0x268
618+#define KEY_LEFT_DOWN 0x269
619+
620+#define KEY_ROOT_MENU 0x26a /* Show Device's Root Menu */
621+/* Show Top Menu of the Media (e.g. DVD) */
622+#define KEY_MEDIA_TOP_MENU 0x26b
623+#define KEY_NUMERIC_11 0x26c
624+#define KEY_NUMERIC_12 0x26d
625+/*
626+ * Toggle Audio Description: refers to an audio service that helps blind and
627+ * visually impaired consumers understand the action in a program. Note: in
628+ * some countries this is referred to as "Video Description".
629+ */
630+#define KEY_AUDIO_DESC 0x26e
631+#define KEY_3D_MODE 0x26f
632+#define KEY_NEXT_FAVORITE 0x270
633+#define KEY_STOP_RECORD 0x271
634+#define KEY_PAUSE_RECORD 0x272
635+#define KEY_VOD 0x273 /* Video on Demand */
636+#define KEY_UNMUTE 0x274
637+#define KEY_FASTREVERSE 0x275
638+#define KEY_SLOWREVERSE 0x276
639+/*
640+ * Control a data application associated with the currently viewed channel,
641+ * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.)
642+ */
643+#define KEY_DATA 0x275
644+
614645 #define BTN_TRIGGER_HAPPY 0x2c0
615646 #define BTN_TRIGGER_HAPPY1 0x2c0
616647 #define BTN_TRIGGER_HAPPY2 0x2c1
include/uapi/linux/input.h+1−0
@@ -247,6 +247,7 @@ struct input_mask { · 246 unmodified lines
247247 #define BUS_ATARI 0x1B
248248 #define BUS_SPI 0x1C
249249 #define BUS_RMI 0x1D
250+#define BUS_CEC 0x1E
250251
251252 /*
252253 * MT_TOOL types

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t