Commit Graph

397 Commits

Author SHA1 Message Date
Hans Verkuil 301e22d691 V4L/DVB (3584): Implement V4L2_TUNER_MODE_LANG1_LANG2 audio mode
Add a new audio mode V4L2_TUNER_MODE_LANG1_LANG2 (used by VIDIOC_G/S_TUNER).
This mode allows the user to select both languages of a bilingual transmission,
one language on the left, one on the right audio channel. If there is no
bilingual transmission, or it is not supported, then this mode should act like
V4L2_TUNER_MODE_STEREO.
This mode is introduced for PVR-like drivers where it is useful to be able to
record both languages of a bilingual broadcast.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-24 16:26:58 -03:00
Michael Krufky ae62e3d4a8 V4L/DVB (3575): Cxusb: fix i2c debug messages for bluebird devices
Only the Medion boxes return 0x08 after an i2c read/write.
The bluebird devices do not return anything at all.
This patch conditionalizes the test for the 0x08 return code
to produce a warning message when using the Medion box, only.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-24 16:26:55 -03:00
Michael Krufky 4d6e772d98 V4L/DVB (3574): Cxusb: fix debug messages
- corrects the wording in some of the debug messages.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-24 16:26:55 -03:00
Michael Krufky afdebc94ea V4L/DVB (3573): Cxusb: remove FIXME: comment in bluebird_patch_dvico_firmware_download
Removed the FIXME comment from bluebird_patch_dvico_firmware_download:
 /* FIXME: are we allowed to change the fw-data ? */
Yes, we are allowed. DViCO's Windows driver also does the same thing.
A single firmware image is used to support all of the bluebird boxes.
The firmware sets all devices to PID: d700. Instead of using that, the
driver replaces the d700 with the cold PID+1 before the download.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-24 16:26:53 -03:00
Michael Krufky 5e805eff15 V4L/DVB (3572): Cxusb: conditionalize gpio write for the medion box
This patch removes the (harmless) -ETIMEDOUT during device init
for the DViCO FusionHDTV Bluebird boxes, by conditionalizing the
gpio write inside cxusb_i2c_xfer to happen only for Medion boxes.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-24 16:26:53 -03:00
Patrick Boettcher 6637e6fd2a V4L/DVB (3549): Make hotplug automatically load the b2c2-flexcop-usb module
There was no MODULE_DEVICE_TABLE for the b2c2-flexcop-usb module. This makes it
impossible for hotplug to load the module automatically, when such a device is
connected.

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-24 16:26:51 -03:00
Manu Abraham c72602b825 V4L/DVB (3543): Fix Makefile to adapt to bt8xx/ conversion
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-24 16:26:50 -03:00
Linus Torvalds e0f4ab8a17 Revert "V4L/DVB (3543): Fix Makefile to adapt to bt8xx/ conversion"
This reverts commit 08f1d0b99f

The "bt8xx/ conversion" for drivers/video/ hasn't actually percolated
all the way to this tree, so the Makefile change escaped too soon.

Build breakage noticed by Jeff Garzik <jeff@garzik.org>

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-03-21 14:51:37 -08:00
Manu Abraham 08f1d0b99f V4L/DVB (3543): Fix Makefile to adapt to bt8xx/ conversion
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-21 08:54:00 -08:00
Oliver Endriss 4caba4261f V4L/DVB (3533): Add WSS (wide screen signalling) module parameters
Add wss_cfg_4_3 and wss_cfg_16_9 configuration options.
Firmware 2623 or later required.
Both parameters are bit masks:
- bit 15: disable WSS
- bit 14: send short WSS burst, then turn off WSS
- bit 13..0: WSS bits as specified by the standard
These parameters are useful if you own a broken tv set which
does not handle wss correctly.
Default settings:
- wss_cfg_4_3: 0x4008
- wss_cfg_16_9: 0x0007
These should work with most devices.

Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-21 08:53:55 -08:00
Perceval Anichini 265366e8fb V4L/DVB (3532): Moved duplicated code of ALPS BSRU6 tuner to a standalone file.
Moved duplicated code of ALPS BSRU6 tuner to a standalone file.
Modified av7110 and budget drivers to include the new file.

Signed-off-by: Perceval Anichini <perceval.anichini@streamvision.fr>
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-21 08:53:54 -08:00
Michael Krufky f5c08a2ee9 V4L/DVB (3528): Kconfig: fix ATSC frontend menu item names by manufacturer
- Corrected typo for NxtWave NXT200X
- Added "Oren" manufacturer name to menu items for OR51132 and OR51211
- Removed "(pcHDTV HDx000 card)" from Oren frontends menu item names,
  This isn't necessary, as these frontends are selected by the card drivers,
  build configuration (DVB_BT8XX and VIDEO_CX88_DVB).

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-21 08:53:50 -08:00
Adrian Bunk c04e89b1f2 V4L/DVB (3509): Make a needlessly global function static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-21 08:53:37 -08:00
Markus Rechberger 77cc531990 V4L/DVB (3506): Cinergy T2 dmx cleanup on disconnect
Detaching the device didn't clean up several device files in /dev/dvb,
after applying that patch all dvb devices disappeared as expected.

Signed-off-by: Markus Rechberger <mrechberger@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-21 08:53:34 -08:00
Andreas Oberritter 34731df288 V4L/DVB (3501): Dmxdev: use dvb_ringbuffer
Use dvb_ringbuffer instead of an own buffer implementation in
dmxdev.[ch].

Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-21 08:53:29 -08:00
Andreas Oberritter 4304954eb6 V4L/DVB (3500): Ringbuffer: don't reset pointers to zero
Oliver Endriss spotted, that resetting read and write pointers on
flush() requires additional locking and breaks the av7110 driver.
Therefore this patch partially reverts the previous patch titled "make
dvb_ringbuffer compatible to dmxdev_buffer".

Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-21 08:53:27 -08:00
Eric Sesterhenn ae24601b47 V4L/DVB (3485): BUG_ON() Conversion in drivers/video/media
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-21 08:53:19 -08:00
Andreas Oberritter 9d9d6baeca V4L/DVB (3484): Make dvb_ringbuffer compatible to dmxdev_buffer
Added variable 'error' to struct dvb_ringbuffer, which is set to zero on
init() and flush(). Also reset read an write pointers to zero on flush()
to get less fragmented data.

Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-21 08:53:17 -08:00
Andreas Oberritter f705e6e494 V4L/DVB (3438): Optical cleanup for dmxdev.c
Used Lindent, manually changed some line breaks. Removed invalid email
addresses, useless casts and useless initialization of return values.

Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-21 08:53:05 -08:00
Andreas Oberritter bbad7dc548 V4L/DVB (3437): Fix typo in enum name and use enum in struct dmxdev_filter
Rename 'enum dmxdevype' to 'enum dmxdev_type' and use this enum instead
of int for the member 'type' of struct dmxdev_filter.

Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-21 08:53:04 -08:00
Andreas Oberritter 6abe6bff6f V4L/DVB (3436): Remove 'dvbdev' from struct dmxdev_filter
The member dvbdev gets initialized once but is never used after that.

Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-21 08:53:02 -08:00
Andreas Oberritter 09794a6f95 V4L/DVB (3435): Remove 'pid' from struct dmxdev_filter
The PID value is already stored in struct dmx_sct_filter_params which is
a member of struct dmxdev_filter.
Acked-by: Johannes Stezenbach <js@linuxtv.org>

Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-21 08:53:01 -08:00
Linus Torvalds b05005772f Merge branch 'origin'
Conflicts:
	Documentation/video4linux/CARDLIST.cx88
	drivers/media/video/cx88/Kconfig
	drivers/media/video/em28xx/em28xx-video.c
	drivers/media/video/saa7134/saa7134-dvb.c

Resolved as in the original merge by Mauro Carvalho Chehab
2006-03-21 08:52:18 -08:00
Alexey Dobriyan 8a59822f68 V4L/DVB (3413): Typos grab bag of the month
Typos grab bag of the month.
Eyeballed by jmc@ in OpenBSD.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-08 12:30:19 -03:00
Marco Schluessler 05e3beb288 V4L/DVB (3403): Workaround to fix initialization for Nexus CA
Workaround for Nexus CA: Debi test fails unless first debi write is repeated.

Signed-off-by: Marco Schluessler <marco@lordzodiac.de>
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-08 12:29:08 -03:00
Alexey Dobriyan be787ace01 V4L/DVB (3413): Typos grab bag of the month
Typos grab bag of the month.
Eyeballed by jmc@ in OpenBSD.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-08 12:04:24 -03:00
Michael Krufky 91ae3299d7 V4L/DVB (3411): FE6600 is a Thomson tuner
- The tuner used in DViCO FusionHDTV DVB-T hybrid is made by Thomson
- renamed tuner and dvb_pll structs accordingly

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-08 11:37:29 -03:00
Chris Pascoe 780dfef37e V4L/DVB (3408): DViCO FusionHDTV DVB-T Hybrid and ZL10353-based FusionHDTV DVB-T Plus support
Add support for the FE6600 tuner used on the DVB-T Hybrid board.
Add support for the Zarlink ZL10353 DVB-T demodulator, which supersedes the
MT352, used on the DViCO FusionHDTV DVB-T Hybrid and later model Plus boards.

Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-08 11:36:50 -03:00
Oliver Endriss db5d91eb36 V4L/DVB (3406): Use refactored LNBP21 and BSBE1 code
Use refactored LNBP21/BSBE1 code for Technotrend/Hauppauge DVB-S rev 2.3.
As a side effect, FE_ENABLE_HIGH_LNB_VOLTAGE ioctl is supported now.

Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-08 11:36:33 -03:00
Perceval Anichini 8cc2e377a0 V4L/DVB (3405): TechnoTrend S-1500 card handling moved from budget.c to budget-ci.c
TechnoTrend S-1500 card handling moved from budget.c to budget-ci.c.

Signed-off-by: Perceval Anichini <perceval.anichini@streamvision.fr>
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-08 11:36:19 -03:00
Oliver Endriss 2f27bdce97 V4L/DVB (3404): Refactored LNBP21 and BSBE1 support
Moved duplicated code to separate files.
LNBP21 stuff rewritten from scratch, BSBE1 copied from av7110.c.
Modified budget driver to use the new routines.

Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-08 11:36:06 -03:00
Marco Schluessler 9f3319b49c V4L/DVB (3403): Workaround to fix initialization for Nexus CA
Workaround for Nexus CA: Debi test fails unless first debi write is repeated.

Signed-off-by: Marco Schluessler <marco@lordzodiac.de>
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-08 11:35:50 -03:00
Mattias Nordstrom 69ca189731 V4L/DVB (3382): Fix stv0297 for qam128 on tt c1500 (saa7146)
I have a TT C1500 card (saa7146, STV0297) which had problems tuning
channels at QAM128 (like the ones in the Finnish HTV / Welho network).
A fix which seems to work perfectly so far is to change the delay for
QAM128 to the same values as for QAM256 in stv0297_set_frontend(),

Signed-off-by: Mattias Nordstrom <nordstrom@realnode.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-03 14:18:16 -03:00
Johannes Stezenbach 11dc3ffa3b V4L/DVB (3385): Dvb: fix __init/__exit section references in av7110 driver
use __devinit/__devexit/__devexit_p() where appropriate

Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-03 14:18:10 -03:00
Michael Krufky 27b547c3a9 V4L/DVB (3352): Cxusb: fix lgdt3303 naming
The following are specific to lgdt3303, and are being renamed to reflect this.
- cxusb_lgdt330x_config renamed to cxusb_lgdt3303_config.
- cxusb_lgdt330x_frontend_attach renamed to cxusb_lgdt3303_frontend_attach.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-03 14:18:01 -03:00
Adrian Bunk f95cdf261b V4L/DVB (3341): Upstream sync - make 2 structs static
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-03 14:17:52 -03:00
Manu Abraham 092734b4bb V4L/DVB (3340): Make a struct static
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-03 14:17:39 -03:00
Adrian Bunk 805e660ca3 V4L/DVB (3337): Drivers/media/dvb/frontends/mt312.c: cleanups
This patch contains the following possible cleanups:
- update the Kconfig help to mention the VP310
- merge vp310_attach and mt312_attach into a new vp310_mt312_attach
  to remove some code duplication

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-03 14:17:35 -03:00
Ian Pickworth 6457af5f7e V4L/DVB (3393): Cx88: reduce excessive logging
- fix temporary debug code by changing printk to dprintk at level 1.
- move CORE_IOCTL messages from level 1 to level 2.
- this should help with selective debugging,
  while not filling people's logs up during normal use.

Signed-off-by: Ian Pickworth <ian@pickworth.me.uk>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-27 00:09:45 -03:00
Manu Abraham df5a4f4fd3 V4L/DVB (3392): Do a RESYNC for all cards
After a FIFO corruptions occurrs (generally due to buffer overflow), FIFO
contents needs to be discarted.

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-27 00:09:37 -03:00
Manu Abraham 6baad3f041 V4L/DVB (3390): Fix module parameters
Now, root may change parameters while module is running.
Thanks to Edgar Toerning

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-27 00:09:32 -03:00
Manu Abraham e7ac46469c V4L/DVB (3389): Fix broken IF-OUT Relay handling
Fixed broken IF-OUT on pinnacle sat board.
Thanks to Edgar Toernig

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-27 00:09:29 -03:00
Manu Abraham 1e7eb89ba9 V4L/DVB (3388): Ignore DiSEqC messages > 6 and < 3
Ignore invalid messages on cx24110 frontend.
Thanks to Edgar Toernig

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-27 00:09:25 -03:00
Peter Beutner 3b81fec432 V4L/DVB (3386): Dvb-core: remove dead code
The field "dvr" in struct dmxdev is competely unused. Remove
it and code which allocates, initializes and frees it.

Signed-off-by: Peter Beutner <p.beutner@gmx.net>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-27 00:09:23 -03:00
Johannes Stezenbach 1be11e367f V4L/DVB (3385): Dvb: fix __init/__exit section references in av7110 driver
use __devinit/__devexit/__devexit_p() where appropriate

Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-27 00:09:20 -03:00
Mattias Nordstrom 981a16f185 V4L/DVB (3382): Fix stv0297 for qam128 on tt c1500 (saa7146)
I have a TT C1500 card (saa7146, STV0297) which had problems tuning
channels at QAM128 (like the ones in the Finnish HTV / Welho network).
A fix which seems to work perfectly so far is to change the delay for
QAM128 to the same values as for QAM256 in stv0297_set_frontend(),

Signed-off-by: Mattias Nordstrom <nordstrom@realnode.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-27 00:09:17 -03:00
Thilo Berger 36f4f334a1 V4L/DVB (3377): Support for Satelco EasyWatch DVB-S light
Support for Satelco EasyWatch DVB-S light.

Signed-off-by: Thilo Berger <thilo_berger@gmx.net>
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-27 00:09:08 -03:00
Michael Krufky fddd632a8f V4L/DVB (3352): Cxusb: fix lgdt3303 naming
The following are specific to lgdt3303, and are being renamed to reflect this.
- cxusb_lgdt330x_config renamed to cxusb_lgdt3303_config.
- cxusb_lgdt330x_frontend_attach renamed to cxusb_lgdt3303_frontend_attach.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-27 00:08:17 -03:00
Adrian Bunk 47a9e50eb7 V4L/DVB (3341): Upstream sync - make 2 structs static
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-27 00:07:55 -03:00
Manu Abraham 36b36562c4 V4L/DVB (3340): Make a struct static
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-02-27 00:07:52 -03:00