This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: sync with kernel Author: Sean Young <s...@mess.org> Date: Thu Nov 22 19:37:36 2018 +0000 Signed-off-by: Sean Young <s...@mess.org> contrib/freebsd/include/linux/v4l2-common.h | 26 ++++---- include/linux/v4l2-common.h | 26 ++++---- utils/keytable/Makefile.am | 2 +- .../keytable/rc_keymaps/allwinner_ba10_tv_box.toml | 18 ++++++ .../rc_keymaps/allwinner_i12_a20_tv_box.toml | 31 +++++++++ utils/keytable/rc_keymaps/dish_network.toml | 62 ++++++++++++++++++ utils/keytable/rc_keymaps/mce_keyboard.toml | 75 ++++++++++++++++++++++ utils/keytable/rc_keymaps/wobo_i5.toml | 12 ++++ utils/keytable/rc_keymaps/xbox_dvd.toml | 31 +++++++++ utils/keytable/rc_maps.cfg | 1 + 10 files changed, 257 insertions(+), 27 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=f3d77d6df975b6fb8fbf9f9f8fe2c4a809136b86 diff --git a/contrib/freebsd/include/linux/v4l2-common.h b/contrib/freebsd/include/linux/v4l2-common.h index 4f797e2af348..efcc401349ac 100644 --- a/contrib/freebsd/include/linux/v4l2-common.h +++ b/contrib/freebsd/include/linux/v4l2-common.h @@ -79,24 +79,11 @@ /* Current composing area plus all padding pixels */ #define V4L2_SEL_TGT_COMPOSE_PADDED 0x0103 -/* Backward compatibility target definitions --- to be removed. */ -#define V4L2_SEL_TGT_CROP_ACTIVE V4L2_SEL_TGT_CROP -#define V4L2_SEL_TGT_COMPOSE_ACTIVE V4L2_SEL_TGT_COMPOSE -#define V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL V4L2_SEL_TGT_CROP -#define V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL V4L2_SEL_TGT_COMPOSE -#define V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS V4L2_SEL_TGT_CROP_BOUNDS -#define V4L2_SUBDEV_SEL_TGT_COMPOSE_BOUNDS V4L2_SEL_TGT_COMPOSE_BOUNDS - /* Selection flags */ #define V4L2_SEL_FLAG_GE (1 << 0) #define V4L2_SEL_FLAG_LE (1 << 1) #define V4L2_SEL_FLAG_KEEP_CONFIG (1 << 2) -/* Backward compatibility flag definitions --- to be removed. */ -#define V4L2_SUBDEV_SEL_FLAG_SIZE_GE V4L2_SEL_FLAG_GE -#define V4L2_SUBDEV_SEL_FLAG_SIZE_LE V4L2_SEL_FLAG_LE -#define V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG V4L2_SEL_FLAG_KEEP_CONFIG - struct v4l2_edid { uint32_t pad; uint32_t start_block; @@ -105,4 +92,17 @@ struct v4l2_edid { uint8_t *edid; }; +/* Backward compatibility target definitions --- to be removed. */ +#define V4L2_SEL_TGT_CROP_ACTIVE V4L2_SEL_TGT_CROP +#define V4L2_SEL_TGT_COMPOSE_ACTIVE V4L2_SEL_TGT_COMPOSE +#define V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL V4L2_SEL_TGT_CROP +#define V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL V4L2_SEL_TGT_COMPOSE +#define V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS V4L2_SEL_TGT_CROP_BOUNDS +#define V4L2_SUBDEV_SEL_TGT_COMPOSE_BOUNDS V4L2_SEL_TGT_COMPOSE_BOUNDS + +/* Backward compatibility flag definitions --- to be removed. */ +#define V4L2_SUBDEV_SEL_FLAG_SIZE_GE V4L2_SEL_FLAG_GE +#define V4L2_SUBDEV_SEL_FLAG_SIZE_LE V4L2_SEL_FLAG_LE +#define V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG V4L2_SEL_FLAG_KEEP_CONFIG + #endif /* __V4L2_COMMON__ */ diff --git a/include/linux/v4l2-common.h b/include/linux/v4l2-common.h index 4f7b892377cd..14de1731b39c 100644 --- a/include/linux/v4l2-common.h +++ b/include/linux/v4l2-common.h @@ -79,24 +79,11 @@ /* Current composing area plus all padding pixels */ #define V4L2_SEL_TGT_COMPOSE_PADDED 0x0103 -/* Backward compatibility target definitions --- to be removed. */ -#define V4L2_SEL_TGT_CROP_ACTIVE V4L2_SEL_TGT_CROP -#define V4L2_SEL_TGT_COMPOSE_ACTIVE V4L2_SEL_TGT_COMPOSE -#define V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL V4L2_SEL_TGT_CROP -#define V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL V4L2_SEL_TGT_COMPOSE -#define V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS V4L2_SEL_TGT_CROP_BOUNDS -#define V4L2_SUBDEV_SEL_TGT_COMPOSE_BOUNDS V4L2_SEL_TGT_COMPOSE_BOUNDS - /* Selection flags */ #define V4L2_SEL_FLAG_GE (1 << 0) #define V4L2_SEL_FLAG_LE (1 << 1) #define V4L2_SEL_FLAG_KEEP_CONFIG (1 << 2) -/* Backward compatibility flag definitions --- to be removed. */ -#define V4L2_SUBDEV_SEL_FLAG_SIZE_GE V4L2_SEL_FLAG_GE -#define V4L2_SUBDEV_SEL_FLAG_SIZE_LE V4L2_SEL_FLAG_LE -#define V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG V4L2_SEL_FLAG_KEEP_CONFIG - struct v4l2_edid { __u32 pad; __u32 start_block; @@ -105,4 +92,17 @@ struct v4l2_edid { __u8 *edid; }; +/* Backward compatibility target definitions --- to be removed. */ +#define V4L2_SEL_TGT_CROP_ACTIVE V4L2_SEL_TGT_CROP +#define V4L2_SEL_TGT_COMPOSE_ACTIVE V4L2_SEL_TGT_COMPOSE +#define V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL V4L2_SEL_TGT_CROP +#define V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL V4L2_SEL_TGT_COMPOSE +#define V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS V4L2_SEL_TGT_CROP_BOUNDS +#define V4L2_SUBDEV_SEL_TGT_COMPOSE_BOUNDS V4L2_SEL_TGT_COMPOSE_BOUNDS + +/* Backward compatibility flag definitions --- to be removed. */ +#define V4L2_SUBDEV_SEL_FLAG_SIZE_GE V4L2_SEL_FLAG_GE +#define V4L2_SUBDEV_SEL_FLAG_SIZE_LE V4L2_SEL_FLAG_LE +#define V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG V4L2_SEL_FLAG_KEEP_CONFIG + #endif /* __V4L2_COMMON__ */ diff --git a/utils/keytable/Makefile.am b/utils/keytable/Makefile.am index ddbab0f7ffd3..159520b65d52 100644 --- a/utils/keytable/Makefile.am +++ b/utils/keytable/Makefile.am @@ -71,6 +71,6 @@ sync-with-kernel: @-mkdir -p $(srcdir)/rc_keymaps @-rm $(srcdir)/rc_keymaps/* - @-cp $(srcdir)/rc_keymaps_userspace/* $(srcdir)/rc_keymaps/ @echo storing existing keymaps at $(srcdir)/rc_keymaps/ @cd $(srcdir) && ./gen_keytables.pl $(KERNEL_DIR); + @-cp $(srcdir)/rc_keymaps_userspace/* $(srcdir)/rc_keymaps/ diff --git a/utils/keytable/rc_keymaps/allwinner_ba10_tv_box.toml b/utils/keytable/rc_keymaps/allwinner_ba10_tv_box.toml new file mode 100644 index 000000000000..adc40180da40 --- /dev/null +++ b/utils/keytable/rc_keymaps/allwinner_ba10_tv_box.toml @@ -0,0 +1,18 @@ +[[protocols]] +name = "allwinner_ba10_tv_box" +protocol = "nec" +[protocols.scancodes] +0x206 = "KEY_UP" +0x216 = "KEY_VOLUMEDOWN" +0x217 = "KEY_NEXTSONG" +0x21a = "KEY_POWER" +0x21b = "KEY_BACK" +0x21e = "KEY_OK" +0x21f = "KEY_DOWN" +0x244 = "KEY_VOLUMEUP" +0x254 = "KEY_PREVIOUSSONG" +0x255 = "KEY_PLAYPAUSE" +0x258 = "KEY_MENU" +0x259 = "KEY_HOMEPAGE" +0x25c = "KEY_RIGHT" +0x25d = "KEY_LEFT" diff --git a/utils/keytable/rc_keymaps/allwinner_i12_a20_tv_box.toml b/utils/keytable/rc_keymaps/allwinner_i12_a20_tv_box.toml new file mode 100644 index 000000000000..d5ffe9391934 --- /dev/null +++ b/utils/keytable/rc_keymaps/allwinner_i12_a20_tv_box.toml @@ -0,0 +1,31 @@ +[[protocols]] +name = "allwinner_i12_a20_tv_box" +protocol = "nec" +[protocols.scancodes] +0x00 = "KEY_7" +0x01 = "KEY_4" +0x02 = "KEY_1" +0x03 = "KEY_VOLUMEDOWN" +0x04 = "KEY_8" +0x05 = "KEY_5" +0x06 = "KEY_2" +0x07 = "KEY_BACK" +0x08 = "KEY_9" +0x09 = "KEY_6" +0x0a = "KEY_3" +0x0b = "KEY_NEXTSONG" +0x0c = "KEY_WWW" +0x0d = "KEY_0" +0x0e = "KEY_BACKSPACE" +0x40 = "KEY_VOLUMEUP" +0x41 = "KEY_LEFT" +0x42 = "KEY_HOMEPAGE" +0x43 = "KEY_POWER" +0x44 = "KEY_DOWN" +0x45 = "KEY_OK" +0x46 = "KEY_UP" +0x47 = "KEY_CONTEXT_MENU" +0x48 = "KEY_PREVIOUSSONG" +0x49 = "KEY_RIGHT" +0x4a = "KEY_MENU" +0x4b = "KEY_MUTE" diff --git a/utils/keytable/rc_keymaps/dish_network.toml b/utils/keytable/rc_keymaps/dish_network.toml new file mode 100644 index 000000000000..9614edae3280 --- /dev/null +++ b/utils/keytable/rc_keymaps/dish_network.toml @@ -0,0 +1,62 @@ +# See https://www.mythtv.org/wiki/DISHNetworkLIRCConfiguration +[[protocols]] +name = 'Dish Network' +protocol = 'pulse_distance' +trailer_pulse = 450 +header_optional = 1 +header_pulse = 525 +header_space = 6045 +bits = 16 +bit_pulse = 440 +bit_1_space = 1645 +bit_0_space = 2780 +[protocols.scancodes] +0x0400 = 'KEY_SAT' +0xa801 = 'KEY_TV' +0xac02 = 'KEY_DVD' +0xb003 = 'KEY_AUX' +0x0800 = 'KEY_POWER' +0x2c00 = 'KEY_MENU' +0x5c00 = 'KEY_SWITCHVIDEOMODE' # Input +0x3c10 = 'KEY_PAGEUP' +0x1c10 = 'KEY_PAGEDOWN' +0x5000 = 'KEY_EPG' +0x6800 = 'KEY_UP' +0x7000 = 'KEY_LEFT' +0x4000 = 'KEY_SELECT' +0x6000 = 'KEY_RIGHT' +0x7800 = 'KEY_DOWN' +0x6c00 = 'KEY_LAST' +0x0000 = 'KEY_INFO' +0xb400 = 'KEY_SEARCH' +0x5800 = 'KEY_TV' # View Live TV +0x4800 = 'KEY_CANCEL' +0x4c00 = 'KEY_RED' +0xd400 = 'KEY_GREEN' +0x8800 = 'KEY_YELLOW' +0x8c00 = 'KEY_BLUE' +0xd810 = 'KEY_PREVIOUS' +0xe410 = 'KEY_PVR' +0xdc10 = 'KEY_NEXT' +0xc410 = 'KEY_REWIND' +0x8000 = 'KEY_PAUSE' +0xc810 = 'KEY_FASTFORWARD' +0x8400 = 'KEY_STOP' +0x7c00 = 'KEY_RECORD' +0x0c10 = 'KEY_PLAY' +0x1000 = 'KEY_NUMERIC_1' +0x1400 = 'KEY_NUMERIC_2' +0x1800 = 'KEY_NUMERIC_3' +0x2000 = 'KEY_NUMERIC_4' +0x2400 = 'KEY_NUMERIC_5' +0x2800 = 'KEY_NUMERIC_6' +0x3000 = 'KEY_NUMERIC_7' +0x3400 = 'KEY_NUMERIC_8' +0x3800 = 'KEY_NUMERIC_9' +0x4400 = 'KEY_NUMERIC_0' +0x9400 = 'KEY_NUMERIC_STAR' +0x9800 = 'KEY_NUMERIC_POUND' +0xf410 = 'KEY_AB' +0xe810 = 'KEY_VIDEO' # PIP (Picture-in-picture) +0xec10 = 'KEY_SCREEN' # Position +0xd010 = 'KEY_MEDIA' # Dish diff --git a/utils/keytable/rc_keymaps/mce_keyboard.toml b/utils/keytable/rc_keymaps/mce_keyboard.toml new file mode 100644 index 000000000000..ed69c2f49b7f --- /dev/null +++ b/utils/keytable/rc_keymaps/mce_keyboard.toml @@ -0,0 +1,75 @@ +# Microsoft Remote Keyboard for Windows Media Center Edition +# The keyboard uses both rc-6 and mce_kbd protocols. The mce_kbd protocol +# is used for the standard keyboard keys (e.g. qwerty, return etc) and the +# other keys like "messager", volume up etc are sent using rc-6 (mce variant). +[[protocols]] +name = "rc6_mce" +protocol = "rc6" +variant = "rc6_mce" +[protocols.scancodes] +0x800f0400 = "KEY_NUMERIC_0" +0x800f0401 = "KEY_NUMERIC_1" +0x800f0402 = "KEY_NUMERIC_2" +0x800f0403 = "KEY_NUMERIC_3" +0x800f0404 = "KEY_NUMERIC_4" +0x800f0405 = "KEY_NUMERIC_5" +0x800f0406 = "KEY_NUMERIC_6" +0x800f0407 = "KEY_NUMERIC_7" +0x800f0408 = "KEY_NUMERIC_8" +0x800f0409 = "KEY_NUMERIC_9" +0x800f040a = "KEY_DELETE" +0x800f040b = "KEY_ENTER" +0x800f040c = "KEY_SLEEP" +0x800f040d = "KEY_MEDIA" +0x800f040e = "KEY_MUTE" +0x800f040f = "KEY_INFO" +0x800f0410 = "KEY_VOLUMEUP" +0x800f0411 = "KEY_VOLUMEDOWN" +0x800f0412 = "KEY_CHANNELUP" +0x800f0413 = "KEY_CHANNELDOWN" +0x800f0414 = "KEY_FASTFORWARD" +0x800f0415 = "KEY_REWIND" +0x800f0416 = "KEY_PLAY" +0x800f0417 = "KEY_RECORD" +0x800f0418 = "KEY_PAUSE" +0x800f0419 = "KEY_STOP" +0x800f041a = "KEY_NEXT" +0x800f041b = "KEY_PREVIOUS" +0x800f041c = "KEY_NUMERIC_POUND" +0x800f041d = "KEY_NUMERIC_STAR" +0x800f041e = "KEY_UP" +0x800f041f = "KEY_DOWN" +0x800f0420 = "KEY_LEFT" +0x800f0421 = "KEY_RIGHT" +0x800f0422 = "KEY_OK" +0x800f0423 = "KEY_EXIT" +0x800f0424 = "KEY_DVD" +0x800f0425 = "KEY_TUNER" +0x800f0426 = "KEY_EPG" +0x800f0427 = "KEY_ZOOM" +0x800f0432 = "KEY_MODE" +0x800f0433 = "KEY_PRESENTATION" +0x800f0434 = "KEY_EJECTCD" +0x800f043a = "KEY_BRIGHTNESSUP" +0x800f0446 = "KEY_TV" +0x800f0447 = "KEY_AUDIO" +0x800f0448 = "KEY_PVR" +0x800f0449 = "KEY_CAMERA" +0x800f044a = "KEY_VIDEO" +0x800f044c = "KEY_LANGUAGE" +0x800f044d = "KEY_TITLE" +0x800f044e = "KEY_PRINT" +0x800f0450 = "KEY_RADIO" +0x800f045a = "KEY_SUBTITLE" +0x800f045b = "KEY_RED" +0x800f045c = "KEY_GREEN" +0x800f045d = "KEY_YELLOW" +0x800f045e = "KEY_BLUE" +0x800f0465 = "KEY_POWER2" +0x800f0469 = "KEY_MESSENGER" +0x800f046e = "KEY_PLAYPAUSE" +0x800f046f = "KEY_PLAYER" +0x800f0480 = "KEY_BRIGHTNESSDOWN" +0x800f0481 = "KEY_PLAYPAUSE" +[[protocols]] +protocol = "mce_kbd" diff --git a/utils/keytable/rc_keymaps/wobo_i5.toml b/utils/keytable/rc_keymaps/wobo_i5.toml new file mode 100644 index 000000000000..f88de43444ad --- /dev/null +++ b/utils/keytable/rc_keymaps/wobo_i5.toml @@ -0,0 +1,12 @@ +[[protocols]] +name = "wobo_i5" +protocol = "nec" +[protocols.scancodes] +0x01 = "KEY_POWER" +0x05 = "KEY_UP" +0x06 = "KEY_LEFT" +0x08 = "KEY_RIGHT" +0x09 = "KEY_PLAYPAUSE" +0x0a = "KEY_DOWN" +0x0c = "KEY_MENU" +0x0e = "KEY_BACK" diff --git a/utils/keytable/rc_keymaps/xbox_dvd.toml b/utils/keytable/rc_keymaps/xbox_dvd.toml new file mode 100644 index 000000000000..778635425c10 --- /dev/null +++ b/utils/keytable/rc_keymaps/xbox_dvd.toml @@ -0,0 +1,31 @@ +[[protocols]] +name = "XBox DVD" +protocol = "xbox" +[protocols.scancodes] +0xa0b = "KEY_OK" +0xaa6 = "KEY_UP" +0xaa7 = "KEY_DOWN" +0xaa8 = "KEY_RIGHT" +0xaa9 = "KEY_LEFT" +0xac3 = "KEY_INFO" +0xac6 = "KEY_9" +0xac7 = "KEY_8" +0xac8 = "KEY_7" +0xac9 = "KEY_6" +0xaca = "KEY_5" +0xacb = "KEY_4" +0xacc = "KEY_3" +0xacd = "KEY_2" +0xace = "KEY_1" +0xacf = "KEY_0" +0xad5 = "KEY_ANGLE" +0xad8 = "KEY_BACK" +0xadd = "KEY_PREVIOUSSONG" +0xadf = "KEY_NEXTSONG" +0xae0 = "KEY_STOP" +0xae2 = "KEY_REWIND" +0xae3 = "KEY_FASTFORWARD" +0xae5 = "KEY_TITLE" +0xae6 = "KEY_PAUSE" +0xaea = "KEY_PLAY" +0xaf7 = "KEY_MENU" diff --git a/utils/keytable/rc_maps.cfg b/utils/keytable/rc_maps.cfg index 03904687bc08..fb0254a1b396 100644 --- a/utils/keytable/rc_maps.cfg +++ b/utils/keytable/rc_maps.cfg @@ -147,6 +147,7 @@ * rc-videomate-tv-pvr videomate_tv_pvr.toml * rc-winfast-usbii-deluxe winfast_usbii_deluxe.toml * rc-winfast winfast.toml +* rc-xbox-dvd xbox_dvd.toml * rc-zx-irdec zx_irdec.toml # * * af9005.toml # found in af9005-remote.c # * * az6027.toml # found in az6027.c _______________________________________________ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
