Commit 20ef0f1a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb 

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (59 commits)
  V4L/DVB (7219): zoran: Fix namespace conflicts with Zoran 'GPIO_MAX' enum
  V4L/DVB (7205): tuner-xc2028 depends on FW_LOADER
  V4L/DVB (7201): cx88-mpeg: Fix race condition in variable access
  V4L/DVB (7200): Fix FM firmware loading
  V4L/DVB (7198): V4L, include ioctl.h in videodev headers
  V4L/DVB (7197): bttv: Fix overlay divide error
  V4L/DVB (7195): xc5000: fix build error when built as module
  V4L/DVB (7194): cx88-mpeg: Allow concurrent access to cx88-mpeg devices
  V4L/DVB (7193): tveeprom: Add proper tuner mapping for hauppauge eeprom id 133
  V4L/DVB (7192): Adds support for Genius TVGo A11MCE
  V4L/DVB (7189): autosuspend support
  V4L/DVB (7188): radio-si470x version 1.0.6
  V4L/DVB (7186): tda10086: make the 22kHz tone for DISEQC a config option
  V4L/DVB (7183): radio-si470x: fix build warning
  V4L/DVB (7180): em28xx: add URB_NO_TRANSFER_DMA_MAP, since urb->transfer_dma is set
  V4L/DVB (7179): Allow more than one em28xx board
  V4L/DVB (7164): em28xx-alsa: Add a missing mutex
  V4L/DVB (7163): em28xx: makes audio settings more stable
  V4L/DVB (7162): em28xx: Fix endian and returns the correct values
  V4L/DVB (7161): em28xx: Fix printing debug values higher than 127
  ...
parents 9960c90c 6165894f

Documentation/video4linux/CARDLIST.em28xx

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
  7 -> Leadtek Winfast USB II                   (em2800)

  8 -> Kworld USB2800                           (em2800)

  9 -> Pinnacle Dazzle DVC 90/DVC 100           (em2820/em2840) [2304:0207,2304:021a]

 10 -> Hauppauge WinTV HVR 900                  (em2880)        [2040:6500]

 10 -> Hauppauge WinTV HVR 900                  (em2880)        [2040:6500,2040:6502]

 11 -> Terratec Hybrid XS                       (em2880)        [0ccd:0042]

 12 -> Kworld PVR TV 2800 RF                    (em2820/em2840)

 13 -> Terratec Prodigy XS                      (em2880)        [0ccd:0047]

Documentation/video4linux/CARDLIST.saa7134

+4 −2
Original line number Diff line number Diff line
@@ -92,9 +92,9 @@ 
 91 -> AVerMedia A169 B                         [1461:7360]

 92 -> AVerMedia A169 B1                        [1461:6360]

 93 -> Medion 7134 Bridge #2                    [16be:0005]

 94 -> LifeView FlyDVB-T Hybrid Cardbus/MSI TV @nywhere A/D NB [5168:3306,5168:3502,4e42:3502]

 94 -> LifeView FlyDVB-T Hybrid Cardbus/MSI TV @nywhere A/D NB [5168:3306,5168:3502,5168:3307,4e42:3502]

 95 -> LifeView FlyVIDEO3000 (NTSC)             [5169:0138]

 96 -> Medion Md8800 Quadro                     [16be:0007,16be:0008]

 96 -> Medion Md8800 Quadro                     [16be:0007,16be:0008,16be:000d]

 97 -> LifeView FlyDVB-S /Acorp TV134DS         [5168:0300,4e42:0300]

 98 -> Proteus Pro 2309                         [0919:2003]

 99 -> AVerMedia TV Hybrid A16AR                [1461:2c00]
@@ -129,3 +129,5 @@ 
128 -> Beholder BeholdTV Columbus TVFM          [0000:5201]

129 -> Beholder BeholdTV 607 / BeholdTV 609     [5ace:6070,5ace:6071,5ace:6072,5ace:6073,5ace:6090,5ace:6091,5ace:6092,5ace:6093]

130 -> Beholder BeholdTV M6 / BeholdTV M6 Extra [5ace:6190,5ace:6193]

131 -> Twinhan Hybrid DTV-DVB 3056 PCI          [1822:0022]

132 -> Genius TVGO AM11MCE

Documentation/video4linux/zr364xx.txt

+3 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ modprobe zr364xx debug=X mode=Y 
 - debug      : set to 1 to enable verbose debug messages

 - mode       : 0 = 320x240, 1 = 160x120, 2 = 640x480

You can then use the camera with V4L2 compatible applications, for example Ekiga.

To capture a single image, try this: dd if=/dev/video0 of=test.jpg bs=1 count=1

To capture a single image, try this: dd if=/dev/video0 of=test.jpg bs=1M count=1



links :

http://mxhaard.free.fr/ (support for many others cams including some Aiptek PocketDV)
@@ -63,3 +63,5 @@ Vendor Product Distributor Model 
0x06d6  0x0034   Trust           Powerc@m 750

0x0a17  0x0062   Pentax          Optio 50L

0x06d6  0x003b   Trust           Powerc@m 970Z

0x0a17  0x004e   Pentax          Optio 50

0x041e  0x405d   Creative        DiVi CAM 516

drivers/media/Kconfig

+11 −7
Original line number Diff line number Diff line
@@ -25,11 +25,16 @@ config VIDEO_DEV 
	  To compile this driver as a module, choose M here: the

	  module will be called videodev.



config VIDEO_V4L2_COMMON

	tristate

	depends on (I2C || I2C=n) && VIDEO_DEV

	default (I2C || I2C=n) && VIDEO_DEV



config VIDEO_V4L1

	bool "Enable Video For Linux API 1 (DEPRECATED)"

	depends on VIDEO_DEV

	depends on VIDEO_DEV && VIDEO_V4L2_COMMON

	default VIDEO_DEV && VIDEO_V4L2_COMMON

	select VIDEO_V4L1_COMPAT

	default y

	---help---

	  Enables a compatibility API used by most V4L2 devices to allow

	  its usage with legacy applications that supports only V4L1 api.
@@ -39,7 +44,7 @@ config VIDEO_V4L1 
config VIDEO_V4L1_COMPAT

	bool "Enable Video For Linux API 1 compatible Layer"

	depends on VIDEO_DEV

	default y

	default VIDEO_DEV

	---help---

	  This api were developed to be used at Kernel 2.2 and 2.4, but

	  lacks support for several video standards. There are several
@@ -55,8 +60,8 @@ config VIDEO_V4L1_COMPAT 


config VIDEO_V4L2

	bool

	depends on VIDEO_DEV

	default y

	depends on VIDEO_DEV && VIDEO_V4L2_COMMON

	default VIDEO_DEV && VIDEO_V4L2_COMMON



source "drivers/media/video/Kconfig"
@@ -93,7 +98,7 @@ if VIDEO_TUNER_CUSTOMIZE 


config TUNER_XC2028

	tristate "XCeive xc2028/xc3028 tuners"

	depends on I2C

	depends on I2C && FW_LOADER

	default m if VIDEO_TUNER_CUSTOMIZE

	help

	  Say Y here to include support for the xc2028/xc3028 tuners.
@@ -180,7 +185,6 @@ config VIDEO_TVEEPROM 


config DAB

	boolean "DAB adapters"

	default y

	---help---

	  Allow selecting support for for Digital Audio Broadcasting (DAB)

	  Receiver adapters.

drivers/media/common/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,6 @@ config VIDEO_SAA7146 


config VIDEO_SAA7146_VV

	tristate

	depends on VIDEO_DEV

	depends on VIDEO_V4L2

	select VIDEOBUF_DMA_SG

	select VIDEO_SAA7146

CRA Git | Maintained and supported by SUSTech CRA and CCSE