Update of /cvsroot/alsa/alsa-kernel/pci/emu10k1
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/pci/emu10k1
Modified Files:
emumixer.c emuproc.c
Log Message:
- AC97 code
- introduced ac97_bus_t structure
- moved attached codecs to /proc/asound/card?/codec97#? directory
- merged snd_ac97_modem() to snd_ac97_mixer()
- proc cleanups - removed already initialized variables
- enhanced snd_info_set_text_ops() syntax
Index: emumixer.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emumixer.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- emumixer.c 13 Oct 2003 16:30:45 -0000 1.17
+++ emumixer.c 23 Oct 2003 14:34:53 -0000 1.18
@@ -455,18 +455,24 @@
int __devinit snd_emu10k1_mixer(emu10k1_t *emu)
{
- ac97_t ac97;
int err, pcm;
snd_kcontrol_t *kctl;
snd_card_t *card = emu->card;
if (!emu->no_ac97) {
+ ac97_bus_t bus, *pbus;
+ ac97_t ac97;
+
+ memset(&bus, 0, sizeof(bus));
+ bus.write = snd_emu10k1_ac97_write;
+ bus.read = snd_emu10k1_ac97_read;
+ if ((err = snd_ac97_bus(emu->card, &bus, &pbus)) < 0)
+ return err;
+
memset(&ac97, 0, sizeof(ac97));
- ac97.write = snd_emu10k1_ac97_write;
- ac97.read = snd_emu10k1_ac97_read;
ac97.private_data = emu;
ac97.private_free = snd_emu10k1_mixer_free_ac97;
- if ((err = snd_ac97_mixer(emu->card, &ac97, &emu->ac97)) < 0)
+ if ((err = snd_ac97_mixer(pbus, &ac97, &emu->ac97)) < 0)
return err;
if (emu->audigy) {
/* Master/PCM controls on ac97 of Audigy has no effect */
Index: emuproc.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emuproc.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- emuproc.c 1 Mar 2003 19:03:22 -0000 1.13
+++ emuproc.c 23 Oct 2003 14:34:53 -0000 1.14
@@ -240,7 +240,7 @@
snd_info_entry_t *entry;
if (! snd_card_proc_new(emu->card, "emu10k1", &entry))
- snd_info_set_text_ops(entry, emu, snd_emu10k1_proc_read);
+ snd_info_set_text_ops(entry, emu, 1024, snd_emu10k1_proc_read);
if (! snd_card_proc_new(emu->card, "fx8010_gpr", &entry)) {
entry->content = SNDRV_INFO_CONTENT_DATA;
-------------------------------------------------------
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community? Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
