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

Commit 6a5df38f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (116 commits)
  V4L/DVB (13698): pms: replace asm/uaccess.h to linux/uaccess.h
  V4L/DVB (13690): radio/si470x: #include <sched.h>
  V4L/DVB (13688): au8522: modify the attributes of local filter coefficients
  V4L/DVB (13687): cx231xx: use NULL when pointer is needed
  V4L/DVB: Davinci VPFE Capture: remove unused #include <linux/version.h>
  V4L/DVB (13685): Correct code taking the size of a pointer
  V4L/DVB (13684): Fix some cut-and-paste noise in dib0090.h
  V4L/DVB (13683): sanio-ms: clean up init, exit and id_table
  V4L/DVB (13682): dib8000: make some constant static
  V4L/DVB: lgs8gxx: Use shifts rather than multiply/divide when possible
  V4L/DVB (13680b): DocBook/media: create links for included sources
  V4L/DVB (13680a): DocBook/media: copy images after building HTML
  V4L/DVB (13678): Add support for yet another DvbWorld, TeVii and Prof USB devices
  V4L/DVB (13676): configurable IRQ mode on NetUP Dual DVB-S2 CI; IRQ from CAM processing (CI interface works faster)
  V4L/DVB (13674): stv090x: Add DiSEqC envelope mode
  V4L/DVB (13673): lnbp21: Implement 22 kHz tone control
  V4L/DVB (13671): sh_mobile_ceu_camera: Remove frame size page alignment
  V4L/DVB (13670): soc-camera: Add mt9t112 camera driver
  V4L/DVB (13669): tw9910: Add sync polarity support
  V4L/DVB (13668): tw9910: remove cropping
  ...
parents 9cfc8624 262ab9ac

Documentation/DocBook/Makefile

+15 −6
Original line number Diff line number Diff line
@@ -32,10 +32,10 @@ PS_METHOD = $(prefer-db2x) 


###

# The targets that may be used.

PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs media

PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs xmldoclinks



BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))

xmldocs: $(BOOKS)

xmldocs: $(BOOKS) xmldoclinks

sgmldocs: xmldocs



PS := $(patsubst %.xml, %.ps, $(BOOKS))
@@ -45,15 +45,24 @@ PDF := $(patsubst %.xml, %.pdf, $(BOOKS)) 
pdfdocs: $(PDF)



HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))

htmldocs: media $(HTML)

htmldocs: $(HTML)

	$(call build_main_index)

	$(call build_images)



MAN := $(patsubst %.xml, %.9, $(BOOKS))

mandocs: $(MAN)



media:

	mkdir -p $(srctree)/Documentation/DocBook/media/

	cp $(srctree)/Documentation/DocBook/dvb/*.png $(srctree)/Documentation/DocBook/v4l/*.gif $(srctree)/Documentation/DocBook/media/

build_images = mkdir -p $(objtree)/Documentation/DocBook/media/ && \

	       cp $(srctree)/Documentation/DocBook/dvb/*.png $(srctree)/Documentation/DocBook/v4l/*.gif $(objtree)/Documentation/DocBook/media/



xmldoclinks:

ifneq ($(objtree),$(srctree))

	for dep in dvb media-entities.tmpl media-indices.tmpl v4l; do \

		rm -f $(objtree)/Documentation/DocBook/$$dep \

		&& ln -s $(srctree)/Documentation/DocBook/$$dep $(objtree)/Documentation/DocBook/ \

		|| exit; \

	done

endif



installmandocs: mandocs

	mkdir -p /usr/local/man/man9/

Documentation/DocBook/media-entities.tmpl

+18 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
<!ENTITY VIDIOC-ENUMINPUT "<link linkend='vidioc-enuminput'><constant>VIDIOC_ENUMINPUT</constant></link>">

<!ENTITY VIDIOC-ENUMOUTPUT "<link linkend='vidioc-enumoutput'><constant>VIDIOC_ENUMOUTPUT</constant></link>">

<!ENTITY VIDIOC-ENUMSTD "<link linkend='vidioc-enumstd'><constant>VIDIOC_ENUMSTD</constant></link>">

<!ENTITY VIDIOC-ENUM-DV-PRESETS "<link linkend='vidioc-enum-dv-presets'><constant>VIDIOC_ENUM_DV_PRESETS</constant></link>">

<!ENTITY VIDIOC-ENUM-FMT "<link linkend='vidioc-enum-fmt'><constant>VIDIOC_ENUM_FMT</constant></link>">

<!ENTITY VIDIOC-ENUM-FRAMEINTERVALS "<link linkend='vidioc-enum-frameintervals'><constant>VIDIOC_ENUM_FRAMEINTERVALS</constant></link>">

<!ENTITY VIDIOC-ENUM-FRAMESIZES "<link linkend='vidioc-enum-framesizes'><constant>VIDIOC_ENUM_FRAMESIZES</constant></link>">
@@ -30,6 +31,8 @@ 
<!ENTITY VIDIOC-G-AUDOUT "<link linkend='vidioc-g-audioout'><constant>VIDIOC_G_AUDOUT</constant></link>">

<!ENTITY VIDIOC-G-CROP "<link linkend='vidioc-g-crop'><constant>VIDIOC_G_CROP</constant></link>">

<!ENTITY VIDIOC-G-CTRL "<link linkend='vidioc-g-ctrl'><constant>VIDIOC_G_CTRL</constant></link>">

<!ENTITY VIDIOC-G-DV-PRESET "<link linkend='vidioc-g-dv-preset'><constant>VIDIOC_G_DV_PRESET</constant></link>">

<!ENTITY VIDIOC-G-DV-TIMINGS "<link linkend='vidioc-g-dv-timings'><constant>VIDIOC_G_DV_TIMINGS</constant></link>">

<!ENTITY VIDIOC-G-ENC-INDEX "<link linkend='vidioc-g-enc-index'><constant>VIDIOC_G_ENC_INDEX</constant></link>">

<!ENTITY VIDIOC-G-EXT-CTRLS "<link linkend='vidioc-g-ext-ctrls'><constant>VIDIOC_G_EXT_CTRLS</constant></link>">

<!ENTITY VIDIOC-G-FBUF "<link linkend='vidioc-g-fbuf'><constant>VIDIOC_G_FBUF</constant></link>">
@@ -53,6 +56,7 @@ 
<!ENTITY VIDIOC-QUERYCTRL "<link linkend='vidioc-queryctrl'><constant>VIDIOC_QUERYCTRL</constant></link>">

<!ENTITY VIDIOC-QUERYMENU "<link linkend='vidioc-queryctrl'><constant>VIDIOC_QUERYMENU</constant></link>">

<!ENTITY VIDIOC-QUERYSTD "<link linkend='vidioc-querystd'><constant>VIDIOC_QUERYSTD</constant></link>">

<!ENTITY VIDIOC-QUERY-DV-PRESET "<link linkend='vidioc-query-dv-preset'><constant>VIDIOC_QUERY_DV_PRESET</constant></link>">

<!ENTITY VIDIOC-REQBUFS "<link linkend='vidioc-reqbufs'><constant>VIDIOC_REQBUFS</constant></link>">

<!ENTITY VIDIOC-STREAMOFF "<link linkend='vidioc-streamon'><constant>VIDIOC_STREAMOFF</constant></link>">

<!ENTITY VIDIOC-STREAMON "<link linkend='vidioc-streamon'><constant>VIDIOC_STREAMON</constant></link>">
@@ -60,6 +64,8 @@ 
<!ENTITY VIDIOC-S-AUDOUT "<link linkend='vidioc-g-audioout'><constant>VIDIOC_S_AUDOUT</constant></link>">

<!ENTITY VIDIOC-S-CROP "<link linkend='vidioc-g-crop'><constant>VIDIOC_S_CROP</constant></link>">

<!ENTITY VIDIOC-S-CTRL "<link linkend='vidioc-g-ctrl'><constant>VIDIOC_S_CTRL</constant></link>">

<!ENTITY VIDIOC-S-DV-PRESET "<link linkend='vidioc-g-dv-preset'><constant>VIDIOC_S_DV_PRESET</constant></link>">

<!ENTITY VIDIOC-S-DV-TIMINGS "<link linkend='vidioc-g-dv-timings'><constant>VIDIOC_S_DV_TIMINGS</constant></link>">

<!ENTITY VIDIOC-S-EXT-CTRLS "<link linkend='vidioc-g-ext-ctrls'><constant>VIDIOC_S_EXT_CTRLS</constant></link>">

<!ENTITY VIDIOC-S-FBUF "<link linkend='vidioc-g-fbuf'><constant>VIDIOC_S_FBUF</constant></link>">

<!ENTITY VIDIOC-S-FMT "<link linkend='vidioc-g-fmt'><constant>VIDIOC_S_FMT</constant></link>">
@@ -118,6 +124,7 @@ 
<!-- Structures -->

<!ENTITY v4l2-audio "struct&nbsp;<link linkend='v4l2-audio'>v4l2_audio</link>">

<!ENTITY v4l2-audioout "struct&nbsp;<link linkend='v4l2-audioout'>v4l2_audioout</link>">

<!ENTITY v4l2-bt-timings "struct&nbsp;<link linkend='v4l2-bt-timings'>v4l2_bt_timings</link>">

<!ENTITY v4l2-buffer "struct&nbsp;<link linkend='v4l2-buffer'>v4l2_buffer</link>">

<!ENTITY v4l2-capability "struct&nbsp;<link linkend='v4l2-capability'>v4l2_capability</link>">

<!ENTITY v4l2-captureparm "struct&nbsp;<link linkend='v4l2-captureparm'>v4l2_captureparm</link>">
@@ -128,6 +135,9 @@ 
<!ENTITY v4l2-dbg-chip-ident "struct&nbsp;<link linkend='v4l2-dbg-chip-ident'>v4l2_dbg_chip_ident</link>">

<!ENTITY v4l2-dbg-match "struct&nbsp;<link linkend='v4l2-dbg-match'>v4l2_dbg_match</link>">

<!ENTITY v4l2-dbg-register "struct&nbsp;<link linkend='v4l2-dbg-register'>v4l2_dbg_register</link>">

<!ENTITY v4l2-dv-enum-preset "struct&nbsp;<link linkend='v4l2-dv-enum-preset'>v4l2_dv_enum_preset</link>">

<!ENTITY v4l2-dv-preset "struct&nbsp;<link linkend='v4l2-dv-preset'>v4l2_dv_preset</link>">

<!ENTITY v4l2-dv-timings "struct&nbsp;<link linkend='v4l2-dv-timings'>v4l2_dv_timings</link>">

<!ENTITY v4l2-enc-idx "struct&nbsp;<link linkend='v4l2-enc-idx'>v4l2_enc_idx</link>">

<!ENTITY v4l2-enc-idx-entry "struct&nbsp;<link linkend='v4l2-enc-idx-entry'>v4l2_enc_idx_entry</link>">

<!ENTITY v4l2-encoder-cmd "struct&nbsp;<link linkend='v4l2-encoder-cmd'>v4l2_encoder_cmd</link>">
@@ -243,6 +253,10 @@ 
<!ENTITY sub-enumaudioout SYSTEM "v4l/vidioc-enumaudioout.xml">

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

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

<!ENTITY sub-enum-dv-presets SYSTEM "v4l/vidioc-enum-dv-presets.xml">

<!ENTITY sub-g-dv-preset SYSTEM "v4l/vidioc-g-dv-preset.xml">

<!ENTITY sub-query-dv-preset SYSTEM "v4l/vidioc-query-dv-preset.xml">

<!ENTITY sub-g-dv-timings SYSTEM "v4l/vidioc-g-dv-timings.xml">

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

<!ENTITY sub-g-audio SYSTEM "v4l/vidioc-g-audio.xml">

<!ENTITY sub-g-audioout SYSTEM "v4l/vidioc-g-audioout.xml">
@@ -333,6 +347,10 @@ 
<!ENTITY enumaudioout SYSTEM "v4l/vidioc-enumaudioout.xml">

<!ENTITY enuminput SYSTEM "v4l/vidioc-enuminput.xml">

<!ENTITY enumoutput SYSTEM "v4l/vidioc-enumoutput.xml">

<!ENTITY enum-dv-presets SYSTEM "v4l/vidioc-enum-dv-presets.xml">

<!ENTITY g-dv-preset SYSTEM "v4l/vidioc-g-dv-preset.xml">

<!ENTITY query-dv-preset SYSTEM "v4l/vidioc-query-dv-preset.xml">

<!ENTITY g-dv-timings SYSTEM "v4l/vidioc-g-dv-timings.xml">

<!ENTITY enumstd SYSTEM "v4l/vidioc-enumstd.xml">

<!ENTITY g-audio SYSTEM "v4l/vidioc-g-audio.xml">

<!ENTITY g-audioout SYSTEM "v4l/vidioc-g-audioout.xml">

Documentation/DocBook/media-indices.tmpl

+4 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
<indexentry><primaryie>enum&nbsp;<link linkend='v4l2-preemphasis'>v4l2_preemphasis</link></primaryie></indexentry>

<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-audio'>v4l2_audio</link></primaryie></indexentry>

<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-audioout'>v4l2_audioout</link></primaryie></indexentry>

<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-bt-timings'>v4l2_bt_timings</link></primaryie></indexentry>

<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-buffer'>v4l2_buffer</link></primaryie></indexentry>

<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-capability'>v4l2_capability</link></primaryie></indexentry>

<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-captureparm'>v4l2_captureparm</link></primaryie></indexentry>
@@ -46,6 +47,9 @@ 
<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-dbg-chip-ident'>v4l2_dbg_chip_ident</link></primaryie></indexentry>

<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-dbg-match'>v4l2_dbg_match</link></primaryie></indexentry>

<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-dbg-register'>v4l2_dbg_register</link></primaryie></indexentry>

<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-dv-enum-preset'>v4l2_dv_enum_preset</link></primaryie></indexentry>

<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-dv-preset'>v4l2_dv_preset</link></primaryie></indexentry>

<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-dv-timings'>v4l2_dv_timings</link></primaryie></indexentry>

<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-enc-idx'>v4l2_enc_idx</link></primaryie></indexentry>

<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-enc-idx-entry'>v4l2_enc_idx_entry</link></primaryie></indexentry>

<indexentry><primaryie>struct&nbsp;<link linkend='v4l2-encoder-cmd'>v4l2_encoder_cmd</link></primaryie></indexentry>

Documentation/DocBook/v4l/common.xml

+35 −0
Original line number Diff line number Diff line
@@ -716,6 +716,41 @@ if (-1 == ioctl (fd, &VIDIOC-S-STD;, &amp;std_id)) { 
}

      </programlisting>

    </example>

  <section id="dv-timings">

	<title>Digital Video (DV) Timings</title>

	<para>

	The video standards discussed so far has been dealing with Analog TV and the

corresponding video timings. Today there are many more different hardware interfaces

such as High Definition TV interfaces (HDMI), VGA, DVI connectors etc., that carry

video signals and there is a need to extend the API to select the video timings

for these interfaces. Since it is not possible to extend the &v4l2-std-id; due to

the limited bits available, a new set of IOCTLs is added to set/get video timings at

the input and output: </para><itemizedlist>

	<listitem>

	<para>DV Presets: Digital Video (DV) presets. These are IDs representing a

video timing at the input/output. Presets are pre-defined timings implemented

by the hardware according to video standards. A __u32 data type is used to represent

a preset unlike the bit mask that is used in &v4l2-std-id; allowing future extensions

to support as many different presets as needed.</para>

	</listitem>

	<listitem>

	<para>Custom DV Timings: This will allow applications to define more detailed

custom video timings for the interface. This includes parameters such as width, height,

polarities, frontporch, backporch etc.

	</para>

	</listitem>

	</itemizedlist>

	<para>To enumerate and query the attributes of DV presets supported by a device,

applications use the &VIDIOC-ENUM-DV-PRESETS; ioctl. To get the current DV preset,

applications use the &VIDIOC-G-DV-PRESET; ioctl and to set a preset they use the

&VIDIOC-S-DV-PRESET; ioctl.</para>

	<para>To set custom DV timings for the device, applications use the

&VIDIOC-S-DV-TIMINGS; ioctl and to get current custom DV timings they use the

&VIDIOC-G-DV-TIMINGS; ioctl.</para>

	<para>Applications can make use of the <xref linkend="input-capabilities" /> and

<xref linkend="output-capabilities"/> flags to decide what ioctls are available to set the

video timings for the device.</para>

	</section>

  </section>



  &sub-controls;

Documentation/DocBook/v4l/compat.xml

+12 −4
Original line number Diff line number Diff line
@@ -2324,6 +2324,14 @@ more information.</para> 
	</listitem>

      </orderedlist>

    </section>

    <section>

      <title>V4L2 in Linux 2.6.33</title>

      <orderedlist>

	<listitem>

	  <para>Added support for Digital Video timings in order to support HDTV receivers and transmitters.</para>

	</listitem>

      </orderedlist>

    </section>

   </section>



   <section id="other">