From 991678667ab5da02f1999db4ae4ece46070a0cd4 Mon Sep 17 00:00:00 2001 From: Michael Hunold Date: Fri, 28 Mar 2003 09:38:08 +0000 Subject: A whole bunch of small changes all over the place: makelinks: adjust the script for the upcoming kernel patches driver.mxb: prevent the tuner module from probing unnecessary i2c addresses getlinks: put symlinks for the header files to the right place(TM) videodev.c: add a verbose error message just for the case that a user has compiled the v4l module into the kernel media/Kconfig: the dpc driver does not the tuner module saa7146_hlp.c: honour the swapped field order for av7110 based cards in capture mode, too saa7146_video.c: add some verbose messages for the v4l2 controls mxb.c: hopefully fix the detection and initialization of the sound arena module --- linux/drivers/media/video/mxb.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'linux/drivers/media/video') diff --git a/linux/drivers/media/video/mxb.c b/linux/drivers/media/video/mxb.c index c5a5e6921..b602a1d26 100644 --- a/linux/drivers/media/video/mxb.c +++ b/linux/drivers/media/video/mxb.c @@ -177,6 +177,9 @@ struct mxb int cur_mute; /* current mute status */ }; +static +struct saa7146_extension extension; + static int mxb_vbi_bypass(struct saa7146_dev* dev) { struct mxb* mxb = (struct mxb*)dev->ext_priv; @@ -424,6 +427,12 @@ static int mxb_init_done(struct saa7146_dev* dev) msg.buf = &saa7740_init[0].data[0]; if( 1 == (err = i2c_transfer(&mxb->i2c_adapter, &msg, 1))) { + /* the sound arena module is a pos, that's probably the reason + philips refuses to hand out a datasheet for the saa7740... + it seems to screw up the i2c bus, so we disable fast irq + based i2c transactions here and rely on the slow and safe + polling method ... */ + extension.flags &= ~SAA7146_USE_I2C_IRQ; for(i = 1;;i++) { msg.len = saa7740_init[i].length; if( -1 == msg.len ) { @@ -1002,9 +1011,6 @@ static struct saa7146_standard standard[] = { { "SECAM", V4L2_STD_SECAM, SAA7146_SECAM_VALUES }, }; -static -struct saa7146_extension extension; - static struct saa7146_pci_extension_data mxb = { .ext_priv = "Multimedia eXtension Board", -- cgit v1.2.3