Update of /cvsroot/alsa/alsa-kernel/pci/nm256
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/pci/nm256
Modified Files:
nm256.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: nm256.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/nm256/nm256.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- nm256.c 14 Oct 2003 14:08:49 -0000 1.31
+++ nm256.c 23 Oct 2003 14:34:53 -0000 1.32
@@ -1195,6 +1195,7 @@
static int __devinit
snd_nm256_mixer(nm256_t *chip)
{
+ ac97_bus_t bus, *pbus;
ac97_t ac97;
int i, err;
/* looks like nm256 hangs up when unexpected registers are touched... */
@@ -1208,16 +1209,20 @@
-1
};
+ memset(&bus, 0, sizeof(bus));
+ bus.reset = snd_nm256_ac97_reset;
+ bus.write = snd_nm256_ac97_write;
+ bus.read = snd_nm256_ac97_read;
+ if ((err = snd_ac97_bus(chip->card, &bus, &pbus)) < 0)
+ return err;
+
memset(&ac97, 0, sizeof(ac97));
- ac97.reset = snd_nm256_ac97_reset;
- ac97.write = snd_nm256_ac97_write;
- ac97.read = snd_nm256_ac97_read;
ac97.scaps = AC97_SCAP_AUDIO; /* we support audio! */
ac97.limited_regs = 1;
for (i = 0; mixer_regs[i] >= 0; i++)
set_bit(mixer_regs[i], ac97.reg_accessed);
ac97.private_data = chip;
- err = snd_ac97_mixer(chip->card, &ac97, &chip->ac97);
+ err = snd_ac97_mixer(pbus, &ac97, &chip->ac97);
if (err < 0)
return err;
if (! (chip->ac97->id & (0xf0000000))) {
-------------------------------------------------------
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
