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: Tue Oct 20 21:59:12 2015 +0200 Update to the latest media-git/master kernel. Signed-off-by: Hans Verkuil <[email protected]> contrib/freebsd/include/linux/v4l2-controls.h | 1 + contrib/freebsd/include/linux/videodev2.h | 13 ++++- include/linux/v4l2-controls.h | 1 + include/linux/videodev2.h | 13 ++++- utils/keytable/rc_keymaps/technisat_ts35 | 34 ++++++++++++++ utils/keytable/rc_keymaps/terratec_cinergy_c_pci | 49 ++++++++++++++++++++ utils/keytable/rc_keymaps/terratec_cinergy_s2_hd | 49 ++++++++++++++++++++ utils/keytable/rc_keymaps/twinhan_dtv_cab_ci | 54 ++++++++++++++++++++++ 8 files changed, 208 insertions(+), 6 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=33ff2b749bc97811559fa5413aa546ff50524be5 diff --git a/contrib/freebsd/include/linux/v4l2-controls.h b/contrib/freebsd/include/linux/v4l2-controls.h index d448c53..1bdce50 100644 --- a/contrib/freebsd/include/linux/v4l2-controls.h +++ b/contrib/freebsd/include/linux/v4l2-controls.h @@ -936,6 +936,7 @@ enum v4l2_deemphasis { #define V4L2_CID_RF_TUNER_BANDWIDTH_AUTO (V4L2_CID_RF_TUNER_CLASS_BASE + 11) #define V4L2_CID_RF_TUNER_BANDWIDTH (V4L2_CID_RF_TUNER_CLASS_BASE + 12) +#define V4L2_CID_RF_TUNER_RF_GAIN (V4L2_CID_RF_TUNER_CLASS_BASE + 32) #define V4L2_CID_RF_TUNER_LNA_GAIN_AUTO (V4L2_CID_RF_TUNER_CLASS_BASE + 41) #define V4L2_CID_RF_TUNER_LNA_GAIN (V4L2_CID_RF_TUNER_CLASS_BASE + 42) #define V4L2_CID_RF_TUNER_MIXER_GAIN_AUTO (V4L2_CID_RF_TUNER_CLASS_BASE + 51) diff --git a/contrib/freebsd/include/linux/videodev2.h b/contrib/freebsd/include/linux/videodev2.h index 4a3a9c1..3c2b6fa 100644 --- a/contrib/freebsd/include/linux/videodev2.h +++ b/contrib/freebsd/include/linux/videodev2.h @@ -177,6 +177,7 @@ enum v4l2_buf_type { V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE = 9, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE = 10, V4L2_BUF_TYPE_SDR_CAPTURE = 11, + V4L2_BUF_TYPE_SDR_OUTPUT = 12, /* Deprecated, do not use */ V4L2_BUF_TYPE_PRIVATE = 0x80, }; @@ -191,16 +192,20 @@ enum v4l2_buf_type { || (type) == V4L2_BUF_TYPE_VIDEO_OVERLAY \ || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY \ || (type) == V4L2_BUF_TYPE_VBI_OUTPUT \ - || (type) == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT) + || (type) == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT \ + || (type) == V4L2_BUF_TYPE_SDR_OUTPUT) enum v4l2_tuner_type { V4L2_TUNER_RADIO = 1, V4L2_TUNER_ANALOG_TV = 2, V4L2_TUNER_DIGITAL_TV = 3, - V4L2_TUNER_ADC = 4, + V4L2_TUNER_SDR = 4, V4L2_TUNER_RF = 5, }; +/* Deprecated, do not use */ +#define V4L2_TUNER_ADC V4L2_TUNER_SDR + enum v4l2_memory { V4L2_MEMORY_MMAP = 1, V4L2_MEMORY_USERPTR = 2, @@ -464,6 +469,7 @@ struct v4l2_capability { #define V4L2_CAP_SDR_CAPTURE 0x00100000 /* Is a SDR capture device */ #define V4L2_CAP_EXT_PIX_FORMAT 0x00200000 /* Supports the extended pixel format */ +#define V4L2_CAP_SDR_OUTPUT 0x00400000 /* Is a SDR output device */ #define V4L2_CAP_READWRITE 0x01000000 /* read/write systemcalls */ #define V4L2_CAP_ASYNCIO 0x02000000 /* async I/O */ @@ -1619,7 +1625,8 @@ struct v4l2_modulator { uint32_t rangelow; uint32_t rangehigh; uint32_t txsubchans; - uint32_t reserved[4]; + uint32_t type; /* enum v4l2_tuner_type */ + uint32_t reserved[3]; }; /* Flags for the 'capability' field */ diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h index d448c53..1bdce50 100644 --- a/include/linux/v4l2-controls.h +++ b/include/linux/v4l2-controls.h @@ -936,6 +936,7 @@ enum v4l2_deemphasis { #define V4L2_CID_RF_TUNER_BANDWIDTH_AUTO (V4L2_CID_RF_TUNER_CLASS_BASE + 11) #define V4L2_CID_RF_TUNER_BANDWIDTH (V4L2_CID_RF_TUNER_CLASS_BASE + 12) +#define V4L2_CID_RF_TUNER_RF_GAIN (V4L2_CID_RF_TUNER_CLASS_BASE + 32) #define V4L2_CID_RF_TUNER_LNA_GAIN_AUTO (V4L2_CID_RF_TUNER_CLASS_BASE + 41) #define V4L2_CID_RF_TUNER_LNA_GAIN (V4L2_CID_RF_TUNER_CLASS_BASE + 42) #define V4L2_CID_RF_TUNER_MIXER_GAIN_AUTO (V4L2_CID_RF_TUNER_CLASS_BASE + 51) diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 03e94bf..1737d4a 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -143,6 +143,7 @@ enum v4l2_buf_type { V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE = 9, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE = 10, V4L2_BUF_TYPE_SDR_CAPTURE = 11, + V4L2_BUF_TYPE_SDR_OUTPUT = 12, /* Deprecated, do not use */ V4L2_BUF_TYPE_PRIVATE = 0x80, }; @@ -157,16 +158,20 @@ enum v4l2_buf_type { || (type) == V4L2_BUF_TYPE_VIDEO_OVERLAY \ || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY \ || (type) == V4L2_BUF_TYPE_VBI_OUTPUT \ - || (type) == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT) + || (type) == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT \ + || (type) == V4L2_BUF_TYPE_SDR_OUTPUT) enum v4l2_tuner_type { V4L2_TUNER_RADIO = 1, V4L2_TUNER_ANALOG_TV = 2, V4L2_TUNER_DIGITAL_TV = 3, - V4L2_TUNER_ADC = 4, + V4L2_TUNER_SDR = 4, V4L2_TUNER_RF = 5, }; +/* Deprecated, do not use */ +#define V4L2_TUNER_ADC V4L2_TUNER_SDR + enum v4l2_memory { V4L2_MEMORY_MMAP = 1, V4L2_MEMORY_USERPTR = 2, @@ -430,6 +435,7 @@ struct v4l2_capability { #define V4L2_CAP_SDR_CAPTURE 0x00100000 /* Is a SDR capture device */ #define V4L2_CAP_EXT_PIX_FORMAT 0x00200000 /* Supports the extended pixel format */ +#define V4L2_CAP_SDR_OUTPUT 0x00400000 /* Is a SDR output device */ #define V4L2_CAP_READWRITE 0x01000000 /* read/write systemcalls */ #define V4L2_CAP_ASYNCIO 0x02000000 /* async I/O */ @@ -1585,7 +1591,8 @@ struct v4l2_modulator { __u32 rangelow; __u32 rangehigh; __u32 txsubchans; - __u32 reserved[4]; + __u32 type; /* enum v4l2_tuner_type */ + __u32 reserved[3]; }; /* Flags for the 'capability' field */ diff --git a/utils/keytable/rc_keymaps/technisat_ts35 b/utils/keytable/rc_keymaps/technisat_ts35 new file mode 100644 index 0000000..3368e10 --- /dev/null +++ b/utils/keytable/rc_keymaps/technisat_ts35 @@ -0,0 +1,34 @@ +# table technisat_ts35, type: UNKNOWN +0x32 KEY_MUTE +0x07 KEY_MEDIA +0x1c KEY_AB +0x33 KEY_POWER +0x3e KEY_1 +0x3d KEY_2 +0x3c KEY_3 +0x3b KEY_4 +0x3a KEY_5 +0x39 KEY_6 +0x38 KEY_7 +0x37 KEY_8 +0x36 KEY_9 +0x3f KEY_0 +0x35 KEY_DIGITS +0x2c KEY_TV +0x20 KEY_INFO +0x2d KEY_MENU +0x1f KEY_UP +0x1e KEY_DOWN +0x2e KEY_LEFT +0x2f KEY_RIGHT +0x28 KEY_OK +0x10 KEY_EPG +0x1d KEY_BACK +0x14 KEY_RED +0x13 KEY_GREEN +0x12 KEY_YELLOW +0x11 KEY_BLUE +0x09 KEY_SELECT +0x03 KEY_TEXT +0x16 KEY_STOP +0x30 KEY_HELP diff --git a/utils/keytable/rc_keymaps/terratec_cinergy_c_pci b/utils/keytable/rc_keymaps/terratec_cinergy_c_pci new file mode 100644 index 0000000..75d3336 --- /dev/null +++ b/utils/keytable/rc_keymaps/terratec_cinergy_c_pci @@ -0,0 +1,49 @@ +# table terratec_cinergy_c_pci, type: UNKNOWN +0x3e KEY_POWER +0x3d KEY_1 +0x3c KEY_2 +0x3b KEY_3 +0x3a KEY_4 +0x39 KEY_5 +0x38 KEY_6 +0x37 KEY_7 +0x36 KEY_8 +0x35 KEY_9 +0x34 KEY_VIDEO_NEXT +0x33 KEY_0 +0x32 KEY_REFRESH +0x30 KEY_EPG +0x2f KEY_UP +0x2e KEY_LEFT +0x2d KEY_OK +0x2c KEY_RIGHT +0x2b KEY_DOWN +0x29 KEY_INFO +0x28 KEY_RED +0x27 KEY_GREEN +0x26 KEY_YELLOW +0x25 KEY_BLUE +0x24 KEY_CHANNELUP +0x23 KEY_VOLUMEUP +0x22 KEY_MUTE +0x21 KEY_VOLUMEDOWN +0x20 KEY_CHANNELDOWN +0x1f KEY_PAUSE +0x1e KEY_HOME +0x1d KEY_MENU +0x1c KEY_SUBTITLE +0x1b KEY_TEXT +0x1a KEY_DELETE +0x19 KEY_TV +0x18 KEY_DVD +0x17 KEY_STOP +0x16 KEY_VIDEO +0x15 KEY_AUDIO +0x14 KEY_SCREEN +0x13 KEY_PLAY +0x12 KEY_BACK +0x11 KEY_REWIND +0x10 KEY_FASTFORWARD +0x0b KEY_PREVIOUS +0x07 KEY_RECORD +0x03 KEY_NEXT diff --git a/utils/keytable/rc_keymaps/terratec_cinergy_s2_hd b/utils/keytable/rc_keymaps/terratec_cinergy_s2_hd new file mode 100644 index 0000000..46c4864 --- /dev/null +++ b/utils/keytable/rc_keymaps/terratec_cinergy_s2_hd @@ -0,0 +1,49 @@ +# table terratec_cinergy_s2_hd, type: UNKNOWN +0x03 KEY_NEXT +0x07 KEY_RECORD +0x0b KEY_PREVIOUS +0x10 KEY_FASTFORWARD +0x11 KEY_REWIND +0x12 KEY_ESC +0x13 KEY_PLAY +0x14 KEY_IMAGES +0x15 KEY_AUDIO +0x16 KEY_MEDIA +0x17 KEY_STOP +0x18 KEY_DVD +0x19 KEY_TV +0x1a KEY_DELETE +0x1b KEY_TEXT +0x1c KEY_SUBTITLE +0x1d KEY_MENU +0x1e KEY_HOME +0x1f KEY_PAUSE +0x20 KEY_CHANNELDOWN +0x21 KEY_VOLUMEDOWN +0x22 KEY_MUTE +0x23 KEY_VOLUMEUP +0x24 KEY_CHANNELUP +0x25 KEY_BLUE +0x26 KEY_YELLOW +0x27 KEY_GREEN +0x28 KEY_RED +0x29 KEY_INFO +0x2b KEY_DOWN +0x2c KEY_RIGHT +0x2d KEY_OK +0x2e KEY_LEFT +0x2f KEY_UP +0x30 KEY_EPG +0x32 KEY_VIDEO +0x33 KEY_0 +0x34 KEY_VCR +0x35 KEY_9 +0x36 KEY_8 +0x37 KEY_7 +0x38 KEY_6 +0x39 KEY_5 +0x3a KEY_4 +0x3b KEY_3 +0x3c KEY_2 +0x3d KEY_1 +0x3e KEY_POWER diff --git a/utils/keytable/rc_keymaps/twinhan_dtv_cab_ci b/utils/keytable/rc_keymaps/twinhan_dtv_cab_ci new file mode 100644 index 0000000..bc9bb11 --- /dev/null +++ b/utils/keytable/rc_keymaps/twinhan_dtv_cab_ci @@ -0,0 +1,54 @@ +# table twinhan_dtv_cab_ci, type: UNKNOWN +0x29 KEY_POWER +0x28 KEY_FAVORITES +0x30 KEY_TEXT +0x17 KEY_INFO +0x23 KEY_EPG +0x3b KEY_F22 +0x3c KEY_1 +0x3e KEY_2 +0x39 KEY_3 +0x36 KEY_4 +0x22 KEY_5 +0x20 KEY_6 +0x32 KEY_7 +0x26 KEY_8 +0x24 KEY_9 +0x2a KEY_0 +0x33 KEY_CANCEL +0x2c KEY_BACK +0x15 KEY_CLEAR +0x3f KEY_TAB +0x10 KEY_ENTER +0x14 KEY_UP +0x0d KEY_RIGHT +0x0e KEY_DOWN +0x11 KEY_LEFT +0x21 KEY_VOLUMEUP +0x35 KEY_VOLUMEDOWN +0x3d KEY_CHANNELDOWN +0x3a KEY_CHANNELUP +0x2e KEY_RECORD +0x2b KEY_PLAY +0x13 KEY_PAUSE +0x25 KEY_STOP +0x1f KEY_REWIND +0x2d KEY_FASTFORWARD +0x1e KEY_PREVIOUS +0x1d KEY_NEXT +0x0b KEY_CAMERA +0x0f KEY_LANGUAGE +0x18 KEY_MODE +0x12 KEY_ZOOM +0x1c KEY_SUBTITLE +0x2f KEY_MUTE +0x16 KEY_F20 +0x38 KEY_F21 +0x37 KEY_SWITCHVIDEOMODE +0x31 KEY_AGAIN +0x1a KEY_KPPLUS +0x19 KEY_KPMINUS +0x27 KEY_RED +0x0C KEY_GREEN +0x01 KEY_YELLOW +0x00 KEY_BLUE _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
