On Fri, 22 Feb 2002, Gerd Knorr wrote:
> The module has insmod options to enable debug output ...
> Does the patch below help?
Yes. It fixed the problem for me now.
I've also managed to fix the problem of not muting the audio path when
the module is rmmod'ed, but I haven't figured out which routine is called
when xawtv exits, so the audio path is still enabled until the module
is rmmod'ed.
Now if only I can figure out the bit definitions for
SAA7134_ANALOG_IO_SELECT so I can get amux_extern working properly.
Enclosed is a patch (including the fix you sent) with my changes against
saa7134-20020219.tar.gz.
T.C.
-------- cut here --------
diff -Naur saa7134-0.1.5/saa7134-core.c saa7134-0.1.5-fv2k/saa7134-core.c
--- saa7134-0.1.5/saa7134-core.c Tue Feb 19 14:59:04 2002
+++ saa7134-0.1.5-fv2k/saa7134-core.c Sat Feb 23 09:42:34 2002
@@ -804,9 +804,9 @@
printk(KERN_INFO "%s: registered device vbi%d\n",
dev->name,dev->vbi_dev.minor & 0x1f);
+ dev->radio_dev = saa7134_radio_template;
+ dev->radio_dev.priv = dev;
if (card_amux_radio(dev)) {
- dev->radio_dev = saa7134_radio_template;
- dev->radio_dev.priv = dev;
err = video_register_device(&dev->radio_dev,VFL_TYPE_RADIO,radio_nr);
if (err < 0)
goto fail5;
diff -Naur saa7134-0.1.5/saa7134-tvaudio.c saa7134-0.1.5-fv2k/saa7134-tvaudio.c
--- saa7134-0.1.5/saa7134-tvaudio.c Tue Dec 18 13:47:10 2001
+++ saa7134-0.1.5-fv2k/saa7134-tvaudio.c Sat Feb 23 09:42:02 2002
@@ -413,6 +413,7 @@
}
done:
+ saa7134_tvaudio_setinput(dev,0); /* Deselect Audio Source */
dev->thread.task = NULL;
if(dev->thread.notify != NULL)
up(dev->thread.notify);
diff -Naur saa7134-0.1.5/saa7134.h saa7134-0.1.5-fv2k/saa7134.h
--- saa7134-0.1.5/saa7134.h Tue Feb 19 14:59:22 2002
+++ saa7134-0.1.5-fv2k/saa7134.h Sat Feb 23 09:42:23 2002
@@ -136,7 +136,8 @@
enum saa7134_audio_in amux_radio;
};
-#define card_hasaudio(dev) (dev->pci->device == PCI_DEVICE_ID_PHILIPS_SAA7134)
+#define card_hasaudio(dev) ((dev->pci->device == PCI_DEVICE_ID_PHILIPS_SAA7134) \
+ || (dev->pci->device == PCI_DEVICE_ID_PHILIPS_SAA7130))
#define card_tuner_type(dev) (saa7134_boards[dev->board].tuner_type)
#define card_vmux_tuner(dev) (saa7134_boards[dev->board].vmux_tuner)
#define card_amux_tuner(dev) (saa7134_boards[dev->board].amux_tuner)
-------- cut here --------
----
Wan Tat Chee (Lecturer)
School of Computer Science, Univ. Science Malaysia,
11800 Minden, Penang, Malaysia. Ofc Ph: +604 657-7888 x 3617
Internet: tcwan@xxxxxxxxx Web: http://nrg.cs.usm.my/~tcwan
GPG Key : http://nrg.cs.usm.my/~tcwan/tcw_gpg.asc
F'print : 2DB6 E00A 9B98 BD36 AF0A 0FE8 69D2 20E5 573C DBA3
