Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1:/tmp/cvs-serv13516/pci/ac97
Modified Files:
ac97_codec.c
Log Message:
fixed the compilation with the recent ac97 and info changes.
Index: ac97_codec.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_codec.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- ac97_codec.c 23 Oct 2003 14:34:52 -0000 1.108
+++ ac97_codec.c 24 Oct 2003 13:44:21 -0000 1.109
@@ -2095,8 +2095,8 @@
}
__reset_ready:
- if (bus->init)
- bus->init(ac97);
+ if (ac97->bus->init)
+ ac97->bus->init(ac97);
is_ad18xx = (ac97->id & 0xffffff40) == AC97_ID_AD1881;
if (is_ad18xx) {
@@ -2105,11 +2105,11 @@
if (! ac97->spec.ad18xx.id[codec])
continue;
/* select single codec */
- ac97->write(ac97, AC97_AD_SERIAL_CFG,
ac97->spec.ad18xx.unchained[codec] | ac97->spec.ad18xx.chained[codec]);
- ac97->write(ac97, AC97_AD_CODEC_CFG,
ac97->spec.ad18xx.codec_cfg[codec]);
+ ac97->bus->write(ac97, AC97_AD_SERIAL_CFG,
ac97->spec.ad18xx.unchained[codec] | ac97->spec.ad18xx.chained[codec]);
+ ac97->bus->write(ac97, AC97_AD_CODEC_CFG,
ac97->spec.ad18xx.codec_cfg[codec]);
}
/* select all codecs */
- ac97->write(ac97, AC97_AD_SERIAL_CFG, 0x7000);
+ ac97->bus->write(ac97, AC97_AD_SERIAL_CFG, 0x7000);
}
/* restore ac97 status */
@@ -2128,12 +2128,12 @@
if (! ac97->spec.ad18xx.id[codec])
continue;
/* select single codec */
- ac97->write(ac97, AC97_AD_SERIAL_CFG,
ac97->spec.ad18xx.unchained[codec] | ac97->spec.ad18xx.chained[codec]);
+ ac97->bus->write(ac97,
AC97_AD_SERIAL_CFG, ac97->spec.ad18xx.unchained[codec] |
ac97->spec.ad18xx.chained[codec]);
/* update PCM bits */
- ac97->write(ac97, AC97_PCM,
ac97->spec.ad18xx.pcmreg[codec]);
+ ac97->bus->write(ac97, AC97_PCM,
ac97->spec.ad18xx.pcmreg[codec]);
}
/* select all codecs */
- ac97->write(ac97, AC97_AD_SERIAL_CFG, 0x7000);
+ ac97->bus->write(ac97, AC97_AD_SERIAL_CFG,
0x7000);
continue;
} else if (i == AC97_AD_TEST ||
i == AC97_AD_CODEC_CFG ||
-------------------------------------------------------
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
