Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f63b759c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (243 commits)
  V4L/DVB: sms: Convert IR support to use the Remote Controller core
  V4L/DVB: sms: properly initialize IR phys and IR name
  V4L/DVB: standardize names at rc-dib0700 tables
  V4L/DVB: smsusb: enable IR port for Hauppauge WinTV MiniStick
  V4L/DVB: dib0700: Fix RC protocol logic to properly handle NEC/NECx and RC-5
  V4L/DVB: dib0700: properly implement IR change_protocol
  V4L/DVB: dib0700: break keytable into NEC and RC-5 variants
  V4L/DVB: dib0700: avoid bad repeat
  V4L/DVB: Port dib0700 to rc-core
  V4L/DVB: Add a keymap file with dib0700 table
  V4L/DVB: dvb-usb: add support for rc-core mode
  V4L/DVB: dvb-usb: prepare drivers for using rc-core
  V4L/DVB: dvb-usb: get rid of struct dvb_usb_rc_key
  V4L/DVB: rj54n1cb0c: fix a comment in the driver
  V4L/DVB: V4L2: sh_vou: VOU does support the full PAL resolution too
  V4L/DVB: V4L2: sh_mobile_camera_ceu: add support for CSI2
  V4L/DVB: V4L2: soc-camera: add a MIPI CSI-2 driver for SH-Mobile platforms
  V4L/DVB: V4L2: soc-camera: export soc-camera bus type for notifications
  V4L/DVB: V4L2: mediabus: add 12-bit Bayer and YUV420 pixel formats
  V4L/DVB: mediabus: fix ambiguous pixel code names
  ...
parents 4a35cee0 844a9e93

Documentation/DocBook/dvb/dvbapi.xml

+16 −3
Original line number Diff line number Diff line
@@ -12,10 +12,12 @@ 
<othername role="mi">O. C.</othername>

<affiliation><address><email>rjkm@metzlerbros.de</email></address></affiliation>

</author>

</authorgroup>

<authorgroup>

<author>

<firstname>Mauro</firstname>

<surname>Chehab</surname>

<othername role="mi">Carvalho</othername>

<surname>Chehab</surname>

<affiliation><address><email>mchehab@redhat.com</email></address></affiliation>

<contrib>Ported document to Docbook XML.</contrib>

</author>
@@ -23,12 +25,23 @@ 
<copyright>

	<year>2002</year>

	<year>2003</year>

	<year>2009</year>

	<holder>Convergence GmbH</holder>

</copyright>

<copyright>

	<year>2009-2010</year>

	<holder>Mauro Carvalho Chehab</holder>

</copyright>



<revhistory>

<!-- Put document revisions here, newest first. -->

<revision>

	<revnumber>2.0.3</revnumber>

	<date>2010-07-03</date>

	<authorinitials>mcc</authorinitials>

	<revremark>

		Add some frontend capabilities flags, present on kernel, but missing at the specs.

	</revremark>

</revision>

<revision>

	<revnumber>2.0.2</revnumber>

	<date>2009-10-25</date>
@@ -63,7 +76,7 @@ Added ISDB-T test originally written by Patrick Boettcher 




<title>LINUX DVB API</title>

<subtitle>Version 3</subtitle>

<subtitle>Version 5.2</subtitle>

<!-- ADD THE CHAPTERS HERE -->

  <chapter id="dvb_introdution">

    &sub-intro;

Documentation/DocBook/dvb/frontend.h.xml

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ typedef enum fe_caps { 
        FE_CAN_8VSB                     = 0x200000,

        FE_CAN_16VSB                    = 0x400000,

        FE_HAS_EXTENDED_CAPS            = 0x800000,   /* We need more bitspace for newer APIs, indicate this. */

        FE_CAN_TURBO_FEC                = 0x8000000,  /* frontend supports "turbo fec modulation" */

        FE_CAN_2G_MODULATION            = 0x10000000, /* frontend supports "2nd generation modulation" (DVB-S2) */

        FE_NEEDS_BENDING                = 0x20000000, /* not supported anymore, don't use (frontend requires frequency bending) */

        FE_CAN_RECOVER                  = 0x40000000, /* frontend can recover from a cable unplug automatically */

Documentation/DocBook/dvb/frontend.xml

+8 −2
Original line number Diff line number Diff line
@@ -64,8 +64,14 @@ a specific frontend type.</para> 
	FE_CAN_BANDWIDTH_AUTO         = 0x40000,

	FE_CAN_GUARD_INTERVAL_AUTO    = 0x80000,

	FE_CAN_HIERARCHY_AUTO         = 0x100000,

	FE_CAN_MUTE_TS                = 0x80000000,

	FE_CAN_CLEAN_SETUP            = 0x40000000

	FE_CAN_8VSB                   = 0x200000,

	FE_CAN_16VSB                  = 0x400000,

	FE_HAS_EXTENDED_CAPS          = 0x800000,

	FE_CAN_TURBO_FEC              = 0x8000000,

	FE_CAN_2G_MODULATION          = 0x10000000,

	FE_NEEDS_BENDING              = 0x20000000,

	FE_CAN_RECOVER                = 0x40000000,

	FE_CAN_MUTE_TS                = 0x80000000

	} fe_caps_t;

</programlisting>

</section>

Documentation/DocBook/media-entities.tmpl

+1 −0
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ 
<!ENTITY sub-dev-teletext SYSTEM "v4l/dev-teletext.xml">

<!ENTITY sub-driver SYSTEM "v4l/driver.xml">

<!ENTITY sub-libv4l SYSTEM "v4l/libv4l.xml">

<!ENTITY sub-lirc_device_interface SYSTEM "v4l/lirc_device_interface.xml">

<!ENTITY sub-remote_controllers SYSTEM "v4l/remote_controllers.xml">

<!ENTITY sub-fdl-appendix SYSTEM "v4l/fdl-appendix.xml">

<!ENTITY sub-close SYSTEM "v4l/func-close.xml">

Documentation/DocBook/media.tmpl

+4 −4
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
<title>LINUX MEDIA INFRASTRUCTURE API</title>



<copyright>

	<year>2009</year>

	<year>2009-2010</year>

	<holder>LinuxTV Developers</holder>

</copyright>
@@ -61,7 +61,7 @@ Foundation. A copy of the license is included in the chapter entitled 
		in fact it covers several different video standards including

		DVB-T, DVB-S, DVB-C and ATSC. The API is currently being updated

		to documment support also for DVB-S2, ISDB-T and ISDB-S.</para>

	<para>The third part covers other API's used by all media infrastructure devices</para>

	<para>The third part covers Remote Controller API</para>

	<para>For additional information and for the latest development code,

		see: <ulink url="http://linuxtv.org">http://linuxtv.org</ulink>.</para>

	<para>For discussing improvements, reporting troubles, sending new drivers, etc, please mail to: <ulink url="http://vger.kernel.org/vger-lists.html#linux-media">Linux Media Mailing List (LMML).</ulink>.</para>
@@ -86,7 +86,7 @@ Foundation. A copy of the license is included in the chapter entitled 
</author>

</authorgroup>

<copyright>

	<year>2009</year>

	<year>2009-2010</year>

	<holder>Mauro Carvalho Chehab</holder>

</copyright>
@@ -101,7 +101,7 @@ Foundation. A copy of the license is included in the chapter entitled 
</revhistory>

</partinfo>



<title>Other API's used by media infrastructure drivers</title>

<title>Remote Controller API</title>

<chapter id="remote_controllers">

&sub-remote_controllers;

</chapter>