Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 (9e9bc973) · Commits · 戴 / test

Documentation/DocBook/v4l/func-ioctl.xml

+2 −3

Original line number	Diff line number	Diff line
		@@ -34,8 +34,7 @@
		<varlistentry>
		<term><parameter>request</parameter></term>
		<listitem>
		<para>V4L2 ioctl request code as defined in the <link
		linkend="videodev">videodev.h</link> header file, for example
		<para>V4L2 ioctl request code as defined in the <filename>videodev2.h</filename> header file, for example
		VIDIOC_QUERYCAP.</para>
		</listitem>
		</varlistentry>
		@@ -57,7 +56,7 @@ file descriptor. An ioctl <parameter>request</parameter> has encoded
		in it whether the argument is an input, output or read/write
		parameter, and the size of the argument <parameter>argp</parameter> in
		bytes. Macros and defines specifying V4L2 ioctl requests are located
		in the <link linkend="videodev">videodev.h</link> header file.
		in the <filename>videodev2.h</filename> header file.
		Applications should use their own copy, not include the version in the
		kernel sources on the system they compile on. All V4L2 ioctl requests,
		their respective function and parameters are specified in <xref

Documentation/DocBook/v4l/pixfmt.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -142,8 +142,8 @@ leftmost pixel of the second row from the top, and so on. The last row
		has just as many pad bytes after it as the other rows.</para>

		<para>In V4L2 each format has an identifier which looks like
		<constant>PIX_FMT_XXX</constant>, defined in the <link
		linkend="videodev">videodev.h</link> header file. These identifiers
		<constant>PIX_FMT_XXX</constant>, defined in the <filename>videodev2.h</filename>
		header file. These identifiers
		represent <link linkend="v4l2-fourcc">four character codes</link>
		which are also listed below, however they are not the same as those
		used in the Windows world.</para>

Documentation/Makefile

+1 −1

Original line number	Diff line number	Diff line
		obj-m := DocBook/ accounting/ auxdisplay/ connector/ \
		filesystems/ filesystems/configfs/ ia64/ laptops/ networking/ \
		pcmcia/ spi/ timers/ video4linux/ vm/ watchdog/src/
		pcmcia/ spi/ timers/ vm/ watchdog/src/

Documentation/dvb/lmedm04.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ and run
		Other LG firmware can be extracted manually from US280D.sys
		only found in windows/system32/driver.

		dd if=US280D.sys ibs=1 skip=42616 count=3668 of=dvb-usb-lme2510-lg.fw
		dd if=US280D.sys ibs=1 skip=42360 count=3924 of=dvb-usb-lme2510-lg.fw

		for DM04 LME2510C (LG Tuner)
		---------------------------

Documentation/feature-removal-schedule.txt

+26 −24

Original line number	Diff line number	Diff line
		@@ -97,36 +97,38 @@ Who: Pavel Machek <pavel@ucw.cz>

		---------------------------

		What: Video4Linux API 1 ioctls and from Video devices.
		When: kernel 2.6.38
		Files: include/linux/videodev.h
		Check: include/linux/videodev.h
		Why: V4L1 AP1 was replaced by V4L2 API during migration from 2.4 to 2.6
		series. The old API have lots of drawbacks and don't provide enough
		means to work with all video and audio standards. The newer API is
		already available on the main drivers and should be used instead.
		Newer drivers should use v4l_compat_translate_ioctl function to handle
		old calls, replacing to newer ones.
		Decoder iocts are using internally to allow video drivers to
		communicate with video decoders. This should also be improved to allow
		V4L2 calls being translated into compatible internal ioctls.
		Compatibility ioctls will be provided, for a while, via
		v4l1-compat module.
		Who: Mauro Carvalho Chehab <mchehab@infradead.org>

		---------------------------

		What: Video4Linux obsolete drivers using V4L1 API
		When: kernel 2.6.38
		Files: drivers/staging/cpia/* drivers/staging/stradis/*
		Check: drivers/staging/cpia/cpia.c drivers/staging/stradis/stradis.c
		When: kernel 2.6.39
		Files: drivers/staging/se401/* drivers/staging/usbvideo/*
		Check: drivers/staging/se401/se401.c drivers/staging/usbvideo/usbvideo.c
		Why: There are some drivers still using V4L1 API, despite all efforts we've done
		to migrate. Those drivers are for obsolete hardware that the old maintainer
		didn't care (or not have the hardware anymore), and that no other developer
		could find any hardware to buy. They probably have no practical usage today,
		and people with such old hardware could probably keep using an older version
		of the kernel. Those drivers will be moved to staging on 2.6.37 and, if nobody
		care enough to port and test them with V4L2 API, they'll be removed on 2.6.38.
		of the kernel. Those drivers will be moved to staging on 2.6.38 and, if nobody
		cares enough to port and test them with V4L2 API, they'll be removed on 2.6.39.
		Who: Mauro Carvalho Chehab <mchehab@infradead.org>

		---------------------------

		What: Video4Linux: Remove obsolete ioctl's
		When: kernel 2.6.39
		Files: include/media/videodev2.h
		Why: Some ioctl's were defined wrong on 2.6.2 and 2.6.6, using the wrong
		type of R/W arguments. They were fixed, but the old ioctl names are
		still there, maintained to avoid breaking binary compatibility:
		#define VIDIOC_OVERLAY_OLD _IOWR('V', 14, int)
		#define VIDIOC_S_PARM_OLD _IOW('V', 22, struct v4l2_streamparm)
		#define VIDIOC_S_CTRL_OLD _IOW('V', 28, struct v4l2_control)
		#define VIDIOC_G_AUDIO_OLD _IOWR('V', 33, struct v4l2_audio)
		#define VIDIOC_G_AUDOUT_OLD _IOWR('V', 49, struct v4l2_audioout)
		#define VIDIOC_CROPCAP_OLD _IOR('V', 58, struct v4l2_cropcap)
		There's no sense on preserving those forever, as it is very doubtful
		that someone would try to use a such old binary with a modern kernel.
		Removing them will allow us to remove some magic done at the V4L ioctl
		handler.

		Who: Mauro Carvalho Chehab <mchehab@infradead.org>

		---------------------------

Admin message