Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

df462b3d · Linus Torvalds <[email protected]> · 2011-05-23 21:12:49 -07:00

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (247 commits)
  [media] gspca - sunplus: Fix some warnings and simplify code
  [media] gspca: Fix some warnings tied to 'no debug'
  [media] gspca: Unset debug by default
  [media] gspca - cpia1: Remove a bad conditional compilation instruction
  [media] gspca - main: Remove USB traces
  [media] gspca - main: Version change to 2.13
  [media] gspca - stk014 / t613: Accept the index 0 in querymenu
  [media] gspca - kinect: Remove __devinitdata
  [media] gspca - cpia1: Fix some warnings
  [media] video/Kconfig: Fix mis-classified devices
  [media] support for medion dvb stick 1660:1921
  [media] tm6000: fix uninitialized field, change prink to dprintk
  [media] cx231xx: Add support for Iconbit U100
  [media] saa7134 add new TV cards
  [media] Use a more consistent value for RC repeat period
  [media] cx18: Move spinlock and vb_type initialisation into stream_init
  [media] tm6000: remove tm6010 sif audio start and stop
  [media] tm6000: remove unused exports
  [media] tm6000: add pts logging
  [media] tm6000: change from ioctl to unlocked_ioctl
  ...

Commit: df462b3dbeeaae7141f1b63cbfcc1e1bae6a85fc
Parents: 343800e7 · cf252206

Merge commit. Changes below are compared with the first parent: 343800e7.

Changes

228 files changed · +18715 −4766

File	Status	Add	Del	Content
Documentation/DocBook/.gitignore	modified	+1	−0	View file
Documentation/DocBook/dvb/dvbapi.xml	modified	+8	−0	View file
Documentation/DocBook/dvb/dvbproperty.xml	modified	+337	−68	View file
Documentation/DocBook/dvb/frontend.h.xml	modified	+16	−4	View file
Documentation/DocBook/media-entities.tmpl	modified	+2	−0	View file
Documentation/DocBook/v4l/pixfmt-m420.xml	added	+147	−0	View file
Documentation/DocBook/v4l/pixfmt-y10b.xml	added	+43	−0	View file
Documentation/DocBook/v4l/pixfmt.xml	modified	+2	−0	View file
Documentation/DocBook/v4l/subdev-formats.xml	modified	+46	−0	View file
Documentation/DocBook/v4l/videodev2.h.xml	modified	+4	−0	View file
Documentation/feature-removal-schedule.txt	modified	+23	−0	View file
Documentation/ioctl/ioctl-number.txt	modified	+1	−1	View file
Documentation/video4linux/CARDLIST.em28xx	modified	+1	−1	View file
Documentation/video4linux/Zoran	modified	+0	−1	View file
Documentation/video4linux/gspca.txt	modified	+1	−0	View file
Documentation/video4linux/uvcvideo.txt	added	+239	−0	View file
drivers/media/common/saa7146_core.c	modified	+1	−6	View file
drivers/media/common/tuners/Kconfig	modified	+8	−0	View file
drivers/media/common/tuners/Makefile	modified	+1	−0	View file
drivers/media/common/tuners/mxl5005s.c	modified	+2	−0	View file
drivers/media/common/tuners/tda18212.c	added	+265	−0	View file
drivers/media/common/tuners/tda18212.h	added	+48	−0	View file
drivers/media/common/tuners/tda18212_priv.h	added	+44	−0	View file
drivers/media/common/tuners/tda18271-fe.c	modified	+4	−0	View file
drivers/media/common/tuners/xc5000.c	modified	+26	−6	View file
drivers/media/dvb/b2c2/flexcop-pci.c	modified	+1	−3	View file
drivers/media/dvb/bt8xx/bt878.c	modified	+1	−1	View file
drivers/media/dvb/dvb-core/dvb_demux.c	modified	+57	−60	View file
drivers/media/dvb/dvb-core/dvb_frontend.c	modified	+193	−172	View file
drivers/media/dvb/dvb-core/dvb_frontend.h	modified	+3	−0	View file
drivers/media/dvb/dvb-usb/Kconfig	modified	+5	−0	View file
drivers/media/dvb/dvb-usb/a800.c	modified	+13	−4	View file
drivers/media/dvb/dvb-usb/anysee.c	modified	+521	−99	View file
drivers/media/dvb/dvb-usb/anysee.h	modified	+21	−2	View file
drivers/media/dvb/dvb-usb/au6610.c	modified	+16	−6	View file
drivers/media/dvb/dvb-usb/ce6230.c	modified	+9	−2	View file
drivers/media/dvb/dvb-usb/dib0700.h	modified	+3	−2	View file
drivers/media/dvb/dvb-usb/dib0700_core.c	modified	+133	−87	View file
drivers/media/dvb/dvb-usb/dib0700_devices.c	modified	+6	−2	View file
drivers/media/dvb/dvb-usb/dibusb-common.c	modified	+1	−1	View file
drivers/media/dvb/dvb-usb/dvb-usb-dvb.c	modified	+21	−10	View file
drivers/media/dvb/dvb-usb/dvb-usb-ids.h	modified	+1	−0	View file
drivers/media/dvb/dvb-usb/dw2102.c	modified	+8	−2	View file
drivers/media/dvb/dvb-usb/ec168.c	modified	+15	−3	View file
drivers/media/dvb/dvb-usb/friio.c	modified	+19	−4	View file
drivers/media/dvb/dvb-usb/lmedm04.c	modified	+136	−29	View file
drivers/media/dvb/dvb-usb/lmedm04.h	modified	+3	−2	View file
drivers/media/dvb/dvb-usb/m920x.c	modified	+30	−19	View file
drivers/media/dvb/dvb-usb/nova-t-usb2.c	modified	+1	−1	View file
drivers/media/dvb/dvb-usb/opera1.c	modified	+21	−12	View file
drivers/media/dvb/dvb-usb/vp702x-fe.c	modified	+59	−21	View file
drivers/media/dvb/dvb-usb/vp702x.c	modified	+167	−46	View file
drivers/media/dvb/dvb-usb/vp702x.h	modified	+7	−0	View file
drivers/media/dvb/dvb-usb/vp7045.c	modified	+34	−13	View file
drivers/media/dvb/frontends/Kconfig	modified	+12	−7	View file
drivers/media/dvb/frontends/Makefile	modified	+5	−1	View file
drivers/media/dvb/frontends/bsbe1-d01a.h	added	+146	−0	View file
drivers/media/dvb/frontends/bsru6.h	modified	+1	−1	View file
drivers/media/dvb/frontends/cx24116.c	modified	+17	−4	View file
drivers/media/dvb/frontends/cx24116.h	modified	+3	−0	View file
drivers/media/dvb/frontends/cxd2820r.h	added	+118	−0	View file
drivers/media/dvb/frontends/cxd2820r_c.c	added	+338	−0	View file
drivers/media/dvb/frontends/cxd2820r_core.c	added	+915	−0	View file
drivers/media/dvb/frontends/cxd2820r_priv.h	added	+166	−0	View file
drivers/media/dvb/frontends/cxd2820r_t.c	added	+449	−0	View file
drivers/media/dvb/frontends/cxd2820r_t2.c	added	+423	−0	View file
drivers/media/dvb/frontends/dib0070.c	modified	+30	−10	View file
drivers/media/dvb/frontends/dib0090.c	modified	+54	−17	View file
drivers/media/dvb/frontends/dib7000m.c	modified	+32	−17	View file
drivers/media/dvb/frontends/dib7000p.c	modified	+52	−20	View file
drivers/media/dvb/frontends/dib8000.c	modified	+94	−32	View file
drivers/media/dvb/frontends/dib9000.c	modified	+114	−62	View file
drivers/media/dvb/frontends/dibx000_common.c	modified	+65	−44	View file
drivers/media/dvb/frontends/dibx000_common.h	modified	+5	−0	View file
drivers/media/dvb/frontends/drx397xD.c	deleted	+0	−1511	View before deletion
drivers/media/dvb/frontends/drx397xD.h	deleted	+0	−130	View before deletion
drivers/media/dvb/frontends/drx397xD_fw.h	deleted	+0	−40	View before deletion
drivers/media/dvb/frontends/drxd.h	added	+61	−0	View file
drivers/media/dvb/frontends/drxd_firm.c	added	+929	−0	View file
drivers/media/dvb/frontends/drxd_firm.h	added	+115	−0	View file
drivers/media/dvb/frontends/drxd_hard.c	added	+3001	−0	View file
drivers/media/dvb/frontends/drxd_map_firm.h	added	+1013	−0	View file
drivers/media/dvb/frontends/eds1547.h	modified	+1	−1	View file
drivers/media/dvb/frontends/ix2505v.c	modified	+6	−4	View file
drivers/media/dvb/frontends/stv0288.c	modified	+1	−1	View file
drivers/media/dvb/frontends/stv0299.c	modified	+8	−2	View file
drivers/media/dvb/frontends/z0194a.h	modified	+1	−1	View file
drivers/media/dvb/mantis/hopper_cards.c	modified	+1	−1	View file
drivers/media/dvb/mantis/mantis_cards.c	modified	+1	−1	View file
drivers/media/dvb/mantis/mantis_pci.c	modified	+2	−3	View file
drivers/media/dvb/mantis/mantis_vp1033.c	modified	+1	−1	View file
drivers/media/dvb/pt1/pt1.c	modified	+3	−2	View file
drivers/media/dvb/siano/smsusb.c	modified	+1	−2	View file
drivers/media/dvb/ttpci/Kconfig	modified	+2	−0	View file
drivers/media/dvb/ttpci/budget-ci.c	modified	+21	−0	View file
drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c	modified	+27	−33	View file
drivers/media/radio/si470x/radio-si470x-common.c	modified	+42	−18	View file
drivers/media/radio/si470x/radio-si470x-i2c.c	modified	+32	−31	View file
drivers/media/radio/si470x/radio-si470x.h	modified	+3	−1	View file
drivers/media/radio/wl128x/fmdrv.h	modified	+0	−2	View file
drivers/media/rc/Kconfig	modified	+11	−0	View file
drivers/media/rc/Makefile	modified	+1	−0	View file
drivers/media/rc/imon.c	modified	+8	−28	View file
drivers/media/rc/ite-cir.c	modified	+25	−35	View file
drivers/media/rc/keymaps/Makefile	modified	+1	−0	View file
drivers/media/rc/keymaps/rc-avermedia-cardbus.c	modified	+1	−1	View file
drivers/media/rc/keymaps/rc-imon-mce.c	modified	+1	−1	View file
drivers/media/rc/keymaps/rc-imon-pad.c	modified	+3	−3	View file
drivers/media/rc/keymaps/rc-kworld-plus-tv-analog.c	modified	+1	−1	View file
drivers/media/rc/keymaps/rc-rc6-mce.c	modified	+2	−2	View file
drivers/media/rc/keymaps/rc-tivo.c	added	+98	−0	View file
drivers/media/rc/keymaps/rc-winfast.c	modified	+2	−2	View file
drivers/media/rc/mceusb.c	modified	+23	−11	View file
drivers/media/rc/nuvoton-cir.c	modified	+55	−20	View file
drivers/media/rc/nuvoton-cir.h	modified	+14	−3	View file
drivers/media/rc/rc-loopback.c	modified	+6	−0	View file
drivers/media/rc/rc-main.c	modified	+48	−6	View file
drivers/media/rc/redrat3.c	added	+1344	−0	View file
drivers/media/rc/winbond-cir.c	modified	+354	−93	View file
drivers/media/video/Kconfig	modified	+86	−63	View file
drivers/media/video/Makefile	modified	+2	−0	View file
drivers/media/video/bt8xx/bttv-driver.c	modified	+1	−1	View file
drivers/media/video/cpia2/cpia2_v4l.c	modified	+1	−1	View file
drivers/media/video/cx18/Kconfig	modified	+4	−0	View file
drivers/media/video/cx18/cx18-cards.c	modified	+14	−4	View file
drivers/media/video/cx18/cx18-cards.h	modified	+1	−1	View file
drivers/media/video/cx18/cx18-driver.c	modified	+24	−3	View file
drivers/media/video/cx18/cx18-driver.h	modified	+25	−0	View file
drivers/media/video/cx18/cx18-fileops.c	modified	+70	−0	View file
drivers/media/video/cx18/cx18-fileops.h	modified	+2	−0	View file
drivers/media/video/cx18/cx18-ioctl.c	modified	+136	−8	View file
drivers/media/video/cx18/cx18-mailbox.c	modified	+58	−0	View file
drivers/media/video/cx18/cx18-streams.c	modified	+176	−1	View file
drivers/media/video/cx18/cx18-version.h	modified	+1	−1	View file
drivers/media/video/cx18/cx23418.h	modified	+6	−0	View file
drivers/media/video/cx231xx/cx231xx-cards.c	modified	+67	−0	View file
drivers/media/video/cx231xx/cx231xx-dvb.c	modified	+1	−0	View file
drivers/media/video/cx231xx/cx231xx.h	modified	+2	−0	View file
drivers/media/video/cx23885/cx23885-cards.c	modified	+1	−0	View file
drivers/media/video/cx23885/cx23885-core.c	modified	+1	−1	View file
drivers/media/video/cx88/cx88-blackbird.c	modified	+22	−19	View file
drivers/media/video/cx88/cx88-dvb.c	modified	+2	−0	View file
drivers/media/video/cx88/cx88-mpeg.c	modified	+27	−15	View file
drivers/media/video/cx88/cx88-video.c	modified	+4	−3	View file
drivers/media/video/cx88/cx88.h	modified	+8	−3	View file
drivers/media/video/em28xx/Kconfig	modified	+2	−0	View file
drivers/media/video/em28xx/em28xx-cards.c	modified	+44	−5	View file
drivers/media/video/em28xx/em28xx-core.c	modified	+7	−2	View file
drivers/media/video/em28xx/em28xx-dvb.c	modified	+114	−46	View file
drivers/media/video/em28xx/em28xx-i2c.c	modified	+1	−1	View file
drivers/media/video/em28xx/em28xx-reg.h	modified	+1	−0	View file
drivers/media/video/em28xx/em28xx.h	modified	+2	−1	View file
drivers/media/video/fsl-viu.c	modified	+42	−14	View file
drivers/media/video/gspca/Kconfig	modified	+9	−0	View file
drivers/media/video/gspca/Makefile	modified	+2	−0	View file
drivers/media/video/gspca/cpia1.c	modified	+1	−5	View file
drivers/media/video/gspca/gl860/gl860.c	modified	+1	−14	View file
drivers/media/video/gspca/gspca.c	modified	+2	−2	View file
drivers/media/video/gspca/gspca.h	modified	+3	−3	View file
drivers/media/video/gspca/jeilinj.c	modified	+409	−172	View file
drivers/media/video/gspca/kinect.c	added	+429	−0	View file
drivers/media/video/gspca/spca508.c	modified	+4	−1	View file
drivers/media/video/gspca/stk014.c	modified	+6	−9	View file
drivers/media/video/gspca/stv06xx/stv06xx_pb0100.c	modified	+2	−0	View file
drivers/media/video/gspca/sunplus.c	modified	+33	−66	View file
drivers/media/video/gspca/t613.c	modified	+6	−11	View file
drivers/media/video/gspca/zc3xx.c	modified	+10	−37	View file
drivers/media/video/ivtv/ivtv-driver.c	modified	+1	−3	View file
drivers/media/video/mt9m111.c	modified	+12	−2	View file
drivers/media/video/mt9v022.c	modified	+1	−1	View file
drivers/media/video/mt9v032.c	added	+773	−0	View file
drivers/media/video/mx3_camera.c	modified	+46	−14	View file
drivers/media/video/omap1_camera.c	modified	+31	−12	View file
drivers/media/video/pvrusb2/pvrusb2-std.c	modified	+6	−4	View file
drivers/media/video/pwc/pwc-if.c	modified	+1	−1	View file
drivers/media/video/pwc/pwc-v4l.c	modified	+21	−2	View file
drivers/media/video/pxa_camera.c	modified	+2	−6	View file
drivers/media/video/s2255drv.c	modified	+22	−5	View file
drivers/media/video/s5p-fimc/Makefile	modified	+4	−2	View file
drivers/media/video/s5p-fimc/mipi-csis.c	added	+724	−0	View file
drivers/media/video/s5p-fimc/mipi-csis.h	added	+22	−0	View file
drivers/media/video/saa7134/saa7134-cards.c	modified	+125	−0	View file
drivers/media/video/saa7134/saa7134-core.c	modified	+1	−1	View file
drivers/media/video/saa7134/saa7134-dvb.c	modified	+34	−0	View file
drivers/media/video/saa7134/saa7134-input.c	modified	+8	−0	View file
drivers/media/video/saa7134/saa7134.h	modified	+3	−0	View file
drivers/media/video/saa7164/saa7164-core.c	modified	+1	−1	View file
drivers/media/video/sh_mobile_ceu_camera.c	modified	+131	−17	View file
drivers/media/video/soc_camera.c	modified	+18	−11	View file
drivers/media/video/soc_mediabus.c	modified	+239	−26	View file
drivers/media/video/tveeprom.c	modified	+19	−13	View file
drivers/media/video/usbvision/usbvision-cards.c	modified	+31	−2	View file
drivers/media/video/usbvision/usbvision-cards.h	modified	+2	−0	View file
drivers/media/video/usbvision/usbvision-core.c	modified	+72	−93	View file
drivers/media/video/usbvision/usbvision-i2c.c	modified	+1	−1	View file
drivers/media/video/usbvision/usbvision-video.c	modified	+2	−1	View file
drivers/media/video/usbvision/usbvision.h	modified	+6	−0	View file
drivers/media/video/uvc/uvc_ctrl.c	modified	+233	−134	View file
drivers/media/video/uvc/uvc_driver.c	modified	+28	−0	View file
drivers/media/video/uvc/uvc_queue.c	modified	+33	−1	View file
drivers/media/video/uvc/uvc_v4l2.c	modified	+59	−9	View file
drivers/media/video/uvc/uvcvideo.h	modified	+45	−19	View file
drivers/media/video/v4l2-dev.c	modified	+18	−0	View file
drivers/media/video/via-camera.c	modified	+1	−0	View file
drivers/media/video/zoran/zoran_card.c	modified	+1	−9	View file
drivers/staging/lirc/lirc_sasem.c	modified	+7	−6	View file
drivers/staging/tm6000/CARDLIST	added	+16	−0	View file
drivers/staging/tm6000/tm6000-alsa.c	modified	+0	−3	View file
drivers/staging/tm6000/tm6000-cards.c	modified	+339	−42	View file
drivers/staging/tm6000/tm6000-core.c	modified	+45	−64	View file
drivers/staging/tm6000/tm6000-i2c.c	modified	+16	−17	View file
drivers/staging/tm6000/tm6000-stds.c	modified	+206	−717	View file
drivers/staging/tm6000/tm6000-usb-isoc.h	modified	+1	−1	View file
drivers/staging/tm6000/tm6000-video.c	modified	+120	−92	View file
drivers/staging/tm6000/tm6000.h	modified	+31	−15	View file
include/linux/Kbuild	modified	+1	−0	View file
include/linux/dvb/frontend.h	modified	+16	−4	View file
include/linux/dvb/version.h	modified	+1	−1	View file
include/linux/uvcvideo.h	added	+69	−0	View file
include/linux/v4l2-mediabus.h	modified	+3	−0	View file
include/linux/videodev2.h	modified	+4	−0	View file
include/media/mt9v032.h	added	+12	−0	View file
include/media/rc-core.h	modified	+5	−2	View file
include/media/rc-map.h	modified	+1	−0	View file
include/media/soc_camera.h	modified	+14	−1	View file
include/media/soc_camera_platform.h	modified	+50	−0	View file
include/media/soc_mediabus.h	modified	+23	−2	View file
include/media/v4l2-dev.h	modified	+2	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/DocBook/.gitignore

View file

diff --git a/Documentation/DocBook/.gitignore b/Documentation/DocBook/.gitignore
index c6def35..679034c 100644
--- a/Documentation/DocBook/.gitignore
+++ b/Documentation/DocBook/.gitignore
@@ -8,3 +8,4 @@
 *.dvi
 *.log
 *.out
+media/

Documentation/DocBook/dvb/dvbapi.xml

View file

diff --git a/Documentation/DocBook/dvb/dvbapi.xml b/Documentation/DocBook/dvb/dvbapi.xml
index ad8678d..9fad86c 100644
--- a/Documentation/DocBook/dvb/dvbapi.xml
+++ b/Documentation/DocBook/dvb/dvbapi.xml
@@ -35,6 +35,14 @@
 <revhistory>
 <!-- Put document revisions here, newest first. -->
 <revision>
+	<revnumber>2.0.4</revnumber>
+	<date>2011-05-06</date>
+	<authorinitials>mcc</authorinitials>
+	<revremark>
+		Add more information about DVB APIv5, better describing the frontend GET/SET props ioctl's.
+	</revremark>
+</revision>
+<revision>
 	<revnumber>2.0.3</revnumber>
 	<date>2010-07-03</date>
 	<authorinitials>mcc</authorinitials>

Documentation/DocBook/dvb/dvbproperty.xml

View file

diff --git a/Documentation/DocBook/dvb/dvbproperty.xml b/Documentation/DocBook/dvb/dvbproperty.xml
index 97f397e..52d5e3c 100644
--- a/Documentation/DocBook/dvb/dvbproperty.xml
+++ b/Documentation/DocBook/dvb/dvbproperty.xml
@@ -1,6 +1,327 @@
-<section id="FE_GET_PROPERTY">
+<section id="FE_GET_SET_PROPERTY">
 <title>FE_GET_PROPERTY/FE_SET_PROPERTY</title>
 
+<programlisting>
+/* Reserved fields should be set to 0 */
+struct dtv_property {
+	__u32 cmd;
+	union {
+		__u32 data;
+		struct {
+			__u8 data[32];
+			__u32 len;
+			__u32 reserved1[3];
+			void *reserved2;
+		} buffer;
+	} u;
+	int result;
+} __attribute__ ((packed));
+
+/* num of properties cannot exceed DTV_IOCTL_MAX_MSGS per ioctl */
+#define DTV_IOCTL_MAX_MSGS 64
+
+struct dtv_properties {
+	__u32 num;
+	struct dtv_property *props;
+};
+</programlisting>
+
+<section id="FE_GET_PROPERTY">
+<title>FE_GET_PROPERTY</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call returns one or more frontend properties. This call only
+ requires read-only access to the device.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request = <link linkend="FE_GET_PROPERTY">FE_GET_PROPERTY</link>,
+ dtv_properties &#x22C6;props);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int num</para>
+</entry><entry
+ align="char">
+<para>Equals <link linkend="FE_GET_PROPERTY">FE_GET_PROPERTY</link> for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>struct dtv_property *props</para>
+</entry><entry
+ align="char">
+<para>Points to the location where the front-end property commands are stored.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS</para>
+<informaltable><tgroup cols="2"><tbody><row>
+  <entry align="char"><para>EINVAL</para></entry>
+  <entry align="char"><para>Invalid parameter(s) received or number of parameters out of the range.</para></entry>
+ </row><row>
+  <entry align="char"><para>ENOMEM</para></entry>
+  <entry align="char"><para>Out of memory.</para></entry>
+ </row><row>
+  <entry align="char"><para>EFAULT</para></entry>
+  <entry align="char"><para>Failure while copying data from/to userspace.</para></entry>
+ </row><row>
+  <entry align="char"><para>EOPNOTSUPP</para></entry>
+  <entry align="char"><para>Property type not supported.</para></entry>
+ </row></tbody></tgroup></informaltable>
+</section>
+
+<section id="FE_SET_PROPERTY">
+<title>FE_SET_PROPERTY</title>
+<para>DESCRIPTION
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>This ioctl call sets one or more frontend properties. This call only
+ requires read-only access to the device.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>SYNOPSIS
+</para>
+<informaltable><tgroup cols="1"><tbody><row><entry
+ align="char">
+<para>int ioctl(int fd, int request = <link linkend="FE_SET_PROPERTY">FE_SET_PROPERTY</link>,
+ dtv_properties &#x22C6;props);</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>PARAMETERS
+</para>
+<informaltable><tgroup cols="2"><tbody><row><entry align="char">
+<para>int fd</para>
+</entry><entry
+ align="char">
+<para>File descriptor returned by a previous call to open().</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>int num</para>
+</entry><entry
+ align="char">
+<para>Equals <link linkend="FE_SET_PROPERTY">FE_SET_PROPERTY</link> for this command.</para>
+</entry>
+ </row><row><entry
+ align="char">
+<para>struct dtv_property *props</para>
+</entry><entry
+ align="char">
+<para>Points to the location where the front-end property commands are stored.</para>
+</entry>
+ </row></tbody></tgroup></informaltable>
+<para>ERRORS
+</para>
+<informaltable><tgroup cols="2"><tbody><row>
+  <entry align="char"><para>EINVAL</para></entry>
+  <entry align="char"><para>Invalid parameter(s) received or number of parameters out of the range.</para></entry>
+ </row><row>
+  <entry align="char"><para>ENOMEM</para></entry>
+  <entry align="char"><para>Out of memory.</para></entry>
+ </row><row>
+  <entry align="char"><para>EFAULT</para></entry>
+  <entry align="char"><para>Failure while copying data from/to userspace.</para></entry>
+ </row><row>
+  <entry align="char"><para>EOPNOTSUPP</para></entry>
+  <entry align="char"><para>Property type not supported.</para></entry>
+ </row></tbody></tgroup></informaltable>
+</section>
+
+<para>
+On <link linkend="FE_GET_PROPERTY">FE_GET_PROPERTY</link>/<link linkend="FE_SET_PROPERTY">FE_SET_PROPERTY</link>,
+the actual action is determined by the dtv_property cmd/data pairs. With one single ioctl, is possible to
+get/set up to 64 properties. The actual meaning of each property is described on the next sections.
+</para>
+
+<para>The Available frontend property types are:</para>
+<programlisting>
+#define DTV_UNDEFINED		0
+#define DTV_TUNE		1
+#define DTV_CLEAR		2
+#define DTV_FREQUENCY		3
+#define DTV_MODULATION		4
+#define DTV_BANDWIDTH_HZ	5
+#define DTV_INVERSION		6
+#define DTV_DISEQC_MASTER	7
+#define DTV_SYMBOL_RATE		8
+#define DTV_INNER_FEC		9
+#define DTV_VOLTAGE		10
+#define DTV_TONE		11
+#define DTV_PILOT		12
+#define DTV_ROLLOFF		13
+#define DTV_DISEQC_SLAVE_REPLY	14
+#define DTV_FE_CAPABILITY_COUNT	15
+#define DTV_FE_CAPABILITY	16
+#define DTV_DELIVERY_SYSTEM	17
+#define DTV_ISDBT_PARTIAL_RECEPTION	18
+#define DTV_ISDBT_SOUND_BROADCASTING	19
+#define DTV_ISDBT_SB_SUBCHANNEL_ID	20
+#define DTV_ISDBT_SB_SEGMENT_IDX	21
+#define DTV_ISDBT_SB_SEGMENT_COUNT	22
+#define DTV_ISDBT_LAYERA_FEC			23
+#define DTV_ISDBT_LAYERA_MODULATION		24
+#define DTV_ISDBT_LAYERA_SEGMENT_COUNT		25
+#define DTV_ISDBT_LAYERA_TIME_INTERLEAVING	26
+#define DTV_ISDBT_LAYERB_FEC			27
+#define DTV_ISDBT_LAYERB_MODULATION		28
+#define DTV_ISDBT_LAYERB_SEGMENT_COUNT		29
+#define DTV_ISDBT_LAYERB_TIME_INTERLEAVING	30
+#define DTV_ISDBT_LAYERC_FEC			31
+#define DTV_ISDBT_LAYERC_MODULATION		32
+#define DTV_ISDBT_LAYERC_SEGMENT_COUNT		33
+#define DTV_ISDBT_LAYERC_TIME_INTERLEAVING	34
+#define DTV_API_VERSION		35
+#define DTV_CODE_RATE_HP	36
+#define DTV_CODE_RATE_LP	37
+#define DTV_GUARD_INTERVAL	38
+#define DTV_TRANSMISSION_MODE	39
+#define DTV_HIERARCHY		40
+#define DTV_ISDBT_LAYER_ENABLED	41
+#define DTV_ISDBS_TS_ID		42
+</programlisting>
+
+<section id="fe_property_common">
+	<title>Parameters that are common to all Digital TV standards</title>
+	<section id="DTV_FREQUENCY">
+		<title><constant>DTV_FREQUENCY</constant></title>
+
+		<para>Central frequency of the channel, in HZ.</para>
+
+		<para>Notes:</para>
+		<para>1)For ISDB-T, the channels are usually transmitted with an offset of 143kHz.
+			E.g. a valid frequncy could be 474143 kHz. The stepping is bound to the bandwidth of
+			the channel which is 6MHz.</para>
+
+		<para>2)As in ISDB-Tsb the channel consists of only one or three segments the
+			frequency step is 429kHz, 3*429 respectively. As for ISDB-T the
+			central frequency of the channel is expected.</para>
+	</section>
+
+	<section id="DTV_BANDWIDTH_HZ">
+		<title><constant>DTV_BANDWIDTH_HZ</constant></title>
+
+		<para>Bandwidth for the channel, in HZ.</para>
+
+		<para>Possible values:
+			<constant>1712000</constant>,
+			<constant>5000000</constant>,
+			<constant>6000000</constant>,
+			<constant>7000000</constant>,
+			<constant>8000000</constant>,
+			<constant>10000000</constant>.
+		</para>
+
+		<para>Notes:</para>
+
+		<para>1) For ISDB-T it should be always 6000000Hz (6MHz)</para>
+		<para>2) For ISDB-Tsb it can vary depending on the number of connected segments</para>
+		<para>3) Bandwidth doesn't apply for DVB-C transmissions, as the bandwidth
+			 for DVB-C depends on the symbol rate</para>
+		<para>4) Bandwidth in ISDB-T is fixed (6MHz) or can be easily derived from
+			other parameters (DTV_ISDBT_SB_SEGMENT_IDX,
+			DTV_ISDBT_SB_SEGMENT_COUNT).</para>
+		<para>5) DVB-T supports 6, 7 and 8MHz.</para>
+		<para>6) In addition, DVB-T2 supports 1.172, 5 and 10MHz.</para>
+	</section>
+
+	<section id="DTV_DELIVERY_SYSTEM">
+		<title><constant>DTV_DELIVERY_SYSTEM</constant></title>
+
+		<para>Specifies the type of Delivery system</para>
+
+		<para>Possible values: </para>
+<programlisting>
+typedef enum fe_delivery_system {
+	SYS_UNDEFINED,
+	SYS_DVBC_ANNEX_AC,
+	SYS_DVBC_ANNEX_B,
+	SYS_DVBT,
+	SYS_DSS,
+	SYS_DVBS,
+	SYS_DVBS2,
+	SYS_DVBH,
+	SYS_ISDBT,
+	SYS_ISDBS,
+	SYS_ISDBC,
+	SYS_ATSC,
+	SYS_ATSCMH,
+	SYS_DMBTH,
+	SYS_CMMB,
+	SYS_DAB,
+	SYS_DVBT2,
+} fe_delivery_system_t;
+</programlisting>
+
+	</section>
+
+	<section id="DTV_TRANSMISSION_MODE">
+		<title><constant>DTV_TRANSMISSION_MODE</constant></title>
+
+		<para>Specifies the number of carriers used by the standard</para>
+
+		<para>Possible values are:</para>
+<programlisting>
+typedef enum fe_transmit_mode {
+	TRANSMISSION_MODE_2K,
+	TRANSMISSION_MODE_8K,
+	TRANSMISSION_MODE_AUTO,
+	TRANSMISSION_MODE_4K,
+	TRANSMISSION_MODE_1K,
+	TRANSMISSION_MODE_16K,
+	TRANSMISSION_MODE_32K,
+} fe_transmit_mode_t;
+</programlisting>
+
+		<para>Notes:</para>
+		<para>1) ISDB-T supports three carrier/symbol-size: 8K, 4K, 2K. It is called
+			'mode' in the standard: Mode 1 is 2K, mode 2 is 4K, mode 3 is 8K</para>
+
+		<para>2) If <constant>DTV_TRANSMISSION_MODE</constant> is set the <constant>TRANSMISSION_MODE_AUTO</constant> the
+			hardware will try to find the correct FFT-size (if capable) and will
+			use TMCC to fill in the missing parameters.</para>
+		<para>3) DVB-T specifies 2K and 8K as valid sizes.</para>
+		<para>4) DVB-T2 specifies 1K, 2K, 4K, 8K, 16K and 32K.</para>
+	</section>
+
+	<section id="DTV_GUARD_INTERVAL">
+		<title><constant>DTV_GUARD_INTERVAL</constant></title>
+
+		<para>Possible values are:</para>
+<programlisting>
+typedef enum fe_guard_interval {
+	GUARD_INTERVAL_1_32,
+	GUARD_INTERVAL_1_16,
+	GUARD_INTERVAL_1_8,
+	GUARD_INTERVAL_1_4,
+	GUARD_INTERVAL_AUTO,
+	GUARD_INTERVAL_1_128,
+	GUARD_INTERVAL_19_128,
+	GUARD_INTERVAL_19_256,
+} fe_guard_interval_t;
+</programlisting>
+
+		<para>Notes:</para>
+		<para>1) If <constant>DTV_GUARD_INTERVAL</constant> is set the <constant>GUARD_INTERVAL_AUTO</constant> the hardware will
+			try to find the correct guard interval (if capable) and will use TMCC to fill
+			in the missing parameters.</para>
+		<para>2) Intervals 1/128, 19/128 and 19/256 are used only for DVB-T2 at present</para>
+	</section>
+</section>
+
 <section id="isdbt">
 	<title>ISDB-T frontend</title>
 	<para>This section describes shortly what are the possible parameters in the Linux
@@ -32,73 +353,6 @@
 
 	<para>Parameters used by ISDB-T and ISDB-Tsb.</para>
 
-	<section id="isdbt-parms">
-		<title>Parameters that are common with DVB-T and ATSC</title>
-
-		<section id="isdbt-freq">
-			<title><constant>DTV_FREQUENCY</constant></title>
-
-			<para>Central frequency of the channel.</para>
-
-			<para>For ISDB-T the channels are usually transmitted with an offset of 143kHz. E.g. a
-				valid frequncy could be 474143 kHz. The stepping is bound to the bandwidth of
-				the channel which is 6MHz.</para>
-
-			<para>As in ISDB-Tsb the channel consists of only one or three segments the
-				frequency step is 429kHz, 3*429 respectively. As for ISDB-T the
-				central frequency of the channel is expected.</para>
-		</section>
-
-		<section id="isdbt-bw">
-			<title><constant>DTV_BANDWIDTH_HZ</constant> (optional)</title>
-
-			<para>Possible values:</para>
-
-			<para>For ISDB-T it should be always 6000000Hz (6MHz)</para>
-			<para>For ISDB-Tsb it can vary depending on the number of connected segments</para>
-
-			<para>Note: Hardware specific values might be given here, but standard
-				applications should not bother to set a value to this field as
-				standard demods are ignoring it anyway.</para>
-
-			<para>Bandwidth in ISDB-T is fixed (6MHz) or can be easily derived from
-				other parameters (DTV_ISDBT_SB_SEGMENT_IDX,
-				DTV_ISDBT_SB_SEGMENT_COUNT).</para>
-		</section>
-
-		<section id="isdbt-delivery-sys">
-			<title><constant>DTV_DELIVERY_SYSTEM</constant></title>
-
-			<para>Possible values: <constant>SYS_ISDBT</constant></para>
-		</section>
-
-		<section id="isdbt-tx-mode">
-			<title><constant>DTV_TRANSMISSION_MODE</constant></title>
-
-			<para>ISDB-T supports three carrier/symbol-size: 8K, 4K, 2K. It is called
-				'mode' in the standard: Mode 1 is 2K, mode 2 is 4K, mode 3 is 8K</para>
-
-			<para>Possible values: <constant>TRANSMISSION_MODE_2K</constant>, <constant>TRANSMISSION_MODE_8K</constant>,
-				<constant>TRANSMISSION_MODE_AUTO</constant>, <constant>TRANSMISSION_MODE_4K</constant></para>
-
-			<para>If <constant>DTV_TRANSMISSION_MODE</constant> is set the <constant>TRANSMISSION_MODE_AUTO</constant> the
-				hardware will try to find the correct FFT-size (if capable) and will
-				use TMCC to fill in the missing parameters.</para>
-
-			<para><constant>TRANSMISSION_MODE_4K</constant> is added at the same time as the other new parameters.</para>
-		</section>
-
-		<section id="isdbt-guard-interval">
-			<title><constant>DTV_GUARD_INTERVAL</constant></title>
-
-			<para>Possible values: <constant>GUARD_INTERVAL_1_32</constant>, <constant>GUARD_INTERVAL_1_16</constant>, <constant>GUARD_INTERVAL_1_8</constant>,
-				<constant>GUARD_INTERVAL_1_4</constant>, <constant>GUARD_INTERVAL_AUTO</constant></para>
-
-			<para>If <constant>DTV_GUARD_INTERVAL</constant> is set the <constant>GUARD_INTERVAL_AUTO</constant> the hardware will
-				try to find the correct guard interval (if capable) and will use TMCC to fill
-				in the missing parameters.</para>
-		</section>
-	</section>
 	<section id="isdbt-new-parms">
 		<title>ISDB-T only parameters</title>
 
@@ -314,5 +568,20 @@
 			</section>
 		</section>
 	</section>
+	<section id="dvbt2-params">
+		<title>DVB-T2 parameters</title>
+		
+		<para>This section covers parameters that apply only to the DVB-T2 delivery method. DVB-T2
+			support is currently in the early stages development so expect this section to grow
+			and become more detailed with time.</para>
+
+		<section id="dvbt2-plp-id">
+			<title><constant>DTV_DVBT2_PLP_ID</constant></title>
+
+			<para>DVB-T2 supports Physical Layer Pipes (PLP) to allow transmission of
+				many data types via a single multiplex. The API will soon support this
+				at which point this section will be expanded.</para>
+		</section>
+	</section>
 </section>
 </section>

Documentation/DocBook/dvb/frontend.h.xml

View file

diff --git a/Documentation/DocBook/dvb/frontend.h.xml b/Documentation/DocBook/dvb/frontend.h.xml
index d08e0d4..d792f78 100644
--- a/Documentation/DocBook/dvb/frontend.h.xml
+++ b/Documentation/DocBook/dvb/frontend.h.xml
@@ -176,14 +176,20 @@ typedef enum fe_transmit_mode {
         TRANSMISSION_MODE_2K,
         TRANSMISSION_MODE_8K,
         TRANSMISSION_MODE_AUTO,
-        TRANSMISSION_MODE_4K
+        TRANSMISSION_MODE_4K,
+        TRANSMISSION_MODE_1K,
+        TRANSMISSION_MODE_16K,
+        TRANSMISSION_MODE_32K,
 } fe_transmit_mode_t;
 
 typedef enum fe_bandwidth {
         BANDWIDTH_8_MHZ,
         BANDWIDTH_7_MHZ,
         BANDWIDTH_6_MHZ,
-        BANDWIDTH_AUTO
+        BANDWIDTH_AUTO,
+        BANDWIDTH_5_MHZ,
+        BANDWIDTH_10_MHZ,
+        BANDWIDTH_1_712_MHZ,
 } fe_bandwidth_t;
 
 
@@ -192,7 +198,10 @@ typedef enum fe_guard_interval {
         GUARD_INTERVAL_1_16,
         GUARD_INTERVAL_1_8,
         GUARD_INTERVAL_1_4,
-        GUARD_INTERVAL_AUTO
+        GUARD_INTERVAL_AUTO,
+        GUARD_INTERVAL_1_128,
+        GUARD_INTERVAL_19_128,
+        GUARD_INTERVAL_19_256,
 } fe_guard_interval_t;
 
 
@@ -306,7 +315,9 @@ struct dvb_frontend_event {
 
 #define DTV_ISDBS_TS_ID         42
 
-#define DTV_MAX_COMMAND                         DTV_ISDBS_TS_ID
+#define DTV_DVBT2_PLP_ID	43
+
+#define DTV_MAX_COMMAND                         DTV_DVBT2_PLP_ID
 
 typedef enum fe_pilot {
         PILOT_ON,
@@ -338,6 +349,7 @@ typedef enum fe_delivery_system {
         SYS_DMBTH,
         SYS_CMMB,
         SYS_DAB,
+        SYS_DVBT2,
 } fe_delivery_system_t;
 
 struct dtv_cmds_h {

Documentation/DocBook/media-entities.tmpl

View file

diff --git a/Documentation/DocBook/media-entities.tmpl b/Documentation/DocBook/media-entities.tmpl
index fea63b4..c8abb23 100644
--- a/Documentation/DocBook/media-entities.tmpl
+++ b/Documentation/DocBook/media-entities.tmpl
@@ -270,6 +270,7 @@
 <!ENTITY sub-write SYSTEM "v4l/func-write.xml">
 <!ENTITY sub-io SYSTEM "v4l/io.xml">
 <!ENTITY sub-grey SYSTEM "v4l/pixfmt-grey.xml">
+<!ENTITY sub-m420 SYSTEM "v4l/pixfmt-m420.xml">
 <!ENTITY sub-nv12 SYSTEM "v4l/pixfmt-nv12.xml">
 <!ENTITY sub-nv12m SYSTEM "v4l/pixfmt-nv12m.xml">
 <!ENTITY sub-nv12mt SYSTEM "v4l/pixfmt-nv12mt.xml">
@@ -295,6 +296,7 @@
 <!ENTITY sub-srggb8 SYSTEM "v4l/pixfmt-srggb8.xml">
 <!ENTITY sub-y10 SYSTEM "v4l/pixfmt-y10.xml">
 <!ENTITY sub-y12 SYSTEM "v4l/pixfmt-y12.xml">
+<!ENTITY sub-y10b SYSTEM "v4l/pixfmt-y10b.xml">
 <!ENTITY sub-pixfmt SYSTEM "v4l/pixfmt.xml">
 <!ENTITY sub-cropcap SYSTEM "v4l/vidioc-cropcap.xml">
 <!ENTITY sub-dbg-g-register SYSTEM "v4l/vidioc-dbg-g-register.xml">

Documentation/DocBook/v4l/pixfmt-m420.xml

View file

diff --git a/Documentation/DocBook/v4l/pixfmt-m420.xml b/Documentation/DocBook/v4l/pixfmt-m420.xml
new file mode 100644
index 0000000..ce4bc01
--- /dev/null
+++ b/Documentation/DocBook/v4l/pixfmt-m420.xml
@@ -0,0 +1,147 @@
+    <refentry id="V4L2-PIX-FMT-M420">
+      <refmeta>
+	<refentrytitle>V4L2_PIX_FMT_M420 ('M420')</refentrytitle>
+	&manvol;
+      </refmeta>
+      <refnamediv>
+	<refname><constant>V4L2_PIX_FMT_M420</constant></refname>
+	<refpurpose>Format with &frac12; horizontal and vertical chroma
+	resolution, also known as YUV 4:2:0. Hybrid plane line-interleaved
+	layout.</refpurpose>
+      </refnamediv>
+      <refsect1>
+	<title>Description</title>
+
+	<para>M420 is a YUV format with &frac12; horizontal and vertical chroma
+	subsampling (YUV 4:2:0). Pixels are organized as interleaved luma and
+	chroma planes. Two lines of luma data are followed by one line of chroma
+	data.</para>
+	<para>The luma plane has one byte per pixel. The chroma plane contains
+	interleaved CbCr pixels subsampled by &frac12; in the horizontal and
+	vertical directions. Each CbCr pair belongs to four pixels. For example,
+Cb<subscript>0</subscript>/Cr<subscript>0</subscript> belongs to
+Y'<subscript>00</subscript>, Y'<subscript>01</subscript>,
+Y'<subscript>10</subscript>, Y'<subscript>11</subscript>.</para>
+
+	<para>All line lengths are identical: if the Y lines include pad bytes
+	so do the CbCr lines.</para>
+
+	<example>
+	  <title><constant>V4L2_PIX_FMT_M420</constant> 4 &times; 4
+pixel image</title>
+
+	  <formalpara>
+	    <title>Byte Order.</title>
+	    <para>Each cell is one byte.
+		<informaltable frame="none">
+		<tgroup cols="5" align="center">
+		  <colspec align="left" colwidth="2*" />
+		  <tbody valign="top">
+		    <row>
+		      <entry>start&nbsp;+&nbsp;0:</entry>
+		      <entry>Y'<subscript>00</subscript></entry>
+		      <entry>Y'<subscript>01</subscript></entry>
+		      <entry>Y'<subscript>02</subscript></entry>
+		      <entry>Y'<subscript>03</subscript></entry>
+		    </row>
+		    <row>
+		      <entry>start&nbsp;+&nbsp;4:</entry>
+		      <entry>Y'<subscript>10</subscript></entry>
+		      <entry>Y'<subscript>11</subscript></entry>
+		      <entry>Y'<subscript>12</subscript></entry>
+		      <entry>Y'<subscript>13</subscript></entry>
+		    </row>
+		    <row>
+		      <entry>start&nbsp;+&nbsp;8:</entry>
+		      <entry>Cb<subscript>00</subscript></entry>
+		      <entry>Cr<subscript>00</subscript></entry>
+		      <entry>Cb<subscript>01</subscript></entry>
+		      <entry>Cr<subscript>01</subscript></entry>
+		    </row>