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: v4l-utils: sync with kernel Author: Hans Verkuil <[email protected]> Date: Mon Apr 10 10:01:36 2017 +0200 Signed-off-by: Hans Verkuil <[email protected]> contrib/freebsd/include/linux/videodev2.h | 3 +- include/linux/cec.h | 2 +- include/linux/videodev2.h | 3 +- utils/keytable/rc_keymaps/dvico_mce | 92 +++++++++++++++---------------- utils/keytable/rc_keymaps/dvico_portable | 74 ++++++++++++------------- 5 files changed, 86 insertions(+), 88 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=9f4ce80524ad9b43453cab3c1e32e3b34c6147fb diff --git a/contrib/freebsd/include/linux/videodev2.h b/contrib/freebsd/include/linux/videodev2.h index ab9808b8ebf7..80684a2d7282 100644 --- a/contrib/freebsd/include/linux/videodev2.h +++ b/contrib/freebsd/include/linux/videodev2.h @@ -408,8 +408,7 @@ enum v4l2_quantization { #define V4L2_MAP_QUANTIZATION_DEFAULT(is_rgb_or_hsv, colsp, ycbcr_enc) \ (((is_rgb_or_hsv) && (colsp) == V4L2_COLORSPACE_BT2020) ? \ V4L2_QUANTIZATION_LIM_RANGE : \ - (((is_rgb_or_hsv) || (ycbcr_enc) == V4L2_YCBCR_ENC_XV601 || \ - (ycbcr_enc) == V4L2_YCBCR_ENC_XV709 || (colsp) == V4L2_COLORSPACE_JPEG) ? \ + (((is_rgb_or_hsv) || (colsp) == V4L2_COLORSPACE_JPEG) ? \ V4L2_QUANTIZATION_FULL_RANGE : V4L2_QUANTIZATION_LIM_RANGE)) enum v4l2_priority { diff --git a/include/linux/cec.h b/include/linux/cec.h index 14b6f24b189e..a0dfe27bc6c7 100644 --- a/include/linux/cec.h +++ b/include/linux/cec.h @@ -223,7 +223,7 @@ static inline int cec_msg_status_is_ok(const struct cec_msg *msg) #define CEC_LOG_ADDR_BACKUP_2 13 #define CEC_LOG_ADDR_SPECIFIC 14 #define CEC_LOG_ADDR_UNREGISTERED 15 /* as initiator address */ -#define CEC_LOG_ADDR_BROADCAST 15 /* ad destination address */ +#define CEC_LOG_ADDR_BROADCAST 15 /* as destination address */ /* The logical address types that the CEC device wants to claim */ #define CEC_LOG_ADDR_TYPE_TV 0 diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 33dc6dbf8833..7266a625626b 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -374,8 +374,7 @@ enum v4l2_quantization { #define V4L2_MAP_QUANTIZATION_DEFAULT(is_rgb_or_hsv, colsp, ycbcr_enc) \ (((is_rgb_or_hsv) && (colsp) == V4L2_COLORSPACE_BT2020) ? \ V4L2_QUANTIZATION_LIM_RANGE : \ - (((is_rgb_or_hsv) || (ycbcr_enc) == V4L2_YCBCR_ENC_XV601 || \ - (ycbcr_enc) == V4L2_YCBCR_ENC_XV709 || (colsp) == V4L2_COLORSPACE_JPEG) ? \ + (((is_rgb_or_hsv) || (colsp) == V4L2_COLORSPACE_JPEG) ? \ V4L2_QUANTIZATION_FULL_RANGE : V4L2_QUANTIZATION_LIM_RANGE)) enum v4l2_priority { diff --git a/utils/keytable/rc_keymaps/dvico_mce b/utils/keytable/rc_keymaps/dvico_mce index b2043a4f922f..31e7e47e28d5 100644 --- a/utils/keytable/rc_keymaps/dvico_mce +++ b/utils/keytable/rc_keymaps/dvico_mce @@ -1,46 +1,46 @@ -# table dvico_mce, type: UNKNOWN -0xfe02 KEY_TV -0xfe0e KEY_MP3 -0xfe1a KEY_DVD -0xfe1e KEY_FAVORITES -0xfe16 KEY_SETUP -0xfe46 KEY_POWER2 -0xfe0a KEY_EPG -0xfe49 KEY_BACK -0xfe4d KEY_MENU -0xfe51 KEY_UP -0xfe5b KEY_LEFT -0xfe5f KEY_RIGHT -0xfe53 KEY_DOWN -0xfe5e KEY_OK -0xfe59 KEY_INFO -0xfe55 KEY_TAB -0xfe0f KEY_PREVIOUSSONG -0xfe12 KEY_NEXTSONG -0xfe42 KEY_ENTER -0xfe15 KEY_VOLUMEUP -0xfe05 KEY_VOLUMEDOWN -0xfe11 KEY_CHANNELUP -0xfe09 KEY_CHANNELDOWN -0xfe52 KEY_CAMERA -0xfe5a KEY_TUNER -0xfe19 KEY_OPEN -0xfe0b KEY_1 -0xfe17 KEY_2 -0xfe1b KEY_3 -0xfe07 KEY_4 -0xfe50 KEY_5 -0xfe54 KEY_6 -0xfe48 KEY_7 -0xfe4c KEY_8 -0xfe58 KEY_9 -0xfe13 KEY_ANGLE -0xfe03 KEY_0 -0xfe1f KEY_ZOOM -0xfe43 KEY_REWIND -0xfe47 KEY_PLAYPAUSE -0xfe4f KEY_FASTFORWARD -0xfe57 KEY_MUTE -0xfe0d KEY_STOP -0xfe01 KEY_RECORD -0xfe4e KEY_POWER +# table dvico_mce, type: NEC +0x0102 KEY_TV +0x010e KEY_MP3 +0x011a KEY_DVD +0x011e KEY_FAVORITES +0x0116 KEY_SETUP +0x0146 KEY_POWER2 +0x010a KEY_EPG +0x0149 KEY_BACK +0x014d KEY_MENU +0x0151 KEY_UP +0x015b KEY_LEFT +0x015f KEY_RIGHT +0x0153 KEY_DOWN +0x015e KEY_OK +0x0159 KEY_INFO +0x0155 KEY_TAB +0x010f KEY_PREVIOUSSONG +0x0112 KEY_NEXTSONG +0x0142 KEY_ENTER +0x0115 KEY_VOLUMEUP +0x0105 KEY_VOLUMEDOWN +0x0111 KEY_CHANNELUP +0x0109 KEY_CHANNELDOWN +0x0152 KEY_CAMERA +0x015a KEY_TUNER +0x0119 KEY_OPEN +0x010b KEY_1 +0x0117 KEY_2 +0x011b KEY_3 +0x0107 KEY_4 +0x0150 KEY_5 +0x0154 KEY_6 +0x0148 KEY_7 +0x014c KEY_8 +0x0158 KEY_9 +0x0113 KEY_ANGLE +0x0103 KEY_0 +0x011f KEY_ZOOM +0x0143 KEY_REWIND +0x0147 KEY_PLAYPAUSE +0x014f KEY_FASTFORWARD +0x0157 KEY_MUTE +0x010d KEY_STOP +0x0101 KEY_RECORD +0x014e KEY_POWER diff --git a/utils/keytable/rc_keymaps/dvico_portable b/utils/keytable/rc_keymaps/dvico_portable index 7b1452ba8252..483f93490e64 100644 --- a/utils/keytable/rc_keymaps/dvico_portable +++ b/utils/keytable/rc_keymaps/dvico_portable @@ -1,37 +1,37 @@ -# table dvico_portable, type: UNKNOWN -0xfc02 KEY_SETUP -0xfc43 KEY_POWER2 -0xfc06 KEY_EPG -0xfc5a KEY_BACK -0xfc05 KEY_MENU -0xfc47 KEY_INFO -0xfc01 KEY_TAB -0xfc42 KEY_PREVIOUSSONG -0xfc49 KEY_VOLUMEUP -0xfc09 KEY_VOLUMEDOWN -0xfc54 KEY_CHANNELUP -0xfc0b KEY_CHANNELDOWN -0xfc16 KEY_CAMERA -0xfc40 KEY_TUNER -0xfc45 KEY_OPEN -0xfc19 KEY_1 -0xfc18 KEY_2 -0xfc1b KEY_3 -0xfc1a KEY_4 -0xfc58 KEY_5 -0xfc59 KEY_6 -0xfc15 KEY_7 -0xfc14 KEY_8 -0xfc17 KEY_9 -0xfc44 KEY_ANGLE -0xfc55 KEY_0 -0xfc07 KEY_ZOOM -0xfc0a KEY_REWIND -0xfc08 KEY_PLAYPAUSE -0xfc4b KEY_FASTFORWARD -0xfc5b KEY_MUTE -0xfc04 KEY_STOP -0xfc56 KEY_RECORD -0xfc57 KEY_POWER -0xfc41 KEY_UNKNOWN -0xfc00 KEY_UNKNOWN +# table dvico_portable, type: NEC +0x0302 KEY_SETUP +0x0343 KEY_POWER2 +0x0306 KEY_EPG +0x035a KEY_BACK +0x0305 KEY_MENU +0x0347 KEY_INFO +0x0301 KEY_TAB +0x0342 KEY_PREVIOUSSONG +0x0349 KEY_VOLUMEUP +0x0309 KEY_VOLUMEDOWN +0x0354 KEY_CHANNELUP +0x030b KEY_CHANNELDOWN +0x0316 KEY_CAMERA +0x0340 KEY_TUNER +0x0345 KEY_OPEN +0x0319 KEY_1 +0x0318 KEY_2 +0x031b KEY_3 +0x031a KEY_4 +0x0358 KEY_5 +0x0359 KEY_6 +0x0315 KEY_7 +0x0314 KEY_8 +0x0317 KEY_9 +0x0344 KEY_ANGLE +0x0355 KEY_0 +0x0307 KEY_ZOOM +0x030a KEY_REWIND +0x0308 KEY_PLAYPAUSE +0x034b KEY_FASTFORWARD +0x035b KEY_MUTE +0x0304 KEY_STOP +0x0356 KEY_RECORD +0x0357 KEY_POWER +0x0341 KEY_UNKNOWN +0x0300 KEY_UNKNOWN _______________________________________________ linuxtv-commits mailing list [email protected] https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
