[alsa-cvslog] CVS: alsa-kernel/drivers/vx vx_core.c,1.4,1.5
Update of /cvsroot/alsa/alsa-kernel/drivers/vx In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/drivers/vx Modified Files: vx_core.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: vx_core.c === RCS file: /cvsroot/alsa/alsa-kernel/drivers/vx/vx_core.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- vx_core.c 8 Jul 2003 10:39:11 - 1.4 +++ vx_core.c 23 Oct 2003 14:34:52 - 1.5 @@ -641,7 +641,7 @@ snd_info_entry_t *entry; if (! snd_card_proc_new(chip->card, "vx-status", &entry)) - snd_info_set_text_ops(entry, chip, vx_proc_read); + snd_info_set_text_ops(entry, chip, 1024, vx_proc_read); } --- 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
[alsa-cvslog] CVS: alsa-driver/pci/au88x0 au88x0_mixer.c,1.1,1.2
Update of /cvsroot/alsa/alsa-driver/pci/au88x0
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-driver/pci/au88x0
Modified Files:
au88x0_mixer.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: au88x0_mixer.c
===
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au88x0_mixer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au88x0_mixer.c 6 Oct 2003 14:01:05 - 1.1
+++ au88x0_mixer.c 23 Oct 2003 14:34:51 - 1.2
@@ -12,12 +12,17 @@
#include "au88x0.h"
int __devinit snd_vortex_mixer(vortex_t *vortex) {
+ac97_bus_t bus, *pbus;
ac97_t ac97;
+int err;
+memset(&bus, 0, sizeof(bus));
+bus.write = vortex_codec_write;
+bus.read = vortex_codec_read;
+if ((err = snd_ac97_bus(vortex->card, &bus, &pbus)) < 0)
+return err;
memset(&ac97, 0, sizeof(ac97));
// Intialize AC97 codec stuff.
-ac97.write = vortex_codec_write;
-ac97.read = vortex_codec_read;
ac97.private_data = vortex;
- return snd_ac97_mixer(vortex->card, &ac97, &vortex->codec);
+return snd_ac97_mixer(pbus, &ac97, &vortex->codec);
}
---
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
[alsa-cvslog] CVS: alsa-kernel/pci/emu10k1 emumixer.c,1.17,1.18 emuproc.c,1.13,1.14
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 - 1.17
+++ emumixer.c 23 Oct 2003 14:34:53 - 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 - 1.13
+++ emuproc.c 23 Oct 2003 14:34:53 - 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
[alsa-cvslog] CVS: alsa-kernel/pci/ac97 ac97_codec.c,1.107,1.108 ac97_local.h,1.3,1.4 ac97_patch.c,1.26,1.27 ac97_proc.c,1.3,1.4 ak4531_codec.c,1.8,1.9
Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/pci/ac97
Modified Files:
ac97_codec.c ac97_local.h ac97_patch.c ac97_proc.c
ak4531_codec.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: ac97_codec.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_codec.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- ac97_codec.c16 Oct 2003 15:13:54 - 1.107
+++ ac97_codec.c23 Oct 2003 14:34:52 - 1.108
@@ -271,7 +271,7 @@
{
if (!snd_ac97_valid_reg(ac97, reg))
return;
- ac97->write(ac97, reg, value);
+ ac97->bus->write(ac97, reg, value);
}
/**
@@ -289,7 +289,7 @@
{
if (!snd_ac97_valid_reg(ac97, reg))
return 0;
- return ac97->read(ac97, reg);
+ return ac97->bus->read(ac97, reg);
}
/**
@@ -309,7 +309,7 @@
spin_lock(&ac97->reg_lock);
ac97->regs[reg] = value;
spin_unlock(&ac97->reg_lock);
- ac97->write(ac97, reg, value);
+ ac97->bus->write(ac97, reg, value);
set_bit(reg, ac97->reg_accessed);
}
@@ -336,7 +336,7 @@
if (change) {
ac97->regs[reg] = value;
spin_unlock(&ac97->reg_lock);
- ac97->write(ac97, reg, value);
+ ac97->bus->write(ac97, reg, value);
} else
spin_unlock(&ac97->reg_lock);
return change;
@@ -369,7 +369,7 @@
if (change) {
ac97->regs[reg] = new;
spin_unlock(&ac97->reg_lock);
- ac97->write(ac97, reg, new);
+ ac97->bus->write(ac97, reg, new);
} else
spin_unlock(&ac97->reg_lock);
return change;
@@ -389,11 +389,11 @@
ac97->spec.ad18xx.pcmreg[codec] = new;
spin_unlock(&ac97->reg_lock);
/* 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, new);
+ ac97->bus->write(ac97, AC97_PCM, new);
/* select all codecs */
- ac97->write(ac97, AC97_AD_SERIAL_CFG, 0x7000);
+ ac97->bus->write(ac97, AC97_AD_SERIAL_CFG, 0x7000);
} else
spin_unlock(&ac97->reg_lock);
up(&ac97->spec.ad18xx.mutex);
@@ -977,9 +977,29 @@
*
*/
+static int snd_ac97_bus_free(ac97_bus_t *bus)
+{
+ if (bus) {
+ snd_ac97_bus_proc_done(bus);
+ if (bus->private_free)
+ bus->private_free(bus);
+ snd_magic_kfree(bus);
+ }
+ return 0;
+}
+
+static int snd_ac97_bus_dev_free(snd_device_t *device)
+{
+ ac97_bus_t *bus = snd_magic_cast(ac97_bus_t, device->device_data, return
-ENXIO);
+ return snd_ac97_bus_free(bus);
+}
+
static int snd_ac97_free(ac97_t *ac97)
{
if (ac97) {
+ snd_ac97_proc_done(ac97);
+ if (ac97->bus)
+ ac97->bus->codec[ac97->num] = NULL;
if (ac97->private_free)
ac97->private_free(ac97);
snd_magic_kfree(ac97);
@@ -1194,7 +1214,7 @@
static int snd_ac97_mixer_build(ac97_t * ac97)
{
- snd_card_t *card = ac97->card;
+ snd_card_t *card = ac97->bus->card;
snd_kcontrol_t *kctl;
int err;
unsigned int idx;
@@ -1501,7 +1521,7 @@
unsigned short val;
unsigned int tmp;
- tmp = ((unsigned int)rate * ac97->clock) / 48000;
+ tmp = ((unsigned int)rate * ac97->bus->clock) / 48000;
snd_ac97_write_cache(ac97, reg, tmp & 0x);
val = snd_ac97_read(ac97, reg);
return val == (tmp & 0x);
@@ -1606,13 +1626,61 @@
}
/**
- * snd_ac97_mixer - create an AC97 codec component
+ * snd_ac97_bus - create an AC97 bus component
* @card: the card instance
+ * @_bus: the template of AC97 bus, callbacks and
+ * the private data.
+ * @rbus: the pointer to store the new AC97 bus instance.
+ *
+ * Creates an AC97 bus component. An ac97_bus_t instance is newly
+ * allocated and initialized from the template (_bus).
+ *
+ * The template must include the valid callbacks (at least read and
+ * write), the bus number (num), and the private data (private_data).
+ * The other callbacks, wait and reset, are not mandatory.
+ *
+ * The clock is set to 48000. If another clock is needed
[alsa-cvslog] CVS: alsa-utils/iecset - New directory
Update of /cvsroot/alsa/alsa-utils/iecset In directory sc8-pr-cvs1:/tmp/cvs-serv32338/iecset Log Message: Directory /cvsroot/alsa/alsa-utils/iecset added to the repository --- 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
[alsa-cvslog] CVS: alsa-kernel/isa/gus gus_irq.c,1.6,1.7 gus_mem.c,1.7,1.8
Update of /cvsroot/alsa/alsa-kernel/isa/gus
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/isa/gus
Modified Files:
gus_irq.c gus_mem.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: gus_irq.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gus_irq.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gus_irq.c 23 Apr 2003 10:01:38 - 1.6
+++ gus_irq.c 23 Oct 2003 14:34:52 - 1.7
@@ -136,7 +136,7 @@
snd_info_entry_t *entry;
if (! snd_card_proc_new(gus->card, "gusirq", &entry))
- snd_info_set_text_ops(entry, gus, snd_gus_irq_info_read);
+ snd_info_set_text_ops(entry, gus, 1024, snd_gus_irq_info_read);
}
#endif
Index: gus_mem.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gus_mem.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gus_mem.c 31 Jan 2003 15:19:51 - 1.7
+++ gus_mem.c 23 Oct 2003 14:34:52 - 1.8
@@ -265,7 +265,7 @@
return -ENOMEM;
#ifdef CONFIG_SND_DEBUG
if (! snd_card_proc_new(gus->card, "gusmem", &entry)) {
- snd_info_set_text_ops(entry, gus, snd_gf1_mem_info_read);
+ snd_info_set_text_ops(entry, gus, 1024, snd_gf1_mem_info_read);
entry->c.text.read_size = 256 * 1024;
}
#endif
---
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
[alsa-cvslog] CVS: alsa-kernel/pci/ali5451 ali5451.c,1.38,1.39
Update of /cvsroot/alsa/alsa-kernel/pci/ali5451
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/pci/ali5451
Modified Files:
ali5451.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: ali5451.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ali5451/ali5451.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ali5451.c 12 Aug 2003 14:10:14 - 1.38
+++ ali5451.c 23 Oct 2003 14:34:53 - 1.39
@@ -265,6 +265,7 @@
unsigned int spurious_irq_count;
unsigned int spurious_irq_max_delta;
+ ac97_bus_t *ac97_bus;
ac97_t *ac97;
unsigned short ac97_ext_id;
unsigned short ac97_ext_status;
@@ -1860,6 +1861,12 @@
ALI5451_SPDIF(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), 0, 2)
};
+static void snd_ali_mixer_free_ac97_bus(ac97_bus_t *bus)
+{
+ ali_t *codec = snd_magic_cast(ali_t, bus->private_data, return);
+ codec->ac97_bus = NULL;
+}
+
static void snd_ali_mixer_free_ac97(ac97_t *ac97)
{
ali_t *codec = snd_magic_cast(ali_t, ac97->private_data, return);
@@ -1868,16 +1875,23 @@
static int __devinit snd_ali_mixer(ali_t * codec)
{
+ ac97_bus_t bus;
ac97_t ac97;
unsigned int idx;
int err;
+ memset(&bus, 0, sizeof(bus));
+ bus.write = snd_ali_codec_write;
+ bus.read = snd_ali_codec_read;
+ bus.private_data = codec;
+ bus.private_free = snd_ali_mixer_free_ac97_bus;
+ if ((err = snd_ac97_bus(codec->card, &bus, &codec->ac97_bus)) < 0)
+ return err;
+
memset(&ac97, 0, sizeof(ac97));
- ac97.write = snd_ali_codec_write;
- ac97.read = snd_ali_codec_read;
ac97.private_data = codec;
ac97.private_free = snd_ali_mixer_free_ac97;
- if ((err = snd_ac97_mixer(codec->card, &ac97, &codec->ac97)) < 0) {
+ if ((err = snd_ac97_mixer(codec->ac97_bus, &ac97, &codec->ac97)) < 0) {
snd_printk("ali mixer creating error.\n");
return err;
}
---
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
[alsa-cvslog] CVS: alsa-lib/test Makefile.am,1.25,1.26 iecbits.c,1.1,NONE iecset.c,1.1,NONE
Update of /cvsroot/alsa/alsa-lib/test In directory sc8-pr-cvs1:/tmp/cvs-serv32269 Modified Files: Makefile.am Removed Files: iecbits.c iecset.c Log Message: moved iecset to alsa-utils Index: Makefile.am === RCS file: /cvsroot/alsa/alsa-lib/test/Makefile.am,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- Makefile.am 30 Sep 2003 17:02:14 - 1.25 +++ Makefile.am 23 Oct 2003 16:53:11 - 1.26 @@ -1,6 +1,6 @@ check_PROGRAMS=control pcm latency seq \ playmidi1 timer rawmidi midiloop \ - omixer code iecset + omixer code control_LDADD=../src/libasound.la pcm_LDADD=../src/libasound.la @@ -12,9 +12,8 @@ midiloop_LDADD=../src/libasound.la omixer_LDADD=../src/libasound.la code_CFLAGS=-Wall -pipe -g -O2 -iecset_LDADD=../src/libasound.la INCLUDES=-I$(top_srcdir)/include CFLAGS=-static -Wall -pipe -g -EXTRA_DIST=seq-decoder.c seq-sender.c midifile.h midifile.c midifile.3 iecbits.c +EXTRA_DIST=seq-decoder.c seq-sender.c midifile.h midifile.c midifile.3 --- iecbits.c DELETED --- --- iecset.c DELETED --- --- 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
[alsa-cvslog] CVS: alsa-utils Makefile.am,1.25,1.26 configure.in,1.66,1.67
Update of /cvsroot/alsa/alsa-utils In directory sc8-pr-cvs1:/tmp/cvs-serv32536 Modified Files: Makefile.am configure.in Log Message: - moved iecset from alsa-lib/test. - added man page. Index: Makefile.am === RCS file: /cvsroot/alsa/alsa-utils/Makefile.am,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- Makefile.am 14 Jun 2003 08:32:44 - 1.25 +++ Makefile.am 23 Oct 2003 16:54:32 - 1.26 @@ -4,7 +4,7 @@ else ALSAMIXER_DIR= endif -SUBDIRS=include alsactl $(ALSAMIXER_DIR) amixer aplay seq utils +SUBDIRS=include alsactl $(ALSAMIXER_DIR) amixer aplay iecset seq utils EXTRA_DIST=ChangeLog INSTALL TODO README configure cvscompile depcomp rpm: dist Index: configure.in === RCS file: /cvsroot/alsa/alsa-utils/configure.in,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- configure.in21 Oct 2003 17:41:36 - 1.66 +++ configure.in23 Oct 2003 16:54:32 - 1.67 @@ -65,5 +65,5 @@ SAVE_UTIL_VERSION AC_OUTPUT(Makefile alsactl/Makefile alsamixer/Makefile amixer/Makefile aplay/Makefile \ - include/Makefile utils/Makefile utils/alsa-utils.spec \ + include/Makefile iecset/Makefile utils/Makefile utils/alsa-utils.spec \ seq/Makefile seq/aconnect/Makefile seq/aseqnet/Makefile) --- 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
[alsa-cvslog] CVS: alsa-kernel/usb usbaudio.c,1.66,1.67
Update of /cvsroot/alsa/alsa-kernel/usb In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/usb Modified Files: usbaudio.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: usbaudio.c === RCS file: /cvsroot/alsa/alsa-kernel/usb/usbaudio.c,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- usbaudio.c 30 Sep 2003 09:28:27 - 1.66 +++ usbaudio.c 23 Oct 2003 14:34:53 - 1.67 @@ -1819,7 +1819,7 @@ sprintf(name, "stream%d", stream->pcm_index); if (! snd_card_proc_new(card, name, &entry)) - snd_info_set_text_ops(entry, stream, proc_pcm_format_read); + snd_info_set_text_ops(entry, stream, 1024, proc_pcm_format_read); } --- 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
[alsa-cvslog] CVS: alsa-kernel/pci/rme9652 hdsp.c,1.44,1.45 rme9652.c,1.37,1.38
Update of /cvsroot/alsa/alsa-kernel/pci/rme9652 In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/pci/rme9652 Modified Files: hdsp.c rme9652.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: hdsp.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/rme9652/hdsp.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- hdsp.c 25 Sep 2003 18:55:43 - 1.44 +++ hdsp.c 23 Oct 2003 14:34:53 - 1.45 @@ -2994,7 +2994,7 @@ snd_info_entry_t *entry; if (! snd_card_proc_new(hdsp->card, "hdsp", &entry)) - snd_info_set_text_ops(entry, hdsp, snd_hdsp_proc_read); + snd_info_set_text_ops(entry, hdsp, 1024, snd_hdsp_proc_read); } static void snd_hdsp_free_buffers(hdsp_t *hdsp) Index: rme9652.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/rme9652/rme9652.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- rme9652.c 3 Sep 2003 13:43:41 - 1.37 +++ rme9652.c 23 Oct 2003 14:34:53 - 1.38 @@ -1835,7 +1835,7 @@ snd_info_entry_t *entry; if (! snd_card_proc_new(rme9652->card, "rme9652", &entry)) - snd_info_set_text_ops(entry, rme9652, snd_rme9652_proc_read); + snd_info_set_text_ops(entry, rme9652, 1024, snd_rme9652_proc_read); } static void snd_rme9652_free_buffers(rme9652_t *rme9652) --- 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
[alsa-cvslog] CVS: alsa-kernel/pci/trident trident_main.c,1.47,1.48
Update of /cvsroot/alsa/alsa-kernel/pci/trident
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/pci/trident
Modified Files:
trident_main.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: trident_main.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/trident/trident_main.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- trident_main.c 2 Sep 2003 18:06:12 - 1.47
+++ trident_main.c 23 Oct 2003 14:34:53 - 1.48
@@ -2955,6 +2955,7 @@
static int __devinit snd_trident_mixer(trident_t * trident, int pcm_spdif_device)
{
+ ac97_bus_t _bus;
ac97_t _ac97;
snd_card_t * card = trident->card;
snd_kcontrol_t *kctl;
@@ -2965,14 +2966,18 @@
if (!uctl)
return -ENOMEM;
+ memset(&_bus, 0, sizeof(_bus));
+ _bus.write = snd_trident_codec_write;
+ _bus.read = snd_trident_codec_read;
+ if ((err = snd_ac97_bus(trident->card, &_bus, &trident->ac97_bus)) < 0)
+ goto __out;
+
memset(&_ac97, 0, sizeof(_ac97));
- _ac97.write = snd_trident_codec_write;
- _ac97.read = snd_trident_codec_read;
_ac97.private_data = trident;
trident->ac97_detect = 1;
__again:
- if ((err = snd_ac97_mixer(trident->card, &_ac97, &trident->ac97)) < 0) {
+ if ((err = snd_ac97_mixer(trident->ac97_bus, &_ac97, &trident->ac97)) < 0) {
if (trident->device == TRIDENT_DEVICE_ID_SI7018) {
if ((err = snd_trident_sis_reset(trident)) < 0)
goto __out;
@@ -2987,7 +2992,7 @@
if (trident->device == TRIDENT_DEVICE_ID_SI7018 &&
(inl(TRID_REG(trident, SI_SERIAL_INTF_CTRL)) & SI_AC97_PRIMARY_READY) !=
0) {
_ac97.num = 1;
- err = snd_ac97_mixer(trident->card, &_ac97, &trident->ac97_sec);
+ err = snd_ac97_mixer(trident->ac97_bus, &_ac97, &trident->ac97_sec);
if (err < 0)
snd_printk("SI7018: the secondary codec - invalid access\n");
#if 0 // only for my testing purpose --jk
@@ -3295,7 +3300,7 @@
if (trident->device == TRIDENT_DEVICE_ID_SI7018)
s = "sis7018";
if (! snd_card_proc_new(trident->card, s, &entry))
- snd_info_set_text_ops(entry, trident, snd_trident_proc_read);
+ snd_info_set_text_ops(entry, trident, 1024, snd_trident_proc_read);
}
static int snd_trident_dev_free(snd_device_t *device)
---
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
[alsa-cvslog] CVS: alsa-kernel/include ac97_codec.h,1.34,1.35 cs46xx.h,1.16,1.17 info.h,1.13,1.14 sndmagic.h,1.21,1.22 trident.h,1.14,1.15 ymfpci.h,1.12,1.13
Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/include
Modified Files:
ac97_codec.h cs46xx.h info.h sndmagic.h trident.h ymfpci.h
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: ac97_codec.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/ac97_codec.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ac97_codec.h1 Sep 2003 09:53:26 - 1.34
+++ ac97_codec.h23 Oct 2003 14:34:52 - 1.35
@@ -274,10 +274,12 @@
/* ac97->scaps */
-#define AC97_SCAP_AUDIO(1<<0) /* audio AC'97 codec */
-#define AC97_SCAP_MODEM(1<<1) /* modem AC'97 codec */
+#define AC97_SCAP_AUDIO(1<<0) /* audio codec 97 */
+#define AC97_SCAP_MODEM(1<<1) /* modem codec 97 */
#define AC97_SCAP_SURROUND_DAC (1<<2) /* surround L&R DACs are present */
#define AC97_SCAP_CENTER_LFE_DAC (1<<3)/* center and LFE DACs are present */
+#define AC97_SCAP_SKIP_AUDIO (1<<4) /* skip audio part of codec */
+#define AC97_SCAP_SKIP_MODEM (1<<5) /* skip modem part of codec */
/* ac97->flags */
#define AC97_HAS_PC_BEEP (1<<0) /* force PC Speaker usage */
@@ -298,6 +300,7 @@
*
*/
+typedef struct _snd_ac97_bus ac97_bus_t;
typedef struct _snd_ac97 ac97_t;
struct snd_ac97_build_ops {
@@ -307,18 +310,33 @@
int (*build_post_spdif) (ac97_t *ac97);
};
-struct _snd_ac97 {
+struct _snd_ac97_bus {
+ /* -- lowlevel (hardware) driver specific -- */
void (*reset) (ac97_t *ac97);
void (*write) (ac97_t *ac97, unsigned short reg, unsigned short val);
unsigned short (*read) (ac97_t *ac97, unsigned short reg);
void (*wait) (ac97_t *ac97);
void (*init) (ac97_t *ac97);
+ void *private_data;
+ void (*private_free) (ac97_bus_t *bus);
+ /* --- */
+ snd_card_t *card;
+ unsigned int num; /* bus number */
+ unsigned int clock; /* AC'97 clock (usually 48000Hz) */
+ ac97_t *codec[4];
+ snd_info_entry_t *proc;
+};
+
+struct _snd_ac97 {
+ /* -- lowlevel (hardware) driver specific -- */
struct snd_ac97_build_ops * build_ops;
void *private_data;
void (*private_free) (ac97_t *ac97);
/* --- */
- snd_card_t *card;
+ ac97_bus_t *bus;
struct pci_dev *pci;/* assigned PCI device - used for quirks */
+ snd_info_entry_t *proc;
+ snd_info_entry_t *proc_regs;
unsigned short subsystem_vendor;
unsigned short subsystem_device;
spinlock_t reg_lock;
@@ -330,7 +348,6 @@
unsigned short ext_mid; /* extended modem ID (register 3C) */
unsigned int scaps; /* driver capabilities */
unsigned int flags; /* specific code */
- unsigned int clock; /* AC'97 clock (usually 48000Hz) */
unsigned int rates[6]; /* see AC97_RATES_* defines */
unsigned int spdif_status;
unsigned short regs[0x80]; /* register cache */
@@ -368,8 +385,8 @@
}
/* functions */
-int snd_ac97_mixer(snd_card_t * card, ac97_t * _ac97, ac97_t ** rac97);/*
create mixer controls */
-int snd_ac97_modem(snd_card_t * card, ac97_t * _ac97, ac97_t ** rac97);/*
create modem controls */
+int snd_ac97_bus(snd_card_t * card, ac97_bus_t * _bus, ac97_bus_t ** rbus); /* create
new AC97 bus */
+int snd_ac97_mixer(ac97_bus_t * bus, ac97_t * _ac97, ac97_t ** rac97); /* create
mixer controls */
void snd_ac97_write(ac97_t *ac97, unsigned short reg, unsigned short value);
unsigned short snd_ac97_read(ac97_t *ac97, unsigned short reg);
Index: cs46xx.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/cs46xx.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cs46xx.h2 Apr 2003 14:42:34 - 1.16
+++ cs46xx.h23 Oct 2003 14:34:52 - 1.17
@@ -1712,6 +1712,7 @@
int nr_ac97_codecs;
+ ac97_bus_t *ac97_bus;
ac97_t *ac97[MAX_NR_AC97];
struct pci_dev *pci;
Index: info.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/info.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- info.h 18 Jul 2003 16:07:35 - 1.13
+++ info.h 23 Oct 2003 14:34:52 - 1.14
@@ -134,12 +134,13 @@
/* for card drivers */
int snd_card_proc_new(snd_card_t *card, const char *name, snd_info_entry_t **entryp);
-inline static void snd_info_set_text_ops(snd_info_entry_t *entry,
+static inline void snd_info_set_text_ops(snd_info_entry_t
[alsa-cvslog] CVS: alsa-kernel/pci/cs46xx cs46xx_lib.c,1.65,1.66
Update of /cvsroot/alsa/alsa-kernel/pci/cs46xx
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/pci/cs46xx
Modified Files:
cs46xx_lib.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: cs46xx_lib.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/cs46xx/cs46xx_lib.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- cs46xx_lib.c14 Oct 2003 14:08:49 - 1.65
+++ cs46xx_lib.c23 Oct 2003 14:34:53 - 1.66
@@ -1804,6 +1804,13 @@
/*
* Mixer routines
*/
+static void snd_cs46xx_mixer_free_ac97_bus(ac97_bus_t *bus)
+{
+ cs46xx_t *chip = snd_magic_cast(cs46xx_t, bus->private_data, return);
+
+ chip->ac97_bus = NULL;
+}
+
static void snd_cs46xx_mixer_free_ac97(ac97_t *ac97)
{
cs46xx_t *chip = snd_magic_cast(cs46xx_t, ac97->private_data, return);
@@ -2445,6 +2452,7 @@
int __devinit snd_cs46xx_mixer(cs46xx_t *chip)
{
snd_card_t *card = chip->card;
+ ac97_bus_t bus;
ac97_t ac97;
snd_ctl_elem_id_t id;
int err;
@@ -2453,14 +2461,20 @@
/* detect primary codec */
chip->nr_ac97_codecs = 0;
snd_printdd("snd_cs46xx: detecting primary codec\n");
+ memset(&bus, 0, sizeof(bus));
+ bus.write = snd_cs46xx_ac97_write;
+ bus.read = snd_cs46xx_ac97_read;
+#ifdef CONFIG_SND_CS46XX_NEW_DSP
+ bus.reset = snd_cs46xx_codec_reset;
+#endif
+ bus.private_data = chip;
+ bus.private_free = snd_cs46xx_mixer_free_ac97_bus;
+ if ((err = snd_ac97_bus(card, &bus, &chip->ac97_bus)) < 0)
+ return err;
+
memset(&ac97, 0, sizeof(ac97));
- ac97.write = snd_cs46xx_ac97_write;
- ac97.read = snd_cs46xx_ac97_read;
ac97.private_data = chip;
ac97.private_free = snd_cs46xx_mixer_free_ac97;
-#ifdef CONFIG_SND_CS46XX_NEW_DSP
- ac97.reset = snd_cs46xx_codec_reset;
-#endif
chip->ac97[CS46XX_PRIMARY_CODEC_INDEX] = &ac97;
snd_cs46xx_ac97_write(&ac97, AC97_MASTER, 0x8000);
@@ -2474,7 +2488,7 @@
return -ENXIO;
_ok:
- if ((err = snd_ac97_mixer(card, &ac97,
&chip->ac97[CS46XX_PRIMARY_CODEC_INDEX])) < 0)
+ if ((err = snd_ac97_mixer(chip->ac97_bus, &ac97,
&chip->ac97[CS46XX_PRIMARY_CODEC_INDEX])) < 0)
return err;
snd_printdd("snd_cs46xx: primary codec phase one\n");
chip->nr_ac97_codecs = 1;
@@ -2483,8 +2497,6 @@
snd_printdd("snd_cs46xx: detecting seconadry codec\n");
/* try detect a secondary codec */
memset(&ac97, 0, sizeof(ac97));
- ac97.write = snd_cs46xx_ac97_write;
- ac97.read = snd_cs46xx_ac97_read;
ac97.private_data = chip;
ac97.private_free = snd_cs46xx_mixer_free_ac97;
ac97.num = CS46XX_SECONDARY_CODEC_INDEX;
@@ -2516,13 +2528,7 @@
/* well, one codec only ... */
goto _end;
_ok2:
- /* set secondary codec in extended mode */
-
- /* use custom reset to set secondary codec in
- extended mode */
- ac97.reset = snd_cs46xx_codec_reset;
-
- if ((err = snd_ac97_mixer(card, &ac97,
&chip->ac97[CS46XX_SECONDARY_CODEC_INDEX])) < 0)
+ if ((err = snd_ac97_mixer(chip->ac97_bus, &ac97,
&chip->ac97[CS46XX_SECONDARY_CODEC_INDEX])) < 0)
return err;
chip->nr_ac97_codecs = 2;
---
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
[alsa-cvslog] CVS: alsa-kernel/pci/nm256 nm256.c,1.31,1.32
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 - 1.31
+++ nm256.c 23 Oct 2003 14:34:53 - 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 & (0xf000))) {
---
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
