Pull media updates from Mauro Carvalho Chehab: - new IR driver: hix5hd2-ir - the virtual test driver (vivi) was replaced by vivid, with has an almost complete set of features to emulate most v4l2 devices and properly test all sorts of userspace apps - the as102 driver had several bugs fixed and was properly split into a frontend and a core driver. With that, it got promoted from staging into mainstream - one new CI driver got added for CIMaX SP2/SP2HF (sp2 driver) - one new frontend driver for Toshiba ISDB-T/ISDB-S demod (tc90522) - one new PCI driver for ISDB-T/ISDB-S (pt3 driver) - saa7134 driver got support for go7007-based devices - added a new PCI driver for Techwell 68xx chipsets (tw68) - a new platform driver was added (coda) - new tuner drivers: mxl301rf and qm1d1c0042 - a new DVB USB driver was added for DVBSky S860 & similar devices - added a new SDR driver (hackrf) - usbtv got audio support - several platform drivers are now compiled with COMPILE_TEST - a series of compiler fixup patches, making sparse/spatch happier with the media stuff and removing several warnings, especially on those platform drivers that didn't use to compile on x86 - Support for several new modern devices got added - lots of other fixes, improvements and cleanups * tag 'media/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (544 commits) [media] ir-hix5hd2: fix build on c6x arch [media] pt3: fix DTV FE I2C driver load error paths Revert "[media] media: em28xx - remove reset_resume interface" [media] exynos4-is: fix some warnings when compiling on arm64 [media] usb drivers: use %zu instead of %zd [media] pci drivers: use %zu instead of %zd [media] dvb-frontends: use %zu instead of %zd [media] s5p-mfc: Fix several printk warnings [media] s5p_mfc_opr: Fix warnings [media] ti-vpe: Fix typecast [media] s3c-camif: fix dma_addr_t printks [media] s5p_mfc_opr_v6: get rid of warnings when compiled with 64 bits [media] s5p_mfc_opr_v5: Fix lots of warnings on x86_64 [media] em28xx: Fix identation [media] drxd: remove a dead code [media] saa7146: remove return after BUG() [media] cx88: remove return after BUG() [media] cx88: fix cards table CodingStyle [media] radio-sf16fmr2: declare some structs as static [media] radio-sf16fmi: declare pnp_attached as static ...
Showing the changes to include/uapi/linux (5 of 474 files). Show all
Unified · Split
| @@ -355,6 +355,7 @@ header-y += serio.h · 354 unmodified lines | ||
| 355 | 355 | header-y += shm.h |
| 356 | 356 | header-y += signal.h |
| 357 | 357 | header-y += signalfd.h |
| 358 | +header-y += smiapp.h | |
| 358 | 359 | header-y += snmp.h |
| 359 | 360 | header-y += sock_diag.h |
| 360 | 361 | header-y += socket.h |
| @@ -0,0 +1,29 @@ | ||
| 1 | +/* | |
| 2 | + * include/uapi/linux/smiapp.h | |
| 3 | + * | |
| 4 | + * Generic driver for SMIA/SMIA++ compliant camera modules | |
| 5 | + * | |
| 6 | + * Copyright (C) 2014 Intel Corporation | |
| 7 | + * Contact: Sakari Ailus <sakari.ailus@iki.fi> | |
| 8 | + * | |
| 9 | + * This program is free software; you can redistribute it and/or | |
| 10 | + * modify it under the terms of the GNU General Public License | |
| 11 | + * version 2 as published by the Free Software Foundation. | |
| 12 | + * | |
| 13 | + * This program is distributed in the hope that it will be useful, but | |
| 14 | + * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 16 | + * General Public License for more details. | |
| 17 | + * | |
| 18 | + */ | |
| 19 | + | |
| 20 | +#ifndef __UAPI_LINUX_SMIAPP_H_ | |
| 21 | +#define __UAPI_LINUX_SMIAPP_H_ | |
| 22 | + | |
| 23 | +#define V4L2_SMIAPP_TEST_PATTERN_MODE_DISABLED 0 | |
| 24 | +#define V4L2_SMIAPP_TEST_PATTERN_MODE_SOLID_COLOUR 1 | |
| 25 | +#define V4L2_SMIAPP_TEST_PATTERN_MODE_COLOUR_BARS 2 | |
| 26 | +#define V4L2_SMIAPP_TEST_PATTERN_MODE_COLOUR_BARS_GREY 3 | |
| 27 | +#define V4L2_SMIAPP_TEST_PATTERN_MODE_PN9 4 | |
| 28 | + | |
| 29 | +#endif /* __UAPI_LINUX_SMIAPP_H_ */ | |
| @@ -746,6 +746,8 @@ enum v4l2_auto_focus_range { · 745 unmodified lines | ||
| 746 | 746 | V4L2_AUTO_FOCUS_RANGE_INFINITY = 3, |
| 747 | 747 | }; |
| 748 | 748 | |
| 749 | +#define V4L2_CID_PAN_SPEED (V4L2_CID_CAMERA_CLASS_BASE+32) | |
| 750 | +#define V4L2_CID_TILT_SPEED (V4L2_CID_CAMERA_CLASS_BASE+33) | |
| 749 | 751 | |
| 750 | 752 | /* FM Modulator class control IDs */ |
| 751 | 753 | |
| @@ -865,6 +867,10 @@ enum v4l2_jpeg_chroma_subsampling { · 113 unmodified lines | ||
| 865 | 867 | #define V4L2_CID_VBLANK (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 1) |
| 866 | 868 | #define V4L2_CID_HBLANK (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 2) |
| 867 | 869 | #define V4L2_CID_ANALOGUE_GAIN (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 3) |
| 870 | +#define V4L2_CID_TEST_PATTERN_RED (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 4) | |
| 871 | +#define V4L2_CID_TEST_PATTERN_GREENR (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 5) | |
| 872 | +#define V4L2_CID_TEST_PATTERN_BLUE (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 6) | |
| 873 | +#define V4L2_CID_TEST_PATTERN_GREENB (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 7) | |
| 868 | 874 | |
| 869 | 875 | |
| 870 | 876 | /* Image processing controls */ |
| @@ -21,17 +21,8 @@ · 20 unmodified lines | ||
| 21 | 21 | #ifndef _V4L2_DV_TIMINGS_H |
| 22 | 22 | #define _V4L2_DV_TIMINGS_H |
| 23 | 23 | |
| 24 | −#if __GNUC__ < 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ < 6)) | |
| 25 | −/* Sadly gcc versions older than 4.6 have a bug in how they initialize | |
| 26 | − anonymous unions where they require additional curly brackets. | |
| 27 | − This violates the C1x standard. This workaround adds the curly brackets | |
| 28 | − if needed. */ | |
| 29 | 24 | #define V4L2_INIT_BT_TIMINGS(_width, args...) \ |
| 30 | 25 | { .bt = { _width , ## args } } |
| 31 | −#else | |
| 32 | −#define V4L2_INIT_BT_TIMINGS(_width, args...) \ | |
| 33 | − .bt = { _width , ## args } | |
| 34 | −#endif | |
| 35 | 26 | |
| 36 | 27 | /* CEA-861-E timings (i.e. standard HDTV timings) */ |
| 37 | 28 | |
| @@ -79,6 +79,7 @@ · 78 unmodified lines | ||
| 79 | 79 | /* Four-character-code (FOURCC) */ |
| 80 | 80 | #define v4l2_fourcc(a, b, c, d)\ |
| 81 | 81 | ((__u32)(a) | ((__u32)(b) << 8) | ((__u32)(c) << 16) | ((__u32)(d) << 24)) |
| 82 | +#define v4l2_fourcc_be(a, b, c, d) (v4l2_fourcc(a, b, c, d) | (1 << 31)) | |
| 82 | 83 | |
| 83 | 84 | /* |
| 84 | 85 | * E N U M S |
| @@ -307,6 +308,8 @@ struct v4l2_pix_format { · 222 unmodified lines | ||
| 307 | 308 | #define V4L2_PIX_FMT_XRGB555 v4l2_fourcc('X', 'R', '1', '5') /* 16 XRGB-1-5-5-5 */ |
| 308 | 309 | #define V4L2_PIX_FMT_RGB565 v4l2_fourcc('R', 'G', 'B', 'P') /* 16 RGB-5-6-5 */ |
| 309 | 310 | #define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R', 'G', 'B', 'Q') /* 16 RGB-5-5-5 BE */ |
| 311 | +#define V4L2_PIX_FMT_ARGB555X v4l2_fourcc_be('A', 'R', '1', '5') /* 16 ARGB-5-5-5 BE */ | |
| 312 | +#define V4L2_PIX_FMT_XRGB555X v4l2_fourcc_be('X', 'R', '1', '5') /* 16 XRGB-5-5-5 BE */ | |
| 310 | 313 | #define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R', 'G', 'B', 'R') /* 16 RGB-5-6-5 BE */ |
| 311 | 314 | #define V4L2_PIX_FMT_BGR666 v4l2_fourcc('B', 'G', 'R', 'H') /* 18 BGR-6-6-6 */ |
| 312 | 315 | #define V4L2_PIX_FMT_BGR24 v4l2_fourcc('B', 'G', 'R', '3') /* 24 BGR-8-8-8 */ |
| @@ -1285,11 +1288,11 @@ struct v4l2_ext_control { · 972 unmodified lines | ||
| 1285 | 1288 | union { |
| 1286 | 1289 | __s32 value; |
| 1287 | 1290 | __s64 value64; |
| 1288 | − char *string; | |
| 1289 | − __u8 *p_u8; | |
| 1290 | − __u16 *p_u16; | |
| 1291 | − __u32 *p_u32; | |
| 1292 | − void *ptr; | |
| 1291 | + char __user *string; | |
| 1292 | + __u8 __user *p_u8; | |
| 1293 | + __u16 __user *p_u16; | |
| 1294 | + __u32 __user *p_u32; | |
| 1295 | + void __user *ptr; | |
| 1293 | 1296 | }; |
| 1294 | 1297 | } __attribute__ ((packed)); |
| 1295 | 1298 | |