This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/v4l-utils.git tree:
Subject: sync-with-kernel: update to latest kernel headers. Author: Hans Verkuil <[email protected]> Date: Sun May 25 15:42:27 2014 +0200 This syncs with the latest kernel code. In particular it adds support for V4L2_EVENT_SOURCE_CHANGE. Signed-off-by: Hans Verkuil <[email protected]> contrib/freebsd/include/linux/input.h | 1 + contrib/freebsd/include/linux/uinput.h | 13 ++++- contrib/freebsd/include/linux/v4l2-common.h | 4 +- contrib/freebsd/include/linux/videodev2.h | 19 ++++-- include/linux/v4l2-common.h | 4 +- include/linux/videodev2.h | 19 ++++-- lib/libdvbv5/dvb-v5.c | 2 +- utils/keytable/rc_keymaps/tivo | 84 +++++++++++++------------- 8 files changed, 88 insertions(+), 58 deletions(-) --- http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=460f2937fbce57e4a1d8029b9179181aff57242e diff --git a/contrib/freebsd/include/linux/input.h b/contrib/freebsd/include/linux/input.h index 615cf76..431deb7 100644 --- a/contrib/freebsd/include/linux/input.h +++ b/contrib/freebsd/include/linux/input.h @@ -200,6 +200,7 @@ struct input_keymap_entry { #define INPUT_PROP_DIRECT 0x01 /* direct input devices */ #define INPUT_PROP_BUTTONPAD 0x02 /* has button(s) under pad */ #define INPUT_PROP_SEMI_MT 0x03 /* touch rectangle only */ +#define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */ #define INPUT_PROP_MAX 0x1f #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1) diff --git a/contrib/freebsd/include/linux/uinput.h b/contrib/freebsd/include/linux/uinput.h index 687e3ce..add58b9 100644 --- a/contrib/freebsd/include/linux/uinput.h +++ b/contrib/freebsd/include/linux/uinput.h @@ -20,6 +20,8 @@ * Author: Aristeu Sergio Rozanski Filho <[email protected]> * * Changes/Revisions: + * 0.4 01/09/2014 (Benjamin Tissoires <[email protected]>) + * - add UI_GET_SYSNAME ioctl * 0.3 24/05/2006 (Anssi Hannula <anssi.hannulagmail.com>) * - update ff support for the changes in kernel interface * - add UINPUT_VERSION @@ -34,7 +36,7 @@ #include <linux/input.h> -#define UINPUT_VERSION 3 +#define UINPUT_VERSION 4 struct uinput_ff_upload { @@ -72,6 +74,15 @@ struct uinput_ff_erase { #define UI_BEGIN_FF_ERASE _IOWR(UINPUT_IOCTL_BASE, 202, struct uinput_ff_erase) #define UI_END_FF_ERASE _IOW(UINPUT_IOCTL_BASE, 203, struct uinput_ff_erase) +/** + * UI_GET_SYSNAME - get the sysfs name of the created uinput device + * + * @return the sysfs name of the created virtual input device. + * The complete sysfs path is then /sys/devices/virtual/input/--NAME-- + * Usually, it is in the form "inputN" + */ +#define UI_GET_SYSNAME(len) _IOC(_IOC_READ, UINPUT_IOCTL_BASE, 300, len) + /* * To write a force-feedback-capable driver, the upload_effect * and erase_effect callbacks in input_dev must be implemented. diff --git a/contrib/freebsd/include/linux/v4l2-common.h b/contrib/freebsd/include/linux/v4l2-common.h index 270db89..2f6f8ca 100644 --- a/contrib/freebsd/include/linux/v4l2-common.h +++ b/contrib/freebsd/include/linux/v4l2-common.h @@ -29,6 +29,8 @@ #ifndef __V4L2_COMMON__ #define __V4L2_COMMON__ +#include <linux/types.h> + /* * * Selection interface definitions @@ -73,7 +75,7 @@ struct v4l2_edid { __u32 start_block; __u32 blocks; __u32 reserved[5]; - __u8 __user *edid; + __u8 *edid; }; #endif /* __V4L2_COMMON__ */ diff --git a/contrib/freebsd/include/linux/videodev2.h b/contrib/freebsd/include/linux/videodev2.h index 7f1d242..06da346 100644 --- a/contrib/freebsd/include/linux/videodev2.h +++ b/contrib/freebsd/include/linux/videodev2.h @@ -683,7 +683,6 @@ struct v4l2_plane { * @length: size in bytes of the buffer (NOT its payload) for single-plane * buffers (when type != *_MPLANE); number of elements in the * planes array for multi-plane buffers - * @input: input number from which the video data has has been captured * * Contains data exchanged by application and driver using one of the Streaming * I/O methods. @@ -1114,14 +1113,14 @@ struct v4l2_bt_timings { /* A few useful defines to calculate the total blanking and frame sizes */ #define V4L2_DV_BT_BLANKING_WIDTH(bt) \ - (bt->hfrontporch + bt->hsync + bt->hbackporch) + ((bt)->hfrontporch + (bt)->hsync + (bt)->hbackporch) #define V4L2_DV_BT_FRAME_WIDTH(bt) \ - (bt->width + V4L2_DV_BT_BLANKING_WIDTH(bt)) + ((bt)->width + V4L2_DV_BT_BLANKING_WIDTH(bt)) #define V4L2_DV_BT_BLANKING_HEIGHT(bt) \ - (bt->vfrontporch + bt->vsync + bt->vbackporch + \ - bt->il_vfrontporch + bt->il_vsync + bt->il_vbackporch) + ((bt)->vfrontporch + (bt)->vsync + (bt)->vbackporch + \ + (bt)->il_vfrontporch + (bt)->il_vsync + (bt)->il_vbackporch) #define V4L2_DV_BT_FRAME_HEIGHT(bt) \ - (bt->height + V4L2_DV_BT_BLANKING_HEIGHT(bt)) + ((bt)->height + V4L2_DV_BT_BLANKING_HEIGHT(bt)) /** struct v4l2_dv_timings - DV timings * @type: the type of the timings @@ -1799,6 +1798,7 @@ struct v4l2_streamparm { #define V4L2_EVENT_EOS 2 #define V4L2_EVENT_CTRL 3 #define V4L2_EVENT_FRAME_SYNC 4 +#define V4L2_EVENT_SOURCE_CHANGE 5 #define V4L2_EVENT_PRIVATE_START 0x08000000 /* Payload for V4L2_EVENT_VSYNC */ @@ -1830,12 +1830,19 @@ struct v4l2_event_frame_sync { uint32_t frame_sequence; }; +#define V4L2_EVENT_SRC_CH_RESOLUTION (1 << 0) + +struct v4l2_event_src_change { + uint32_t changes; +}; + struct v4l2_event { uint32_t type; union { struct v4l2_event_vsync vsync; struct v4l2_event_ctrl ctrl; struct v4l2_event_frame_sync frame_sync; + struct v4l2_event_src_change src_change; uint8_t data[64]; } u; uint32_t pending; diff --git a/include/linux/v4l2-common.h b/include/linux/v4l2-common.h index 270db89..2f6f8ca 100644 --- a/include/linux/v4l2-common.h +++ b/include/linux/v4l2-common.h @@ -29,6 +29,8 @@ #ifndef __V4L2_COMMON__ #define __V4L2_COMMON__ +#include <linux/types.h> + /* * * Selection interface definitions @@ -73,7 +75,7 @@ struct v4l2_edid { __u32 start_block; __u32 blocks; __u32 reserved[5]; - __u8 __user *edid; + __u8 *edid; }; #endif /* __V4L2_COMMON__ */ diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index e35ad6c..00259d2 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -649,7 +649,6 @@ struct v4l2_plane { * @length: size in bytes of the buffer (NOT its payload) for single-plane * buffers (when type != *_MPLANE); number of elements in the * planes array for multi-plane buffers - * @input: input number from which the video data has has been captured * * Contains data exchanged by application and driver using one of the Streaming * I/O methods. @@ -1080,14 +1079,14 @@ struct v4l2_bt_timings { /* A few useful defines to calculate the total blanking and frame sizes */ #define V4L2_DV_BT_BLANKING_WIDTH(bt) \ - (bt->hfrontporch + bt->hsync + bt->hbackporch) + ((bt)->hfrontporch + (bt)->hsync + (bt)->hbackporch) #define V4L2_DV_BT_FRAME_WIDTH(bt) \ - (bt->width + V4L2_DV_BT_BLANKING_WIDTH(bt)) + ((bt)->width + V4L2_DV_BT_BLANKING_WIDTH(bt)) #define V4L2_DV_BT_BLANKING_HEIGHT(bt) \ - (bt->vfrontporch + bt->vsync + bt->vbackporch + \ - bt->il_vfrontporch + bt->il_vsync + bt->il_vbackporch) + ((bt)->vfrontporch + (bt)->vsync + (bt)->vbackporch + \ + (bt)->il_vfrontporch + (bt)->il_vsync + (bt)->il_vbackporch) #define V4L2_DV_BT_FRAME_HEIGHT(bt) \ - (bt->height + V4L2_DV_BT_BLANKING_HEIGHT(bt)) + ((bt)->height + V4L2_DV_BT_BLANKING_HEIGHT(bt)) /** struct v4l2_dv_timings - DV timings * @type: the type of the timings @@ -1765,6 +1764,7 @@ struct v4l2_streamparm { #define V4L2_EVENT_EOS 2 #define V4L2_EVENT_CTRL 3 #define V4L2_EVENT_FRAME_SYNC 4 +#define V4L2_EVENT_SOURCE_CHANGE 5 #define V4L2_EVENT_PRIVATE_START 0x08000000 /* Payload for V4L2_EVENT_VSYNC */ @@ -1796,12 +1796,19 @@ struct v4l2_event_frame_sync { __u32 frame_sequence; }; +#define V4L2_EVENT_SRC_CH_RESOLUTION (1 << 0) + +struct v4l2_event_src_change { + __u32 changes; +}; + struct v4l2_event { __u32 type; union { struct v4l2_event_vsync vsync; struct v4l2_event_ctrl ctrl; struct v4l2_event_frame_sync frame_sync; + struct v4l2_event_src_change src_change; __u8 data[64]; } u; __u32 pending; diff --git a/lib/libdvbv5/dvb-v5.c b/lib/libdvbv5/dvb-v5.c index ade44f1..469b8e2 100644 --- a/lib/libdvbv5/dvb-v5.c +++ b/lib/libdvbv5/dvb-v5.c @@ -3,7 +3,7 @@ */ #include <stddef.h> -#include "dvb-v5.h" +#include <libdvbv5/dvb-v5.h> struct fe_caps_name fe_caps_name[31] = { { FE_CAN_2G_MODULATION, "CAN_2G_MODULATION" }, diff --git a/utils/keytable/rc_keymaps/tivo b/utils/keytable/rc_keymaps/tivo index 1decfeb..53d4e72 100644 --- a/utils/keytable/rc_keymaps/tivo +++ b/utils/keytable/rc_keymaps/tivo @@ -1,46 +1,46 @@ # table tivo, type: NEC -0x3085f009 KEY_MEDIA -0x3085e010 KEY_POWER2 -0x3085e011 KEY_TV -0x3085c034 KEY_VIDEO_NEXT -0x3085e013 KEY_INFO -0x3085a05f KEY_CYCLEWINDOWS +0xa10c900f KEY_MEDIA +0xa10c0807 KEY_POWER2 +0xa10c8807 KEY_TV +0xa10c2c03 KEY_VIDEO_NEXT +0xa10cc807 KEY_INFO +0xa10cfa05 KEY_CYCLEWINDOWS 0x0085305f KEY_CYCLEWINDOWS -0x3085c036 KEY_EPG -0x3085e014 KEY_UP -0x3085e016 KEY_DOWN -0x3085e017 KEY_LEFT -0x3085e015 KEY_RIGHT -0x3085e018 KEY_SCROLLDOWN -0x3085e019 KEY_SELECT -0x3085e01a KEY_SCROLLUP -0x3085e01c KEY_VOLUMEUP -0x3085e01d KEY_VOLUMEDOWN -0x3085e01b KEY_MUTE -0x3085d020 KEY_RECORD -0x3085e01e KEY_CHANNELUP -0x3085e01f KEY_CHANNELDOWN +0xa10c6c03 KEY_EPG +0xa10c2807 KEY_UP +0xa10c6807 KEY_DOWN +0xa10ce807 KEY_LEFT +0xa10ca807 KEY_RIGHT +0xa10c1807 KEY_SCROLLDOWN +0xa10c9807 KEY_SELECT +0xa10c5807 KEY_SCROLLUP +0xa10c3807 KEY_VOLUMEUP +0xa10cb807 KEY_VOLUMEDOWN +0xa10cd807 KEY_MUTE +0xa10c040b KEY_RECORD +0xa10c7807 KEY_CHANNELUP +0xa10cf807 KEY_CHANNELDOWN 0x0085301f KEY_CHANNELDOWN -0x3085d021 KEY_PLAY -0x3085d023 KEY_PAUSE -0x3085d025 KEY_SLOW -0x3085d022 KEY_REWIND -0x3085d024 KEY_FASTFORWARD -0x3085d026 KEY_PREVIOUS -0x3085d027 KEY_NEXT -0x3085b044 KEY_ZOOM -0x3085b048 KEY_STOP -0x3085b04a KEY_DVD -0x3085d028 KEY_NUMERIC_1 -0x3085d029 KEY_NUMERIC_2 -0x3085d02a KEY_NUMERIC_3 -0x3085d02b KEY_NUMERIC_4 -0x3085d02c KEY_NUMERIC_5 -0x3085d02d KEY_NUMERIC_6 -0x3085d02e KEY_NUMERIC_7 -0x3085d02f KEY_NUMERIC_8 +0xa10c840b KEY_PLAY +0xa10cc40b KEY_PAUSE +0xa10ca40b KEY_SLOW +0xa10c440b KEY_REWIND +0xa10c240b KEY_FASTFORWARD +0xa10c640b KEY_PREVIOUS +0xa10ce40b KEY_NEXT +0xa10c220d KEY_ZOOM +0xa10c120d KEY_STOP +0xa10c520d KEY_DVD +0xa10c140b KEY_NUMERIC_1 +0xa10c940b KEY_NUMERIC_2 +0xa10c540b KEY_NUMERIC_3 +0xa10cd40b KEY_NUMERIC_4 +0xa10c340b KEY_NUMERIC_5 +0xa10cb40b KEY_NUMERIC_6 +0xa10c740b KEY_NUMERIC_7 +0xa10cf40b KEY_NUMERIC_8 0x0085302f KEY_NUMERIC_8 -0x3085c030 KEY_NUMERIC_9 -0x3085c031 KEY_NUMERIC_0 -0x3085c033 KEY_ENTER -0x3085c032 KEY_CLEAR +0xa10c0c03 KEY_NUMERIC_9 +0xa10c8c03 KEY_NUMERIC_0 +0xa10ccc03 KEY_ENTER +0xa10c4c03 KEY_CLEAR _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
