diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-09-30 10:20:18 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-09-30 10:20:18 -0300 |
| commit | 3a4a805a5f31c97287eedd997fe2d3191c035d4f (patch) | |
| tree | 4681f2827766843ff820a437003b0181e9466b69 | |
| parent | ba84783701ac8f491e853ecd0ed51a6dae86f2bf (diff) | |
| parent | 83fb6c87a9c82a47fd57ffaed422eba87114dbb1 (diff) | |
| download | mediapointer-dvb-s2-3a4a805a5f31c97287eedd997fe2d3191c035d4f.tar.gz mediapointer-dvb-s2-3a4a805a5f31c97287eedd997fe2d3191c035d4f.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/dvb-pll
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/video/bw-qcam.c | 18 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-alsa.c | 2 | ||||
| -rwxr-xr-x | v4l/scripts/gentree.pl | 3 | ||||
| -rw-r--r-- | v4l/scripts/make_config_compat.pl | 20 |
4 files changed, 40 insertions, 3 deletions
diff --git a/linux/drivers/media/video/bw-qcam.c b/linux/drivers/media/video/bw-qcam.c index a175d7810..f6d5197da 100644 --- a/linux/drivers/media/video/bw-qcam.c +++ b/linux/drivers/media/video/bw-qcam.c @@ -107,6 +107,17 @@ static inline void write_lpdata(struct qcam_device *q, int d) static inline void write_lpcontrol(struct qcam_device *q, int d) { + if(0x20 & d) { + /* Set bidirectional mode to reverse (data in) */ + parport_data_reverse(q->pport); + } else { + /* Set bidirectional mode to forward (data out) */ + parport_data_forward(q->pport); + } + + /* Now issue the regular port command, but strip out the + * direction flag */ + d &= ~0x20; parport_write_control(q->pport, d); } @@ -347,10 +358,13 @@ static int qc_detect(struct qcam_device *q) /* Be (even more) liberal in what you accept... */ /* if (count > 30 && count < 200) */ - if (count > 20 && count < 300) + if (count > 20 && count < 400) + { return 1; /* found */ - else + } else { + printk(KERN_ERR "No Quickcam found on port %s\n", q->pport->name); return 0; /* not found */ + } } diff --git a/linux/drivers/media/video/cx88/cx88-alsa.c b/linux/drivers/media/video/cx88/cx88-alsa.c index f441193eb..d858bdd5c 100644 --- a/linux/drivers/media/video/cx88/cx88-alsa.c +++ b/linux/drivers/media/video/cx88/cx88-alsa.c @@ -103,7 +103,7 @@ typedef struct cx88_audio_dev snd_cx88_card_t; #define chip_t snd_cx88_card_t #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) +#ifdef COMPAT_SND_CTL_BOOLEAN_MONO static int snd_ctl_boolean_mono_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { diff --git a/v4l/scripts/gentree.pl b/v4l/scripts/gentree.pl index cfff178b1..a10738648 100755 --- a/v4l/scripts/gentree.pl +++ b/v4l/scripts/gentree.pl @@ -62,9 +62,12 @@ my %defs = ( 'I2C_PEC' => 1, 'I2C_DF_DUMMY' => 0, 'CONFIG_XC3028' => 0, + 'HAVE_XC2028'=> 0, + 'HAVE_XC3028' => 0, 'I2C_CLASS_TV_ANALOG' => 1, 'I2C_CLASS_TV_DIGITAL' => 1, 'OLD_XMIT_LOCK' => 0, + 'COMPAT_SND_CTL_BOOLEAN_MONO' => 0, 'CONFIG_VIVI_SCATTER' => 0, 'CONFIG_BIGPHYS_AREA' => 0, 'BUZ_USE_HIMEM' => 1, diff --git a/v4l/scripts/make_config_compat.pl b/v4l/scripts/make_config_compat.pl index be577d247..21dce0126 100644 --- a/v4l/scripts/make_config_compat.pl +++ b/v4l/scripts/make_config_compat.pl @@ -26,9 +26,29 @@ sub check_spin_lock() close INNET; } +sub check_snd_ctl_boolean_mono_info() +{ + my $file = "$kdir/include/sound/control.h"; + my $old_syntax = 1; + + open INNET, "<$file" or die "File not found: $file"; + while (<INNET>) { + if (m/snd_ctl_boolean_mono_info/) { + $old_syntax = 0; + last; + } + } + + if ($old_syntax) { + $out.= "\n#define COMPAT_SND_CTL_BOOLEAN_MONO 1\n"; + } + close INNET; +} + sub check_other_dependencies() { check_spin_lock(); + check_snd_ctl_boolean_mono_info(); } # Do the basic rules |