Commit fd3113e8 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Linus Torvalds
Browse files

[PATCH] V4L: Miscellaneous fixes 



- Fixed some bttv card numbers.

- BTTV and SAA7134 version numbers incremented to reflect changes.

- pci_dma_supported() is called after pci_set_dma_mask() which
  already did check that for us. This patch removes the unneeded call to
  pci_dma_supported() at bttv-driver.c

- Ensure a sufficient I2C bus idle time between 2 messages for
  saa7134-i2c.c

- It is important to write at first to MO_GP3_IO for cx88-tvaudio.c

- Use try_to_freeze() instead of refrigerator at msp3400.c

- Recognizing the MFPE05-2 Tuner at tveeprom.c

- Add new parameter to help identify radio chipsets at tuner module:
  show_i2c=1 will show 16 reading bytes from detected tuners.

- BTTV does generate some Unimplemented IOCTL log at tuner module:
  0x40046d11(dir=1,tp=0x6d,nr=17,sz=4) means that it is sending
  MSP3400 calls to non-msp3400 tuners. Warning eliminated.
  VIDIOSAUDIO is also called, so debug messages updated. It is still
  requiring IOCTL implementation.

- Added two more tuners.

- Add support for the SVideo input on the GDI Black Gold.

Signed-off-by: default avatarPeter Missel <peter.missel@onlinehome.de>
Signed-off-by: default avatarGraham Bevan <graham.bevan@ntlworld.com>
Signed-off-by: default avatarTorsten Seeboth <Torsten.Seeboth@t-online.de>
Signed-off-by: default avatarHartmut Hackmann <hartmut.hackmann@t.online.de>
Signed-off-by: default avatarTobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: default avatarMichael Krufky <mkrufky@m1k.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent cdf32eaa

Documentation/video4linux/CARDLIST.tuner

+2 −0
Original line number Diff line number Diff line
@@ -62,3 +62,5 @@ tuner=60 - Thomson DDT 7611 (ATSC/NTSC) 
tuner=61 - Tena TNF9533-D/IF/TNF9533-B/DF

tuner=62 - Philips TEA5767HN FM Radio

tuner=63 - Philips FMD1216ME MK3 Hybrid Tuner

tuner=64 - LG TDVS-H062F/TUA6034

tuner=65 - Ymec TVF66T5-B/DFF

drivers/media/video/bttv-driver.c

+1 −6
Original line number Diff line number Diff line 
/*

    $Id: bttv-driver.c,v 1.42 2005/07/05 17:37:35 nsh Exp $

    $Id: bttv-driver.c,v 1.45 2005/07/20 19:43:24 mkrufky Exp $



    bttv - Bt848 frame grabber driver
@@ -3869,11 +3869,6 @@ static int __devinit bttv_probe(struct pci_dev *dev, 
        pci_set_master(dev);

	pci_set_command(dev);

	pci_set_drvdata(dev,btv);

	if (!pci_dma_supported(dev,0xffffffff)) {

		printk("bttv%d: Oops: no 32bit PCI DMA ???\n", btv->c.nr);

		result = -EIO;

		goto fail1;

	}



        pci_read_config_byte(dev, PCI_CLASS_REVISION, &btv->revision);

        pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat);

drivers/media/video/bttv.h

+4 −2
Original line number Diff line number Diff line 
/*

 * $Id: bttv.h,v 1.18 2005/05/24 23:41:42 nsh Exp $

 * $Id: bttv.h,v 1.22 2005/07/28 18:41:21 mchehab Exp $

 *

 *  bttv - Bt848 frame grabber driver

 *
@@ -135,7 +135,9 @@ 
#define BTTV_DVICO_DVBT_LITE  0x80

#define BTTV_TIBET_CS16  0x83

#define BTTV_KODICOM_4400R  0x84

#define BTTV_ADLINK_RTV24   0x85

#define BTTV_ADLINK_RTV24   0x86

#define BTTV_DVICO_FUSIONHDTV_5_LITE 0x87

#define BTTV_ACORP_Y878F   0x88



/* i2c address list */

#define I2C_TSA5522        0xc2

drivers/media/video/bttvp.h

+2 −2
Original line number Diff line number Diff line 
/*

    $Id: bttvp.h,v 1.19 2005/06/16 21:38:45 nsh Exp $

    $Id: bttvp.h,v 1.21 2005/07/15 21:44:14 mchehab Exp $



    bttv - Bt848 frame grabber driver
@@ -27,7 +27,7 @@ 
#define _BTTVP_H_



#include <linux/version.h>

#define BTTV_VERSION_CODE KERNEL_VERSION(0,9,15)

#define BTTV_VERSION_CODE KERNEL_VERSION(0,9,16)



#include <linux/types.h>

#include <linux/wait.h>

drivers/media/video/cx88/cx88-cards.c

+4 −1
Original line number Diff line number Diff line 
/*

 * $Id: cx88-cards.c,v 1.86 2005/07/14 03:06:43 mchehab Exp $

 * $Id: cx88-cards.c,v 1.90 2005/07/28 02:47:42 mkrufky Exp $

 *

 * device driver for Conexant 2388x based TV cards

 * card-specific stuff.
@@ -90,6 +90,9 @@ struct cx88_board cx88_boards[] = { 
		.input          = {{

			.type   = CX88_VMUX_TELEVISION,

			.vmux   = 0,

		},{

			.type   = CX88_VMUX_SVIDEO,

			.vmux   = 2,

		}},

	},

	[CX88_BOARD_PIXELVIEW] = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE