[alsa-cvslog] CVS: alsa-driver/pci/ymfpci .cvsignore,1.2,1.3 Makefile,1.3,1.4
Update of /cvsroot/alsa/alsa-driver/pci/ymfpci In directory sc8-pr-cvs1:/tmp/cvs-serv1156/pci/ymfpci Modified Files: .cvsignore Makefile Log Message: - fixed --with-isapnp option of configure. - changed (added) to build / install for 2.6 kernels. with this change, you cannot run make in the local directory any more unless you set SND_TOPDIR environment variable. it points to the path name of the top directory of alsa-driver directory. Index: .cvsignore === RCS file: /cvsroot/alsa/alsa-driver/pci/ymfpci/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Jun 2003 11:12:53 - 1.2 +++ .cvsignore 10 Nov 2003 17:32:44 - 1.3 @@ -1,2 +1,5 @@ .depend ymfpci.c +.*.cmd +*.ko +*.mod.c Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/pci/ymfpci/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile18 Jun 2003 11:12:53 - 1.3 +++ Makefile10 Nov 2003 17:32:44 - 1.4 @@ -1,13 +1,10 @@ -TOPDIR = ../.. +include $(SND_TOPDIR)/toplevel.config +include $(SND_TOPDIR)/Makefile.conf -include $(TOPDIR)/toplevel.config -include $(TOPDIR)/Makefile.conf +clean-files := ymfpci.c -EXTRA_CLEAN = ymfpci.c +include $(SND_TOPDIR)/alsa-kernel/pci/ymfpci/Makefile -TOPDIR = $(MAINSRCDIR) -include $(TOPDIR)/alsa-kernel/pci/ymfpci/Makefile +include $(SND_TOPDIR)/Rules.make -include $(TOPDIR)/Rules.make - -ymfpci.c: ymfpci.patch $(TOPDIR)/alsa-kernel/pci/ymfpci/ymfpci.c +ymfpci.c: ymfpci.patch $(SND_TOPDIR)/alsa-kernel/pci/ymfpci/ymfpci.c --- This SF.Net email sponsored by: ApacheCon 2003, 16-19 November in Las Vegas. Learn firsthand the latest developments in Apache, PHP, Perl, XML, Java, MySQL, WebDAV, and more! http://www.apachecon.com/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/usb .cvsignore,1.2,1.3 Makefile,1.10,1.11 usbaudio.inc,1.2,1.3 usbmidi.c,1.10,1.11 usbmixer.c,1.7,1.8
Update of /cvsroot/alsa/alsa-driver/usb In directory sc8-pr-cvs1:/tmp/cvs-serv1156/usb Modified Files: .cvsignore Makefile usbaudio.inc usbmidi.c usbmixer.c Log Message: - fixed --with-isapnp option of configure. - changed (added) to build / install for 2.6 kernels. with this change, you cannot run make in the local directory any more unless you set SND_TOPDIR environment variable. it points to the path name of the top directory of alsa-driver directory. Index: .cvsignore === RCS file: /cvsroot/alsa/alsa-driver/usb/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jun 2003 18:37:45 - 1.2 +++ .cvsignore 10 Nov 2003 17:32:44 - 1.3 @@ -1,2 +1,5 @@ .depend usbaudio.c +.*.cmd +*.ko +*.mod.c Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/usb/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Makefile24 Sep 2003 16:45:10 - 1.10 +++ Makefile10 Nov 2003 17:32:44 - 1.11 @@ -1,24 +1,19 @@ -TOPDIR = .. +include $(SND_TOPDIR)/toplevel.config +include $(SND_TOPDIR)/Makefile.conf -include $(TOPDIR)/toplevel.config -include $(TOPDIR)/Makefile.conf - -EXTRA_CLEAN = usbaudio.c +clean-files := usbaudio.c # for compatibility extra-snd-usb-audio-objs := usbcompat.o -extra-subdir-y := us428 -extra-subdir-m := $(extra-subdir-y) +obj-$(CONFIG_SND) += us428/ export-objs := usbaudio.o usbmidi.o -TOPDIR = $(MAINSRCDIR) - -include $(TOPDIR)/alsa-kernel/usb/Makefile +include $(SND_TOPDIR)/alsa-kernel/usb/Makefile -EXTRA_CFLAGS = -I$(TOPDIR)/alsa-kernel/usb +EXTRA_CFLAGS += -I$(SND_TOPDIR)/alsa-kernel/usb -include $(TOPDIR)/Rules.make +include $(SND_TOPDIR)/Rules.make -usbaudio.c: usbaudio.patch usbaudio.inc usbaudio.inc1 $(TOPDIR)/alsa-kernel/usb/usbaudio.c +usbaudio.c: usbaudio.patch usbaudio.inc usbaudio.inc1 $(SND_TOPDIR)/alsa-kernel/usb/usbaudio.c Index: usbaudio.inc === RCS file: /cvsroot/alsa/alsa-driver/usb/usbaudio.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- usbaudio.inc20 Aug 2003 09:59:59 - 1.2 +++ usbaudio.inc10 Nov 2003 17:32:44 - 1.3 @@ -1,6 +1,11 @@ +#include +#include + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) #define SND_NEED_USB_WRAPPER #include #include +#endif #ifdef OLD_USB #define snd_usb_complete_callback(x) __old_ ## x Index: usbmidi.c === RCS file: /cvsroot/alsa/alsa-driver/usb/usbmidi.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- usbmidi.c 8 Sep 2003 10:57:41 - 1.10 +++ usbmidi.c 10 Nov 2003 17:32:45 - 1.11 @@ -1,7 +1,12 @@ +#include +#include + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) #define SND_NEED_USB_WRAPPER #define __NO_VERSION__ #include #include +#endif #ifdef OLD_USB #define snd_usb_complete_callback(x) __old_ ## x Index: usbmixer.c === RCS file: /cvsroot/alsa/alsa-driver/usb/usbmixer.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- usbmixer.c 22 Oct 2002 10:15:37 - 1.7 +++ usbmixer.c 10 Nov 2003 17:32:45 - 1.8 @@ -1,3 +1,8 @@ +#include +#include + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) #define SND_NEED_USB_WRAPPER #define __NO_VERSION__ +#endif #include "../alsa-kernel/usb/usbmixer.c" --- This SF.Net email sponsored by: ApacheCon 2003, 16-19 November in Las Vegas. Learn firsthand the latest developments in Apache, PHP, Perl, XML, Java, MySQL, WebDAV, and more! http://www.apachecon.com/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/pcmcia/pdaudiocf .cvsignore,1.1,1.2 Makefile,1.1,1.2
Update of /cvsroot/alsa/alsa-driver/pcmcia/pdaudiocf In directory sc8-pr-cvs1:/tmp/cvs-serv1156/pcmcia/pdaudiocf Modified Files: .cvsignore Makefile Log Message: - fixed --with-isapnp option of configure. - changed (added) to build / install for 2.6 kernels. with this change, you cannot run make in the local directory any more unless you set SND_TOPDIR environment variable. it points to the path name of the top directory of alsa-driver directory. Index: .cvsignore === RCS file: /cvsroot/alsa/alsa-driver/pcmcia/pdaudiocf/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Jun 2003 14:56:19 - 1.1 +++ .cvsignore 10 Nov 2003 17:32:44 - 1.2 @@ -1 +1,4 @@ .depend +.*.cmd +*.ko +*.mod.c Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/pcmcia/pdaudiocf/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile29 Jun 2003 14:56:19 - 1.1 +++ Makefile10 Nov 2003 17:32:44 - 1.2 @@ -1,16 +1,12 @@ -TOPDIR = ../.. - -include $(TOPDIR)/toplevel.config -include $(TOPDIR)/Makefile.conf +include $(SND_TOPDIR)/toplevel.config +include $(SND_TOPDIR)/Makefile.conf # # # -TOPDIR = $(MAINSRCDIR) - snd-pdaudiocf-objs := pdaudiocf.o pdaudiocf_core.o pdaudiocf_irq.o pdaudiocf_pcm.o obj-$(CONFIG_SND_PDAUDIOCF) += snd-pdaudiocf.o -include $(TOPDIR)/Rules.make +include $(SND_TOPDIR)/Rules.make --- This SF.Net email sponsored by: ApacheCon 2003, 16-19 November in Las Vegas. Learn firsthand the latest developments in Apache, PHP, Perl, XML, Java, MySQL, WebDAV, and more! http://www.apachecon.com/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/pcmcia/vx .cvsignore,1.2,1.3 Makefile,1.7,1.8
Update of /cvsroot/alsa/alsa-driver/pcmcia/vx In directory sc8-pr-cvs1:/tmp/cvs-serv1156/pcmcia/vx Modified Files: .cvsignore Makefile Log Message: - fixed --with-isapnp option of configure. - changed (added) to build / install for 2.6 kernels. with this change, you cannot run make in the local directory any more unless you set SND_TOPDIR environment variable. it points to the path name of the top directory of alsa-driver directory. Index: .cvsignore === RCS file: /cvsroot/alsa/alsa-driver/pcmcia/vx/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Sep 2003 16:43:33 - 1.2 +++ .cvsignore 10 Nov 2003 17:32:44 - 1.3 @@ -1,2 +1,5 @@ .depend vx_entry.c +.*.cmd +*.ko +*.mod.c Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/pcmcia/vx/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile24 Sep 2003 16:43:33 - 1.7 +++ Makefile10 Nov 2003 17:32:44 - 1.8 @@ -1,7 +1,5 @@ -TOPDIR = ../.. - -include $(TOPDIR)/toplevel.config -include $(TOPDIR)/Makefile.conf +include $(SND_TOPDIR)/toplevel.config +include $(SND_TOPDIR)/Makefile.conf EXTRA_CLEAN = vx_entry.c @@ -11,9 +9,8 @@ export-objs = vx_entry.o -TOPDIR = $(MAINSRCDIR) -include $(TOPDIR)/alsa-kernel/pcmcia/vx/Makefile +include $(SND_TOPDIR)/alsa-kernel/pcmcia/vx/Makefile -include $(TOPDIR)/Rules.make +include $(SND_TOPDIR)/Rules.make -vx_entry.c: vx_entry.patch vx_entry.inc vx_entry.inc1 $(TOPDIR)/alsa-kernel/pcmcia/vx/vx_entry.c +vx_entry.c: vx_entry.patch vx_entry.inc vx_entry.inc1 $(SND_TOPDIR)/alsa-kernel/pcmcia/vx/vx_entry.c --- This SF.Net email sponsored by: ApacheCon 2003, 16-19 November in Las Vegas. Learn firsthand the latest developments in Apache, PHP, Perl, XML, Java, MySQL, WebDAV, and more! http://www.apachecon.com/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/support/pnp Makefile,1.1,1.2
Update of /cvsroot/alsa/alsa-driver/support/pnp In directory sc8-pr-cvs1:/tmp/cvs-serv1156/support/pnp Modified Files: Makefile Log Message: - fixed --with-isapnp option of configure. - changed (added) to build / install for 2.6 kernels. with this change, you cannot run make in the local directory any more unless you set SND_TOPDIR environment variable. it points to the path name of the top directory of alsa-driver directory. Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/support/pnp/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile7 Apr 2003 10:00:31 - 1.1 +++ Makefile10 Nov 2003 17:32:44 - 1.2 @@ -16,7 +16,7 @@ # Toplevel Module Dependency ifndef CONFIG_PNP_KERNEL -ifeq (y,$(CONFIG_ISAPNP)) +ifeq (y,$(CONFIG_PNP)) obj-m += snd-pnp.o endif endif --- This SF.Net email sponsored by: ApacheCon 2003, 16-19 November in Las Vegas. Learn firsthand the latest developments in Apache, PHP, Perl, XML, Java, MySQL, WebDAV, and more! http://www.apachecon.com/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/pci/pdplus .cvsignore,1.1,1.2 Makefile,1.2,1.3
Update of /cvsroot/alsa/alsa-driver/pci/pdplus In directory sc8-pr-cvs1:/tmp/cvs-serv1156/pci/pdplus Modified Files: .cvsignore Makefile Log Message: - fixed --with-isapnp option of configure. - changed (added) to build / install for 2.6 kernels. with this change, you cannot run make in the local directory any more unless you set SND_TOPDIR environment variable. it points to the path name of the top directory of alsa-driver directory. Index: .cvsignore === RCS file: /cvsroot/alsa/alsa-driver/pci/pdplus/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Dec 2001 20:46:15 - 1.1 +++ .cvsignore 10 Nov 2003 17:32:43 - 1.2 @@ -1 +1,4 @@ .depend +.*.cmd +*.ko +*.mod.c Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/pci/pdplus/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile9 May 2002 06:43:32 - 1.2 +++ Makefile10 Nov 2003 17:32:43 - 1.3 @@ -3,22 +3,16 @@ # Copyright (c) 2001 by Jaroslav Kysela <[EMAIL PROTECTED]> # -TOPDIR = ../.. - -include $(TOPDIR)/toplevel.config -include $(TOPDIR)/Makefile.conf - -TOPDIR = $(MAINSRCDIR) +include $(SND_TOPDIR)/toplevel.config +include $(SND_TOPDIR)/Makefile.conf # # # -O_TARGET := _pdplus.o - snd-pdplus-objs := pdplus.o # Toplevel Module Dependency obj-$(CONFIG_SND_PDPLUS) += snd-pdplus.o -include $(TOPDIR)/Rules.make +include $(SND_TOPDIR)/Rules.make --- This SF.Net email sponsored by: ApacheCon 2003, 16-19 November in Las Vegas. Learn firsthand the latest developments in Apache, PHP, Perl, XML, Java, MySQL, WebDAV, and more! http://www.apachecon.com/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/pcmcia Makefile,1.3,1.4
Update of /cvsroot/alsa/alsa-driver/pcmcia In directory sc8-pr-cvs1:/tmp/cvs-serv1156/pcmcia Modified Files: Makefile Log Message: - fixed --with-isapnp option of configure. - changed (added) to build / install for 2.6 kernels. with this change, you cannot run make in the local directory any more unless you set SND_TOPDIR environment variable. it points to the path name of the top directory of alsa-driver directory. Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/pcmcia/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile29 Jun 2003 14:56:19 - 1.3 +++ Makefile10 Nov 2003 17:32:44 - 1.4 @@ -1,18 +1,14 @@ -TOPDIR = .. - -include $(TOPDIR)/toplevel.config -include $(TOPDIR)/Makefile.conf +include $(SND_TOPDIR)/toplevel.config +include $(SND_TOPDIR)/Makefile.conf # # # -TOPDIR = $(MAINSRCDIR) - obj-$(CONFIG_SND) += pdaudiocf/ -include $(TOPDIR)/alsa-kernel/pcmcia/Makefile +include $(SND_TOPDIR)/alsa-kernel/pcmcia/Makefile -include $(TOPDIR)/Rules.make +include $(SND_TOPDIR)/Rules.make --- This SF.Net email sponsored by: ApacheCon 2003, 16-19 November in Las Vegas. Learn firsthand the latest developments in Apache, PHP, Perl, XML, Java, MySQL, WebDAV, and more! http://www.apachecon.com/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/pci/rme9652 .cvsignore,1.2,1.3 Makefile,1.5,1.6
Update of /cvsroot/alsa/alsa-driver/pci/rme9652 In directory sc8-pr-cvs1:/tmp/cvs-serv1156/pci/rme9652 Modified Files: .cvsignore Makefile Log Message: - fixed --with-isapnp option of configure. - changed (added) to build / install for 2.6 kernels. with this change, you cannot run make in the local directory any more unless you set SND_TOPDIR environment variable. it points to the path name of the top directory of alsa-driver directory. Index: .cvsignore === RCS file: /cvsroot/alsa/alsa-driver/pci/rme9652/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 31 May 2003 11:33:48 - 1.2 +++ .cvsignore 10 Nov 2003 17:32:43 - 1.3 @@ -1,2 +1,5 @@ .depend hammerfall_mem.c +.*.cmd +*.ko +*.mod.c Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/pci/rme9652/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile3 Jul 2003 11:34:16 - 1.5 +++ Makefile10 Nov 2003 17:32:43 - 1.6 @@ -1,9 +1,6 @@ -TOPDIR = ../.. +include $(SND_TOPDIR)/toplevel.config +include $(SND_TOPDIR)/Makefile.conf -include $(TOPDIR)/toplevel.config -include $(TOPDIR)/Makefile.conf +include $(SND_TOPDIR)/alsa-kernel/pci/rme9652/Makefile -TOPDIR = $(MAINSRCDIR) -include $(TOPDIR)/alsa-kernel/pci/rme9652/Makefile - -include $(TOPDIR)/Rules.make +include $(SND_TOPDIR)/Rules.make --- This SF.Net email sponsored by: ApacheCon 2003, 16-19 November in Las Vegas. Learn firsthand the latest developments in Apache, PHP, Perl, XML, Java, MySQL, WebDAV, and more! http://www.apachecon.com/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/usb/us428 .cvsignore,1.1,1.2 Makefile,1.1,1.2
Update of /cvsroot/alsa/alsa-driver/usb/us428 In directory sc8-pr-cvs1:/tmp/cvs-serv1156/usb/us428 Modified Files: .cvsignore Makefile Log Message: - fixed --with-isapnp option of configure. - changed (added) to build / install for 2.6 kernels. with this change, you cannot run make in the local directory any more unless you set SND_TOPDIR environment variable. it points to the path name of the top directory of alsa-driver directory. Index: .cvsignore === RCS file: /cvsroot/alsa/alsa-driver/usb/us428/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Sep 2003 10:57:41 - 1.1 +++ .cvsignore 10 Nov 2003 17:32:45 - 1.2 @@ -1 +1,4 @@ .depend +.*.cmd +*.ko +*.mod.c Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/usb/us428/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile8 Sep 2003 10:57:41 - 1.1 +++ Makefile10 Nov 2003 17:32:45 - 1.2 @@ -3,22 +3,16 @@ # Copyright (c) 2001 by Jaroslav Kysela <[EMAIL PROTECTED]> # -TOPDIR = ../.. - -include $(TOPDIR)/toplevel.config -include $(TOPDIR)/Makefile.conf - -TOPDIR = $(MAINSRCDIR) +include $(SND_TOPDIR)/toplevel.config +include $(SND_TOPDIR)/Makefile.conf # # # -O_TARGET := _us428.o - snd-usb-us428-objs := usbus428.o usbus428audio.o usX2Yhwdep.o # Toplevel Module Dependency obj-$(CONFIG_SND_USB_US428) += snd-usb-us428.o -include $(TOPDIR)/Rules.make +include $(SND_TOPDIR)/Rules.make --- This SF.Net email sponsored by: ApacheCon 2003, 16-19 November in Las Vegas. Learn firsthand the latest developments in Apache, PHP, Perl, XML, Java, MySQL, WebDAV, and more! http://www.apachecon.com/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/synth .cvsignore,1.1,1.2 Makefile,1.3,1.4
Update of /cvsroot/alsa/alsa-driver/synth In directory sc8-pr-cvs1:/tmp/cvs-serv1156/synth Modified Files: .cvsignore Makefile Log Message: - fixed --with-isapnp option of configure. - changed (added) to build / install for 2.6 kernels. with this change, you cannot run make in the local directory any more unless you set SND_TOPDIR environment variable. it points to the path name of the top directory of alsa-driver directory. Index: .cvsignore === RCS file: /cvsroot/alsa/alsa-driver/synth/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Dec 2001 20:46:16 - 1.1 +++ .cvsignore 10 Nov 2003 17:32:44 - 1.2 @@ -1 +1,4 @@ .depend +.*.cmd +*.ko +*.mod.c Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/synth/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile9 Feb 2003 18:35:58 - 1.3 +++ Makefile10 Nov 2003 17:32:44 - 1.4 @@ -1,11 +1,8 @@ -TOPDIR = .. - -include $(TOPDIR)/toplevel.config -include $(TOPDIR)/Makefile.conf +include $(SND_TOPDIR)/toplevel.config +include $(SND_TOPDIR)/Makefile.conf export-objs := util_mem.o -TOPDIR = $(MAINSRCDIR) -include $(TOPDIR)/alsa-kernel/synth/Makefile +include $(SND_TOPDIR)/alsa-kernel/synth/Makefile -include $(TOPDIR)/Rules.make +include $(SND_TOPDIR)/Rules.make --- This SF.Net email sponsored by: ApacheCon 2003, 16-19 November in Las Vegas. Learn firsthand the latest developments in Apache, PHP, Perl, XML, Java, MySQL, WebDAV, and more! http://www.apachecon.com/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/pci/trident .cvsignore,1.2,1.3 Makefile,1.4,1.5
Update of /cvsroot/alsa/alsa-driver/pci/trident In directory sc8-pr-cvs1:/tmp/cvs-serv1156/pci/trident Modified Files: .cvsignore Makefile Log Message: - fixed --with-isapnp option of configure. - changed (added) to build / install for 2.6 kernels. with this change, you cannot run make in the local directory any more unless you set SND_TOPDIR environment variable. it points to the path name of the top directory of alsa-driver directory. Index: .cvsignore === RCS file: /cvsroot/alsa/alsa-driver/pci/trident/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Jun 2003 11:12:53 - 1.2 +++ .cvsignore 10 Nov 2003 17:32:43 - 1.3 @@ -1,2 +1,5 @@ .depend trident.c +.*.cmd +*.ko +*.mod.c Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/pci/trident/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile18 Jun 2003 11:12:53 - 1.4 +++ Makefile10 Nov 2003 17:32:43 - 1.5 @@ -1,15 +1,12 @@ -TOPDIR = ../.. +include $(SND_TOPDIR)/toplevel.config +include $(SND_TOPDIR)/Makefile.conf -include $(TOPDIR)/toplevel.config -include $(TOPDIR)/Makefile.conf - -EXTRA_CLEAN = trident.c +clean-files := trident.c export-objs := trident_main.o -TOPDIR = $(MAINSRCDIR) -include $(TOPDIR)/alsa-kernel/pci/trident/Makefile +include $(SND_TOPDIR)/alsa-kernel/pci/trident/Makefile -include $(TOPDIR)/Rules.make +include $(SND_TOPDIR)/Rules.make -trident.c: trident.patch $(TOPDIR)/alsa-kernel/pci/trident/trident.c +trident.c: trident.patch $(SND_TOPDIR)/alsa-kernel/pci/trident/trident.c --- This SF.Net email sponsored by: ApacheCon 2003, 16-19 November in Las Vegas. Learn firsthand the latest developments in Apache, PHP, Perl, XML, Java, MySQL, WebDAV, and more! http://www.apachecon.com/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-lib/src/conf/cards CMI8738-MC6.conf,1.5,1.6
Update of /cvsroot/alsa/alsa-lib/src/conf/cards
In directory sc8-pr-cvs1:/tmp/cvs-serv2198/cards
Modified Files:
CMI8738-MC6.conf
Log Message:
removed "Exchange DAC" hack again. now it's handled in the driver.
Index: CMI8738-MC6.conf
===
RCS file: /cvsroot/alsa/alsa-lib/src/conf/cards/CMI8738-MC6.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CMI8738-MC6.conf31 Oct 2003 16:50:40 - 1.5
+++ CMI8738-MC6.conf7 Nov 2003 19:39:16 - 1.6
@@ -50,12 +50,6 @@
preserve true
value false
}
-{
-name "Exchange DAC"
-lock true
-preserve true
-value true
-}
]
}
}
---
This SF.Net email sponsored by: ApacheCon 2003,
16-19 November in Las Vegas. Learn firsthand the latest
developments in Apache, PHP, Perl, XML, Java, MySQL,
WebDAV, and more! http://www.apachecon.com/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci cmipci.c,1.52,1.53
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv2057
Modified Files:
cmipci.c
Log Message:
- set XCHGDAC bit implicitly on MC4/6 models for fixing wrong
playback on some boards.
- removed "Exchange DAC" control from such a model.
Index: cmipci.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/cmipci.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- cmipci.c28 Oct 2003 11:28:01 - 1.52
+++ cmipci.c7 Nov 2003 19:38:09 - 1.53
@@ -725,6 +725,7 @@
spin_lock_irqsave(&cm->reg_lock, flags);
snd_cmipci_set_bit(cm, CM_REG_LEGACY_CTRL, CM_NXCHG);
+ snd_cmipci_set_bit(cm, CM_REG_MISC_CTRL, CM_XCHGDAC);
if (channels > 4) {
snd_cmipci_clear_bit(cm, CM_REG_CHFORMAT, CM_CHB3D);
snd_cmipci_set_bit(cm, CM_REG_CHFORMAT, CM_CHB3D5C);
@@ -749,6 +750,7 @@
snd_cmipci_clear_bit(cm, CM_REG_CHFORMAT, CM_CHB3D5C);
snd_cmipci_clear_bit(cm, CM_REG_LEGACY_CTRL, CM_CHB3D6C);
snd_cmipci_clear_bit(cm, CM_REG_MISC_CTRL, CM_ENCENTER);
+ snd_cmipci_clear_bit(cm, CM_REG_MISC_CTRL, CM_XCHGDAC);
spin_unlock_irqrestore(&cm->reg_lock, flags);
}
}
@@ -2671,11 +2673,14 @@
/* both for CM8338/8738 */
static snd_kcontrol_new_t snd_cmipci_mixer_switches[] __devinitdata = {
- DEFINE_MIXER_SWITCH("Exchange DAC", exchange_dac),
DEFINE_MIXER_SWITCH("Four Channel Mode", fourch),
DEFINE_MIXER_SWITCH("Line-In As Rear", line_rear),
};
+/* for non-multichannel chips */
+static snd_kcontrol_new_t snd_cmipci_nomulti_switch __devinitdata =
+DEFINE_MIXER_SWITCH("Exchange DAC", exchange_dac);
+
/* only for CM8738 */
static snd_kcontrol_new_t snd_cmipci_8738_mixer_switches[] __devinitdata = {
#if 0 /* controlled in pcm device */
@@ -2748,6 +2753,11 @@
sw = snd_cmipci_mixer_switches;
for (idx = 0; idx < num_controls(snd_cmipci_mixer_switches); idx++, sw++) {
err = snd_ctl_add(cm->card, snd_ctl_new1(sw, cm));
+ if (err < 0)
+ return err;
+ }
+ if (! cm->can_multi_ch) {
+ err = snd_ctl_add(cm->card, snd_ctl_new1(&snd_cmipci_nomulti_switch,
cm));
if (err < 0)
return err;
}
---
This SF.Net email sponsored by: ApacheCon 2003,
16-19 November in Las Vegas. Learn firsthand the latest
developments in Apache, PHP, Perl, XML, Java, MySQL,
WebDAV, and more! http://www.apachecon.com/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/rme9652 hdsp.c,1.47,1.48
Update of /cvsroot/alsa/alsa-kernel/pci/rme9652
In directory sc8-pr-cvs1:/tmp/cvs-serv23391
Modified Files:
hdsp.c
Log Message:
Thomas Charbonnel <[EMAIL PROTECTED]>:
The attached patch at last fixes the long lasting firmware loading error
after boot, and includes a small cosmetic fix for H9632 cards (fixes
SPDIF external rate reporting in /proc/asound/cardX/hdsp and amixer
outputs).
Index: hdsp.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/rme9652/hdsp.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- hdsp.c 7 Nov 2003 18:25:54 - 1.47
+++ hdsp.c 7 Nov 2003 18:42:59 - 1.48
@@ -694,6 +694,13 @@
return -EIO;
}
}
+
+ if ((1000 / HZ) < 3000) {
+ set_current_state(TASK_UNINTERRUPTIBLE);
+ schedule_timeout((3000 * HZ + 999) / 1000);
+ } else {
+ mdelay(3000);
+ }
if (hdsp_fifo_wait (hdsp, 0, HDSP_LONG_WAIT)) {
snd_printk ("timeout at end of firmware loading\n");
@@ -708,12 +715,6 @@
hdsp_write (hdsp, HDSP_control2Reg, hdsp->control2_register);
snd_printk ("finished firmware loading\n");
- if ((1000 / HZ) < 3000) {
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout((3000 * HZ + 999) / 1000);
- } else {
- mdelay(3000);
- }
}
if (hdsp->state & HDSP_InitializationComplete) {
snd_printk("firmware loaded from cache, restoring defaults\n");
@@ -1882,10 +1883,12 @@
static int snd_hdsp_info_spdif_sample_rate(snd_kcontrol_t *kcontrol,
snd_ctl_elem_info_t * uinfo)
{
- static char *texts[] = {"32000", "44100", "48000", "64000", "88200", "96000",
"None"};
+ static char *texts[] = {"32000", "44100", "48000", "64000", "88200", "96000",
"None", "128000", "176400", "192000"};
+ hdsp_t *hdsp = _snd_kcontrol_chip(kcontrol);
+
uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
uinfo->count = 1;
- uinfo->value.enumerated.items = 7 ;
+ uinfo->value.enumerated.items = (hdsp->io_type == H9632) ? 10 : 7;
if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
@@ -1915,6 +1918,15 @@
case 96000:
ucontrol->value.enumerated.item[0] = 5;
break;
+ case 128000:
+ ucontrol->value.enumerated.item[0] = 7;
+ break;
+ case 176400:
+ ucontrol->value.enumerated.item[0] = 8;
+ break;
+ case 192000:
+ ucontrol->value.enumerated.item[0] = 9;
+ break;
default:
ucontrol->value.enumerated.item[0] = 6;
}
@@ -3534,7 +3546,7 @@
tmp = "-12 dB";
break;
}
- snd_iprintf(buffer, "Phone Gain : %s\n", tmp);
+ snd_iprintf(buffer, "Phones Gain : %s\n", tmp);
snd_iprintf(buffer, "XLR Breakout Cable : %s\n",
hdsp_xlr_breakout_cable(hdsp) ? "yes" : "no");
---
This SF.Net email sponsored by: ApacheCon 2003,
16-19 November in Las Vegas. Learn firsthand the latest
developments in Apache, PHP, Perl, XML, Java, MySQL,
WebDAV, and more! http://www.apachecon.com/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/rme9652 hdsp.c,1.46,1.47
Update of /cvsroot/alsa/alsa-kernel/pci/rme9652
In directory sc8-pr-cvs1:/tmp/cvs-serv20235
Modified Files:
hdsp.c
Log Message:
Thomas Charbonnel <[EMAIL PROTECTED]>:
The attached patch fixes matrix mixer and metering problems spotted by
Pentti Ala-Vannesluoma for H9632 cards and gcc 2.9x compile errors
reported by Martin Langer.
Index: hdsp.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/rme9652/hdsp.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- hdsp.c 3 Nov 2003 18:24:53 - 1.46
+++ hdsp.c 7 Nov 2003 18:25:54 - 1.47
@@ -454,6 +454,7 @@
unsigned shortstate; /* stores state bits */
u32 firmware_cache[24413]; /* this helps recover from
accidental iobox power failure */
size_tperiod_bytes; /* guess what this is */
+ unsigned char max_channels;
unsigned char qs_in_channels;/* quad speed mode for H9632 */
unsigned char ds_in_channels;
unsigned char ss_in_channels; /* different for
multiface/digiface */
@@ -1169,11 +1170,11 @@
/* set thru for all channels */
if (enable) {
- for (i = 0; i < HDSP_MAX_CHANNELS; i++) {
+ for (i = 0; i < hdsp->max_channels; i++) {
hdsp_write_gain (hdsp,
hdsp_input_to_output_key(hdsp,i,i), UNITY_GAIN);
}
} else {
- for (i = 0; i < HDSP_MAX_CHANNELS; i++) {
+ for (i = 0; i < hdsp->max_channels; i++) {
hdsp_write_gain (hdsp,
hdsp_input_to_output_key(hdsp,i,i), MINUS_INFINITY_GAIN);
}
}
@@ -1181,7 +1182,7 @@
} else {
int mapped_channel;
- snd_assert(channel < HDSP_MAX_CHANNELS, return);
+ snd_assert(channel < hdsp->max_channels, return);
mapped_channel = hdsp->channel_map[channel];
@@ -2902,9 +2903,9 @@
source = ucontrol->value.integer.value[0];
destination = ucontrol->value.integer.value[1];
-
- if (source > 25) {
- addr = hdsp_playback_to_output_key(hdsp,source-26,destination);
+
+ if (source >= hdsp->max_channels) {
+ addr =
hdsp_playback_to_output_key(hdsp,source-hdsp->max_channels,destination);
} else {
addr = hdsp_input_to_output_key(hdsp,source, destination);
}
@@ -2931,8 +2932,8 @@
source = ucontrol->value.integer.value[0];
destination = ucontrol->value.integer.value[1];
- if (source > 25) {
- addr = hdsp_playback_to_output_key(hdsp,source-26, destination);
+ if (source >= hdsp->max_channels) {
+ addr = hdsp_playback_to_output_key(hdsp,source-hdsp->max_channels,
destination);
} else {
addr = hdsp_input_to_output_key(hdsp,source, destination);
}
@@ -3177,7 +3178,7 @@
int snd_hdsp_create_controls(snd_card_t *card, hdsp_t *hdsp)
{
- unsigned int idx, limit;
+ unsigned int idx;
int err;
snd_kcontrol_t *kctl;
@@ -3676,12 +3677,13 @@
odd numbered channels to right, even to left.
*/
if (hdsp->io_type == H9632) {
- lineouts_base = 14;
+ /* this is the phones/analog output */
+ lineouts_base = 10;
} else {
lineouts_base = 26;
}
- for (i = 0; i < HDSP_MAX_CHANNELS; i++) {
+ for (i = 0; i < hdsp->max_channels; i++) {
if (i & 1) {
if (hdsp_write_gain (hdsp, hdsp_input_to_output_key
(hdsp, i, lineouts_base), UNITY_GAIN) ||
hdsp_write_gain (hdsp, hdsp_playback_to_output_key
(hdsp, i, lineouts_base), UNITY_GAIN)) {
@@ -3793,7 +3795,7 @@
{
int mapped_channel;
-snd_assert(channel >= 0 || channel < HDSP_MAX_CHANNELS, return NULL);
+snd_assert(channel >= 0 || channel < hdsp->max_channels, return NULL);
if ((mapped_channel = hdsp->channel_map[channel]) < 0) {
return NULL;
@@ -3963,7 +3965,7 @@
hdsp_t *hdsp = _snd_pcm_substream_chip(substream);
int mapped_channel;
- snd_assert(info->channel < HDSP_MAX_CHANNELS, return -EINVAL);
+ snd_assert(info->channel < hdsp->max_channels, return -EINVAL);
if ((mapped_channel = hdsp->channel_map[info->channel]) < 0) {
return -EINVAL;
@@ -4487,8 +4489,8 @@
static int snd_hdsp_hwdep_dummy_op(snd_hwdep_t *hw, struct file *file)
{
-/* we have nothing to initialize but the call is
[alsa-cvslog] CVS: alsa-kernel/include emu10k1.h,1.33,1.34
Update of /cvsroot/alsa/alsa-kernel/include In directory sc8-pr-cvs1:/tmp/cvs-serv13854/include Modified Files: emu10k1.h Log Message: Peter Zubaj <[EMAIL PROTECTED]>: - disable routing from AC97 line out to front speakers. - AC97 ADC is used only for Mic playback and recording - Philips ADC is used for other analog playback and recording (Analog Mix Playback Volume, Analog Mix Capture Volume) - removes unused AC97 controls (is phone used ???) Takashi Iwai <[EMAIL PROTECTED]>: - removed the duplicated IEC958 control on Dell's board. Index: emu10k1.h === RCS file: /cvsroot/alsa/alsa-kernel/include/emu10k1.h,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- emu10k1.h 17 Oct 2003 15:39:52 - 1.33 +++ emu10k1.h 7 Nov 2003 17:52:00 - 1.34 @@ -679,6 +679,9 @@ #define A_ADCIDX 0x63 #define A_ADCIDX_IDX 0x1063 +#define A_MICIDX 0x64 +#define A_MICIDX_IDX 0x1064 + #define FXIDX 0x65/* FX recording buffer index register */ #define FXIDX_MASK 0x /* 16-bit value */ #define FXIDX_IDX 0x1065 @@ -1201,8 +1204,8 @@ #define A_EXTIN_OPT_SPDIF_R 0x05/* right */ #define A_EXTIN_LINE2_L0x08/* audigy drive line2/mic2 - left */ #define A_EXTIN_LINE2_R0x09/* right */ -#define A_EXTIN_RCA_SPDIF_L 0x0a/* audigy drive RCA SPDIF - left */ -#define A_EXTIN_RCA_SPDIF_R 0x0b/* right */ +#define A_EXTIN_ADC_L 0x0a/* Philips ADC - left */ +#define A_EXTIN_ADC_R 0x0b/* right */ #define A_EXTIN_AUX2_L 0x0c/* audigy drive aux2 - left */ #define A_EXTIN_AUX2_R 0x0d/* - right */ @@ -1227,6 +1230,7 @@ #define A_EXTOUT_AC97_R0x11/* right */ #define A_EXTOUT_ADC_CAP_L 0x16/* ADC capture buffer left */ #define A_EXTOUT_ADC_CAP_R 0x17/*right */ +#define A_EXTOUT_MIC_CAP 0x18/* Mic capture buffer */ /* Audigy constants */ #define A_C_ 0xc0 --- This SF.Net email sponsored by: ApacheCon 2003, 16-19 November in Las Vegas. Learn firsthand the latest developments in Apache, PHP, Perl, XML, Java, MySQL, WebDAV, and more! http://www.apachecon.com/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/pci/emu10k1 emu10k1_main.c,1.25,1.26 emufx.c,1.43,1.44 emumixer.c,1.18,1.19 emupcm.c,1.22,1.23
Update of /cvsroot/alsa/alsa-kernel/pci/emu10k1
In directory sc8-pr-cvs1:/tmp/cvs-serv13854/pci/emu10k1
Modified Files:
emu10k1_main.c emufx.c emumixer.c emupcm.c
Log Message:
Peter Zubaj <[EMAIL PROTECTED]>:
- disable routing from AC97 line out to front speakers.
- AC97 ADC is used only for Mic playback and recording
- Philips ADC is used for other analog playback and recording
(Analog Mix Playback Volume, Analog Mix Capture Volume)
- removes unused AC97 controls (is phone used ???)
Takashi Iwai <[EMAIL PROTECTED]>:
- removed the duplicated IEC958 control on Dell's board.
Index: emu10k1_main.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emu10k1_main.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- emu10k1_main.c 25 Jul 2003 10:39:38 - 1.25
+++ emu10k1_main.c 7 Nov 2003 17:52:01 - 1.26
@@ -269,6 +269,9 @@
* This has to be done after init ALice3 I2SOut beyond 48KHz.
* So, sequence is important. */
outl(inl(emu->port + A_IOCFG) | 0x0040, emu->port + A_IOCFG);
+ } else {
+ /* Disable routing from AC97 line out to Front speakers */
+ outl(inl(emu->port + A_IOCFG) | 0x0080, emu->port + A_IOCFG);
}
}
Index: emufx.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emufx.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- emufx.c 21 Oct 2003 17:40:14 - 1.43
+++ emufx.c 7 Nov 2003 17:52:01 - 1.44
@@ -1308,10 +1308,10 @@
snd_emu10k1_init_stereo_control(&controls[nctl++], "Music Playback Volume",
gpr, 100);
gpr += 2;
- /* Wave Capture */
+ /* Wave (PCM) Capture */
A_OP(icode, &ptr, iMAC0, A_GPR(capture+0), A_C_, A_GPR(gpr),
A_FXBUS(FXBUS_PCM_LEFT));
A_OP(icode, &ptr, iMAC0, A_GPR(capture+1), A_C_, A_GPR(gpr+1),
A_FXBUS(FXBUS_PCM_RIGHT));
- snd_emu10k1_init_stereo_control(&controls[nctl++], "Wave Capture Volume", gpr,
0);
+ snd_emu10k1_init_stereo_control(&controls[nctl++], "PCM Capture Volume", gpr,
0);
gpr += 2;
/* Music Capture */
@@ -1326,17 +1326,20 @@
#define A_ADD_VOLUME_IN(var,vol,input) \
A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))
- /* AC'97 Playback Volume */
+ /* AC'97 Playback Volume - used only for mic */
A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_AC97_L);
A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_AC97_R);
- snd_emu10k1_init_stereo_control(&controls[nctl++], "AC97 Playback Volume",
gpr, 100);
+ snd_emu10k1_init_stereo_control(&controls[nctl++], "AMic Playback Volume",
gpr, 0);
gpr += 2;
- /* AC'97 Capture Volume */
+ /* AC'97 Capture Volume - used only for mic */
A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_AC97_L);
A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_AC97_R);
- snd_emu10k1_init_stereo_control(&controls[nctl++], "AC97 Capture Volume", gpr,
100);
+ snd_emu10k1_init_stereo_control(&controls[nctl++], "Mic Capture Volume", gpr,
0);
gpr += 2;
+ /* mic capture buffer */
+ A_OP(icode, &ptr, iINTERP, A_EXTOUT(A_EXTOUT_MIC_CAP),
A_EXTIN(A_EXTIN_AC97_L), 0xcd, A_EXTIN(A_EXTIN_AC97_R));
+
/* Audigy CD Playback Volume */
A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_SPDIF_CD_L);
A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_SPDIF_CD_R);
@@ -1370,15 +1373,15 @@
snd_emu10k1_init_stereo_control(&controls[nctl++], "Line2 Capture Volume",
gpr, 0);
gpr += 2;
- /* RCA SPDIF Playback Volume */
- A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_RCA_SPDIF_L);
- A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_RCA_SPDIF_R);
- snd_emu10k1_init_stereo_control(&controls[nctl++], "IEC958 Coaxial Playback
Volume", gpr, 0);
- gpr += 2;
- /* RCA SPDIF Capture Volume */
- A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_RCA_SPDIF_L);
- A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_RCA_SPDIF_R);
- snd_emu10k1_init_stereo_control(&controls[nctl++], "IEC958 Coaxial Capture
Volume", gpr, 0);
+ /* Philips ADC Playback Volume */
+ A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_ADC_L);
+ A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_ADC_R);
+ snd_emu10k1_init_stereo_control(&controls[nctl++], "Analog Mix Playback
Volume", gpr, 0);
+ gpr += 2;
+ /* Philips ADC Capture Volume */
+ A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_ADC_L)
[alsa-cvslog] CVS: alsa-tools/hdspmixer NEWS,1.1,1.2 configure.in,1.2,1.3
Update of /cvsroot/alsa/alsa-tools/hdspmixer In directory sc8-pr-cvs1:/tmp/cvs-serv8357/hdspmixer Modified Files: NEWS configure.in Log Message: Thomas Charbonnel <[EMAIL PROTECTED]>: updated to version 1.4. Index: NEWS === RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/NEWS,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- NEWS28 Jul 2003 11:32:32 - 1.1 +++ NEWS3 Nov 2003 19:10:38 - 1.2 @@ -1,3 +1,16 @@ +Version 1.4 (01/11/2003): +* Adds support for H9632 cards + +Version 1.3 (no public release): +* Adds metering for H9652 cards +* Stops shipping unused pixmaps +* Shows stereo relationships in the mixer +* pixmap directory has been cleaned up + +Version 1.2 (no public release): +* Fixes a graphical bug for H9652 cards +* Changes FLTK detection scheme in configure + Version 1.1 (27/07/2003): * Fixes a typo for Digiface and H9652 cards in HDSPMixerSelector.cxx (caused a crash on startup) Index: configure.in === RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/configure.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- configure.in28 Jul 2003 12:02:25 - 1.2 +++ configure.in3 Nov 2003 19:10:38 - 1.3 @@ -1,5 +1,5 @@ AC_INIT(src/hdspmixer.cxx) -AM_INIT_AUTOMAKE(hdspmixer, 1.1) +AM_INIT_AUTOMAKE(hdspmixer, 1.4) AC_PROG_CXX AC_PROG_MAKE_SET @@ -51,9 +51,12 @@ AC_PATH_PROG(FLTK_CONFIG, fltk-config, no) if test "$FLTK_CONFIG" = "no"; then - AC_MSG_WARN(no fltk-config is found) +AC_MSG_ERROR(fltk-config is required) fi -LIBS="-s `fltk-config --ldflags` -lasound" -CXXFLAGS="`fltk-config --cxxflags` -fno-exceptions $ALSA_CFLAGS" +FLTK_CXXFLAGS="`$FLTK_CONFIG --cxxflags` -fno-exceptions" +FLTK_LIBS="`$FLTK_CONFIG --ldflags`" + +CXXFLAGS="$CXXFLAGS $ALSA_CFLAGS $FLTK_CXXFLAGS" +LDFLAGS="$LDFLAGS $ALSA_LIBS $FLTK_LIBS" AC_OUTPUT(Makefile src/Makefile pixmaps/Makefile) --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/hdspmixer/src HDSPMixerAbout.cxx,1.1,1.2 HDSPMixerAbout.h,1.1,1.2 HDSPMixerAboutText.cxx,1.1,1.2 HDSPMixerCard.cxx,1.1,1.2 HDSPMixerCard.h,1.1,1.2 HDSPMixerIOMixer.cxx,1.1,1.2 HDSPMixerIOMixer.h,1.1,1.2 HDSPMixerInputs.cxx,1.1,1.2 HDSPMixerInputs.h,1.1,1.2 HDSPMixerMeter.cxx,1.1,1.2 HDSPMixerOutput.cxx,1.1,1.2 HDSPMixerOutput.h,1.1,1.2 HDSPMixerOutputs.cxx,1.1,1.2 HDSPMixerOutputs.h,1.1,1.2 HDSPMixerPlaybacks.cxx,1.1,1.2 HDSPMixerPlaybacks.h,1.1,1.2 HDSPMixerPresets.cxx,1.1,1.2 HDSPMixerSelector.cxx,1.1,1.2 HDSPMixerSelector.h,1.1,1.2 HDSPMixerWindow.cxx,1.1,1.2 HDSPMixerWindow.h,1.1,1.2 hdspmixer.cxx,1.1,1.2 mappings.h,1.1,1.2 pixmaps.cxx,1.1,1.2 pixmaps.h,1.1,1.2
Update of /cvsroot/alsa/alsa-tools/hdspmixer/src
In directory sc8-pr-cvs1:/tmp/cvs-serv8357/hdspmixer/src
Modified Files:
HDSPMixerAbout.cxx HDSPMixerAbout.h HDSPMixerAboutText.cxx
HDSPMixerCard.cxx HDSPMixerCard.h HDSPMixerIOMixer.cxx
HDSPMixerIOMixer.h HDSPMixerInputs.cxx HDSPMixerInputs.h
HDSPMixerMeter.cxx HDSPMixerOutput.cxx HDSPMixerOutput.h
HDSPMixerOutputs.cxx HDSPMixerOutputs.h HDSPMixerPlaybacks.cxx
HDSPMixerPlaybacks.h HDSPMixerPresets.cxx
HDSPMixerSelector.cxx HDSPMixerSelector.h HDSPMixerWindow.cxx
HDSPMixerWindow.h hdspmixer.cxx mappings.h pixmaps.cxx
pixmaps.h
Log Message:
Thomas Charbonnel <[EMAIL PROTECTED]>:
updated to version 1.4.
Index: HDSPMixerAbout.cxx
===
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/src/HDSPMixerAbout.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HDSPMixerAbout.cxx 28 Jul 2003 11:32:32 - 1.1
+++ HDSPMixerAbout.cxx 3 Nov 2003 19:10:39 - 1.2
@@ -25,8 +25,17 @@
HDSPMixerAbout::HDSPMixerAbout(int w, int h, char *label, HDSPMixerWindow
*win):Fl_Double_Window(w, h, label)
{
basew = win;
-text = new HDSPMixerAboutText(0,0,w,h);
+text = new HDSPMixerAboutText(10,10,w-20,h-20);
end();
set_modal();
}
+int HDSPMixerAbout::handle(int e) {
+switch (e) {
+case FL_PUSH:
+ hide();
+ return 1;
+default:
+ return Fl_Window::handle(e);
+}
+}
Index: HDSPMixerAbout.h
===
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/src/HDSPMixerAbout.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HDSPMixerAbout.h28 Jul 2003 11:32:32 - 1.1
+++ HDSPMixerAbout.h3 Nov 2003 19:10:39 - 1.2
@@ -37,6 +37,7 @@
HDSPMixerWindow *basew;
public:
HDSPMixerAbout(int w, int h, char *label, HDSPMixerWindow *w);
+int handle(int e);
};
#endif
Index: HDSPMixerAboutText.cxx
===
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/src/HDSPMixerAboutText.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HDSPMixerAboutText.cxx 28 Jul 2003 11:32:32 - 1.1
+++ HDSPMixerAboutText.cxx 3 Nov 2003 19:10:39 - 1.2
@@ -23,7 +23,7 @@
HDSPMixerAboutText::HDSPMixerAboutText(int x, int y, int w, int h):Fl_Widget(x, y, w,
h, "About Text")
{
- text = "HDSPMixer (C) 2003 Thomas Charbonnel \n\n"
+ text = "HDSPMixer " VERSION " (C) 2003 Thomas Charbonnel
\n\n"
"Bitmaps by Ralf Brunner\n"
"Many thanks to Martin Björnsen, Matthias Carstens and Paul Davis\n\n"
"This Program is free software; you can redistribute it and/or modify\n"
Index: HDSPMixerCard.cxx
===
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/src/HDSPMixerCard.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HDSPMixerCard.cxx 28 Jul 2003 11:32:32 - 1.1
+++ HDSPMixerCard.cxx 3 Nov 2003 19:10:39 - 1.2
@@ -57,12 +57,14 @@
clock_value = snd_ctl_elem_value_get_enumerated(elemval, 0);
if (clock_value == 0) {
int new_speed = card->getAutosyncSpeed();
- if (new_speed >= 0 && new_speed != card->double_speed)
card->setMode(new_speed);
+ if (new_speed >= 0 && new_speed != card->speed_mode)
card->setMode(new_speed);
}
- if (clock_value > 3 && !card->double_speed) {
+ if (clock_value > 3 && clock_value < 7 && card->speed_mode != 1) {
card->setMode(1);
- } else if (clock_value < 4 && card->double_speed) {
+ } else if (clock_value < 4 && card->speed_mode != 0) {
card->setMode(0);
+ } else if (clock_value > 6 && card->speed_mode != 2) {
+ card->setMode(2);
}
}
snd_ctl_event_clear(event);
@@ -103,7 +105,9 @@
if (external_rate > 2 && external_rate < 6) {
return 1;
-} else if (external_rate < 2) {
+} else if (external_rate > 6) {
+ return 2;
+} else if (external_rate <= 2) {
return 0;
}
}
@@ -143,9 +147,13 @@
case 4:
case 5:
case 6:
- /* SR > 48000 kHz - double speed */
+ /* SR > 48000 Hz - double speed */
return 1;
- break;
+case 7:
+case 8:
+case 9:
+ /* SR > 96000 Hz - quad speed */
+ return 2;
default:
/* Should never happen */
return 0;
@@ -158,8 +166,11 @@
type = cardtype;
card_id = id;
snprintf(name, 6, "hw:%i", card_id);
-double_speed = getSpeed();
-if (double_speed < 0) {
+h9632_aeb.aebi = 0;
+h9632_aeb.aebo = 0;
+if (type == H9632) getAeb(
[alsa-cvslog] CVS: alsa-tools/hdsploader INSTALL,1.1,1.2 configure.in,1.3,1.4 hdsploader.c,1.3,1.4
Update of /cvsroot/alsa/alsa-tools/hdsploader In directory sc8-pr-cvs1:/tmp/cvs-serv8174/hdsploader Modified Files: INSTALL configure.in hdsploader.c Log Message: Thomas Charbonnel <[EMAIL PROTECTED]>: updated to version 1.2. Index: INSTALL === RCS file: /cvsroot/alsa/alsa-tools/hdsploader/INSTALL,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- INSTALL 7 Apr 2003 15:37:21 - 1.1 +++ INSTALL 3 Nov 2003 19:09:55 - 1.2 @@ -1,3 +1,9 @@ +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software +Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + Basic Installation == @@ -8,20 +14,27 @@ those values to create a `Makefile' in each directory of the package. It may also create one or more `.h' files containing system-dependent definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, a file -`config.cache' that saves the results of its tests to speed up -reconfiguring, and a file `config.log' containing compiler output -(useful mainly for debugging `configure'). +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. (Caching is +disabled by default to prevent problems with accidental use of stale +cache files.) If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail diffs or instructions to the address given in the `README' so they can -be considered for the next release. If at some point `config.cache' -contains results you don't want to keep, you may remove or edit it. - - The file `configure.in' is used to create `configure' by a program -called `autoconf'. You only need `configure.in' if you want to change -it or regenerate `configure' using a newer version of `autoconf'. +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You only need +`configure.ac' if you want to change it or regenerate `configure' using +a newer version of `autoconf'. The simplest way to compile this package is: @@ -55,14 +68,16 @@ = Some systems require unusual options for compilation or linking that -the `configure' script does not know about. You can give `configure' -initial values for variables by setting them in the environment. Using -a Bourne-compatible shell, you can do that on the command line like -this: - CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. -Or on systems that have the `env' program, you can do it like this: - env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + + *Note Defining Variables::, for more details. Compiling For Multiple Architectures @@ -75,11 +90,11 @@ the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - If you have to use a `make' that does not supports the `VPATH' -variable, you have to compile the package for one architecture at a time -in the source code directory. After you have installed the package for -one architecture, use `make distclean' before reconfiguring for another -architecture. + If you have to use a `make' that does not support the `VPATH' +variable, you have to compile the package for one architecture at a +time in the source code directory. After you have installed the +package for one architecture, use `make distclean' before reconfiguring +for another architecture. Installation Names == @@ -122,22 +137,32 @@ Specifying the System Type == - There may be some features `configure' can not figure out -automatically, but needs to determine by the type of host the package -will run on. Usually `configure' can figure that out, but if it prints -a message saying it can not guess the host type, give it the -`--host=TYPE' option. TYPE can either be a short name for the syste
[alsa-cvslog] CVS: alsa-tools/hdspconf/src HC_Aeb.cxx,NONE,1.1 HC_Aeb.h,NONE,1.1 HC_BreakoutCable.cxx,NONE,1.1 HC_BreakoutCable.h,NONE,1.1 HC_InputLevel.cxx,NONE,1.1 HC_InputLevel.h,NONE,1.1 HC_OutputLevel.cxx,NONE,1.1 HC_OutputLevel.h,NONE,1.1 HC_Phones.cxx,NONE,1.1 HC_Phones.h,NONE,1.1 pixmaps.cxx,NONE,1.1 pixmaps.h,NONE,1.1 HC_AboutText.cxx,1.1,1.2 HC_AutoSyncRef.cxx,1.1,1.2 HC_CardPane.cxx,1.1,1.2 HC_CardPane.h,1.1,1.2 HC_ClockSource.cxx,1.1,1.2 HC_ClockSource.h,1.1,1.2 HC_PrefSyncRef.cxx,1.1,1.2 HC_PrefSyncRef.h,1.1,1.2 HC_SpdifFreq.cxx,1.1,1.2 HC_SpdifIn.cxx,1.1,1.2 HC_SpdifIn.h,1.1,1.2 HC_SyncCheck.cxx,1.1,1.2 HC_SyncCheck.h,1.1,1.2 HC_SystemClock.cxx,1.1,1.2 HC_XpmRenderer.h,1.1,1.2 Makefile.am,1.1,1.2 defines.h,1.1,1.2 hdspconf.cxx,1.2,1.3
Update of /cvsroot/alsa/alsa-tools/hdspconf/src
In directory sc8-pr-cvs1:/tmp/cvs-serv8037/hdspconf/src
Modified Files:
HC_AboutText.cxx HC_AutoSyncRef.cxx HC_CardPane.cxx
HC_CardPane.h HC_ClockSource.cxx HC_ClockSource.h
HC_PrefSyncRef.cxx HC_PrefSyncRef.h HC_SpdifFreq.cxx
HC_SpdifIn.cxx HC_SpdifIn.h HC_SyncCheck.cxx HC_SyncCheck.h
HC_SystemClock.cxx HC_XpmRenderer.h Makefile.am defines.h
hdspconf.cxx
Added Files:
HC_Aeb.cxx HC_Aeb.h HC_BreakoutCable.cxx HC_BreakoutCable.h
HC_InputLevel.cxx HC_InputLevel.h HC_OutputLevel.cxx
HC_OutputLevel.h HC_Phones.cxx HC_Phones.h pixmaps.cxx
pixmaps.h
Log Message:
Thomas Charbonnel <[EMAIL PROTECTED]>:
updated to version 1.2.
--- NEW FILE: HC_Aeb.cxx ---
/*
* HDSPConf
*
* Copyright (C) 2003 Thomas Charbonnel ([EMAIL PROTECTED])
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#pragma implementation
#include "HC_Aeb.h"
static void setAebStatus(char *ctl_name, int val, int card_index)
{
int err;
char card_name[6];
snd_ctl_elem_value_t *ctl;
snd_ctl_elem_id_t *id;
snd_ctl_t *handle;
snprintf(card_name, 6, "hw:%i", card_index);
snd_ctl_elem_value_alloca(&ctl);
snd_ctl_elem_id_alloca(&id);
snd_ctl_elem_id_set_name(id, ctl_name);
snd_ctl_elem_id_set_numid(id, 0);
snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_HWDEP);
snd_ctl_elem_id_set_device(id, 0);
snd_ctl_elem_id_set_subdevice(id, 0);
snd_ctl_elem_id_set_index(id, 0);
snd_ctl_elem_value_set_id(ctl, id);
snd_ctl_elem_value_set_integer(ctl, 0, val);
if ((err = snd_ctl_open(&handle, card_name, SND_CTL_NONBLOCK)) < 0) {
fprintf(stderr, "Error opening ctl interface on card %s\n", card_name);
return;
}
if ((err = snd_ctl_elem_write(handle, ctl)) < 0) {
fprintf(stderr, "Error accessing ctl interface on card %s\n", card_name);
return;
}
snd_ctl_close(handle);
}
void adat_internal_cb(Fl_Widget *w, void *arg)
{
setAebStatus("Analog Extension Board", ((Fl_Check_Button *)w)->value(),
((HC_CardPane *)arg)->alsa_index);
}
HC_Aeb::HC_Aeb(int x, int y, int w, int h):Fl_Group(x, y, w, h, "AEB")
{
int i = 0;
lock = 0;
box(FL_ENGRAVED_FRAME);
label("AEB");
labelsize(10);
align(FL_ALIGN_TOP|FL_ALIGN_LEFT);
adat_internal = new Fl_Check_Button(x+15, y, w-30, 20, "Adat1 Int.");
adat_internal->labelsize(10);
adat_internal->callback(adat_internal_cb, (void *)parent());
end();
}
void HC_Aeb::setAdatInternal(unsigned char val)
{
if (val != adat_internal->value()) {
adat_internal->value(val);
}
}
int HC_Aeb::handle(int e)
{
switch (e) {
case FL_PUSH:
lock = 1;
break;
case FL_RELEASE:
lock = 0;
break;
default:
return Fl_Group::handle(e);
}
return Fl_Group::handle(e);
}
--- NEW FILE: HC_Aeb.h ---
/*
* HDSPConf
*
* Copyright (C) 2003 Thomas Charbonnel ([EMAIL PROTECTED])
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#pragma interface
#ifndef HC_AEB_H
#define HC_AEB_H
#include
#include
#include
#include "HC_CardPane.h"
class HC_CardPane;
class HC_Aeb:public Fl_Group
{
public:
HC_Aeb(int x, int y, int w, int h);
Fl_Check_Button *adat_internal;
void setAdatInternal(unsigned char val);
int handle(int e);
int lock;
};
#endif
--- NEW FILE: HC_BreakoutCable.cxx ---
/*
* HDSPConf
*
* Copyright (C) 2003 Thomas Charbonnel ([EMAIL PROTECTED])
*
[alsa-cvslog] CVS: alsa-tools/hdspconf/pixmaps alsalogo.xpm,1.1,1.2 lad_banner.xpm,1.1,1.2 rme.xpm,1.1,1.2
Update of /cvsroot/alsa/alsa-tools/hdspconf/pixmaps
In directory sc8-pr-cvs1:/tmp/cvs-serv8037/hdspconf/pixmaps
Modified Files:
alsalogo.xpm lad_banner.xpm rme.xpm
Log Message:
Thomas Charbonnel <[EMAIL PROTECTED]>:
updated to version 1.2.
Index: alsalogo.xpm
===
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/pixmaps/alsalogo.xpm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alsalogo.xpm2 Jul 2003 10:21:11 - 1.1
+++ alsalogo.xpm3 Nov 2003 19:09:32 - 1.2
@@ -1,5 +1,5 @@
/* XPM */
-static char * alsalogo_xpm[] = {
+char * alsalogo_xpm[] = {
"50 50 398 2",
" c None",
". c #C0C0C0",
Index: lad_banner.xpm
===
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/pixmaps/lad_banner.xpm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lad_banner.xpm 2 Jul 2003 10:21:11 - 1.1
+++ lad_banner.xpm 3 Nov 2003 19:09:32 - 1.2
@@ -1,5 +1,5 @@
/* XPM */
-static char * lad_banner_xpm[] = {
+char * lad_banner_xpm[] = {
"113 39 1833 2",
" c None",
". c #C0C0C0",
Index: rme.xpm
===
RCS file: /cvsroot/alsa/alsa-tools/hdspconf/pixmaps/rme.xpm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rme.xpm 2 Jul 2003 10:21:11 - 1.1
+++ rme.xpm 3 Nov 2003 19:09:32 - 1.2
@@ -1,5 +1,5 @@
/* XPM */
-static char * rme_xpm[] = {
+char * rme_xpm[] = {
"113 35 2300 2",
" c None",
". c #030505",
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/hdspconf ChangeLog,1.1,1.2 README,1.1,1.2 configure.in,1.2,1.3
Update of /cvsroot/alsa/alsa-tools/hdspconf In directory sc8-pr-cvs1:/tmp/cvs-serv8037/hdspconf Modified Files: ChangeLog README configure.in Log Message: Thomas Charbonnel <[EMAIL PROTECTED]>: updated to version 1.2. Index: ChangeLog === RCS file: /cvsroot/alsa/alsa-tools/hdspconf/ChangeLog,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ChangeLog 2 Jul 2003 10:21:11 - 1.1 +++ ChangeLog 3 Nov 2003 19:09:32 - 1.2 @@ -0,0 +1,2 @@ +Version 1.2 (01/11/2003) : +* added support for HDSP 9652 and HDSP 9632 specific features Index: README === RCS file: /cvsroot/alsa/alsa-tools/hdspconf/README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README 2 Jul 2003 10:21:11 - 1.1 +++ README 3 Nov 2003 19:09:32 - 1.2 @@ -1,2 +1,2 @@ -HDSPConfig is a GUI to control the Hammerfall HDSP Alsa Settings. +HDSPConf is a GUI to control the Hammerfall HDSP Alsa Settings. Up to four hdsp cards are supported. Index: configure.in === RCS file: /cvsroot/alsa/alsa-tools/hdspconf/configure.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- configure.in28 Jul 2003 12:58:10 - 1.2 +++ configure.in3 Nov 2003 19:09:32 - 1.3 @@ -1,5 +1,5 @@ AC_INIT(src/hdspconf.cxx) -AM_INIT_AUTOMAKE(hdspconf, 1.1) +AM_INIT_AUTOMAKE(hdspconf, 1.2) AC_PROG_CXX AC_PROG_MAKE_SET --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/ac3dec .cvsignore,1.5,1.6 configure.in,1.5,1.6
Update of /cvsroot/alsa/alsa-tools/ac3dec In directory sc8-pr-cvs1:/tmp/cvs-serv7577/ac3dec Modified Files: .cvsignore configure.in Log Message: - don't ignore autogen.sh (included in tarball). - removed the unnecessary host detection. Index: .cvsignore === RCS file: /cvsroot/alsa/alsa-tools/ac3dec/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 25 Mar 2003 17:34:29 - 1.5 +++ .cvsignore 3 Nov 2003 19:07:51 - 1.6 @@ -14,7 +14,6 @@ stamp-h.in ac3dec .deps -autogen.sh stamp-h confdefs.h depcomp Index: configure.in === RCS file: /cvsroot/alsa/alsa-tools/ac3dec/configure.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- configure.in31 Aug 2002 10:26:33 - 1.5 +++ configure.in3 Nov 2003 19:07:51 - 1.6 @@ -18,13 +18,13 @@ AM_PATH_ALSA(0.9.0) dnl Set the appropriate architecture define -case "$host" in -i?86-*) AC_DEFINE(__i386__, 1, [Using i386 architecture]);; -alpha*-*) AC_DEFINE(__alpha__, 1, [Using Alpha architecture]);; -sparc-*) AC_DEFINE(__sparc__, 1, [Using SPARC architecture]);; -ppc-*|powerpc-*) AC_DEFINE(__ppc__, 1, [Using PowerPC architecture]);; -ia64-*) AC_DEFINE(__ia64__, 1, [Using IA-64 architecture]);; -*) echo "$host is not currently supported by ac3dec"; exit 1;; -esac +dnl case "$host" in +dnl i?86-*) AC_DEFINE(__i386__, 1, [Using i386 architecture]);; +dnl alpha*-*) AC_DEFINE(__alpha__, 1, [Using Alpha architecture]);; +dnl sparc-*) AC_DEFINE(__sparc__, 1, [Using SPARC architecture]);; +dnl ppc-*|powerpc-*) AC_DEFINE(__ppc__, 1, [Using PowerPC architecture]);; +dnl ia64-*) AC_DEFINE(__ia64__, 1, [Using IA-64 architecture]);; +dnl *) echo "$host is not currently supported by ac3dec"; exit 1;; +dnl esac AC_OUTPUT(libac3/Makefile tools/Makefile test/Makefile Makefile ) --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! 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 hdsp.h,1.3,1.4
Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1:/tmp/cvs-serv31285/include
Modified Files:
hdsp.h
Log Message:
Thomas Charbonnel <[EMAIL PROTECTED]>:
- include support for hdsp 9632 cards and bugfixes for hdsp
9652 cards.
Index: hdsp.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/hdsp.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hdsp.h 25 Sep 2003 18:55:43 - 1.3
+++ hdsp.h 3 Nov 2003 18:24:53 - 1.4
@@ -25,17 +25,20 @@
Digiface,
Multiface,
H9652,
+ H9632,
Undefined,
} HDSP_IO_Type;
typedef struct _snd_hdsp_peak_rms hdsp_peak_rms_t;
struct _snd_hdsp_peak_rms {
- unsigned int playback_peaks[26];
unsigned int input_peaks[26];
+ unsigned int playback_peaks[26];
unsigned int output_peaks[28];
- unsigned long long playback_rms[26];
unsigned long long input_rms[26];
+ unsigned long long playback_rms[26];
+ /* These are only used for H96xx cards */
+ unsigned long long output_rms[26];
};
#define SNDRV_HDSP_IOCTL_GET_PEAK_RMS _IOR('H', 0x40, hdsp_peak_rms_t)
@@ -61,6 +64,11 @@
unsigned char autosync_ref;
unsigned char line_out;
unsigned char passthru;
+ unsigned char da_gain;
+ unsigned char ad_gain;
+ unsigned char phone_gain;
+ unsigned char xlr_breakout_cable;
+ unsigned char analog_extension_board;
};
#define SNDRV_HDSP_IOCTL_GET_CONFIG_INFO _IOR('H', 0x41, hdsp_config_info_t)
@@ -89,5 +97,14 @@
};
#define SNDRV_HDSP_IOCTL_GET_MIXER _IOR('H', 0x44, hdsp_mixer_t)
+
+typedef struct _snd_hdsp_9632_aeb hdsp_9632_aeb_t;
+
+struct _snd_hdsp_9632_aeb {
+ int aebi;
+ int aebo;
+};
+
+#define SNDRV_HDSP_IOCTL_GET_9632_AEB _IOR('H', 0x45, hdsp_9632_aeb_t)
#endif /* __SOUND_HDSP_H */
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/envy24control envy24control.c,1.19,1.20 hardware.c,1.11,1.12
Update of /cvsroot/alsa/alsa-tools/envy24control
In directory sc8-pr-cvs1:/tmp/cvs-serv30516
Modified Files:
envy24control.c hardware.c
Log Message:
Daniel Ankers <[EMAIL PROTECTED]>:
- Fixes a minor bug in the previous patch in hardware.c
- Adds friendly names to the analog volume controls for DMX 6Fire users
- Automatically sets the number of I/O channels for DMX 6Fire users
Index: envy24control.c
===
RCS file: /cvsroot/alsa/alsa-tools/envy24control/envy24control.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- envy24control.c 30 Oct 2003 15:09:04 - 1.19
+++ envy24control.c 3 Nov 2003 18:20:53 - 1.20
@@ -387,6 +387,16 @@
"H/W In 8"
};
+ if (card_eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE)
+ {
+ table[2] = "CD In L";
+table[3] = "CD In R";
+table[4] = "Line In L";
+table[5] = "Line In R";
+table[6] = "Phono/Mic In L";
+table[7] = "Phono/Mic In R";
+ }
+
if (stream <= 8) {
sprintf(str, "H/W Out %i (%s)", stream, stream & 1 ? "L" : "R");
} else if (stream == 9) {
@@ -1438,6 +1448,23 @@
GtkWidget *scrolledwindow;
GtkWidget *viewport;
int i, j;
+ static char* dmx6fire_inputs[6] = {
+ "CD In (L)",
+ "CD In (R)",
+ "Line In (L)",
+ "Line In (R)",
+ "Phono In (L)",
+ "Phono In (R)"
+ };
+ static char* dmx6fire_outputs[6] = {
+ "Front (L)",
+ "Front (R)",
+ "Rear (L)",
+ "Rear (R)",
+ "Centre",
+ "LFE"
+ };
+
scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_show(scrolledwindow);
@@ -1474,6 +1501,13 @@
gtk_container_add(GTK_CONTAINER(frame), vbox);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
+ /* Add friendly labels for DMX 6Fires */
+ if((card_eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE) && (i < 6)){
+ label = gtk_label_new(dmx6fire_outputs[i]);
+ gtk_widget_show(label);
+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 6);
+ }
+
adj = gtk_adjustment_new(0, -(envy_dac_max()), 0, 1, 16, 0);
av_dac_volume_adj[i] = adj;
vscale = gtk_vscale_new(GTK_ADJUSTMENT(adj));
@@ -1523,6 +1557,13 @@
gtk_container_add(GTK_CONTAINER(frame), vbox);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
+ /* Add friendly labels for DMX 6Fires */
+ if((card_eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE) && (i < 6)){
+ label = gtk_label_new(dmx6fire_inputs[i]);
+ gtk_widget_show(label);
+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 6);
+ }
+
adj = gtk_adjustment_new(0, -127, 0, 1, 16, 0);
av_adc_volume_adj[i] = adj;
vscale = gtk_vscale_new(GTK_ADJUSTMENT(adj));
@@ -1572,6 +1613,13 @@
gtk_container_add(GTK_CONTAINER(frame), vbox);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
+ /* Add friendly labels for DMX 6Fires */
+ if((card_eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE) && (i < 6)){
+ label = gtk_label_new(dmx6fire_inputs[i]);
+ gtk_widget_show(label);
+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 6);
+ }
+
adj = gtk_adjustment_new(0, -36, 0, 1, 16, 0);
av_ipga_volume_adj[i] = adj;
vscale = gtk_vscale_new(GTK_ADJUSTMENT(adj));
@@ -1612,6 +1660,8 @@
int npfds;
struct pollfd *pfds;
int page;
+ int output_channels_set = 0;
+ int input_channels_set = 0;
static struct option long_options[] = {
{"device", 1, 0, 'D'},
{"card", 1, 0, 'c'},
@@ -1652,12 +1702,14 @@
fprintf(stderr, "envy24control: must have 0-8
inputs\n");
exit(1);
}
+ input_channels_set = 1;
break;
case 'o':
output_channels = atoi(optarg);
if (output_channels < 0 || output_channels > 10) {
fprintf(stderr, "envy24control: must have 0-10
outputs\n");
exit(1);
+ output_channels_set = 1;
}
break;
ca
[alsa-cvslog] CVS: alsa-driver/usb/us428 usbus428.c,1.6,1.7 usbus428.h,1.2,1.3 usbus428audio.c,1.6,1.7
Update of /cvsroot/alsa/alsa-driver/usb/us428
In directory sc8-pr-cvs1:/tmp/cvs-serv29007
Modified Files:
usbus428.c usbus428.h usbus428audio.c
Log Message:
- added 24Bit in 3Bytes (S24_3LE) support.
Index: usbus428.c
===
RCS file: /cvsroot/alsa/alsa-driver/usb/us428/usbus428.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- usbus428.c 24 Oct 2003 13:58:47 - 1.6
+++ usbus428.c 3 Nov 2003 18:13:40 - 1.7
@@ -1,6 +1,11 @@
/*
* usbus428.c - ALSA USB US-428 Driver
*
+2003-11-03 Karsten Wiese
+ Version 0.3:
+ 24Bit support.
+ "arecord -D hw:1 -c 2 -r 48000 -M -f S24_3LE|aplay -D hw:1 -c 2 -r 48000 -M -f
S24_3LE" works.
+
2003-08-22 Karsten Wiese
Version 0.0.8:
Removed EZUSB Firmware. First Stage Firmwaredownload is now done by
tascam-firmware downloader.
@@ -75,7 +80,7 @@
MODULE_AUTHOR("Karsten Wiese <[EMAIL PROTECTED]>");
-MODULE_DESCRIPTION("TASCAM "NAME_ALLCAPS" Version 0.2");
+MODULE_DESCRIPTION("TASCAM "NAME_ALLCAPS" Version 0.3");
MODULE_LICENSE("GPL");
MODULE_CLASSES("{sound}");
MODULE_DEVICES("{{TASCAM(0x1604), "NAME_ALLCAPS"(0x8001) }}");
@@ -226,18 +231,14 @@
{
int dev;
snd_card_t* card;
-
for (dev = 0; dev < SNDRV_CARDS; ++dev)
if (enable[dev] && !snd_us428_card_used[dev])
break;
-
if (dev >= SNDRV_CARDS)
return NULL;
-
card = snd_card_new(index[dev], id[dev], THIS_MODULE, sizeof(us428dev_t));
if (!card)
return NULL;
-
snd_us428_card_used[us428(card)->chip.index = dev] = 1;
card->private_free = snd_us428_card_private_free;
us428(card)->chip.dev = device;
@@ -245,7 +246,6 @@
init_MUTEX (&us428(card)->open_mutex);
INIT_LIST_HEAD(&us428(card)->chip.midi_list);
us428(card)->Seq04Complete = 1;
- us428(card)->stride = 4;// 16 Bit
strcpy(card->driver, "USB "NAME_ALLCAPS"");
sprintf(card->shortname, "TASCAM "NAME_ALLCAPS"");
sprintf(card->longname, "%s (%x:%x if %d at %03d/%03d)",
@@ -258,25 +258,15 @@
}
-static void* snd_us428_usb_probe(struct usb_device* device,
-struct usb_interface *intf,
-const struct usb_device_id* device_id)
+static void* snd_us428_usb_probe(struct usb_device* device, struct usb_interface
*intf, const struct usb_device_id* device_id)
{
int err;
snd_card_t* card;
-
- /* See if the device offered us matches what we can accept */
- if (device->descriptor.idVendor != 0x1604 || device->descriptor.idProduct !=
0x8001)
+ if (device->descriptor.idVendor != 0x1604 || device->descriptor.idProduct !=
0x8001 ||
+ !(card = snd_us428_create_card(device)))
return 0;
-
- if (!(card = snd_us428_create_card(device)))
- return 0;
-
- if ((err = snd_usX2Y_hwdep_new(card, device)) < 0) {
- snd_card_free(card);
- return 0;
- }
- if ((err = snd_card_register(card)) < 0) {
+ if ((err = snd_usX2Y_hwdep_new(card, device)) < 0 ||
+ (err = snd_card_register(card)) < 0) {
snd_card_free(card);
return 0;
}
@@ -287,8 +277,7 @@
/*
* new 2.5 USB kernel API
*/
-static int snd_us428_probe(struct usb_interface *intf,
- const struct usb_device_id *id)
+static int snd_us428_probe(struct usb_interface *intf, const struct usb_device_id *id)
{
void *chip;
chip = snd_us428_usb_probe(interface_to_usbdev(intf), intf, id);
@@ -308,8 +297,7 @@
/*
* 2.4 USB kernel API
*/
-static void *snd_us428_probe(struct usb_device *dev, unsigned int ifnum,
-const struct usb_device_id *id)
+static void *snd_us428_probe(struct usb_device *dev, unsigned int ifnum, const struct
usb_device_id *id)
{
return snd_us428_usb_probe(dev, usb_ifnum_to_if(dev, ifnum), id);
}
Index: usbus428.h
===
RCS file: /cvsroot/alsa/alsa-driver/usb/us428/usbus428.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- usbus428.h 24 Sep 2003 16:45:10 - 1.2
+++ usbus428.h 3 Nov 2003 18:13:40 - 1.3
@@ -14,12 +14,12 @@
#define URBS_AsyncSeq 10
#define URB_DataLen_AsyncSeq 32
-typedef struct{
+typedef struct {
urb_t* urb[URBS_AsyncSeq];
char* buffer;
} snd_us428_AsyncSeq_t;
-typedef struct{
+typedef struct {
int submitted;
int len;
urb_t* urb[0];
@@ -38,7 +38,8 @@
int Seq04Complete;
wait_queue_head_t In04WaitQueue;
snd_us428_AsyncSeq_tAS04;
- int rate;
+
[alsa-cvslog] CVS: alsa-kernel/pci via82xx.c,1.65,1.66
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv22574/pci
Modified Files:
via82xx.c
Log Message:
added the quirk for ASUS A7V600.
Index: via82xx.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/via82xx.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- via82xx.c 28 Oct 2003 11:28:01 - 1.65
+++ via82xx.c 3 Nov 2003 12:31:50 - 1.66
@@ -1976,6 +1976,7 @@
static struct dxs_whitelist whitelist[] = {
{ .vendor = 0x1019, .device = 0x0996, .action = VIA_DXS_48K },
{ .vendor = 0x1043, .device = 0x80a1, .action = VIA_DXS_NO_VRA }, /*
ASUS A7V8-X */
+ { .vendor = 0x1043, .device = 0x80b0, .action = VIA_DXS_ENABLE }, /*
ASUS A7V600 */
{ .vendor = 0x1297, .device = 0xc160, .action = VIA_DXS_ENABLE }, /*
Shuttle SK41G */
{ .vendor = 0x1458, .device = 0xa002, .action = VIA_DXS_ENABLE }, /*
Gigabyte GA-7VAXP */
{ .vendor = 0x14ff, .device = 0x0403, .action = VIA_DXS_ENABLE }, /*
Twinhead mobo */
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! 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/src/pcm pcm.c,1.261,1.262
Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1:/tmp/cvs-serv7275
Modified Files:
pcm.c
Log Message:
added more descriptions.
Index: pcm.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm.c,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- pcm.c 20 Oct 2003 14:04:21 - 1.261
+++ pcm.c 31 Oct 2003 18:52:55 - 1.262
@@ -770,6 +770,9 @@
* The configuration is chosen fixing single parameters in this order:
* first access, first format, first subformat, min channels, min rate,
* min period time, max buffer size, min tick time
+ *
+ * After this call, #snd_pcm_prepare() is called automatically and
+ * the stream is brought to \c #SND_PCM_STATE_PREPARED state.
*/
int snd_pcm_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
{
@@ -845,6 +848,9 @@
* \brief Return PCM state
* \param pcm PCM handle
* \return PCM state #snd_pcm_state_t of given PCM handle
+ *
+ * This is a faster way to obtain only the PCM state without calling
+ * \link ::snd_pcm_status() \endlink.
*/
snd_pcm_state_t snd_pcm_state(snd_pcm_t *pcm)
{
@@ -900,7 +906,7 @@
*
* This function can be used when the stream is in the suspend state
* to do the fine resume from this state. Not all hardware supports
- * this feature, when an -ENOSYS error is returned, use the snd_pcm_prepare
+ * this feature, when an -ENOSYS error is returned, use the \link ::snd_pcm_prepare()
\endlink
* function to recovery.
*/
int snd_pcm_resume(snd_pcm_t *pcm)
@@ -952,6 +958,12 @@
* \brief Stop a PCM dropping pending frames
* \param pcm PCM handle
* \return 0 on success otherwise a negative error code
+ *
+ * This function stops the PCM immediately.
+ * The pending samples on the buffer are ignored.
+ *
+ * For processing all pending samples, use \link ::snd_pcm_drain() \endlink
+ * instead.
*/
int snd_pcm_drop(snd_pcm_t *pcm)
{
@@ -969,6 +981,9 @@
* For playback wait for all pending frames to be played and then stop
* the PCM.
* For capture stop PCM permitting to retrieve residual frames.
+ *
+ * For stopping the PCM stream immediately, use \link ::snd_pcm_drop() \endlink
+ * instead.
*/
int snd_pcm_drain(snd_pcm_t *pcm)
{
@@ -982,6 +997,10 @@
* \param pcm PCM handle
* \param pause 0 = resume, 1 = pause
* \return 0 on success otherwise a negative error code
+ *
+ * Note that this function works only on the hardware which supports
+ * pause feature. You can check it via \link ::snd_pcm_hw_params_can_pause() \endlink
+ * function.
*/
int snd_pcm_pause(snd_pcm_t *pcm, int enable)
{
@@ -1183,6 +1202,14 @@
* \param pfds array of poll descriptors
* \param space space in the poll descriptor array
* \return count of filled descriptors
+ *
+ * This function fills the given poll descriptor structs for the specified
+ * PCM handle. The poll desctiptor array should have the size returned by
+ * \link ::snd_pcm_poll_descriptors_count() \endlink function.
+ *
+ * For reading the returned events of poll descriptor after poll() system
+ * call, use \link ::snd_pcm_poll_descriptors_revent() \endlink function.
+ * The field values in pollfd structs may be bogus.
*/
int snd_pcm_poll_descriptors(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int space)
{
@@ -1393,9 +1420,9 @@
#endif
/**
- * \brief get name of PCM stream
- * \param stream PCM stream
- * \return ascii name of PCM stream
+ * \brief get name of PCM stream type
+ * \param stream PCM stream type
+ * \return ascii name of PCM stream type
*/
const char *snd_pcm_stream_name(snd_pcm_stream_t stream)
{
@@ -1998,7 +2025,8 @@
* \param pcm PCM handle
* \param timeout maximum time in milliseconds to wait
* \return a positive value on success otherwise a negative error code
- * (-EPIPE for the xrun and -ESTRPIPE for the suspended status)
+ * (-EPIPE for the xrun and -ESTRPIPE for the suspended status,
+ * others for general errors)
* \retval 0 timeout occurred
* \retval 1 PCM stream is ready for I/O
*/
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! 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/src/conf/cards CMI8738-MC6.conf,1.4,1.5
Update of /cvsroot/alsa/alsa-lib/src/conf/cards
In directory sc8-pr-cvs1:/tmp/cvs-serv18540
Modified Files:
CMI8738-MC6.conf
Log Message:
Marcel <[EMAIL PROTECTED]>:
- fixed the 4.0 output.
Index: CMI8738-MC6.conf
===
RCS file: /cvsroot/alsa/alsa-lib/src/conf/cards/CMI8738-MC6.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CMI8738-MC6.conf12 Aug 2003 09:34:38 - 1.4
+++ CMI8738-MC6.conf31 Oct 2003 16:50:40 - 1.5
@@ -50,6 +50,12 @@
preserve true
value false
}
+{
+name "Exchange DAC"
+lock true
+preserve true
+value true
+}
]
}
}
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! 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/opti9xx opti92x-ad1848.c,1.34,1.35
Update of /cvsroot/alsa/alsa-kernel/isa/opti9xx
In directory sc8-pr-cvs1:/tmp/cvs-serv15244/alsa-kernel/isa/opti9xx
Modified Files:
opti92x-ad1848.c
Log Message:
- fixed the detection of opti92x-ad1848 pnp.
Index: opti92x-ad1848.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/opti9xx/opti92x-ad1848.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- opti92x-ad1848.c30 Oct 2003 14:21:08 - 1.34
+++ opti92x-ad1848.c31 Oct 2003 16:32:32 - 1.35
@@ -543,11 +543,11 @@
__skip_base:
switch (chip->irq) {
-#ifdef OPTi93X
+//#ifdef OPTi93X
case 5:
irq_bits = 0x05;
break;
-#endif /* OPTi93X */
+//#endif /* OPTi93X */
case 7:
irq_bits = 0x01;
break;
@@ -1735,15 +1735,23 @@
#if defined(CS4231) || defined(OPTi93X)
if (dma2 != SNDRV_AUTO_DMA)
pnp_resource_change(&cfg->dma_resource[1], dma2, 1);
+#else
+#ifdef snd_opti9xx_fixup_dma2
+ snd_opti9xx_fixup_dma2(pdev);
+#endif
#endif /* CS4231 || OPTi93X */
- if (fm_port != SNDRV_AUTO_PORT)
+#ifdef OPTi93X
+ if (fm_port > 0 && fm_port != SNDRV_AUTO_PORT)
pnp_resource_change(&cfg->port_resource[1], fm_port, 4);
-
+#else
+ if (fm_port > 0 && fm_port != SNDRV_AUTO_PORT)
+ pnp_resource_change(&cfg->port_resource[2], fm_port, 4);
+#endif
if (pnp_manual_config_dev(pdev, cfg, 0) < 0)
snd_printk(KERN_ERR "AUDIO the requested resources are invalid, using
auto config\n");
err = pnp_activate_dev(pdev);
if (err < 0) {
- snd_printk(KERN_ERR "AUDIO pnp configure failure\n");
+ snd_printk(KERN_ERR "AUDIO pnp configure failure: %d\n", err);
kfree(cfg);
return err;
}
@@ -1763,7 +1771,7 @@
#endif /* CS4231 || OPTi93X */
pdev = chip->devmpu;
- if (pdev) {
+ if (pdev && mpu_port > 0) {
pnp_init_resource_table(cfg);
if (mpu_port != SNDRV_AUTO_PORT)
@@ -1986,9 +1994,6 @@
chip->dma2 = dma2;
#endif
-#ifdef CONFIG_PNP
- if (!isapnp) {
-#endif
if (chip->wss_base == SNDRV_AUTO_PORT) {
if ((chip->wss_base = snd_legacy_find_free_ioport(possible_ports, 4))
< 0) {
snd_card_free(card);
@@ -1996,6 +2001,9 @@
return -EBUSY;
}
}
+#ifdef CONFIG_PNP
+ if (!isapnp) {
+#endif
if (chip->mpu_port == SNDRV_AUTO_PORT) {
if ((chip->mpu_port = snd_legacy_find_free_ioport(possible_mpu_ports,
2)) < 0) {
snd_card_free(card);
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! 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/isa/opti9xx opti92x-ad1848.c,1.5,1.6 opti92x-cs4231.c,1.2,1.3 opti93x.c,1.2,1.3
Update of /cvsroot/alsa/alsa-driver/isa/opti9xx
In directory sc8-pr-cvs1:/tmp/cvs-serv15211/alsa-driver/isa/opti9xx
Modified Files:
opti92x-ad1848.c opti92x-cs4231.c opti93x.c
Log Message:
- fixed the detection of opti92x-ad1848 pnp.
- added EXPORT_NO_SYMBOLS.
Index: opti92x-ad1848.c
===
RCS file: /cvsroot/alsa/alsa-driver/isa/opti9xx/opti92x-ad1848.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- opti92x-ad1848.c23 May 2003 11:15:10 - 1.5
+++ opti92x-ad1848.c31 Oct 2003 16:32:18 - 1.6
@@ -1,3 +1,15 @@
+#include
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 0)
+#define snd_opti9xx_fixup_dma2(pdev) \
+ {struct isapnp_dev *b = (struct isapnp_dev *)pdev;\
+ memset(&b->dma_resource[1].flags, 0,
sizeof(b->dma_resource[1].flags));}
+#else
+#define snd_opti9xx_fixup_dma2(pdev) \
+ {struct pci_dev *b = (struct pci_dev *)pdev;\
+ memset(&b->dma_resource[1].flags, 0,
sizeof(b->dma_resource[1].flags));}
+#endif
+
#include "../../alsa-kernel/isa/opti9xx/opti92x-ad1848.c"
#ifndef __isapnp_now__
#include "opti92x-ad1848.isapnp"
Index: opti92x-cs4231.c
===
RCS file: /cvsroot/alsa/alsa-driver/isa/opti9xx/opti92x-cs4231.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- opti92x-cs4231.c9 Apr 2003 15:56:19 - 1.2
+++ opti92x-cs4231.c31 Oct 2003 16:32:18 - 1.3
@@ -2,3 +2,4 @@
#ifndef __isapnp_now__
#include "opti92x-cs4231.isapnp"
#endif
+EXPORT_NO_SYMBOLS;
Index: opti93x.c
===
RCS file: /cvsroot/alsa/alsa-driver/isa/opti9xx/opti93x.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- opti93x.c 9 Apr 2003 15:56:20 - 1.2
+++ opti93x.c 31 Oct 2003 16:32:18 - 1.3
@@ -2,3 +2,4 @@
#ifndef __isapnp_now__
#include "opti93x.isapnp"
#endif
+EXPORT_NO_SYMBOLS;
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! 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/support/pnp pnp.c,1.15,1.16
Update of /cvsroot/alsa/alsa-driver/support/pnp
In directory sc8-pr-cvs1:/tmp/cvs-serv28682
Modified Files:
pnp.c
Log Message:
fixed the double detection of the card.
the lock-up problem of some cs4232 boards should be fixed.
Index: pnp.c
===
RCS file: /cvsroot/alsa/alsa-driver/support/pnp/pnp.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pnp.c 17 Oct 2003 15:45:02 - 1.15
+++ pnp.c 31 Oct 2003 15:02:21 - 1.16
@@ -89,6 +89,12 @@
pos = n, n = pos->next)
#endif
+#ifdef ISAPNP_ALSA_LOCAL
+extern struct isapnp_card *isapnp_cards;
+#else
+extern struct list_head isapnp_cards;
+#endif
+
struct pnp_driver_instance {
struct pnp_dev * dev;
struct pnp_driver * driver;
@@ -161,20 +167,29 @@
unsigned short subvendor, subdevice;
unsigned int i, res = 0;
const struct pnp_card_device_id *cid;
- struct pnp_card *card;
+ struct isapnp_card *card;
struct pnp_dev *dev;
struct pnp_card_driver_instance *ninst = NULL;
+#ifndef ISAPNP_ALSA_LOCAL
+ struct list_head *p;
+#endif
if (! drv->probe) {
printk(KERN_ERR "pnp: no probe function!\n");
return -EINVAL;
}
- for (cid = drv->id_table; cid->id[0] != '\0'; cid++) {
- if (parse_id(cid->id, &vendor, &device) < 0)
- continue;
- card = NULL;
- while ((card = (struct pnp_card *)isapnp_find_card(vendor, device,
(struct isapnp_card *)card)) != NULL) {
+#ifdef ISAPNP_ALSA_LOCAL
+ for (card = isapnp_cards; card; card = card->next) {
+#else
+ list_for_each(p, &isapnp_cards) {
+ card = pci_bus_b(p);
+#endif
+ for (cid = drv->id_table; cid->id[0] != '\0'; cid++) {
+ if (parse_id(cid->id, &vendor, &device) < 0)
+ continue;
+ if (card->vendor != vendor || card->device != device)
+ continue;
if (ninst == NULL) {
ninst = kmalloc(sizeof(*ninst), GFP_KERNEL);
if (ninst == NULL)
@@ -187,9 +202,9 @@
for (i = 0; i < PNP_MAX_DEVICES && cid->devs[i].id[0] != '\0';
i++) {
if (parse_id(cid->devs[i].id, &subvendor, &subdevice)
< 0)
goto __next_id;
- dev = ninst->devs[i] = (struct pnp_dev
*)isapnp_find_dev((struct isapnp_card *)card, subvendor, subdevice, NULL);
+ dev = ninst->devs[i] = (struct pnp_dev
*)isapnp_find_dev(card, subvendor, subdevice, NULL);
if (dev == NULL)
- goto __next_card;
+ goto __next_id;
}
/* all parsed successfully */
@@ -205,7 +220,7 @@
dev->p.prepare((struct isapnp_dev *)dev);
}
}
- ninst->link.card = card;
+ ninst->link.card = (struct pnp_card *)card;
ninst->link.driver = drv;
ninst->link.driver_data = NULL;
if (drv->probe(&ninst->link, cid) >= 0) {
@@ -213,11 +228,11 @@
ninst = NULL;
res++;
}
- __next_card:
+ break; /* next card */
+
+ __next_id:
;
}
- __next_id:
- ;
}
if (ninst != NULL)
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! 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/ac97 Makefile,1.3,1.4
Update of /cvsroot/alsa/alsa-driver/pci/ac97 In directory sc8-pr-cvs1:/tmp/cvs-serv26197/pci/ac97 Modified Files: Makefile Log Message: added missing dependencies of au88x0 drivers. Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/pci/ac97/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile9 Feb 2003 18:35:57 - 1.3 +++ Makefile31 Oct 2003 11:38:38 - 1.4 @@ -3,6 +3,10 @@ include $(TOPDIR)/toplevel.config include $(TOPDIR)/Makefile.conf +obj-$(CONFIG_SND_AU8810) += snd-ac97-codec.o +obj-$(CONFIG_SND_AU8820) += snd-ac97-codec.o +obj-$(CONFIG_SND_AU8830) += snd-ac97-codec.o + export-objs := ac97_codec.o ak4531_codec.o TOPDIR = $(MAINSRCDIR) --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! 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/drivers/mpu401 Makefile,1.7,1.8
Update of /cvsroot/alsa/alsa-driver/drivers/mpu401 In directory sc8-pr-cvs1:/tmp/cvs-serv26197/drivers/mpu401 Modified Files: Makefile Log Message: added missing dependencies of au88x0 drivers. Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/drivers/mpu401/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile2 Jun 2003 13:03:39 - 1.7 +++ Makefile31 Oct 2003 11:38:38 - 1.8 @@ -3,6 +3,10 @@ include $(TOPDIR)/toplevel.config include $(TOPDIR)/Makefile.conf +obj-$(CONFIG_SND_AU8810) += snd-mpu401-uart.o +obj-$(CONFIG_SND_AU8820) += snd-mpu401-uart.o +obj-$(CONFIG_SND_AU8830) += snd-mpu401-uart.o + export-objs := mpu401_uart.o TOPDIR = $(MAINSRCDIR) --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! 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/acore/seq Makefile,1.11,1.12
Update of /cvsroot/alsa/alsa-driver/acore/seq In directory sc8-pr-cvs1:/tmp/cvs-serv26197/acore/seq Modified Files: Makefile Log Message: added missing dependencies of au88x0 drivers. Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/acore/seq/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Makefile2 Jun 2003 13:03:38 - 1.11 +++ Makefile31 Oct 2003 11:38:38 - 1.12 @@ -7,6 +7,9 @@ obj-$(CONFIG_SND_SERIALMIDI) += snd-seq-midi.o snd-seq.o snd-seq-device.o snd-seq-midi-event.o obj-$(CONFIG_SND_MSND_PINNACLE) += snd-seq-midi.o snd-seq.o snd-seq-device.o snd-seq-midi-event.o +obj-$(CONFIG_SND_AU8810) += snd-seq-midi.o snd-seq.o snd-seq-device.o snd-seq-midi-event.o +obj-$(CONFIG_SND_AU8820) += snd-seq-midi.o snd-seq.o snd-seq-device.o snd-seq-midi-event.o +obj-$(CONFIG_SND_AU8830) += snd-seq-midi.o snd-seq.o snd-seq-device.o snd-seq-midi-event.o export-objs := seq_device.o seq.o seq_instr.o seq_midi_emul.o \ seq_midi_event.o seq_virmidi.o --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! 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/acore Makefile,1.29,1.30
Update of /cvsroot/alsa/alsa-driver/acore In directory sc8-pr-cvs1:/tmp/cvs-serv26197/acore Modified Files: Makefile Log Message: added missing dependencies of au88x0 drivers. Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/acore/Makefile,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- Makefile16 Sep 2003 10:14:03 - 1.29 +++ Makefile31 Oct 2003 11:38:38 - 1.30 @@ -10,6 +10,9 @@ obj-$(CONFIG_SND_SERIALMIDI) += snd-rawmidi.o snd.o obj-$(CONFIG_SND_MSND_PINNACLE) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o obj-$(CONFIG_SND_USB_US428) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o +obj-$(CONFIG_SND_AU8810) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o +obj-$(CONFIG_SND_AU8820) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o +obj-$(CONFIG_SND_AU8830) += snd-pcm.o snd-timer.o snd-page-alloc.o snd.o snd-rawmidi.o snd-hwdep.o export-objs := sound.o pcm.o pcm_lib.o rawmidi.o timer.o hwdep.o memalloc.o --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! 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 configure.in,1.198,1.199
Update of /cvsroot/alsa/alsa-driver In directory sc8-pr-cvs1:/tmp/cvs-serv26068 Modified Files: configure.in Log Message: - added the check of linux/device.h. - improved the check of RH9 kernel for workqueue.h. Index: configure.in === RCS file: /cvsroot/alsa/alsa-driver/configure.in,v retrieving revision 1.198 retrieving revision 1.199 diff -u -r1.198 -r1.199 --- configure.in21 Oct 2003 17:40:58 - 1.198 +++ configure.in31 Oct 2003 11:38:14 - 1.199 @@ -374,7 +374,7 @@ CHECK_KERNEL_HEADER(linux/highmem.h) CHECK_KERNEL_HEADER(linux/workqueue.h) if test ! -f include/linux/workqueue.h; then - if test "$kversion.$kpatchlevel.$ksublevel" = "2.4.20"; then + if test "$kversion.$kpatchlevel" = "2.4"; then CHECK_KERNEL_CONFIG(RED_HAT_LINUX_KERNEL, [redhat kernel]) if test $RED_HAT_LINUX_KERNEL = y; then echo "It looks like you're using a RedHat 9 kernel." @@ -385,6 +385,7 @@ fi fi CHECK_KERNEL_HEADER(asm/hw_irq.h) +CHECK_KERNEL_HEADER(linux/device.h) CHECK_KERNEL_HEADER(linux/jiffies.h, [#include ]) CHECK_KERNEL_HEADER(linux/compat.h, [#include \"compat_64.h\" --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! 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 sound_core.c,1.16,1.17
Update of /cvsroot/alsa/alsa-kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv25900
Modified Files:
sound_core.c
Log Message:
- take MODULE_ALIAS_CHARDEV_MAJOR() back.
- added missing inclusion of linux/device.h.
Index: sound_core.c
===
RCS file: /cvsroot/alsa/alsa-kernel/sound_core.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sound_core.c30 Oct 2003 11:29:25 - 1.16
+++ sound_core.c31 Oct 2003 11:37:09 - 1.17
@@ -45,6 +45,7 @@
#include
#include
#include
+#include
#define SOUND_STEP 16
@@ -547,8 +548,7 @@
MODULE_DESCRIPTION("Core sound module");
MODULE_AUTHOR("Alan Cox");
MODULE_LICENSE("GPL");
-// MODULE_ALIAS_CHARDEV_MAJOR(SOUND_MAJOR);
-MODULE_ALIAS("char-major-" __stringify(SOUND_MAJOR));
+MODULE_ALIAS_CHARDEV_MAJOR(SOUND_MAJOR);
static void __exit cleanup_soundcore(void)
{
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! 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/core sound.c,1.53,1.54
Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1:/tmp/cvs-serv25900/core
Modified Files:
sound.c
Log Message:
- take MODULE_ALIAS_CHARDEV_MAJOR() back.
- added missing inclusion of linux/device.h.
Index: sound.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/sound.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sound.c 30 Oct 2003 11:29:25 - 1.53
+++ sound.c 31 Oct 2003 11:37:10 - 1.54
@@ -31,6 +31,7 @@
#include
#include
#include
+#include
#define SNDRV_OS_MINORS 256
@@ -57,8 +58,7 @@
MODULE_PARM_DESC(device_mode, "Device file permission mask for devfs.");
MODULE_PARM_SYNTAX(device_mode, "default:0666,base:8");
#endif
-// MODULE_ALIAS_CHARDEV_MAJOR(CONFIG_SND_MAJOR);
-MODULE_ALIAS("char-major-" __stringify(CONFIG_SND_MAJOR));
+MODULE_ALIAS_CHARDEV_MAJOR(CONFIG_SND_MAJOR);
/* this one holds the actual max. card number currently available.
* as default, it's identical with cards_limit option. when more
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! 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/src/pcm pcm_plugin.c,1.91,1.92
Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1:/tmp/cvs-serv20904
Modified Files:
pcm_plugin.c
Log Message:
- fixed the calculation of snd_pcm_avail() with plugin.
this will fix the slow playback problem on mplayer.
- the delay calculation is optimized a bit.
Index: pcm_plugin.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_plugin.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- pcm_plugin.c25 Jul 2003 17:02:04 - 1.91
+++ pcm_plugin.c30 Oct 2003 18:46:32 - 1.92
@@ -622,8 +622,10 @@
}
status->appl_ptr = *pcm->appl.ptr;
status->hw_ptr = *pcm->hw.ptr;
- status->avail = pcm->buffer_size;
- snd_pcm_plugin_delay(pcm, &status->delay);
+ if (plugin->client_frames) {
+ status->delay = plugin->client_frames(pcm, status->delay);
+ status->avail = plugin->client_frames(pcm, status->avail);
+ }
if (!snd_atomic_read_ok(&ratom)) {
snd_atomic_read_wait(&ratom);
goto _again;
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/envy24control envy24control.c,1.18,1.19 envy24control.h,1.10,1.11 hardware.c,1.10,1.11
Update of /cvsroot/alsa/alsa-tools/envy24control
In directory sc8-pr-cvs1:/tmp/cvs-serv6202
Modified Files:
envy24control.c envy24control.h hardware.c
Log Message:
Daniel Ankers <[EMAIL PROTECTED]>:
This patch against the stable version of envy24control gives access
to most of the Terratec DMX 6Fire mixer controls. It also changes
the lables on the inputs in the monitor mixer to be more useful.
It should have no effect on your envy24control if you are using a
card other than the 6Fire.
Index: envy24control.c
===
RCS file: /cvsroot/alsa/alsa-tools/envy24control/envy24control.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- envy24control.c 10 Oct 2003 07:47:38 - 1.18
+++ envy24control.c 30 Oct 2003 15:09:04 - 1.19
@@ -94,6 +94,20 @@
GtkWidget *hw_spdif_input_coaxial_radio;
GtkWidget *hw_spdif_input_optical_radio;
+GtkWidget *input_interface_internal;
+GtkWidget *input_interface_front_input;
+GtkWidget *input_interface_rear_input;
+GtkWidget *input_interface_wavetable;
+
+GtkWidget *hw_breakbox_led_on_radio;
+GtkWidget *hw_breakbox_led_off_radio;
+
+GtkWidget *hw_phono_input_on_radio;
+GtkWidget *hw_phono_input_off_radio;
+
+GtkWidget *hw_spdif_switch_on_radio;
+GtkWidget *hw_spdif_switch_off_radio;
+
GtkObject *av_dac_volume_adj[10];
GtkObject *av_adc_volume_adj[10];
GtkObject *av_ipga_volume_adj[10];
@@ -119,6 +133,18 @@
if (stream <= 10) {
sprintf(str, "PCM Out %i", stream);
+ } else if ((card_eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE) && (stream ==
11)) {
+ sprintf(str, "CD In L");
+ } else if ((card_eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE) && (stream ==
12)) {
+ sprintf(str, "CD In R");
+ } else if ((card_eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE) && (stream ==
13)) {
+ sprintf(str, "Line In L");
+ } else if ((card_eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE) && (stream ==
14)) {
+ sprintf(str, "Line In R");
+ } else if ((card_eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE) && (stream ==
15)) {
+ sprintf(str, "Phono/Mic In L");
+ } else if ((card_eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE) && (stream ==
16)) {
+ sprintf(str, "Phono/Mic In R");
} else if (stream <= 18) {
sprintf(str, "H/W In %i", stream - 10);
} else if (stream == 19) {
@@ -1092,7 +1118,7 @@
GSList *group = NULL;
int hide = 1;
- if(card_eeprom.subvendor == ICE1712_SUBDEVICE_DELTADIO2496)
+ if((card_eeprom.subvendor == ICE1712_SUBDEVICE_DELTADIO2496) ||
(card_eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE))
hide = 0;
frame = gtk_frame_new("S/PDIF Input");
@@ -1127,11 +1153,202 @@
gtk_widget_hide_all(frame);
}
+static void create_spdif_on_off(GtkWidget *box)
+{
+GtkWidget *frame;
+GtkWidget *vbox;
+GtkWidget *radiobutton;
+GSList *group = NULL;
+int hide = 1;
+
+if( card_eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE)
+hide = 0;
+
+frame = gtk_frame_new("S/PDIF On/Off");
+gtk_widget_show(frame);
+gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0);
+gtk_container_set_border_width(GTK_CONTAINER(frame), 6);
+
+vbox = gtk_vbox_new(FALSE, 0);
+gtk_widget_show(vbox);
+gtk_container_add(GTK_CONTAINER(frame), vbox);
+gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
+
+radiobutton = gtk_radio_button_new_with_label(group, "On");
+hw_spdif_switch_on_radio = radiobutton;
+group = gtk_radio_button_group(GTK_RADIO_BUTTON(radiobutton));
+gtk_widget_show(radiobutton);
+gtk_box_pack_start(GTK_BOX(vbox), radiobutton, FALSE, FALSE, 0);
+gtk_signal_connect(GTK_OBJECT(radiobutton), "toggled",
+ (GtkSignalFunc)spdif_on_off_toggled,
+ (gpointer)"On");
+
+radiobutton = gtk_radio_button_new_with_label(group, "Off");
+hw_spdif_switch_off_radio = radiobutton;
+group = gtk_radio_button_group(GTK_RADIO_BUTTON(radiobutton));
+gtk_widget_show(radiobutton);
+gtk_box_pack_start(GTK_BOX(vbox), radiobutton, FALSE, FALSE, 0);
+gtk_signal_connect(GTK_OBJECT(radiobutton), "toggled",
+ (GtkSignalFunc)spdif_on_off_toggled,
+ (gpointer)"Off");
+
+if(hide)
+gtk_widget_hide_all(frame);
+}
+
+static void create_breakbox_led(GtkWidget *box)
+{
+GtkWidget *frame;
+GtkWidget *vbox;
+GtkWidget *radiobutton;
+GSList *group = NULL;
+int hide = 1;
+
+if( card_eeprom.subvendor == ICE1712_SUBDEVICE_DMX6FIRE)
+hide = 0;
+
+frame = gtk_frame_new("Break
[alsa-cvslog] CVS: alsa-kernel/isa/wavefront wavefront.c,1.25,1.26
Update of /cvsroot/alsa/alsa-kernel/isa/wavefront
In directory sc8-pr-cvs1:/tmp/cvs-serv30435/isa/wavefront
Modified Files:
wavefront.c
Log Message:
use the standard port address, 0 = disable, 1 = auto-probe, others manual.
negative values are accepted as disable, too.
Index: wavefront.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/wavefront/wavefront.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- wavefront.c 14 Oct 2003 13:08:18 - 1.25
+++ wavefront.c 30 Oct 2003 14:21:09 - 1.26
@@ -418,13 +418,6 @@
snd_hwdep_t *fx_processor;
int hw_dev = 0, midi_dev = 0, err;
- if (cs4232_mpu_port[dev] < 0)
- cs4232_mpu_port[dev] = SNDRV_AUTO_PORT;
- if (fm_port[dev] < 0)
- fm_port[dev] = SNDRV_AUTO_PORT;
- if (ics2115_port[dev] < 0)
- ics2115_port[dev] = SNDRV_AUTO_PORT;
-
#ifdef CONFIG_PNP
if (!isapnp[dev]) {
#endif
@@ -490,7 +483,7 @@
/* -- OPL3 synth - */
- if (fm_port[dev] != SNDRV_AUTO_PORT) {
+ if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) {
opl3_t *opl3;
if ((err = snd_opl3_create(card,
@@ -561,7 +554,7 @@
/* -- ICS2115 internal MIDI */
- if (ics2115_port[dev] >= 0 && ics2115_port[dev] != SNDRV_AUTO_PORT) {
+ if (ics2115_port[dev] > 0 && ics2115_port[dev] != SNDRV_AUTO_PORT) {
ics2115_internal_rmidi =
snd_wavefront_new_midi (card,
midi_dev,
@@ -578,7 +571,7 @@
/* -- ICS2115 external MIDI */
- if (ics2115_port[dev] >= 0 && ics2115_port[dev] != SNDRV_AUTO_PORT) {
+ if (ics2115_port[dev] > 0 && ics2115_port[dev] != SNDRV_AUTO_PORT) {
ics2115_external_rmidi =
snd_wavefront_new_midi (card,
midi_dev,
@@ -631,7 +624,7 @@
if (dma2[dev] >= 0 && dma2[dev] < 8)
sprintf(card->longname + strlen(card->longname), "&%d", dma2[dev]);
- if (cs4232_mpu_port[dev] != SNDRV_AUTO_PORT) {
+ if (cs4232_mpu_port[dev] > 0 && cs4232_mpu_port[dev] != SNDRV_AUTO_PORT) {
sprintf (card->longname + strlen (card->longname),
" MPU-401 0x%lx irq %d",
cs4232_mpu_port[dev],
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! 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 als100.c,1.21,1.22 azt2320.c,1.21,1.22 dt019x.c,1.12,1.13
Update of /cvsroot/alsa/alsa-kernel/isa
In directory sc8-pr-cvs1:/tmp/cvs-serv30435/isa
Modified Files:
als100.c azt2320.c dt019x.c
Log Message:
use the standard port address, 0 = disable, 1 = auto-probe, others manual.
negative values are accepted as disable, too.
Index: als100.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/als100.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- als100.c14 Oct 2003 13:08:14 - 1.21
+++ als100.c30 Oct 2003 14:21:07 - 1.22
@@ -249,7 +249,7 @@
return error;
}
- if (mpu_port[dev] > 0) {
+ if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) {
if (snd_mpu401_uart_new(card, 0, MPU401_HW_ALS100,
mpu_port[dev], 0,
mpu_irq[dev], SA_INTERRUPT,
@@ -257,7 +257,7 @@
snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx\n",
mpu_port[dev]);
}
- if (fm_port[dev] > 0) {
+ if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) {
if (snd_opl3_create(card,
fm_port[dev], fm_port[dev] + 2,
OPL3_HW_AUTO, 0, &opl3) < 0) {
Index: azt2320.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/azt2320.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- azt2320.c 14 Oct 2003 13:08:14 - 1.21
+++ azt2320.c 30 Oct 2003 14:21:08 - 1.22
@@ -283,7 +283,7 @@
return error;
}
- if (mpu_port[dev] > 0) {
+ if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) {
if (snd_mpu401_uart_new(card, 0, MPU401_HW_AZT2320,
mpu_port[dev], 0,
mpu_irq[dev], SA_INTERRUPT,
@@ -291,7 +291,7 @@
snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx\n",
mpu_port[dev]);
}
- if (fm_port[dev] > 0) {
+ if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) {
if (snd_opl3_create(card,
fm_port[dev], fm_port[dev] + 2,
OPL3_HW_AUTO, 0, &opl3) < 0) {
Index: dt019x.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/dt019x.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dt019x.c14 Oct 2003 13:08:14 - 1.12
+++ dt019x.c30 Oct 2003 14:21:08 - 1.13
@@ -235,18 +235,20 @@
return error;
}
- if (mpu_port[dev] > 0) {
+ if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) {
+ if (mpu_irq[dev] == SNDRV_AUTO_IRQ)
+ mpu_irq[dev] = -1;
if (snd_mpu401_uart_new(card, 0,
/* MPU401_HW_SB,*/
MPU401_HW_MPU401,
mpu_port[dev], 0,
mpu_irq[dev],
- SA_INTERRUPT,
+ mpu_irq[dev] >= 0 ? SA_INTERRUPT : 0,
NULL) < 0)
snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx ?\n",
mpu_port[dev]);
}
- if (fm_port[dev] > 0) {
+ if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) {
if (snd_opl3_create(card,
fm_port[dev],
fm_port[dev] + 2,
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! 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/cs423x cs4231.c,1.10,1.11 cs4236.c,1.37,1.38 pc98.c,1.6,1.7
Update of /cvsroot/alsa/alsa-kernel/isa/cs423x
In directory sc8-pr-cvs1:/tmp/cvs-serv30435/isa/cs423x
Modified Files:
cs4231.c cs4236.c pc98.c
Log Message:
use the standard port address, 0 = disable, 1 = auto-probe, others manual.
negative values are accepted as disable, too.
Index: cs4231.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/cs423x/cs4231.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cs4231.c14 Oct 2003 13:08:15 - 1.10
+++ cs4231.c30 Oct 2003 14:21:08 - 1.11
@@ -103,8 +103,6 @@
if (card == NULL)
return -ENOMEM;
acard = (struct snd_card_cs4231 *)card->private_data;
- if (mpu_port[dev] < 0)
- mpu_port[dev] = SNDRV_AUTO_PORT;
if ((err = snd_cs4231_create(card, port[dev], -1,
irq[dev],
dma1[dev],
@@ -128,10 +126,13 @@
return err;
}
- if (mpu_irq[dev] >= 0 && mpu_irq[dev] != SNDRV_AUTO_IRQ) {
+ if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) {
+ if (mpu_irq[dev] == SNDRV_AUTO_IRQ)
+ mpu_irq[dev] = -1;
if (snd_mpu401_uart_new(card, 0, MPU401_HW_CS4232,
mpu_port[dev], 0,
- mpu_irq[dev], SA_INTERRUPT,
+ mpu_irq[dev],
+ mpu_irq[dev] >= 0 ? SA_INTERRUPT : 0,
NULL) < 0)
printk(KERN_ERR "cs4231: MPU401 not detected\n");
}
Index: cs4236.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/cs423x/cs4236.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- cs4236.c14 Oct 2003 13:08:15 - 1.37
+++ cs4236.c30 Oct 2003 14:21:08 - 1.38
@@ -307,7 +307,7 @@
pnp_init_resource_table(cfg);
if (port[dev] != SNDRV_AUTO_PORT)
pnp_resource_change(&cfg->port_resource[0], port[dev], 4);
- if (fm_port[dev] != SNDRV_AUTO_PORT && fm_port[dev] >= 0)
+ if (fm_port[dev] != SNDRV_AUTO_PORT && fm_port[dev] > 0)
pnp_resource_change(&cfg->port_resource[1], fm_port[dev], 4);
if (sb_port[dev] != SNDRV_AUTO_PORT)
pnp_resource_change(&cfg->port_resource[2], sb_port[dev], 16);
@@ -327,7 +327,7 @@
return -EBUSY;
}
port[dev] = pnp_port_start(pdev, 0);
- if (fm_port[dev] >= 0)
+ if (fm_port[dev] > 0)
fm_port[dev] = pnp_port_start(pdev, 1);
sb_port[dev] = pnp_port_start(pdev, 2);
irq[dev] = pnp_irq(pdev, 0);
@@ -338,7 +338,7 @@
snd_printdd("isapnp WSS: irq=%i, dma1=%i, dma2=%i\n",
irq[dev], dma1[dev], dma2[dev]);
/* CTRL initialization */
- if (acard->ctrl && cport[dev] >= 0) {
+ if (acard->ctrl && cport[dev] > 0) {
pdev = acard->ctrl;
pnp_init_resource_table(cfg);
if (cport[dev] != SNDRV_AUTO_PORT)
@@ -356,12 +356,13 @@
snd_printdd("isapnp CTRL: control port=0x%lx\n", cport[dev]);
}
/* MPU initialization */
- if (acard->mpu && mpu_port[dev] >= 0) {
+ if (acard->mpu && mpu_port[dev] > 0) {
pdev = acard->mpu;
pnp_init_resource_table(cfg);
if (mpu_port[dev] != SNDRV_AUTO_PORT)
pnp_resource_change(&cfg->port_resource[0], mpu_port[dev], 2);
- if (mpu_irq[dev] != SNDRV_AUTO_IRQ && mpu_irq[dev] >= 0)
+ if (mpu_irq[dev] != SNDRV_AUTO_IRQ && mpu_irq[dev] >= 0 &&
+ pnp_irq_valid(pdev, 0))
pnp_resource_change(&cfg->irq_resource[0], mpu_irq[dev], 1);
err = pnp_manual_config_dev(pdev, cfg, 0);
if (err < 0)
@@ -373,7 +374,8 @@
mpu_irq[dev] = SNDRV_AUTO_IRQ;
} else {
mpu_port[dev] = pnp_port_start(pdev, 0);
- if (pnp_irq_valid(pdev, 0) && pnp_irq(pdev, 0) >= 0) {
+ if (mpu_irq[dev] >= 0 &&
+ pnp_irq_valid(pdev, 0) && pnp_irq(pdev, 0) >= 0) {
mpu_irq[dev] = pnp_irq(pdev, 0);
} else {
mpu_irq[dev] = -1; /* disable interrupt */
@@ -435,13 +437,7 @@
return -ENXIO;
}
#endif
- if (mpu_port[dev] < 0)
- mpu_port[dev] = SNDRV_AUTO_PORT;
- if (fm_port[dev] < 0)
- fm_port[dev] = SNDRV_AUTO_PORT;
- if (sb_port[dev] < 0)
- sb_port[dev] = SNDRV_AUTO_PORT;
- if (sb_port[dev] != SNDRV_AUTO_PORT)
+
[alsa-cvslog] CVS: alsa-kernel/isa/sb sb16.c,1.38,1.39
Update of /cvsroot/alsa/alsa-kernel/isa/sb
In directory sc8-pr-cvs1:/tmp/cvs-serv30435/isa/sb
Modified Files:
sb16.c
Log Message:
use the standard port address, 0 = disable, 1 = auto-probe, others manual.
negative values are accepted as disable, too.
Index: sb16.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/sb16.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sb16.c 14 Oct 2003 13:08:18 - 1.38
+++ sb16.c 30 Oct 2003 14:21:09 - 1.39
@@ -465,7 +465,7 @@
return -ENXIO;
}
- if (chip->mpu_port) {
+ if (chip->mpu_port > 0 && chip->mpu_port != SNDRV_AUTO_PORT) {
if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_SB,
chip->mpu_port, 0,
xirq, 0, &chip->rmidi)) < 0) {
@@ -475,7 +475,12 @@
chip->rmidi_callback = snd_mpu401_uart_interrupt;
}
- if (fm_port[dev] > 0) {
+#ifdef SNDRV_SBAWE_EMU8000
+ if (awe_port[dev] == SNDRV_AUTO_PORT)
+ awe_port[dev] = 0; /* disable */
+#endif
+
+ if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) {
if (snd_opl3_create(card, fm_port[dev], fm_port[dev] + 2,
OPL3_HW_OPL3,
fm_port[dev] == port[dev] || fm_port[dev] == 0x388,
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! 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/opti9xx opti92x-ad1848.c,1.33,1.34
Update of /cvsroot/alsa/alsa-kernel/isa/opti9xx
In directory sc8-pr-cvs1:/tmp/cvs-serv30435/isa/opti9xx
Modified Files:
opti92x-ad1848.c
Log Message:
use the standard port address, 0 = disable, 1 = auto-probe, others manual.
negative values are accepted as disable, too.
Index: opti92x-ad1848.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/opti9xx/opti92x-ad1848.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- opti92x-ad1848.c14 Oct 2003 13:08:18 - 1.33
+++ opti92x-ad1848.c30 Oct 2003 14:21:08 - 1.34
@@ -604,6 +604,7 @@
__skip_resources:
if (chip->hardware > OPTi9XX_HW_82C928) {
switch (chip->mpu_port) {
+ case 0:
case -1:
break;
case 0x300:
@@ -644,7 +645,7 @@
}
snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(6),
- (chip->mpu_port == -1) ? 0x00 :
+ (chip->mpu_port <= 0) ? 0x00 :
0x80 | mpu_port_bits << 5 | mpu_irq_bits << 3,
0xf8);
}
@@ -2093,7 +2094,7 @@
}
#endif
- if (chip->mpu_port <= 0)
+ if (chip->mpu_port <= 0 || chip->mpu_port == SNDRV_AUTO_PORT)
rmidi = NULL;
else
if ((error = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
@@ -2101,7 +2102,7 @@
&rmidi)))
snd_printk("no MPU-401 device at 0x%lx?\n", chip->mpu_port);
- if (chip->fm_port > 0) {
+ if (chip->fm_port > 0 && chip->fm_port != SNDRV_AUTO_PORT) {
opl3_t *opl3 = NULL;
#ifndef OPTi93X
if (chip->hardware == OPTi9XX_HW_82C928 ||
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! 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 initval.h,1.16,1.17
Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1:/tmp/cvs-serv30435/include
Modified Files:
initval.h
Log Message:
use the standard port address, 0 = disable, 1 = auto-probe, others manual.
negative values are accepted as disable, too.
Index: initval.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/initval.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- initval.h 14 Oct 2003 13:08:14 - 1.16
+++ initval.h 30 Oct 2003 14:21:07 - 1.17
@@ -35,7 +35,7 @@
#define MODULE_DEVICES(val) MODULE_GENERIC_STRING(info_devices, val)
#define MODULE_PARM_SYNTAX(id, val) MODULE_GENERIC_STRING(info_parm_##id, val)
-#define SNDRV_AUTO_PORT0x
+#define SNDRV_AUTO_PORT1
#define SNDRV_AUTO_IRQ 0x
#define SNDRV_AUTO_DMA 0x
#define SNDRV_AUTO_DMA_SIZE(0x7fff)
@@ -58,7 +58,7 @@
#else
#define SNDRV_DEFAULT_ENABLE_ISAPNP SNDRV_DEFAULT_ENABLE
#endif
-#define SNDRV_DEFAULT_PORT { SNDRV_AUTO_PORT, [1 ... (SNDRV_CARDS-1)] = -1 }
+#define SNDRV_DEFAULT_PORT { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_PORT }
#define SNDRV_DEFAULT_IRQ { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_IRQ }
#define SNDRV_DEFAULT_DMA { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_DMA }
#define SNDRV_DEFAULT_DMA_SIZE { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_DMA_SIZE }
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! 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/alsaconf alsaconf.in,1.1,1.2
Update of /cvsroot/alsa/alsa-utils/alsaconf
In directory sc8-pr-cvs1:/tmp/cvs-serv7847
Modified Files:
alsaconf.in
Log Message:
- fixed (now really) for 2.6 modprobe.conf.
- clean up, modprobing without a temporary file.
- alsaconf will set up only the minimum aliases/options.
- cosmetic message changes.
Index: alsaconf.in
===
RCS file: /cvsroot/alsa/alsa-utils/alsaconf/alsaconf.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alsaconf.in 29 Oct 2003 13:38:23 - 1.1
+++ alsaconf.in 30 Oct 2003 12:00:38 - 1.2
@@ -93,15 +93,15 @@
-L|--log)
do_logging=1; rm -f $LOGFILE; shift;;
-p|--probe)
- legacy_probe_card=$2; shift 2;;
+ legacy_probe_card="$2"; shift 2;;
-P|--listprobe)
echo "$LEGACY_CARDS"; exit 0;;
-u|--uid)
- alsa_uid=$2; shift 2;;
+ alsa_uid="$2"; shift 2;;
-g|--gid)
- alsa_gid=$2; shift 2;;
+ alsa_gid="$2"; shift 2;;
-d|--devmode)
- alsa_mode=$2; shift 2;;
+ alsa_mode="$2"; shift 2;;
-r|--strict)
alsa_uid=0; alsa_gid=17; alsa_mode=0660; shift;;
--) shift ; break ;;
@@ -134,7 +134,18 @@
fi
fi
-if [ "$distribution" = "debian" ]; then
+case `uname -r` in
+2.6.*)
+ kernel="new"
+ ;;
+*)
+ kernel="old"
+ ;;
+esac
+
+if [ "$kernel" = "new" -a -f /etc/modprobe.conf ]; then
+ cfgfile="/etc/modprobe.conf"
+elif [ "$distribution" = "debian" ]; then
cfgfile="/etc/alsa/modutils/0.9"
elif [ -e /etc/modules.conf ]; then
cfgfile="/etc/modules.conf"
@@ -231,6 +242,7 @@
#
mixer() {
amixer set "$1" "$2" unmute >/dev/null 2>&1
+ amixer set "$1" unmute >/dev/null 2>&1
}
set_mixers() {
@@ -238,18 +250,23 @@
mixer PCM 90%
mixer Synth 90%
mixer CD 90%
+# mute mic
+amixer set Mic 0% mute >/dev/null 2>&1
# ESS 1969 chipset has 2 PCM channels
mixer PCM,1 90%
# Trident/YMFPCI/emu10k1
mixer Wave 100%
mixer Music 100%
+mixer AC97 100%
# CS4237B chipset:
mixer 'Master Digital' 75%
# Envy24 chips with analog outs
+mixer DAC 90%
mixer DAC,0 90%
mixer DAC,1 90%
# some notebooks use headphone instead of master
mixer Headphone 75%
+mixer Playback 100%
}
@@ -494,11 +511,6 @@
CARD_DRIVER=snd-$1
CARD_OPTS="${*:2}"
-if [ -z "$CARD_OPTS" ]; then
- CARD_OPTS="${mpfx}index=0"
-else
- CARD_OPTS="${mpfx}index=0 $CARD_OPTS"
-fi
# Configuration done
$DIALOG --yesno "
@@ -528,19 +540,30 @@
remove_ac_block < $cfgfile | remove_y2_block | uniq > $TMP
fi
echo "$ACB
-# --- ALSACONF verion $version ---
-alias char-major-116 snd
-alias snd-card-0 $CARD_DRIVER
+# --- ALSACONF verion $version ---" >> $TMP
+if [ -z "$have_alias" -a "$kernel" = "new" ]; then
+ if grep -q char-major-116 /lib/modules/`uname -r`/modules.alias; then
+ have_alias="yes"
+ fi
+fi
+if [ -z "$have_alias" ]; then
+echo "alias char-major-116 snd
alias char-major-14 $SOUND_CORE
-alias sound-slot-0 snd-card-0
alias sound-service-0-0 snd-mixer-oss
alias sound-service-0-1 snd-seq-oss
alias sound-service-0-3 snd-pcm-oss
alias sound-service-0-8 snd-seq-oss
-alias sound-service-0-12 snd-pcm-oss
-options snd ${mpfx}major=116 ${mpfx}cards_limit=1$alsa_device_opts
-options $CARD_DRIVER $CARD_OPTS
-$ACE
+alias sound-service-0-12 snd-pcm-oss" >> $TMP
+fi
+if [ -n "$alsa_device_opts" ]; then
+ echo "options snd $alsa_device_opts" >> $TMP
+fi
+echo "alias snd-card-0 $CARD_DRIVER
+alias sound-slot-0 $CARD_DRIVER" >> $TMP
+if [ -n "$CARD_OPTS" ]; then
+ echo "options $CARD_DRIVER $CARD_OPTS" >> $TMP
+fi
+echo "$ACE
" >> $TMP
if cp -f $cfgfile $cfgfile.old; then
@@ -603,7 +626,7 @@
===
Now ALSA is ready to use.
- For adjustment of volumes, please use alsamixer or gamix.
+ For adjustment of volumes, use your favorite mixer.
Have a lot of fun!
@@ -638,15 +661,9 @@
# check playback
# return 0 - OK, 1 - NG, 2 - not working (irq/dma problem)
ac_try_load () {
-echo "alias char-major-116 snd
-alias snd-card-0 snd-card-$1
-options snd ${mpfx}major=116 ${mpfx}cards_limit=1
-options snd-$1 ${*:2}
-" > $TMP
test $do_logging = 1 && echo "$1 ${*:2}" >> $LOGFILE
-/sbin/modprobe -C $TMP snd-$1 >/dev/null 2>&1
+/sbin/modprobe snd-$1 ${*:2} >/dev/null 2>&1
$lsmod | grep -E '(snd-|snd_)' $1 >/dev/null 2>&1 || return 1
-/sbin/modprobe -C $TMP snd-ioctl32 >/dev/null 2>&1
# mute mixers
amixer set Master 0% mute >/dev/null 2>&1
@@ -662,8 +679,7 @@
kill -9 $pp > /dev/null 2>&1
st=$?
ac_cardname=`head -n 1 /proc/asound/cards | sed -e 's/^[0-9].* - \(.*\)$/\1/'`
-/sbin/modprobe -C $TMP -r snd-ioctl32 >/dev/null 2>&1
-/sbin/modprobe -C $TMP -r snd-$1 >/dev/null 2>&1
+/sbin/modp
[alsa-cvslog] CVS: alsa-driver INSTALL,1.147,1.148
Update of /cvsroot/alsa/alsa-driver In directory sc8-pr-cvs1:/tmp/cvs-serv2735 Modified Files: INSTALL Log Message: - added MODULE_ALIAS macro. - fixed and clean up INSTALL document. Index: INSTALL === RCS file: /cvsroot/alsa/alsa-driver/INSTALL,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- INSTALL 9 Oct 2003 12:14:02 - 1.147 +++ INSTALL 30 Oct 2003 11:31:43 - 1.148 @@ -4,16 +4,19 @@ Installation guide -The ALSA driver replaces the OSS/Free driver. The OSS/Free driver is -present in current Linux kernels (2.2). Since version 0.4.0, ALSA has -supported only 2.2+ kernels. The 2.0 kernels are no longer supported. You -must compile the kernel with sound support (you do not need to select -any of the other sound modules apart from sound support). +The ALSA driver replaces the OSS/Free driver. Since version 0.4.0, +ALSA has supported only 2.2 or later kernels. The 2.0 kernels are no +longer supported. + +You must compile the kernel with sound support (CONFIG_SOUND on +2.2/2.4 kernels) either as module or built-in. You do not need to +select any of the other sound modules apart from sound support. Before installing this driver, it will be helpful to read carefully the documentation for insmod, modprobe, kmod and for the isapnp module if you have an ISA PnP soundcard. + Module option name change after 0.9.0rc3 @@ -21,6 +24,7 @@ was removed. You may use script in utils directory (module-options) to convert your older /etc/modules.conf to newer one. + Quick install = @@ -45,11 +49,10 @@ Skip this step, if you have a kernel with the DEVFS support. 7) Edit your /etc/modules.conf (see the kmod support section below). 8) Run 'modprobe snd-' where is the name of your card. - Note: If you have a ISA PnP soundcard you need to first run the isapnp - program from isapnptools package to initialize your - soundcard. You can also use the native ISA PnP support by - using the --with-isapnp=yes configuration switch, in which -case you do not need the isapnptools package. + Note: All ALSA ISA drivers support ISA PnP natively, so you don't need + isapnptools any more. Don't use both together. It will + conflict. For disabling the ALSA ISA PnP support, specify + --with-isapnp=no configure switch. You can also look at the utils/alsasound file. This script is designed for the RedHat distribution, but it can be used with other distributions which @@ -64,14 +67,24 @@ valid. +Basic Configurations + + +See alsa-kernel/Documentation/ALSA-Configuration.txt +(or Documentation/sounds/alsa/ALSA-Configuration.txt in linux-2.6 + kernel tree). + + Driver cannot be activated? === 1) You can check your soundcard setup again and read this install file (module parameters) carefully. 2) If you have got ISA PnP soundcard: - - native ISA PnP support: is your setup in /proc/isapnp correct? - - isapnptools: is configuration on isapnp.conf same as for the driver? + native ISA PnP support: is your setup in /proc/isapnp correct? +3) If you have *non*-ISA PnP card: + set isapnp=0 module option? Otherwise the driver probes only the + ISA PnP cards. 3) The driver is not still working: remake driver with: ./configure --with-debug=detect; make clean; make Reinsert new driver modules to kernel and look to /var/log/messages if @@ -110,17 +123,44 @@ './configure --with-cross=arm-linux- --with-kernel=/home/ipaq/kernel/linux'. -Bug reporting system - +Autoloading on Older Kernels + + +On 2.2 or 2.4 kernels, you have to set the additional aliases for +auto-loading via kmod in /etc/modules.conf: -http://www.alsa-project.org/cgi-bin/bugs +- /etc/modules.conf +# ALSA portion +alias char-major-116 snd +# OSS/Free portion +alias char-major-14 soundcore +alias sound-service-0-0 snd-mixer-oss +alias sound-service-0-1 snd-seq-oss +alias sound-service-0-3 snd-pcm-oss +alias sound-service-0-8 snd-seq-oss +alias sound-service-0-12 snd-pcm-oss +- /etc/modules.conf + +The aliases sound-service-x-y define the add-on modules for ALSA +OSS emulation. For the second or later card, define more aliases +for mixer and pcm in addition, such as: + +- /etc/modules.conf +# OSS/Free portion - card #2 +alias sound-service-1-0 snd-mixer-oss +alias sound-service-1-3 snd-pcm-oss +alias sound-service-1-12 snd-pcm-oss +- /etc/modules.conf + +You don't need to define service 1 and 8 for the second or later +cards. +If you want to autoclean your modules, you should put below line to your +/etc/crontab: -Module parameters -= +*/10 * * * * root /sbin/modprobe -rs snd-card-0 snd-card-1; /sbin/rmmod -a
[alsa-cvslog] CVS: alsa-driver/include adriver.h,1.60,1.61
Update of /cvsroot/alsa/alsa-driver/include In directory sc8-pr-cvs1:/tmp/cvs-serv2735/include Modified Files: adriver.h Log Message: - added MODULE_ALIAS macro. - fixed and clean up INSTALL document. Index: adriver.h === RCS file: /cvsroot/alsa/alsa-driver/include/adriver.h,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- adriver.h 12 Oct 2003 16:39:45 - 1.60 +++ adriver.h 30 Oct 2003 11:31:43 - 1.61 @@ -405,6 +405,12 @@ #define EXPORT_NO_SYMBOLS #endif +/* MODULE_ALIAS & co. */ +#ifndef MODULE_ALIAS +#define MODULE_ALIAS(x) +#define MODULE_ALIAS_CHARDEV_MAJOR(x) +#endif + #include "amagic.h" #endif /* __SOUND_LOCAL_DRIVER_H */ --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! 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/core/seq/oss seq_oss.c,1.10,1.11
Update of /cvsroot/alsa/alsa-kernel/core/seq/oss
In directory sc8-pr-cvs1:/tmp/cvs-serv2159/core/seq/oss
Modified Files:
seq_oss.c
Log Message:
Rusty Russell <[EMAIL PROTECTED]>:
- added MODULE_ALIAS for sound services.
clean up the document.
modified by Takashi Iwai <[EMAIL PROTECTED]>
Index: seq_oss.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/seq/oss/seq_oss.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- seq_oss.c 25 Sep 2003 18:55:43 - 1.10
+++ seq_oss.c 30 Oct 2003 11:29:26 - 1.11
@@ -35,6 +35,9 @@
MODULE_DESCRIPTION("OSS-compatible sequencer module");
MODULE_LICENSE("GPL");
MODULE_CLASSES("{sound}");
+/* Takashi says this is really only for sound-service-0-, but this is OK. */
+MODULE_ALIAS_SNDRV_MINOR(SNDRV_MINOR_OSS_SEQUENCER);
+MODULE_ALIAS_SNDRV_MINOR(SNDRV_MINOR_OSS_MUSIC);
#ifdef SNDRV_SEQ_OSS_DEBUG
MODULE_PARM(seq_oss_debug, "i");
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! 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/Documentation ALSA-Configuration.txt,1.24,1.25
Update of /cvsroot/alsa/alsa-kernel/Documentation In directory sc8-pr-cvs1:/tmp/cvs-serv2159/Documentation Modified Files: ALSA-Configuration.txt Log Message: Rusty Russell <[EMAIL PROTECTED]>: - added MODULE_ALIAS for sound services. clean up the document. modified by Takashi Iwai <[EMAIL PROTECTED]> Index: ALSA-Configuration.txt === RCS file: /cvsroot/alsa/alsa-kernel/Documentation/ALSA-Configuration.txt,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- ALSA-Configuration.txt 29 Oct 2003 16:33:06 - 1.24 +++ ALSA-Configuration.txt 30 Oct 2003 11:29:25 - 1.25 @@ -1153,160 +1153,49 @@ will be not built in. -modprobe/kmod support -= +Module Autoloading Support +== -The modprobe program must know which modules are used for the -device major numbers. -Native ALSA devices have got default number 116. Thus a line like -'alias char-major-116 snd' must be added to /etc/modules.conf. If you have -compiled the ALSA driver with the OSS/Free emulation code, then you -will need to add lines as explained below: +The ALSA drivers can be loaded automatically on demand by defining +module aliases. The string 'snd-card-%1' is requested for ALSA native +devices where %i is soundcard number from zero to seven. + +To auto-load an ALSA driver for OSS services, define the string +'sound-slot-%i' where %i means the slot number for OSS, which +corresponds to the card index of ALSA. Usually, define this +as the the same card module. + +An example configuration for a single emu10k1 card is like below: +- /etc/modprobe.conf +alias snd-card-0 snd-emu10k1 +alias sound-slot-0 snd-emu10k1 +- /etc/modprobe.conf + +The available number of auto-loaded soundcards depends on the module +option "cards_limit" of snd module. As default it's set to 1. +To enable the auto-loading of multiple cards, specify the number of +soundcards in that option. + +When multiple cards are available, it'd better to specify the index +number for each card via module option, too, so that the order of +cards is kept consistent. -The ALSA driver uses soundcore multiplexer for 2.2+ kernels and OSS compatible -devices. You should add line like 'alias char-major-14 soundcore'. - -Example with OSS/Free emulation turned on: - -- /etc/modules.conf - -# ALSA portion -alias char-major-116 snd -# OSS/Free portion -alias char-major-14 soundcore - -- /etc/modules.conf - -After the main multiplexer is loaded, its code requests top-level soundcard -module. String 'snd-card-%i' is requested for native devices where %i is -soundcard number from zero to seven. String 'sound-slot-%i' is requested -for native devices where %i is slot number (for ALSA owner this means soundcard -number). - -- /etc/modules.conf +An example configuration for two soundcards is like below: +- /etc/modprobe.conf # ALSA portion +options snd cards_limit=2 alias snd-card-0 snd-interwave alias snd-card-1 snd-ens1371 +options snd-interwave index=0 +options snd-ens1371 index=1 # OSS/Free portion -alias sound-slot-0 snd-card-0 -alias sound-slot-1 snd-card-1 - -- /etc/modules.conf - -We are finished at this point with the configuration for ALSA native devices, -but you may also need autoloading for ALSA's add-on OSS/Free emulation -modules. At this time only one module does not depend on any others, thus -must be loaded separately - snd-pcm-oss. String 'sound-service-%i-%i' -is requested for OSS/Free service where first %i means slot number -(e.g. card number) and second %i means service number. - -- /etc/modules.conf - -# OSS/Free portion - card #1 -alias sound-service-0-0 snd-mixer-oss -alias sound-service-0-1 snd-seq-oss -alias sound-service-0-3 snd-pcm-oss -alias sound-service-0-8 snd-seq-oss -alias sound-service-0-12 snd-pcm-oss -# OSS/Free portion - card #2 -alias sound-service-1-0 snd-mixer-oss -alias sound-service-1-3 snd-pcm-oss -alias sound-service-1-12 snd-pcm-oss - -- /etc/modules.conf - -A complete example for Gravis UltraSound PnP soundcard: - -- /etc/modules.conf - -# ISA PnP support (don't use IRQs 9,10,11,12,13) -options isapnp isapnp_reserve_irq=9,10,11,12,13 - -# ALSA native device support -alias char-major-116 snd -options snd major=116 cards_limit=1 -alias snd-card-0 snd-interwave -options snd-interwave index=0 id="GusPnP" - -# OSS/Free setup -alias char-major-14 soundcore -alias sound-slot-0 snd-card-0 -alias sound-service-0-0 snd-mixer-oss -alias sound-service-0-1 snd-seq-oss -alias sound-service-0-3 snd-pcm-oss -alias sound-service-0-8 snd-seq-oss -alias sound-service-0-12 snd-pcm-oss - -- - -A complete example if you want to use more soundcards in one machine -(the configuration below is for Sound Blaster 16 and Gravis UltraSound C
[alsa-cvslog] CVS: alsa-kernel sound_core.c,1.15,1.16
Update of /cvsroot/alsa/alsa-kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv2159
Modified Files:
sound_core.c
Log Message:
Rusty Russell <[EMAIL PROTECTED]>:
- added MODULE_ALIAS for sound services.
clean up the document.
modified by Takashi Iwai <[EMAIL PROTECTED]>
Index: sound_core.c
===
RCS file: /cvsroot/alsa/alsa-kernel/sound_core.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sound_core.c25 Sep 2003 18:55:42 - 1.15
+++ sound_core.c30 Oct 2003 11:29:25 - 1.16
@@ -547,6 +547,8 @@
MODULE_DESCRIPTION("Core sound module");
MODULE_AUTHOR("Alan Cox");
MODULE_LICENSE("GPL");
+// MODULE_ALIAS_CHARDEV_MAJOR(SOUND_MAJOR);
+MODULE_ALIAS("char-major-" __stringify(SOUND_MAJOR));
static void __exit cleanup_soundcore(void)
{
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! 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/core sound.c,1.52,1.53
Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1:/tmp/cvs-serv2159/core
Modified Files:
sound.c
Log Message:
Rusty Russell <[EMAIL PROTECTED]>:
- added MODULE_ALIAS for sound services.
clean up the document.
modified by Takashi Iwai <[EMAIL PROTECTED]>
Index: sound.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/sound.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sound.c 29 Oct 2003 16:33:06 - 1.52
+++ sound.c 30 Oct 2003 11:29:25 - 1.53
@@ -57,6 +57,8 @@
MODULE_PARM_DESC(device_mode, "Device file permission mask for devfs.");
MODULE_PARM_SYNTAX(device_mode, "default:0666,base:8");
#endif
+// MODULE_ALIAS_CHARDEV_MAJOR(CONFIG_SND_MAJOR);
+MODULE_ALIAS("char-major-" __stringify(CONFIG_SND_MAJOR));
/* this one holds the actual max. card number currently available.
* as default, it's identical with cards_limit option. when more
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! 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 minors.h,1.4,1.5
Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1:/tmp/cvs-serv2159/include
Modified Files:
minors.h
Log Message:
Rusty Russell <[EMAIL PROTECTED]>:
- added MODULE_ALIAS for sound services.
clean up the document.
modified by Takashi Iwai <[EMAIL PROTECTED]>
Index: minors.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/minors.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- minors.h9 Apr 2002 06:35:33 - 1.4
+++ minors.h30 Oct 2003 11:29:26 - 1.5
@@ -81,6 +81,9 @@
#define SNDRV_OSS_DEVICE_TYPE_SNDSTAT 5
#define SNDRV_OSS_DEVICE_TYPE_MUSIC6
+#define MODULE_ALIAS_SNDRV_MINOR(type) \
+ MODULE_ALIAS("sound-service-?-" __stringify(type))
+
#endif
#endif /* __SOUND_MINORS_H */
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! 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/core/oss mixer_oss.c,1.25,1.26 pcm_oss.c,1.55,1.56
Update of /cvsroot/alsa/alsa-kernel/core/oss
In directory sc8-pr-cvs1:/tmp/cvs-serv2159/core/oss
Modified Files:
mixer_oss.c pcm_oss.c
Log Message:
Rusty Russell <[EMAIL PROTECTED]>:
- added MODULE_ALIAS for sound services.
clean up the document.
modified by Takashi Iwai <[EMAIL PROTECTED]>
Index: mixer_oss.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/oss/mixer_oss.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mixer_oss.c 16 Oct 2003 12:01:04 - 1.25
+++ mixer_oss.c 30 Oct 2003 11:29:26 - 1.26
@@ -33,6 +33,7 @@
MODULE_AUTHOR("Jaroslav Kysela <[EMAIL PROTECTED]>");
MODULE_DESCRIPTION("Mixer OSS emulation for ALSA.");
MODULE_LICENSE("GPL");
+MODULE_ALIAS_SNDRV_MINOR(SNDRV_MINOR_OSS_MIXER);
static int snd_mixer_oss_open(struct inode *inode, struct file *file)
{
Index: pcm_oss.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/oss/pcm_oss.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- pcm_oss.c 29 Oct 2003 09:30:33 - 1.55
+++ pcm_oss.c 30 Oct 2003 11:29:26 - 1.56
@@ -56,6 +56,8 @@
MODULE_PARM(nonblock_open, "i");
MODULE_PARM_DESC(nonblock_open, "Don't block opening busy PCM devices.");
MODULE_PARM_SYNTAX(nonblock_open, "default:0,skill:advanced");
+MODULE_ALIAS_SNDRV_MINOR(SNDRV_MINOR_OSS_PCM);
+MODULE_ALIAS_SNDRV_MINOR(SNDRV_MINOR_OSS_PCM1);
extern int snd_mixer_oss_ioctl_card(snd_card_t *card, unsigned int cmd, unsigned long
arg);
static int snd_pcm_oss_get_rate(snd_pcm_oss_file_t *pcm_oss_file);
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! 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/core sound.c,1.51,1.52
Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1:/tmp/cvs-serv3283/core
Modified Files:
sound.c
Log Message:
- cards_limit=1 as default instead of 8.
- cards_limit means the number of auto-loaded cards. not limits the
actual card numbers for manual loading (e.g. hotplug).
Index: sound.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/sound.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sound.c 23 Oct 2003 14:34:52 - 1.51
+++ sound.c 29 Oct 2003 16:33:06 - 1.52
@@ -36,7 +36,7 @@
static int major = CONFIG_SND_MAJOR;
int snd_major;
-static int cards_limit = SNDRV_CARDS;
+static int cards_limit = 1;
#ifdef CONFIG_DEVFS_FS
static int device_mode = S_IFCHR | S_IRUGO | S_IWUGO;
#endif
@@ -50,7 +50,7 @@
MODULE_PARM_DESC(major, "Major # for sound driver.");
MODULE_PARM_SYNTAX(major, "default:116,skill:devel");
MODULE_PARM(cards_limit, "i");
-MODULE_PARM_DESC(cards_limit, "Count of soundcards installed in the system.");
+MODULE_PARM_DESC(cards_limit, "Count of auto-loadable soundcards.");
MODULE_PARM_SYNTAX(cards_limit, "default:8,skill:advanced");
#ifdef CONFIG_DEVFS_FS
MODULE_PARM(device_mode, "i");
@@ -58,6 +58,10 @@
MODULE_PARM_SYNTAX(device_mode, "default:0666,base:8");
#endif
+/* this one holds the actual max. card number currently available.
+ * as default, it's identical with cards_limit option. when more
+ * modules are loaded manually, this limit number increases, too.
+ */
int snd_ecards_limit;
static struct list_head snd_minors_hash[SNDRV_CARDS];
@@ -224,7 +228,7 @@
}
list_add_tail(&preg->list, &snd_minors_hash[SNDRV_MINOR_CARD(minor)]);
#ifdef CONFIG_DEVFS_FS
- if (strncmp(name, "controlC", 8)) /* created in sound.c */
+ if (strncmp(name, "controlC", 8) || card->number >= cards_limit)
devfs_mk_cdev(MKDEV(major, minor), S_IFCHR | device_mode, "snd/%s",
name);
#endif
up(&sound_mutex);
@@ -257,6 +261,8 @@
#ifdef CONFIG_DEVFS_FS
if (strncmp(mptr->name, "controlC", 8)) /* created in sound.c */
devfs_remove("snd/%s", mptr->name);
+ else if (card->number >= cards_limit)
+ devfs_remove("snd/%s", mptr->name); /* manualy created */
#endif
list_del(&mptr->list);
up(&sound_mutex);
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! 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/Documentation ALSA-Configuration.txt,1.23,1.24
Update of /cvsroot/alsa/alsa-kernel/Documentation In directory sc8-pr-cvs1:/tmp/cvs-serv3283/Documentation Modified Files: ALSA-Configuration.txt Log Message: - cards_limit=1 as default instead of 8. - cards_limit means the number of auto-loaded cards. not limits the actual card numbers for manual loading (e.g. hotplug). Index: ALSA-Configuration.txt === RCS file: /cvsroot/alsa/alsa-kernel/Documentation/ALSA-Configuration.txt,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ALSA-Configuration.txt 28 Oct 2003 11:28:01 - 1.23 +++ ALSA-Configuration.txt 29 Oct 2003 16:33:06 - 1.24 @@ -55,9 +55,10 @@ major - major # for sound driver - default is 116 cards_limit - - specifies card limit # (1-8) - - good for kmod support if you do not want to search - for soundcards which are not installed in your system + - specifies card limit # for auto-loading (1-8) + - default is 1 + - for auto-loading more than 1 card, specify this option + together with snd-card-X aliases. device_mode - specifies permission mask for dynamic sound device filesystem (available only when DEVFS is enabled) --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! 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 Makefile,1.97,1.98
Update of /cvsroot/alsa/alsa-driver In directory sc8-pr-cvs1:/tmp/cvs-serv32208 Modified Files: Makefile Log Message: moved alsaconf to alsa-utils. Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/Makefile,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- Makefile22 Oct 2003 14:23:59 - 1.97 +++ Makefile29 Oct 2003 13:37:17 - 1.98 @@ -155,10 +155,6 @@ elif [ -d $(DESTDIR)/etc/init.d ]; then \ install -m 755 -g $(IGROUP) -o $(IUSER) utils/alsasound $(DESTDIR)/etc/init.d/alsasound; \ fi - mkdir -p $(DESTDIR)$(bindir) - install -m 755 -g $(IGROUP) -o $(IUSER) utils/alsaconf $(DESTDIR)$(bindir) - mkdir -p $(DESTDIR)$(mandir)/man8 - install -m 644 -g $(IGROUP) -o $(IUSER) utils/alsaconf.8 $(DESTDIR)$(mandir)/man8 .PHONY: check-snd-prefix check-snd-prefix: --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! 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.27,1.28 README,1.6,1.7 configure.in,1.68,1.69
Update of /cvsroot/alsa/alsa-utils In directory sc8-pr-cvs1:/tmp/cvs-serv32418 Modified Files: Makefile.am README configure.in Log Message: - added alsaconf script. - fixed alsaconf script for the new module tools of 2.6 kernel. Index: Makefile.am === RCS file: /cvsroot/alsa/alsa-utils/Makefile.am,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- Makefile.am 28 Oct 2003 10:53:43 - 1.27 +++ Makefile.am 29 Oct 2003 13:38:23 - 1.28 @@ -4,7 +4,7 @@ else ALSAMIXER_DIR= endif -SUBDIRS=include alsactl $(ALSAMIXER_DIR) amidi amixer aplay iecset seq utils +SUBDIRS=include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq utils EXTRA_DIST=ChangeLog INSTALL TODO README configure cvscompile depcomp rpm: dist Index: README === RCS file: /cvsroot/alsa/alsa-utils/README,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- README 28 Oct 2003 10:53:43 - 1.6 +++ README 29 Oct 2003 13:38:23 - 1.7 @@ -6,6 +6,7 @@ The package can be compiled only with the installed ALSA driver and the ALSA C library. +alsaconf - the ALSA driver configurator script alsactl- an utility for soundcard settings management aplay/arecord - an utility for the playback / capture of .wav,.voc,.au files amixer - a command line mixer Index: configure.in === RCS file: /cvsroot/alsa/alsa-utils/configure.in,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- configure.in28 Oct 2003 10:53:43 - 1.68 +++ configure.in29 Oct 2003 13:38:23 - 1.69 @@ -48,9 +48,11 @@ AC_SUBST(CURSESINC) AC_SUBST(CURSESLIB) -dnl Check for Gtk+ -dnl AM_PATH_GTK(1.0.1) -dnl CFLAGS="$CFLAGS $GTK_CFLAGS" +AC_ARG_WITH(testsound, + [ --with-testsound=filegive the path of test sound file for alsaconf], + TESTSOUND="$withval", + TESTSOUND="/usr/share/sounds/alsa/test.wav") +AC_SUBST(TESTSOUND) AM_CONFIG_HEADER(include/aconfig.h) @@ -65,5 +67,6 @@ SAVE_UTIL_VERSION AC_OUTPUT(Makefile alsactl/Makefile alsamixer/Makefile amidi/Makefile amixer/Makefile \ + alsaconf/alsaconf alsaconf/Makefile \ aplay/Makefile 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: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! 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/alsaconf .cvsignore,NONE,1.1 Makefile.am,NONE,1.1 alsaconf.8,NONE,1.1 alsaconf.in,NONE,1.1
Update of /cvsroot/alsa/alsa-utils/alsaconf
In directory sc8-pr-cvs1:/tmp/cvs-serv32418/alsaconf
Added Files:
.cvsignore Makefile.am alsaconf.8 alsaconf.in
Log Message:
- added alsaconf script.
- fixed alsaconf script for the new module tools of 2.6 kernel.
--- NEW FILE: .cvsignore ---
.deps
alsaconf
Makefile
Makefile.in
--- NEW FILE: Makefile.am ---
bin_SCRIPTS = alsaconf
man_MANS = alsaconf.8
EXTRA_DIST = alsaconf.8
--- NEW FILE: alsaconf.8 ---
.\" Hey, EMACS: -*- nroff -*-
.\" alsaconf.8 is copyright 2003 by Jordi Mallach <[EMAIL PROTECTED]>
.\"
.\" This is free documentation, see the latest version of the GNU
.\" General Public License for copying conditions. There is NO warranty.
.TH ALSACONF 8 "February 23, 2003"
.SH NAME
alsaconf \- configuration tool for the Advanced Linux Sound Architecture
.SH SYNOPSIS
.B alsaconf
.RI [ options ]
.SH DESCRIPTION
This manual page documents briefly the
.B alsaconf
command.
This manual page was written for the Debian distribution because the
original program does not have a manual page.
.PP
\fBAlsaconf\fP is a simple shell script which tries to detect the sound cards
on your system and writes a suitable configuration file for ALSA. It will try
to guess what GNU/Linux distribution you're running, and will act accordingly
to the standards of that distribution, if specific support is available.
.PP
Alsaconf will write a modutils snippet which can be then used by modutils
to load the correct parameters for your sound card.
.SH OPTIONS
Alsaconf accepts the following options:
.TP
.B \-l, \-\-legacy
Check only for legacy non-isapnp cards
.TP
.B \-m, \-\-modinfo
Read module descriptions instead of reading a card database.
.TP
.B \-s, \-\-sound\-wav\-file
Use the specified wav file as a test sound
.TP
.B \-u, \-\-uid uid
Set the uid for the ALSA devices (default = 0)
.TP
.B \-g, \-\-gid gid
Set the gid for the ALSA devices (default = 0)
.TP
.B \-d, \-\-devmode mode
Set the device mode for the ALSA devices (default = 0666)
.TP
.B \-r, \-\-strict
Set strict device mode (equiv. with -g 17 -d 0660)
.TP
.B \-L, \-\-log
Logging on /tmp/alsaconf.log
.TP
.B \-p, \-\-probe card-name
Probe a legacy non-isapnp card and print module options
.TP
.B \-h, \-\-help
Displays this help text
.SH DEBIAN SPECIFIC
In Debian, the default gid of the device files is 29 (corresponding to the
audio group) and the default device mode is 0660.
For the ALSA base package, see also
.I /usr/share/doc/alsa-base/
.SH SEE ALSO
\fB
alsamixer(1),
amixer(1),
aplay(1),
arecord(1)
\fP
.SH HOMEPAGE
http://www.alsa-project.org/
.SH AUTHOR
The alsaconf script was written by
Takashi Iwai <[EMAIL PROTECTED]>,
Bernd Kaindl <[EMAIL PROTECTED]> and
Jan Ondrej (SAL) <[EMAIL PROTECTED]>
This manual page was written by Jordi Mallach <[EMAIL PROTECTED]>,
for the Debian system (but may be used by others).
--- NEW FILE: alsaconf.in ---
#!/bin/bash
#
# ALSA Configurator
#
# Copyright (c) 1999-2002 SuSE GmbH
# Jan ONDREJ
#
# written by Takashi Iwai <[EMAIL PROTECTED]>
# Bernd Kaindl <[EMAIL PROTECTED]>
# Jan ONDREJ (SAL) <[EMAIL PROTECTED]>
#
# based on the original version of Jan ONDREJ's alsaconf for ALSA 0.4.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
[EMAIL PROTECTED]@
# Check for root privileges
if [ `id -u` -ne 0 ]; then
echo "You must be root to use this script."
exit 1
fi
# Check for GNU/Linux distributions
if [ -f /etc/SuSE-release -o -f /etc/UnitedLinux-release ]; then
distribution="suse"
elif [ -f /etc/debian_version ]; then
distribution="debian"
elif [ -f /etc/redhat-release ]; then
distribution="redhat"
else
distribution="unknown"
fi
for prog in lspci lsmod; do
for path in /sbin /usr/sbin /bin /usr/bin;do
[[ -x $path/$prog ]] && eval $prog=$path/$prog
done
done
unset prog path
usage() {
echo "ALSA configurator version $version"
echo "usage: alsaconf [options]"
echo " -l|--legacycheck only legacy non-isapnp cards"
echo " -m|--modinfo read module descriptions instead of reading card db"
echo " -s|--sound wav-file"
echo " use the specified wav file as a test sound"
echo " -u|--uid uid set the uid for the ALSA devices (default = 0) [obsoleted]"
echo " -g|--gid gid set the gid for the ALSA devices (default = 0) [obsoleted]"
echo " -d|--devmode mode"
echo " set the device mode for the ALSA devices (default = 0666)
[ob
[alsa-cvslog] CVS: alsa-driver/utils alsaconf,1.10,NONE alsaconf.8,1.1,NONE
Update of /cvsroot/alsa/alsa-driver/utils In directory sc8-pr-cvs1:/tmp/cvs-serv32208/utils Removed Files: alsaconf alsaconf.8 Log Message: moved alsaconf to alsa-utils. --- alsaconf DELETED --- --- alsaconf.8 DELETED --- --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! 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/alsaconf - New directory
Update of /cvsroot/alsa/alsa-utils/alsaconf In directory sc8-pr-cvs1:/tmp/cvs-serv31973/alsaconf Log Message: Directory /cvsroot/alsa/alsa-utils/alsaconf added to the repository --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! 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/src/pcm/ext pcm_jack.c,1.3,1.4
Update of /cvsroot/alsa/alsa-lib/src/pcm/ext In directory sc8-pr-cvs1:/tmp/cvs-serv769 Modified Files: pcm_jack.c Log Message: disabled debug messages as default. Index: pcm_jack.c === RCS file: /cvsroot/alsa/alsa-lib/src/pcm/ext/pcm_jack.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pcm_jack.c 25 Jul 2003 17:02:05 - 1.3 +++ pcm_jack.c 28 Oct 2003 18:19:09 - 1.4 @@ -35,7 +35,7 @@ #include "pcm_local.h" #include -#define PCM_JACK_DEBUG +#undef PCM_JACK_DEBUG #ifndef PIC /* entry for static linking */ --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! 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/iecset Makefile.am,1.1,1.2 iecset.c,1.1,1.2
Update of /cvsroot/alsa/alsa-utils/iecset
In directory sc8-pr-cvs1:/tmp/cvs-serv26977/iecset
Modified Files:
Makefile.am iecset.c
Log Message:
- fixed Makefile.
- don't include but link iecbits.c.
Index: Makefile.am
===
RCS file: /cvsroot/alsa/alsa-utils/iecset/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 23 Oct 2003 16:54:33 - 1.1
+++ Makefile.am 28 Oct 2003 17:42:28 - 1.2
@@ -4,6 +4,6 @@
# CFLAGS += -g -Wall
bin_PROGRAMS = iecset
-amixer_SOURCES = iecset.c iecbits.c
+iecset_SOURCES = iecset.c iecbits.c
man_MANS = iecset.1
EXTRA_DIST = iecset.1
Index: iecset.c
===
RCS file: /cvsroot/alsa/alsa-utils/iecset/iecset.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iecset.c23 Oct 2003 16:54:33 - 1.1
+++ iecset.c28 Oct 2003 17:42:28 - 1.2
@@ -21,7 +21,7 @@
#include
#include
-#include "iecbits.c"
+void dump_iec958(snd_aes_iec958_t *iec);
static int get_bool(const char *str)
{
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! 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 als4000.c,1.23,1.24 azt3328.c,1.5,1.6 cmipci.c,1.51,1.52 ens1370.c,1.53,1.54 via82xx.c,1.64,1.65
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv24429/pci
Modified Files:
als4000.c azt3328.c cmipci.c ens1370.c via82xx.c
Log Message:
- use consistent values for specifying the port address
(0 = disable, 1 = auto-detect, others = manual)
- fixed the auto-detection of joystick port.
Index: als4000.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/als4000.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- als4000.c 24 Oct 2003 13:42:41 - 1.23
+++ als4000.c 28 Oct 2003 11:28:01 - 1.24
@@ -655,9 +655,12 @@
if (joystick_port[dev] == 1) {
/* auto-detect */
long p;
- for (p = 0x200; p <= 0x218; p += 8)
- if ((acard->res_joystick = request_region(p, 8, "ALS4000
gameport")) != NULL)
+ for (p = 0x200; p <= 0x218; p += 8) {
+ if ((acard->res_joystick = request_region(p, 8, "ALS4000
gameport")) != NULL) {
+ joystick_port[dev] = p;
break;
+ }
+ }
} else if (joystick_port[dev] > 0)
acard->res_joystick = request_region(joystick_port[dev], 8, "ALS4000
gameport");
if (acard->res_joystick)
Index: azt3328.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/azt3328.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- azt3328.c 14 Oct 2003 13:59:20 - 1.5
+++ azt3328.c 28 Oct 2003 11:28:01 - 1.6
@@ -164,8 +164,7 @@
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
#ifdef SUPPORT_JOYSTICK
-static int joystick[SNDRV_CARDS] =
- {-1}; /* "unset" as default */
+static int joystick[SNDRV_CARDS];
#endif
MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
@@ -179,8 +178,8 @@
MODULE_PARM_SYNTAX(enable, SNDRV_INDEX_DESC);
#ifdef SUPPORT_JOYSTICK
MODULE_PARM(joystick, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(joystick, "Forced joystick port enable for AZF3328 soundcard. (0 =
force disable)");
-MODULE_PARM_SYNTAX(joystick, SNDRV_ENABLED);
+MODULE_PARM_DESC(joystick, "Enable joystick for AZF3328 soundcard.");
+MODULE_PARM_SYNTAX(joystick, SNDRV_BOOLEAN_FALSE_DESC);
#endif
typedef struct _snd_azf3328 azf3328_t;
@@ -1445,47 +1444,21 @@
#ifdef SUPPORT_JOYSTICK
static void __devinit snd_azf3328_config_joystick(azf3328_t *chip, int joystick)
{
- int i, activate = 0;
- char *msg = NULL;
unsigned char val;
- if (joystick == -1) /* auto detection/activation */
- {
- activate = 1;
- for (i=0x200; i <= 0x207; i++)
- if (inb(i) != 0xff) {
- activate = 0;
- break;
- }
- }
-
- if (activate || joystick == 1) {
- if ((chip->res_joystick = request_region(0x200, 8, "AZF3328
gameport")) != NULL) {
+ if (joystick == 1) {
+ if ((chip->res_joystick = request_region(0x200, 8, "AZF3328
gameport")) != NULL)
chip->gameport.io = 0x200;
- activate = 1;
- } else
- activate = 0;
- }
- if (joystick == 0)
- msg = "DISABLED (forced)";
- else if (joystick == 1 && activate)
- msg = "ENABLED (Warning: forced!)";
- else if (activate)
- msg = "ENABLED (via autodetect)";
- else
- msg = "DISABLED (address occupied by another joystick port)";
+ }
val = inb(chip->io2_port + IDX_IO2_LEGACY_ADDR);
- if (activate)
+ if (chip->res_joystick)
val |= LEGACY_JOY;
else
val &= ~LEGACY_JOY;
outb(val, chip->io2_port + IDX_IO2_LEGACY_ADDR);
-#ifdef MODULE
- printk("azt3328: Joystick port: %s.\n", msg);
-#endif
- if (activate)
+ if (chip->res_joystick)
gameport_register_port(&chip->gameport);
}
#endif
Index: cmipci.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/cmipci.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- cmipci.c23 Oct 2003 14:34:52 - 1.51
+++ cmipci.c28 Oct 2003 11:28:01 - 1.52
@@ -60,8 +60,8 @@
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable switches */
-static long mpu_port[SNDRV_CARDS] = {0x330, [1 ... (SNDRV_CARDS-1)]=-1};
-static long fm_po
[alsa-cvslog] CVS: alsa-kernel/pci/ymfpci ymfpci.c,1.31,1.32
Update of /cvsroot/alsa/alsa-kernel/pci/ymfpci
In directory sc8-pr-cvs1:/tmp/cvs-serv24429/pci/ymfpci
Modified Files:
ymfpci.c
Log Message:
- use consistent values for specifying the port address
(0 = disable, 1 = auto-detect, others = manual)
- fixed the auto-detection of joystick port.
Index: ymfpci.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ymfpci/ymfpci.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ymfpci.c27 Oct 2003 11:30:18 - 1.31
+++ ymfpci.c28 Oct 2003 11:28:01 - 1.32
@@ -128,7 +128,8 @@
legacy_ctrl2 = 0x0800; /* SBEN = 0, SMOD = 01, LAD = 0 */
if (pci_id->device >= 0x0010) { /* YMF 744/754 */
- if (fm_port[dev] <= 0) {
+ if (fm_port[dev] == 1) {
+ /* auto-detect */
fm_port[dev] = pci_resource_start(pci, 1);
}
if (fm_port[dev] > 0 &&
@@ -136,7 +137,8 @@
legacy_ctrl |= YMFPCI_LEGACY_FMEN;
pci_write_config_word(pci, PCIR_DSXG_FMBASE, fm_port[dev]);
}
- if (mpu_port[dev] <= 0) {
+ if (mpu_port[dev] == 1) {
+ /* auto-detect */
mpu_port[dev] = pci_resource_start(pci, 1) + 0x20;
}
if (mpu_port[dev] > 0 &&
@@ -146,6 +148,7 @@
}
#ifdef SUPPORT_JOYSTICK
if (joystick_port[dev] == 1) {
+ /* auto-detect */
joystick_port[dev] = pci_resource_start(pci, 2);
}
if (joystick_port[dev] > 0 &&
@@ -160,28 +163,28 @@
case 0x398: legacy_ctrl2 |= 1; break;
case 0x3a0: legacy_ctrl2 |= 2; break;
case 0x3a8: legacy_ctrl2 |= 3; break;
- default: fm_port[dev] = -1; break;
+ default: fm_port[dev] = 0; break;
}
if (fm_port[dev] > 0 &&
(fm_res = request_region(fm_port[dev], 4, "YMFPCI OPL3")) != NULL)
{
legacy_ctrl |= YMFPCI_LEGACY_FMEN;
} else {
legacy_ctrl2 &= ~YMFPCI_LEGACY2_FMIO;
- fm_port[dev] = -1;
+ fm_port[dev] = 0;
}
switch (mpu_port[dev]) {
case 0x330: legacy_ctrl2 |= 0 << 4; break;
case 0x300: legacy_ctrl2 |= 1 << 4; break;
case 0x332: legacy_ctrl2 |= 2 << 4; break;
case 0x334: legacy_ctrl2 |= 3 << 4; break;
- default: mpu_port[dev] = -1; break;
+ default: mpu_port[dev] = 0; break;
}
if (mpu_port[dev] > 0 &&
(mpu_res = request_region(mpu_port[dev], 2, "YMFPCI MPU401")) !=
NULL) {
legacy_ctrl |= YMFPCI_LEGACY_MEN;
} else {
legacy_ctrl2 &= ~YMFPCI_LEGACY2_MPUIO;
- mpu_port[dev] = -1;
+ mpu_port[dev] = 0;
}
#ifdef SUPPORT_JOYSTICK
if (joystick_port[dev] == 1) {
@@ -200,7 +203,7 @@
case 0x202: legacy_ctrl2 |= 1 << 6; break;
case 0x204: legacy_ctrl2 |= 2 << 6; break;
case 0x205: legacy_ctrl2 |= 3 << 6; break;
- default: joystick_port[dev] = -1; break;
+ default: joystick_port[dev] = 0; break;
}
if (! joystick_res && joystick_port[dev] > 0)
joystick_res = request_region(joystick_port[dev], 1, "YMFPCI
gameport");
@@ -208,7 +211,7 @@
legacy_ctrl |= YMFPCI_LEGACY_JPEN;
} else {
legacy_ctrl2 &= ~YMFPCI_LEGACY2_JSIO;
- joystick_port[dev] = -1;
+ joystick_port[dev] = 0;
}
#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/Documentation ALSA-Configuration.txt,1.22,1.23
Update of /cvsroot/alsa/alsa-kernel/Documentation In directory sc8-pr-cvs1:/tmp/cvs-serv24429/Documentation Modified Files: ALSA-Configuration.txt Log Message: - use consistent values for specifying the port address (0 = disable, 1 = auto-detect, others = manual) - fixed the auto-detection of joystick port. Index: ALSA-Configuration.txt === RCS file: /cvsroot/alsa/alsa-kernel/Documentation/ALSA-Configuration.txt,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- ALSA-Configuration.txt 24 Oct 2003 13:42:41 - 1.22 +++ ALSA-Configuration.txt 28 Oct 2003 11:28:01 - 1.23 @@ -198,6 +198,8 @@ Module for soundcards based on Aztech AZF3328 PCI chip. +joystick - Enable joystick (default off) + Module supports up to 8 cards. Module snd-cmi8330 @@ -220,8 +222,8 @@ Module for C-Media CMI8338 and 8738 PCI soundcards. -mpu_port - 0x300 (default),0x310,0x320,0x330, -1 (diable) -fm_port - 0x388 (default), -1 (disable) +mpu_port - 0x300,0x310,0x320,0x330, 0 = disable (default) +fm_port - 0x388 (default), 0 = disable (default) soft_ac3- Sofware-conversion of raw SPDIF packets (model 033 only) (default = 1) joystick - Enable joystick (default off) @@ -1124,17 +1126,16 @@ Module for Yamaha PCI chips (YMF72x, YMF74x & YMF75x). -mpu_port - 0x300,0x330,0x332,0x334, 0 (disable) by default +mpu_port - 0x300,0x330,0x332,0x334, 0 (disable) by default, +1 (auto-detect for YMF744/754 only) fm_port - 0x388,0x398,0x3a0,0x3a8, 0 (disable) by default +1 (auto-detect for YMF744/754 only) joystick_port - 0x201,0x202,0x204,0x205, 0 (disable) by default, 1 (auto-detect) rear_switch - enable shared rear/line-in switch (bool) Module supports autoprobe and multiple chips (max 8). -With YMF744/754 chips, the MPU401/FM/joystick port addresses are -chosen automatically, and enabled by default. - The power-management is supported. --- 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-tools/us428control Cus428Midi.cc,1.1,1.2 Cus428Midi.h,1.1,1.2 Cus428State.h,1.2,1.3 configure.in,1.2,1.3
Update of /cvsroot/alsa/alsa-tools/us428control
In directory sc8-pr-cvs1:/tmp/cvs-serv19153
Modified Files:
Cus428Midi.cc Cus428Midi.h Cus428State.h configure.in
Log Message:
update by Karsten Wiese <[EMAIL PROTECTED]>:
- Initialize Cus428State::SelectInputMonitor in Ctor.
- Added GPL description.
Index: Cus428Midi.cc
===
RCS file: /cvsroot/alsa/alsa-tools/us428control/Cus428Midi.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Cus428Midi.cc 24 Oct 2003 14:01:45 - 1.1
+++ Cus428Midi.cc 28 Oct 2003 10:57:13 - 1.2
@@ -1,3 +1,22 @@
+/*
+ *
+ * Copyright (c) 2003 by Karsten Wiese <[EMAIL PROTECTED]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
#include
#include "Cus428Midi.h"
Index: Cus428Midi.h
===
RCS file: /cvsroot/alsa/alsa-tools/us428control/Cus428Midi.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Cus428Midi.h24 Oct 2003 14:01:45 - 1.1
+++ Cus428Midi.h28 Oct 2003 10:57:13 - 1.2
@@ -1,3 +1,22 @@
+/*
+ *
+ * Copyright (c) 2003 by Karsten Wiese <[EMAIL PROTECTED]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
#include
#include "Cus428State.h"
Index: Cus428State.h
===
RCS file: /cvsroot/alsa/alsa-tools/us428control/Cus428State.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Cus428State.h 24 Oct 2003 14:01:45 - 1.2
+++ Cus428State.h 28 Oct 2003 10:57:13 - 1.3
@@ -29,6 +29,8 @@
:us428ctls_sharedmem(Pus428ctls_sharedmem)
,MuteInputMonitor(0)
,Mute(0)
+ ,SelectInputMonitor(0)
+ ,Select(0)
,us428_ctls(0)
{
init_us428_lights();
Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-tools/us428control/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configure.in24 Oct 2003 14:01:45 - 1.2
+++ configure.in28 Oct 2003 10:57:13 - 1.3
@@ -1,5 +1,5 @@
AC_INIT(us428control.cc)
-AM_INIT_AUTOMAKE(us428control, 0.3)
+AM_INIT_AUTOMAKE(us428control, 0.4)
AC_PROG_CXX
AC_PROG_INSTALL
AC_HEADER_STDC
---
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/amidi .cvsignore,NONE,1.1 Makefile.am,NONE,1.1 amidi.1,NONE,1.1 amidi.c,NONE,1.1
Update of /cvsroot/alsa/alsa-utils/amidi In directory sc8-pr-cvs1:/tmp/cvs-serv18564/amidi Added Files: .cvsignore Makefile.am amidi.1 amidi.c Log Message: - added amidi utility by Clemens Ladisch <[EMAIL PROTECTED]> - fixed .cvsignore and README --- NEW FILE: .cvsignore --- .deps amidi Makefile Makefile.in --- NEW FILE: Makefile.am --- INCLUDES = -I$(top_srcdir)/include EXTRA_DIST = amidi.1 bin_PROGRAMS = amidi man_MANS = amidi.1 --- NEW FILE: amidi.1 --- .TH AMIDI 1 "27 Oct 2003" .SH NAME amidi \- read from and write to ALSA RawMIDI ports .SH SYNOPSIS .B amidi .I options .SH DESCRIPTION .B amidi is a command-line utility which allows to receive and send SysEx (system exclusive) data from/to external MIDI devices. It can also send any other MIDI commands. .B amidi handles only files containing raw MIDI commands, without timing information. Standard MIDI (.mid) files are not supported. .SH INVOKING .B amidi .I options Use the .I -h, .I -V, .I -l, or .I -L options to display information; or use at least one of the .I -s, .I -r, .I -S, or .I -d options to specify what data to send or receive. .SS Options .TP .I -h, --help Help: prints a list of options. .TP .I -V, --version Prints the current version. .TP .I -l, --list-devices Prints a list of all hardware MIDI ports. .TP .I -L, --list-rawmidis Prints all RawMIDI definitions. (used when debugging configuration files) .TP .I -p, --port=name Sets the name of the ALSA RawMIDI port to use. If this is not specified, .B amidi uses the default port defined in the configuration file (the default for this is port 0 on card 0, which may not exist). .TP .I -s, --send=filename Sends the contents of the specified file to the MIDI port. The file must contain raw MIDI commands (e.g. a .syx file); you can .I not use a Standard MIDI (.mid) file for this. .TP .I -r, --receive=filename Writes data received from the MIDI port into the specified file. The file will contain raw MIDI commands (such as in a .syx file); this will .I not create a Standard MIDI (.mid) file. .B amidi will filter out any Active Sensing bytes (FEh). .TP .I -S, --send-hex="..." Sends the bytes specified as hexadecimal numbers to the MIDI port. .TP .I -d, --dump Prints data received from the MIDI port as hexadecimal bytes. Active Sensing bytes (FEh) will not be shown. This option is useful for debugging. .TP .I -t, --timeout=seconds Stops receiving data when no data has been received for the specified amount of time. If this option has not been given, you must press Ctrl+C (or kill .B amidi\fR) to stop receiving data. .SH EXAMPLES .SS .B amidi -p hw:0 -s my_settings.syx .ID will send the MIDI commands in .I my_settings.syx to port .I hw:0. .SS .B amidi -S 'F0 43 10 4C 00 00 7E 00 F7' .ID sends an XG Reset to the default port. .SS .B amidi -p hw:1,2 -S F0411042110C0074F7 -r dump.syx -t 1 .ID sends a \(lqParameter Dump Request\(rq to a GS device, saves the received parameter data to the file .I dump.syx, and stops after the device has finished sending data (when no data has been received for one second). .SS .B amidi -p virtual -d .ID creates a virtual RawMIDI port and prints all data sent to this port. .SH FILES .I /usr/share/alsa/alsa.conf default rawmidi definitions .br .I /etc/asound.conf system-wide rawmidi definitions .br .I ~/.asoundrc user specific rawmidi definitions .SH BUGS The .I --list-devices option pretends that output and input ports are the same. .SH AUTHOR Clemens Ladisch <[EMAIL PROTECTED]> --- NEW FILE: amidi.c --- /* * amidi.c - read from/write to RawMIDI ports * * Copyright (c) Clemens Ladisch <[EMAIL PROTECTED]> * * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #define _GNU_SOURCE #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "aconfig.h" #include "version.h" static int do_device_list, do_rawmidi_list; static char *port_name = "default"; static char *send_file_name; static char *receive_file_name; static char *send_hex; static char *send_data; static int send_data_length; static int receive_file; static int dump; static int timeout; static int stop; static snd_rawmidi_t *input, **inputp; static snd_rawmidi_t *output, **outputp; static void error(
[alsa-cvslog] CVS: alsa-utils .cvsignore,1.6,1.7 Makefile.am,1.26,1.27 README,1.5,1.6 configure.in,1.67,1.68
Update of /cvsroot/alsa/alsa-utils In directory sc8-pr-cvs1:/tmp/cvs-serv18564 Modified Files: .cvsignore Makefile.am README configure.in Log Message: - added amidi utility by Clemens Ladisch <[EMAIL PROTECTED]> - fixed .cvsignore and README Index: .cvsignore === RCS file: /cvsroot/alsa/alsa-utils/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 24 Oct 2002 12:26:15 - 1.6 +++ .cvsignore 28 Oct 2003 10:53:42 - 1.7 @@ -10,3 +10,6 @@ version autom4te.cache depcomp +missing +install-sh +mkinstalldirs Index: Makefile.am === RCS file: /cvsroot/alsa/alsa-utils/Makefile.am,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- Makefile.am 23 Oct 2003 16:54:32 - 1.26 +++ Makefile.am 28 Oct 2003 10:53:43 - 1.27 @@ -4,7 +4,7 @@ else ALSAMIXER_DIR= endif -SUBDIRS=include alsactl $(ALSAMIXER_DIR) amixer aplay iecset seq utils +SUBDIRS=include alsactl $(ALSAMIXER_DIR) amidi amixer aplay iecset seq utils EXTRA_DIST=ChangeLog INSTALL TODO README configure cvscompile depcomp rpm: dist Index: README === RCS file: /cvsroot/alsa/alsa-utils/README,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- README 25 Nov 2000 18:25:56 - 1.5 +++ README 28 Oct 2003 10:53:43 - 1.6 @@ -10,6 +10,8 @@ aplay/arecord - an utility for the playback / capture of .wav,.voc,.au files amixer - a command line mixer alsamixer - a ncurses mixer +amidi - a utility to send/receive sysex dumps or other MIDI data +iecset - a utility to show/set the IEC958 status bits You may give a look for more information about the ALSA project to URL http://www.alsa-project.org. Index: configure.in === RCS file: /cvsroot/alsa/alsa-utils/configure.in,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- configure.in23 Oct 2003 16:54:32 - 1.67 +++ configure.in28 Oct 2003 10:53:43 - 1.68 @@ -64,6 +64,6 @@ SAVE_UTIL_VERSION -AC_OUTPUT(Makefile alsactl/Makefile alsamixer/Makefile amixer/Makefile aplay/Makefile \ - include/Makefile iecset/Makefile utils/Makefile utils/alsa-utils.spec \ - seq/Makefile seq/aconnect/Makefile seq/aseqnet/Makefile) +AC_OUTPUT(Makefile alsactl/Makefile alsamixer/Makefile amidi/Makefile amixer/Makefile \ + aplay/Makefile 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-utils/amidi - New directory
Update of /cvsroot/alsa/alsa-utils/amidi In directory sc8-pr-cvs1:/tmp/cvs-serv18173/amidi Log Message: Directory /cvsroot/alsa/alsa-utils/amidi 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/pci/ymfpci ymfpci.c,1.30,1.31
Update of /cvsroot/alsa/alsa-kernel/pci/ymfpci
In directory sc8-pr-cvs1:/tmp/cvs-serv4229/pci/ymfpci
Modified Files:
ymfpci.c
Log Message:
fixed the auto-detection of joystick port.
Index: ymfpci.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ymfpci/ymfpci.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ymfpci.c24 Oct 2003 13:42:41 - 1.30
+++ ymfpci.c27 Oct 2003 11:30:18 - 1.31
@@ -194,17 +194,16 @@
}
if (joystick_res)
joystick_port[dev] = p;
- } else {
- switch (joystick_port[dev]) {
- case 0x201: legacy_ctrl2 |= 0 << 6; break;
- case 0x202: legacy_ctrl2 |= 1 << 6; break;
- case 0x204: legacy_ctrl2 |= 2 << 6; break;
- case 0x205: legacy_ctrl2 |= 3 << 6; break;
- default: joystick_port[dev] = -1; break;
- }
- if (joystick_port[dev] > 0)
- joystick_res = request_region(joystick_port[dev], 1,
"YMFPCI gameport");
}
+ switch (joystick_port[dev]) {
+ case 0x201: legacy_ctrl2 |= 0 << 6; break;
+ case 0x202: legacy_ctrl2 |= 1 << 6; break;
+ case 0x204: legacy_ctrl2 |= 2 << 6; break;
+ case 0x205: legacy_ctrl2 |= 3 << 6; break;
+ default: joystick_port[dev] = -1; break;
+ }
+ if (! joystick_res && joystick_port[dev] > 0)
+ joystick_res = request_region(joystick_port[dev], 1, "YMFPCI
gameport");
if (joystick_res) {
legacy_ctrl |= YMFPCI_LEGACY_JPEN;
} else {
---
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/cs46xx cs46xx_lib.c,1.66,1.67
Update of /cvsroot/alsa/alsa-kernel/pci/cs46xx
In directory sc8-pr-cvs1:/tmp/cvs-serv3108/pci/cs46xx
Modified Files:
cs46xx_lib.c
Log Message:
fixed the 4channel mode of another CS429x codec (0x592b).
Index: cs46xx_lib.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/cs46xx/cs46xx_lib.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- cs46xx_lib.c23 Oct 2003 14:34:53 - 1.66
+++ cs46xx_lib.c27 Oct 2003 11:23:40 - 1.67
@@ -2552,8 +2552,10 @@
#ifdef CONFIG_SND_CS46XX_NEW_DSP
if (chip->nr_ac97_codecs == 1 &&
- snd_cs46xx_codec_read(chip, AC97_VENDOR_ID2,
- CS46XX_PRIMARY_CODEC_INDEX) == 0x592d) {
+ (snd_cs46xx_codec_read(chip, AC97_VENDOR_ID2,
+ CS46XX_PRIMARY_CODEC_INDEX) == 0x592b ||
+snd_cs46xx_codec_read(chip, AC97_VENDOR_ID2,
+ CS46XX_PRIMARY_CODEC_INDEX) == 0x592d)) {
/* set primary cs4294 codec into Extended Audio Mode */
snd_printdd("setting EAM bit on cs4294 CODEC\n");
snd_cs46xx_codec_write(chip, AC97_CSR_ACMODE, 0x200,
---
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.109,1.110 ac97_patch.c,1.27,1.28 ac97_patch.h,1.9,1.10
Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1:/tmp/cvs-serv29731/pci/ac97
Modified Files:
ac97_codec.c ac97_patch.c ac97_patch.h
Log Message:
[EMAIL PROTECTED]:
- added patch for IT2646.
Index: ac97_codec.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_codec.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- ac97_codec.c24 Oct 2003 13:44:21 - 1.109
+++ ac97_codec.c27 Oct 2003 10:48:41 - 1.110
@@ -140,6 +140,7 @@
{ 0x49434551, 0x, "VT1616",patch_vt1616, NULL },
{ 0x49434552, 0x, "VT1616i", patch_vt1616, NULL }, // VT1616
compatible (chipset integrated)
{ 0x49544520, 0x, "IT2226E", NULL, NULL },
+{ 0x49544561, 0x, "IT2646E", patch_it2646, NULL },
{ 0x4e534300, 0x, "LM4540/43/45/46/48",NULL, NULL }, //
only guess --jk
{ 0x4e534331, 0x, "LM4549",NULL, NULL },
{ 0x4e534350, 0x, "LM4550",NULL, NULL },
Index: ac97_patch.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_patch.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ac97_patch.c23 Oct 2003 14:34:52 - 1.27
+++ ac97_patch.c27 Oct 2003 10:48:42 - 1.28
@@ -1105,3 +1105,37 @@
ac97->build_ops = &patch_vt1616_ops;
return 0;
}
+
+static const snd_kcontrol_new_t snd_ac97_controls_it2646[] = {
+ AC97_SINGLE("Line-In As Surround", 0x76, 9, 1, 0),
+ AC97_SINGLE("Mic As Center/LFE", 0x76, 10, 1, 0),
+};
+
+static const snd_kcontrol_new_t snd_ac97_spdif_controls_it2646[] = {
+ AC97_SINGLE("IEC958 Capture Switch", 0x76, 11, 1, 0),
+ AC97_SINGLE("Analog to IEC958 Output", 0x76, 12, 1, 0),
+ AC97_SINGLE("IEC958 Input Monitor", 0x76, 13, 1, 0),
+};
+
+static int patch_it2646_specific(ac97_t * ac97)
+{
+ int err;
+ if ((err = patch_build_controls(ac97, snd_ac97_controls_it2646,
ARRAY_SIZE(snd_ac97_controls_it2646))) < 0)
+ return err;
+ if ((err = patch_build_controls(ac97, snd_ac97_spdif_controls_it2646,
ARRAY_SIZE(snd_ac97_spdif_controls_it2646))) < 0)
+ return err;
+ return 0;
+}
+
+static struct snd_ac97_build_ops patch_it2646_ops = {
+ .build_specific = patch_it2646_specific
+};
+
+int patch_it2646(ac97_t * ac97)
+{
+ ac97->build_ops = &patch_it2646_ops;
+ /* full DAC volume */
+ snd_ac97_write_cache(ac97, 0x5E, 0x0808);
+ snd_ac97_write_cache(ac97, 0x7A, 0x0808);
+ return 0;
+}
Index: ac97_patch.h
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_patch.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ac97_patch.h30 Jul 2003 10:54:03 - 1.9
+++ ac97_patch.h27 Oct 2003 10:48:42 - 1.10
@@ -47,3 +47,4 @@
int patch_cm9738(ac97_t * ac97);
int patch_cm9739(ac97_t * ac97);
int patch_vt1616(ac97_t * ac97);
+int patch_it2646(ac97_t * ac97);
---
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/ymfpci ymfpci.c,1.29,1.30
Update of /cvsroot/alsa/alsa-kernel/pci/ymfpci
In directory sc8-pr-cvs1:/tmp/cvs-serv13252/pci/ymfpci
Modified Files:
ymfpci.c
Log Message:
added auto-detection of joystick port.
Index: ymfpci.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ymfpci/ymfpci.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ymfpci.c14 Oct 2003 13:59:21 - 1.29
+++ ymfpci.c24 Oct 2003 13:42:41 - 1.30
@@ -145,10 +145,10 @@
pci_write_config_word(pci, PCIR_DSXG_MPU401BASE,
mpu_port[dev]);
}
#ifdef SUPPORT_JOYSTICK
- if (joystick_port[dev] < 0) {
+ if (joystick_port[dev] == 1) {
joystick_port[dev] = pci_resource_start(pci, 2);
}
- if (joystick_port[dev] >= 0 &&
+ if (joystick_port[dev] > 0 &&
(joystick_res = request_region(joystick_port[dev], 1, "YMFPCI
gameport")) != NULL) {
legacy_ctrl |= YMFPCI_LEGACY_JPEN;
pci_write_config_word(pci, PCIR_DSXG_JOYBASE,
joystick_port[dev]);
@@ -184,15 +184,28 @@
mpu_port[dev] = -1;
}
#ifdef SUPPORT_JOYSTICK
- switch (joystick_port[dev]) {
- case 0x201: legacy_ctrl2 |= 0 << 6; break;
- case 0x202: legacy_ctrl2 |= 1 << 6; break;
- case 0x204: legacy_ctrl2 |= 2 << 6; break;
- case 0x205: legacy_ctrl2 |= 3 << 6; break;
- default: joystick_port[dev] = -1; break;
+ if (joystick_port[dev] == 1) {
+ /* auto-detect */
+ long p;
+ for (p = 0x201; p <= 0x205; p++) {
+ if (p == 0x203) continue;
+ if ((joystick_res = request_region(p, 1, "YMFPCI
gameport")) != NULL)
+ break;
+ }
+ if (joystick_res)
+ joystick_port[dev] = p;
+ } else {
+ switch (joystick_port[dev]) {
+ case 0x201: legacy_ctrl2 |= 0 << 6; break;
+ case 0x202: legacy_ctrl2 |= 1 << 6; break;
+ case 0x204: legacy_ctrl2 |= 2 << 6; break;
+ case 0x205: legacy_ctrl2 |= 3 << 6; break;
+ default: joystick_port[dev] = -1; break;
+ }
+ if (joystick_port[dev] > 0)
+ joystick_res = request_region(joystick_port[dev], 1,
"YMFPCI gameport");
}
- if (joystick_port[dev] > 0 &&
- (joystick_res = request_region(joystick_port[dev], 1, "YMFPCI
gameport")) != NULL) {
+ if (joystick_res) {
legacy_ctrl |= YMFPCI_LEGACY_JPEN;
} else {
legacy_ctrl2 &= ~YMFPCI_LEGACY2_JSIO;
---
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/Documentation ALSA-Configuration.txt,1.21,1.22 Joystick.txt,1.1,1.2
Update of /cvsroot/alsa/alsa-kernel/Documentation In directory sc8-pr-cvs1:/tmp/cvs-serv13252/Documentation Modified Files: ALSA-Configuration.txt Joystick.txt Log Message: added auto-detection of joystick port. Index: ALSA-Configuration.txt === RCS file: /cvsroot/alsa/alsa-kernel/Documentation/ALSA-Configuration.txt,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- ALSA-Configuration.txt 14 Oct 2003 13:59:19 - 1.21 +++ ALSA-Configuration.txt 24 Oct 2003 13:42:41 - 1.22 @@ -173,7 +173,7 @@ Module for soundcards based on Avance Logic ALS4000 PCI chip. joystick_port - port # for legacy joystick support. -0 = disabled (default) +0 = disabled (default), 1 = auto-detect Module supports up to 8 cards, autoprobe and PnP. @@ -390,7 +390,7 @@ * SoundBlaster Vibra PCI joystick_port - port # for joystick (0x200,0x208,0x210,0x218), - 0 = disable (default) + 0 = disable (default), 1 = auto-detect Module supports up to 8 cards and autoprobe. @@ -1124,9 +1124,10 @@ Module for Yamaha PCI chips (YMF72x, YMF74x & YMF75x). -mpu_port - 0x300,0x330,0x332,0x334, -1 (disable) by default -fm_port - 0x388,0x398,0x3a0,0x3a8, -1 (disable) by default -joystick_port - 0x201,0x202,0x204,0x205, -1 (disable) by default +mpu_port - 0x300,0x330,0x332,0x334, 0 (disable) by default +fm_port - 0x388,0x398,0x3a0,0x3a8, 0 (disable) by default +joystick_port - 0x201,0x202,0x204,0x205, 0 (disable) by default, +1 (auto-detect) rear_switch - enable shared rear/line-in switch (bool) Module supports autoprobe and multiple chips (max 8). Index: Joystick.txt === RCS file: /cvsroot/alsa/alsa-kernel/Documentation/Joystick.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Joystick.txt14 Oct 2003 13:59:19 - 1.1 +++ Joystick.txt24 Oct 2003 13:42:41 - 1.2 @@ -36,11 +36,13 @@ Driver Module Option Available Values --- -als4000joystick_port any address (e.g. 0x200), 0 = disable (default) +als4000joystick_port 0 = disable (default), 1 = auto-detect, +manual: any address (e.g. 0x200) au88x0 N/A N/A azf3328joystick0 = disable, 1 = enable, -1 = auto (default) ens1370joystick0 = disable (default), 1 = enable -ens1371joystick_port 0 = disable (default), 0x200,0x208,0x210,0x218 +ens1371joystick_port 0 = disable (default), 1 = auto-detect, +manual: 0x200, 0x208, 0x210, 0x218 cmipci joystick0 = disable (default), 1 = enable cs4281 N/A N/A cs46xx N/A N/A @@ -50,13 +52,13 @@ sonicvibes N/A N/A tridentN/A N/A via82xx(*2)joystick0 = disable (default), 1 = enable -ymfpci(*3) joystick_port 0 = disable (default), 0x201,0x202,0x204,0x205 +ymfpci joystick_port 0 = disable (default), 1 = auto-detect, +manual: 0x201, 0x202, 0x204, 0x205(*3) --- *1) not all chips support joystick *2) VIA686A/B only -*3) With YMF744/754 chips, the port address is chosen automatically - and enabled by default +*3) With YMF744/754 chips, the port address can be chosen arbitrarily The following drivers don't support gameport natively, but there are additional modules. Load the corresponding module to add the gameport --- 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-tools/us428control Cus428Midi.cc,NONE,1.1 Cus428Midi.h,NONE,1.1 Cus428State.cc,1.1,1.2 Cus428State.h,1.1,1.2 Cus428_ctls.cc,1.1,1.2 Cus428_ctls.h,1.1,1.2 Makefile.am,1.1,1.2 configure.in,1.1,1.2 us428control.cc,1.1,1.2 usbus428ctldefs.h,1.1,1.2
Update of /cvsroot/alsa/alsa-tools/us428control
In directory sc8-pr-cvs1:/tmp/cvs-serv16947
Modified Files:
Cus428State.cc Cus428State.h Cus428_ctls.cc Cus428_ctls.h
Makefile.am configure.in us428control.cc usbus428ctldefs.h
Added Files:
Cus428Midi.cc Cus428Midi.h
Log Message:
Karsten Wiese <[EMAIL PROTECTED]>:
This has more features:
- PCM-Volume adjusted to MasteVolumeSlider setting at device start.
- Direct Monitoring Functions adjustable directly on the US428
- Alsa Sequencer Output port for applications to receive the US428 sliders
etc.
--- NEW FILE: Cus428Midi.cc ---
#include
#include "Cus428Midi.h"
char Cus428Midi::KnobParam[] = {
0x17,
0x16,
0x15,
0x14,
0x13,
0x2A,
0x29,
0x28,
-1,
0x10,
0x11,
0x18,
0x19,
0x1A,
-1,
-1,
-1,
-1,
0x2C,
0x2D,
0x2E,
0x2F,
-1,
-1,
0x20,
0x21,
0x22,
0x23,
0x24,
0x25,
0x26,
0x27,
0,
1,
2,
3,
4,
5,
6,
7,
-1,
-1,
-1,
-1,
-1,
-1,
-1,
-1,
0x30,
0x31,
0x32,
0x33,
0x34,
0x35,
0x36,
0x37,
};
--- NEW FILE: Cus428Midi.h ---
#include
#include "Cus428State.h"
class Cus428Midi {
public:
Cus428Midi():
Seq(0){}
int CreatePorts(){
int Err;
if (0 <= (Err = snd_seq_open(&Seq, "default", SND_SEQ_OPEN_DUPLEX,
SND_SEQ_NONBLOCK))) {
snd_seq_set_client_name(Seq, "US-428");
Err = snd_seq_create_simple_port(Seq, "Controls",
SNDRV_SEQ_PORT_CAP_READ
//|SNDRV_SEQ_PORT_CAP_WRITE
FIXME: Next Step is to make Lights switchable
|SNDRV_SEQ_PORT_CAP_SUBS_READ
/*|SNDRV_SEQ_PORT_CAP_SUBS_WRITE*/,
SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC);
if (Err >= 0) {
Port = Err;
snd_seq_ev_clear(&Ev);
snd_seq_ev_set_direct(&Ev);
snd_seq_ev_set_source(&Ev, Port);
snd_seq_ev_set_subs(&Ev);
}
}
return Err;
}
int SendMidiControl(char Param, char Val){
snd_seq_ev_set_controller(&Ev, 15, Param, Val & 0x7F);
SubMitEvent();
return 0;
}
int SendMidiControl(Cus428State::eKnobs K, bool Down){
return SendMidiControl(KnobParam[K - Cus428State::eK_RECORD], Down ?
0x7F : 0);
}
private:
snd_seq_t *Seq;
int Port;
snd_seq_event_t Ev;
int SubMitEvent(){
snd_seq_event_output(Seq, &Ev);
snd_seq_drain_output(Seq);
return 0;
}
static char KnobParam[];
};
extern Cus428Midi Midi;
Index: Cus428State.cc
===
RCS file: /cvsroot/alsa/alsa-tools/us428control/Cus428State.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Cus428State.cc 6 Oct 2003 15:57:24 - 1.1
+++ Cus428State.cc 24 Oct 2003 14:01:45 - 1.2
@@ -20,12 +20,14 @@
#include
#include
-#include "Cus428State.h"
+#include
+#include "Cus428Midi.h"
extern int verbose;
-void
-us428_lights::init_us428_lights()
+
+
+void us428_lights::init_us428_lights()
{
int i = 0;
memset(this, 0, sizeof(*this));
@@ -33,8 +35,14 @@
Light[ i].Offset = i + 0x19;
}
-int
-Cus428State::LightSend()
+
+void Cus428State::InitDevice(void)
+{
+ SliderChangedTo(eFaderM, ((unsigned char*)(us428ctls_sharedmem->CtlSnapShot +
us428ctls_sharedmem->CtlSnapShotLast))[eFaderM]);
+}
+
+
+int Cus428State::LightSend()
{
int Next = us428ctls_sharedmem->p4outLast + 1;
if(Next < 0 || Next >= N_us428_p4out_BUFS)
@@ -44,14 +52,8 @@
return us428ctls_sharedmem->p4outLast = Next;
}
-void
-Cus428State::SliderChangedTo(int S, unsigned char New)
+void Cus428State::SendVolume(usX2Y_volume &V)
{
- if ((S >= eFader4 || S < 0) && S != eFaderM)
- return;
-
- usX2Y_volume V;
- V.SetTo(S, New);
int Next = us428ctls_sharedmem->p4outLast + 1;
if (Next < 0 || Next >= N_us428_p4out_BUFS)
Next = 0;
@@ -60,24 +62,107 @@
us428ctls_sharedmem->p4outLast = Next;
}
+void Cu
[alsa-cvslog] CVS: alsa-kernel/pci/ac97 ac97_codec.c,1.108,1.109
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.c23 Oct 2003 14:34:52 - 1.108
+++ ac97_codec.c24 Oct 2003 13:44:21 - 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 & 0xff40) == 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
[alsa-cvslog] CVS: alsa-utils/iecset .cvsignore,NONE,1.1 Makefile.am,NONE,1.1 iecbits.c,NONE,1.1 iecset.1,NONE,1.1 iecset.c,NONE,1.1
Update of /cvsroot/alsa/alsa-utils/iecset
In directory sc8-pr-cvs1:/tmp/cvs-serv32536/iecset
Added Files:
.cvsignore Makefile.am iecbits.c iecset.1 iecset.c
Log Message:
- moved iecset from alsa-lib/test.
- added man page.
--- NEW FILE: .cvsignore ---
.deps
iecset
Makefile
Makefile.in
--- NEW FILE: Makefile.am ---
INCLUDES = -I$(top_srcdir)/include
LDADD = -lm
# LDFLAGS = -static
# CFLAGS += -g -Wall
bin_PROGRAMS = iecset
amixer_SOURCES = iecset.c iecbits.c
man_MANS = iecset.1
EXTRA_DIST = iecset.1
--- NEW FILE: iecbits.c ---
/*
iecdump - dump IEC958 status bits on ALSA
Copyright (C) 2003 by Takashi Iwai <[EMAIL PROTECTED]>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include
#include
struct category_str {
int val;
const char *name;
};
static struct category_str con_category[] = {
{ IEC958_AES1_CON_DAT, "DAT" },
{ IEC958_AES1_CON_VCR, "VCR" },
{ IEC958_AES1_CON_MICROPHONE, "microphone" },
{ IEC958_AES1_CON_SYNTHESIZER, "synthesizer" },
{ IEC958_AES1_CON_RATE_CONVERTER, "rate converter" },
{ IEC958_AES1_CON_MIXER, "mixer" },
{ IEC958_AES1_CON_SAMPLER, "sampler" },
{ IEC958_AES1_CON_PCM_CODER, "PCM coder" },
{ IEC958_AES1_CON_IEC908_CD, "CD" },
{ IEC958_AES1_CON_NON_IEC908_CD, "non-IEC908 CD" },
{ IEC958_AES1_CON_GENERAL, "general" },
};
#define ARRAY_SIZE(x) (int)(sizeof(x)/sizeof(x[0]))
void dump_iec958(snd_aes_iec958_t *iec)
{
int i;
if (! (iec->status[0] & IEC958_AES0_PROFESSIONAL)) {
/* consumer */
printf("Mode: consumer\n");
printf("Data: ");
if (!(iec->status[0] & IEC958_AES0_NONAUDIO)) {
printf("audio\n");
} else {
printf("non-audio\n");
}
printf("Rate: ");
switch (iec->status[3] & IEC958_AES3_CON_FS) {
case IEC958_AES3_CON_FS_44100:
printf("44100 Hz\n");
break;
case IEC958_AES3_CON_FS_48000:
printf("48000 Hz\n");
break;
case IEC958_AES3_CON_FS_32000:
printf("32000 Hz\n");
break;
default:
printf("unknown\n");
break;
}
printf("Copyright: ");
if (iec->status[0] & IEC958_AES0_CON_NOT_COPYRIGHT) {
printf("permitted\n");
} else {
printf("protected\n");
}
printf("Emphasis: ");
if ((iec->status[0] & IEC958_AES0_CON_EMPHASIS) !=
IEC958_AES0_CON_EMPHASIS_5015) {
printf("none\n");
} else {
printf("50/15us\n");
}
printf("Category: ");
for (i = 0; i < ARRAY_SIZE(con_category); i++) {
if ((iec->status[1] & IEC958_AES1_CON_CATEGORY) ==
con_category[i].val) {
printf("%s\n", con_category[i].name);
break;
}
}
if (i >= ARRAY_SIZE(con_category)) {
printf("unknown 0x%x\n", iec->status[1] &
IEC958_AES1_CON_CATEGORY);
}
printf("Original: ");
if (iec->status[1] & IEC958_AES1_CON_ORIGINAL) {
printf("original\n");
} else {
printf("1st generation\n");
}
printf("Clock: ");
switch (iec->status[3] & IEC958_AES3_CON_CLOCK) {
case IEC958_AES3_CON_CLOCK_1000PPM:
[alsa-cvslog] CVS: alsa-driver/pcmcia/pdaudiocf pdaudiocf_core.c,1.6,1.7
Update of /cvsroot/alsa/alsa-driver/pcmcia/pdaudiocf In directory sc8-pr-cvs1:/tmp/cvs-serv13747/pcmcia/pdaudiocf Modified Files: pdaudiocf_core.c Log Message: fixed the compilation with the recent ac97 and info changes. Index: pdaudiocf_core.c === RCS file: /cvsroot/alsa/alsa-driver/pcmcia/pdaudiocf/pdaudiocf_core.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- pdaudiocf_core.c26 Aug 2003 08:20:58 - 1.6 +++ pdaudiocf_core.c24 Oct 2003 13:45:05 - 1.7 @@ -147,7 +147,7 @@ snd_info_entry_t *entry; if (! snd_card_proc_new(chip->card, "pdaudiocf", &entry)) - snd_info_set_text_ops(entry, chip, pdacf_proc_read); + snd_info_set_text_ops(entry, chip, 1024, pdacf_proc_read); } pdacf_t *snd_pdacf_create(snd_card_t *card) --- 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/core init.c,1.40,1.41
Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1:/tmp/cvs-serv13419/core
Modified Files:
init.c
Log Message:
- fixed oops at resume.
- block also the non-blocking devices until the resume is finished.
Index: init.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/init.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- init.c 23 Oct 2003 14:34:52 - 1.40
+++ init.c 24 Oct 2003 13:43:59 - 1.41
@@ -679,6 +679,7 @@
int snd_power_wait(snd_card_t *card, unsigned int power_state, struct file *file)
{
wait_queue_t wait;
+ int result = 0;
/* fastpath */
if (snd_power_get_state(card) == power_state)
@@ -686,18 +687,24 @@
init_waitqueue_entry(&wait, current);
add_wait_queue(&card->power_sleep, &wait);
while (1) {
- if (card->shutdown)
- return -ENODEV;
- if (snd_power_get_state(card) == power_state) {
- remove_wait_queue(&card->power_sleep, &wait);
- return 0;
+ if (card->shutdown) {
+ result = -ENODEV;
+ break;
}
- if (file && (file->f_flags & O_NONBLOCK))
- return -EAGAIN;
+ if (snd_power_get_state(card) == power_state)
+ break;
+#if 0 /* block all devices */
+ if (file && (file->f_flags & O_NONBLOCK)) {
+ result = -EAGAIN;
+ break;
+ }
+#endif
set_current_state(TASK_UNINTERRUPTIBLE);
snd_power_unlock(card);
schedule_timeout(30 * HZ);
snd_power_lock(card);
}
+ remove_wait_queue(&card->power_sleep, &wait);
+ return result;
}
#endif /* CONFIG_PM */
---
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 als4000.c,1.22,1.23 ens1370.c,1.52,1.53
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv13252/pci
Modified Files:
als4000.c ens1370.c
Log Message:
added auto-detection of joystick port.
Index: als4000.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/als4000.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- als4000.c 14 Oct 2003 13:59:20 - 1.22
+++ als4000.c 24 Oct 2003 13:42:41 - 1.23
@@ -652,9 +652,18 @@
/* disable all legacy ISA stuff except for joystick */
#ifdef SUPPORT_JOYSTICK
- if (joystick_port[dev] > 0 &&
- (acard->res_joystick = request_region(joystick_port[dev], 8, "ALS4000
gameport")) != NULL)
+ if (joystick_port[dev] == 1) {
+ /* auto-detect */
+ long p;
+ for (p = 0x200; p <= 0x218; p += 8)
+ if ((acard->res_joystick = request_region(p, 8, "ALS4000
gameport")) != NULL)
+ break;
+ } else if (joystick_port[dev] > 0)
+ acard->res_joystick = request_region(joystick_port[dev], 8, "ALS4000
gameport");
+ if (acard->res_joystick)
joystick = joystick_port[dev];
+ else
+ joystick = 0;
#endif
snd_als4000_set_addr(gcr, 0, 0, 0, joystick);
Index: ens1370.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ens1370.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ens1370.c 23 Oct 2003 14:34:52 - 1.52
+++ ens1370.c 24 Oct 2003 13:42:41 - 1.53
@@ -1685,11 +1685,24 @@
#ifdef SUPPORT_JOYSTICK
static int snd_ensoniq_joystick(ensoniq_t *ensoniq, long port)
{
- ensoniq->gameport.io = port;
- if (!request_region(ensoniq->gameport.io, 8, "ens137x: gameport")) {
- snd_printk("gameport io port 0x%03x in use", ensoniq->gameport.io);
- return -EBUSY;
+#ifdef CHIP1371
+ if (port == 1) { /* auto-detect */
+ for (port = 0x200; port <= 0x218; port += 8)
+ if (request_region(port, 8, "ens137x: gameport"))
+ break;
+ if (port > 0x218) {
+ snd_printk("no gameport available\n");
+ return -EBUSY;
+ }
+ } else
+#endif
+ {
+ if (!request_region(port, 8, "ens137x: gameport")) {
+ snd_printk("gameport io port 0x%03x in use",
ensoniq->gameport.io);
+ return -EBUSY;
+ }
}
+ ensoniq->gameport.io = port;
ensoniq->ctrl |= ES_JYSTK_EN;
#ifdef CHIP1371
ensoniq->ctrl &= ~ES_1371_JOY_ASELM;
@@ -2251,6 +2264,7 @@
#ifdef SUPPORT_JOYSTICK
#ifdef CHIP1371
switch (joystick_port[dev]) {
+ case 1: /* auto-detect */
case 0x200:
case 0x208:
case 0x210:
---
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/nm256 Makefile,1.2,1.3
Update of /cvsroot/alsa/alsa-driver/pci/nm256 In directory sc8-pr-cvs1:/tmp/cvs-serv13853/pci/nm256 Modified Files: Makefile Log Message: added the missing clean-up of patched c file. Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/pci/nm256/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile17 Dec 2002 19:59:01 - 1.2 +++ Makefile24 Oct 2003 13:45:28 - 1.3 @@ -3,7 +3,11 @@ include $(TOPDIR)/toplevel.config include $(TOPDIR)/Makefile.conf +EXTRA_CLEAN = nm256.c + TOPDIR = $(MAINSRCDIR) include $(TOPDIR)/alsa-kernel/pci/nm256/Makefile include $(TOPDIR)/Rules.make + +nm256.c: nm256.patch $(TOPDIR)/alsa-kernel/pci/nm256/nm256.c --- 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 es1968.c,1.55,1.56
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv13516/pci
Modified Files:
es1968.c
Log Message:
fixed the compilation with the recent ac97 and info changes.
Index: es1968.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/es1968.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- es1968.c14 Oct 2003 13:59:20 - 1.55
+++ es1968.c24 Oct 2003 13:44:20 - 1.56
@@ -2037,15 +2037,20 @@
static int __devinit
snd_es1968_mixer(es1968_t *chip)
{
+ ac97_bus_t bus, *pbus;
ac97_t ac97;
snd_ctl_elem_id_t id;
int err;
+ memset(&bus, 0, sizeof(bus));
+ bus.write = snd_es1968_ac97_write;
+ bus.read = snd_es1968_ac97_read;
+ if ((err = snd_ac97_bus(chip->card, &bus, &pbus)) < 0)
+ return err;
+
memset(&ac97, 0, sizeof(ac97));
- ac97.write = snd_es1968_ac97_write;
- ac97.read = snd_es1968_ac97_read;
ac97.private_data = chip;
- if ((err = snd_ac97_mixer(chip->card, &ac97, &chip->ac97)) < 0)
+ if ((err = snd_ac97_mixer(pbus, &ac97, &chip->ac97)) < 0)
return err;
/* attach master switch / volumes for h/w volume control */
---
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/usb/us428 usX2Yhwdep.c,1.2,1.3 usbus428.c,1.5,1.6 usbus428audio.c,1.5,1.6
Update of /cvsroot/alsa/alsa-driver/usb/us428
In directory sc8-pr-cvs1:/tmp/cvs-serv16346/us428
Modified Files:
usX2Yhwdep.c usbus428.c usbus428audio.c
Log Message:
Karsten Wiese <[EMAIL PROTECTED]>:
This is a Bugfix (sporadic hangups solved), cosmetical treatment and
feature-enhancement (Setting of PCM-Out Volume according to
Mastervolume-Slider at device start).
Index: usX2Yhwdep.c
===
RCS file: /cvsroot/alsa/alsa-driver/usb/us428/usX2Yhwdep.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- usX2Yhwdep.c24 Sep 2003 16:45:10 - 1.2
+++ usX2Yhwdep.c24 Oct 2003 13:58:47 - 1.3
@@ -93,7 +93,7 @@
return -EBUSY;
/* if userspace tries to mmap beyond end of our buffer, fail */
-if (size > ((PAGE_SIZE - 1 + sizeof(us428ctls_sharedmem_t)) / PAGE_SIZE) *
PAGE_SIZE){
+if (size > ((PAGE_SIZE - 1 + sizeof(us428ctls_sharedmem_t)) / PAGE_SIZE) *
PAGE_SIZE) {
snd_printd( "%i > %i\n", size,sizeof(us428ctls_sharedmem_t));
return -EINVAL;
}
@@ -103,6 +103,7 @@
if(!(us428->us428ctls_sharedmem =
snd_malloc_pages(sizeof(us428ctls_sharedmem_t), GFP_KERNEL)))
return -ENOMEM;
memset(us428->us428ctls_sharedmem, -1, sizeof(us428ctls_sharedmem_t));
+ us428->us428ctls_sharedmem->CtlSnapShotLast = -2;
}
area->vm_ops = &us428ctls_vm_ops;
#ifdef VM_RESERVED
@@ -174,11 +175,11 @@
i;
us428->Seq04 = 0;
- if (NULL == (us428->AS04.buffer = kmalloc(URB_DataLen_AsyncSeq*URBS_AsyncSeq,
GFP_KERNEL))){
+ if (NULL == (us428->AS04.buffer = kmalloc(URB_DataLen_AsyncSeq*URBS_AsyncSeq,
GFP_KERNEL))) {
err = -ENOMEM;
}else
- for (i = 0; i < URBS_AsyncSeq; ++i){
- if (NULL == (us428->AS04.urb[i] = usb_alloc_urb(0,
GFP_KERNEL))){
+ for (i = 0; i < URBS_AsyncSeq; ++i) {
+ if (NULL == (us428->AS04.urb[i] = usb_alloc_urb(0,
GFP_KERNEL))) {
err = -ENOMEM;
break;
}
@@ -219,7 +220,7 @@
int err;
do {
- if ((err = snd_us428_create_usbmidi(card)) < 0){
+ if ((err = snd_us428_create_usbmidi(card)) < 0) {
snd_printk("snd_us428_create_alsa_devices:
snd_us428_create_usbmidi error %i \n", err);
break;
}
@@ -238,7 +239,7 @@
if (! (us428->In04urb = usb_alloc_urb(0, GFP_KERNEL)))
return -ENOMEM;
- if (! (us428->In04Buf = kmalloc(21, GFP_KERNEL))){
+ if (! (us428->In04Buf = kmalloc(21, GFP_KERNEL))) {
usb_free_urb(us428->In04urb);
return -ENOMEM;
}
@@ -276,15 +277,15 @@
}
if (!err && 1 == dsp->index)
do {
- if ((err =
snd_us428_AsyncSeq04_init((us428dev_t*)hw->private_data))){
+ if ((err =
snd_us428_AsyncSeq04_init((us428dev_t*)hw->private_data))) {
snd_printk("snd_us428_AsyncSeq04_init error \n");
break;
}
- if ((err =
snd_us428_In04_init((us428dev_t*)hw->private_data))){
+ if ((err =
snd_us428_In04_init((us428dev_t*)hw->private_data))) {
snd_printk("snd_us428_In04_init error \n");
break;
}
- if ((err = snd_us428_create_alsa_devices(hw->card))){
+ if ((err = snd_us428_create_alsa_devices(hw->card))) {
snd_printk("snd_us428_create_alsa_devices error %i
\n", err);
snd_card_free(hw->card);
break;
Index: usbus428.c
===
RCS file: /cvsroot/alsa/alsa-driver/usb/us428/usbus428.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- usbus428.c 6 Oct 2003 13:15:17 - 1.5
+++ usbus428.c 24 Oct 2003 13:58:47 - 1.6
@@ -75,7 +75,7 @@
MODULE_AUTHOR("Karsten Wiese <[EMAIL PROTECTED]>");
-MODULE_DESCRIPTION("TASCAM "NAME_ALLCAPS" Version 0.1");
+MODULE_DESCRIPTION("TASCAM "NAME_ALLCAPS" Version 0.2");
MODULE_LICENSE("GPL");
MODULE_CLASSES("{sound}");
MODULE_DEVICES("{{TASCAM(0x1604), "NAME_ALLCAPS"(0x8001) }}");
@@ -131,22 +131,29 @@
us428->In04IntCalls++;
- if (urb->status){
+ if (urb->status) {
snd_printk( "Interrupt Pipe 4 came back with status=%i\n",
urb->status);
return;
}
-{
- int diff = -1, i;
// printk("%i:0x%02X ",
[alsa-cvslog] CVS: alsa-lib/src/pcm pcm_dmix.c,1.43,1.44 pcm_dshare.c,1.9,1.10 pcm_dsnoop.c,1.9,1.10 pcm_hooks.c,1.30,1.31 pcm_multi.c,1.84,1.85 pcm_share.c,1.76,1.77
Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1:/tmp/cvs-serv5317
Modified Files:
pcm_dmix.c pcm_dshare.c pcm_dsnoop.c pcm_hooks.c pcm_multi.c
pcm_share.c
Log Message:
added more documents and examples about plugins.
Index: pcm_dmix.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_dmix.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- pcm_dmix.c 17 Sep 2003 17:09:45 - 1.43
+++ pcm_dmix.c 23 Oct 2003 14:42:47 - 1.44
@@ -958,6 +958,74 @@
}
\endcode
+ipc_key specfies the unique IPC key in integer.
+This number must be unique for each different dmix definition,
+since the shared memory is created with this key number.
+When ipc_key_add_uid is set true, the uid value is
+added to the value set in ipc_key. This will
+avoid the confliction of the same IPC key with different users
+concurrently.
+
+Note that the dmix plugin itself supports only a single configuration.
+That is, it supports only the fixed rate (default 48000), format
+(\c S16), channels (2), and period_time (125000).
+For using other configuration, you have to set the value explicitly
+in the slave PCM definition. The rate, format and channels can be
+covered by an additional \ref pcm_plugins_dmix "plug plugin",
+but there is only one base configuration, anyway.
+
+An example configuration for setting 44100 Hz, \c S32_LE format
+as the slave PCM of "hw:0" is like below:
+\code
+pcm.dmix_44 {
+ type dmix
+ ipc_key 321456 # any unique value
+ ipc_key_add_uid true
+ slave {
+ pcm "hw:0"
+ format S32_LE
+ rate 44100
+ }
+}
+\endcode
+You can hear 48000 Hz samples still using this dmix pcm via plug plugin
+like:
+\code
+% aplay -Dplug:dmix_44 foo_48k.wav
+\endcode
+
+For using the dmix plugin for OSS emulation device, you have to set
+the period and the buffer sizes in power of two. For example,
+\code
+pcm.dmixoss {
+ type dmix
+ ipc_key 321456 # any unique value
+ ipc_key_add_uid true
+ slave {
+ pcm "hw:0"
+ period_time 0
+ period_size 1024 # must be power of 2
+ buffer_size 8192 # ditto
+ }
+}
+\endcode
+period_time 0 must be set, too, for resetting the
+default value. In the case of soundcards with multi-channel IO,
+adding the bindings would help
+\code
+pcm.dmixoss {
+ ...
+ bindings {
+ 0 0 # map from 0 to 0
+ 1 1 # map from 1 to 1
+ }
+}
+\endcode
+so that only the first two channels are used by dmix.
+Also, note that ICE1712 have the limited buffer size, 5513 frames
+(corresponding to 640 kB). In this case, reduce the buffer_size
+to 4096.
+
\subsection pcm_plugins_dmix_funcref Function reference
Index: pcm_dshare.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_dshare.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pcm_dshare.c2 Sep 2003 10:32:33 - 1.9
+++ pcm_dshare.c23 Oct 2003 14:42:47 - 1.10
@@ -681,6 +681,11 @@
\section pcm_plugins_dshare Plugin: dshare
This plugin provides sharing channels.
+Unlike \ref pcm_plugins_share "share plugin", this plugin doesn't need
+the explicit server program but accesses the shared buffer concurrently
+from each client as well as \ref pcm_plugins_dmix "dmix" and
+\ref pcm_plugins_dsnoop "dsnoop" plugins do.
+The parameters below are almost identical with these plugins.
\code
pcm.name {
Index: pcm_dsnoop.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_dsnoop.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pcm_dsnoop.c2 Sep 2003 10:32:33 - 1.9
+++ pcm_dsnoop.c23 Oct 2003 14:42:47 - 1.10
@@ -632,6 +632,10 @@
\section pcm_plugins_snoop Plugin: dsnoop
This plugin splits one capture stream to more.
+It works the reverse way of \ref pcm_plugins_dmix "dmix plugin",
+reading the shared capture buffer from many clients concurrently.
+The meaning of parameters below are almost identical with
+dmix plugin.
\code
pcm.name {
Index: pcm_hooks.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_hooks.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- pcm_hooks.c 25 Jul 2003 17:02:03 - 1.30
+++ pcm_hooks.c 23 Oct 2003 14:42:47 - 1.31
@@ -370,6 +370,11 @@
\section pcm_plugins_hooks Plugin: hooks
+This plugin is used to call some 'hook' function when this plugin is opened,
+modified or closed.
+Typically, it is used to change control values for a certain state
+specially for the PCM (see the example below).
+
\code
# Hook arguments definition
hook_args.NAME
[alsa-cvslog] CVS: alsa-kernel/pci via82xx.c,1.63,1.64
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv30904
Modified Files:
via82xx.c
Log Message:
Zinx Verituse <[EMAIL PROTECTED]>:
fixed the calculation of the port for "Catpure Source" control switch.
Index: via82xx.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/via82xx.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- via82xx.c 23 Oct 2003 14:34:52 - 1.63
+++ via82xx.c 23 Oct 2003 16:46:14 - 1.64
@@ -1402,7 +1402,7 @@
static int snd_via8233_capture_source_get(snd_kcontrol_t *kcontrol,
snd_ctl_elem_value_t *ucontrol)
{
via82xx_t *chip = snd_kcontrol_chip(kcontrol);
- unsigned long port = chip->port + kcontrol->id.index ?
(VIA_REG_CAPTURE_CHANNEL + 0x10) : VIA_REG_CAPTURE_CHANNEL;
+ unsigned long port = chip->port + (kcontrol->id.index ?
(VIA_REG_CAPTURE_CHANNEL + 0x10) : VIA_REG_CAPTURE_CHANNEL);
ucontrol->value.enumerated.item[0] = inb(port) & VIA_REG_CAPTURE_CHANNEL_MIC ?
1 : 0;
return 0;
}
@@ -1410,7 +1410,7 @@
static int snd_via8233_capture_source_put(snd_kcontrol_t *kcontrol,
snd_ctl_elem_value_t *ucontrol)
{
via82xx_t *chip = snd_kcontrol_chip(kcontrol);
- unsigned long port = chip->port + kcontrol->id.index ?
(VIA_REG_CAPTURE_CHANNEL + 0x10) : VIA_REG_CAPTURE_CHANNEL;
+ unsigned long port = chip->port + (kcontrol->id.index ?
(VIA_REG_CAPTURE_CHANNEL + 0x10) : VIA_REG_CAPTURE_CHANNEL);
unsigned long flags;
u8 val, oval;
---
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/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-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-driver Makefile,1.96,1.97 Makefile.conf.in,1.53,1.54
Update of /cvsroot/alsa/alsa-driver In directory sc8-pr-cvs1:/tmp/cvs-serv19721 Modified Files: Makefile Makefile.conf.in Log Message: added more documents. removed the obsolete snd_seq_port_subscribe_set_voices(). Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/Makefile,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- Makefile6 Aug 2003 11:13:28 - 1.96 +++ Makefile22 Oct 2003 14:23:59 - 1.97 @@ -155,6 +155,10 @@ elif [ -d $(DESTDIR)/etc/init.d ]; then \ install -m 755 -g $(IGROUP) -o $(IUSER) utils/alsasound $(DESTDIR)/etc/init.d/alsasound; \ fi + mkdir -p $(DESTDIR)$(bindir) + install -m 755 -g $(IGROUP) -o $(IUSER) utils/alsaconf $(DESTDIR)$(bindir) + mkdir -p $(DESTDIR)$(mandir)/man8 + install -m 644 -g $(IGROUP) -o $(IUSER) utils/alsaconf.8 $(DESTDIR)$(mandir)/man8 .PHONY: check-snd-prefix check-snd-prefix: Index: Makefile.conf.in === RCS file: /cvsroot/alsa/alsa-driver/Makefile.conf.in,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- Makefile.conf.in7 Apr 2003 09:51:23 - 1.53 +++ Makefile.conf.in22 Oct 2003 14:23:59 - 1.54 @@ -16,8 +16,11 @@ mainsrcdir = @srcdir@ MAINSRCDIR = @SRCDIR@ prefix = @prefix@ +exec_prefix= @exec_prefix@ sysconfdir = @sysconfdir@ +bindir = @bindir@ sbindir= @sbindir@ +mandir = @mandir@ moddir = @moddir@ moddir_tree= @moddir_tree@ c_opts = @c_opts@ --- 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
[alsa-cvslog] CVS: alsa-lib/include seq.h,1.50,1.51 seqmid.h,1.14,1.15
Update of /cvsroot/alsa/alsa-lib/include
In directory sc8-pr-cvs1:/tmp/cvs-serv20260/include
Modified Files:
seq.h seqmid.h
Log Message:
added more documents.
removed the obsolete snd_seq_port_subscribe_set_voices().
Index: seq.h
===
RCS file: /cvsroot/alsa/alsa-lib/include/seq.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- seq.h 25 Jul 2003 17:24:13 - 1.50
+++ seq.h 22 Oct 2003 14:25:55 - 1.51
@@ -46,13 +46,14 @@
/** Sequencer handle */
typedef struct _snd_seq snd_seq_t;
-/** Allocate and initialize array on stack \internal */
+#ifndef DOC_HIDDEN
#define SND_ALLOCA(type,ptr) \
do {\
assert(ptr);\
*ptr = (type##_t *)alloca(type##_sizeof());\
memset(*ptr, 0, type##_sizeof());\
} while (0)
+#endif
/**
* sequencer opening stream types
@@ -315,7 +316,6 @@
void snd_seq_port_subscribe_set_sender(snd_seq_port_subscribe_t *info, const
snd_seq_addr_t *addr);
void snd_seq_port_subscribe_set_dest(snd_seq_port_subscribe_t *info, const
snd_seq_addr_t *addr);
void snd_seq_port_subscribe_set_queue(snd_seq_port_subscribe_t *info, int q);
-void snd_seq_port_subscribe_set_voices(snd_seq_port_subscribe_t *info, unsigned int
voices);
void snd_seq_port_subscribe_set_exclusive(snd_seq_port_subscribe_t *info, int val);
void snd_seq_port_subscribe_set_time_update(snd_seq_port_subscribe_t *info, int val);
void snd_seq_port_subscribe_set_time_real(snd_seq_port_subscribe_t *info, int val);
Index: seqmid.h
===
RCS file: /cvsroot/alsa/alsa-lib/include/seqmid.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- seqmid.h12 Mar 2002 20:14:33 - 1.14
+++ seqmid.h22 Oct 2003 14:25:55 - 1.15
@@ -42,6 +42,8 @@
/**
* \brief initialize event record
* \param ev event record pointer
+ *
+ * This macro clears the given event record pointer to the default status.
*/
#define snd_seq_ev_clear(ev) \
memset(ev, 0, sizeof(snd_seq_event_t))
@@ -51,6 +53,10 @@
* \param ev event record
* \param c destination client id
* \param p destination port id
+ *
+ * This macro sets the client and port id numbers to the given event record.
+ *
+ * \sa snd_seq_ev_set_subs()
*/
#define snd_seq_ev_set_dest(ev,c,p) \
((ev)->dest.client = (c), (ev)->dest.port = (p))
@@ -58,6 +64,10 @@
/**
* \brief set broadcasting to subscribers
* \param ev event record
+ *
+ * This macro sets the destination as the subscribers.
+ *
+ * \sa snd_seq_ev_set_dest()
*/
#define snd_seq_ev_set_subs(ev) \
((ev)->dest.client = SND_SEQ_ADDRESS_SUBSCRIBERS,\
@@ -66,6 +76,10 @@
/**
* \brief set broadcasting to all clients/ports
* \param ev event record
+ *
+ * This macro sets the destination as the broadcasting.
+ *
+ * \sa snd_seq_ev_set_dest()
*/
#define snd_seq_ev_set_broadcast(ev) \
((ev)->dest.client = SND_SEQ_ADDRESS_BROADCAST,\
@@ -75,6 +89,8 @@
* \brief set the source port
* \param ev event record
* \param p source port id
+ *
+ * This macro sets the source port id number.
*/
#define snd_seq_ev_set_source(ev,p) \
((ev)->source.port = (p))
@@ -82,6 +98,11 @@
/**
* \brief set direct passing mode (without queued)
* \param ev event instance
+ *
+ * This macro sets the event to the direct passing mode
+ * to be delivered immediately without queueing.
+ *
+ * \sa snd_seq_ev_schedule_tick(), snd_seq_ev_schedule_real()
*/
#define snd_seq_ev_set_direct(ev) \
((ev)->queue = SND_SEQ_QUEUE_DIRECT)
@@ -92,6 +113,11 @@
* \param q queue id to schedule
* \param relative relative time-stamp if non-zero
* \param ttick tick time-stamp to be delivered
+ *
+ * This macro sets the scheduling of the event in the
+ * MIDI tick mode.
+ *
+ * \sa snd_seq_ev_schedule_real(), snd_seq_ev_set_direct()
*/
#define snd_seq_ev_schedule_tick(ev, q, relative, ttick) \
((ev)->flags &= ~(SND_SEQ_TIME_STAMP_MASK | SND_SEQ_TIME_MODE_MASK),\
@@ -106,6 +132,11 @@
* \param q queue id to schedule
* \param relative relative time-stamp if non-zero
* \param rtime time-stamp to be delivered
+ *
+ * This macro sets the scheduling of the event in the
+ * realtime mode.
+ *
+ * \sa snd_seq_ev_schedule_tick(), snd_seq_ev_set_direct()
*/
#define snd_seq_ev_schedule_real(ev, q, relative, rtime) \
((ev)->flags &= ~(SND_SEQ_TIME_STAMP_MASK | SND_SEQ_TIME_MODE_MASK),\
@@ -128,6 +159,8 @@
* \param ev event instance
*
* Sets the event length mode as fixed size.
+ *
+ * \sa snd_seq_ev_set_variable(), snd_seq_ev_set_varusr()
*/
#define snd_seq_ev_set_fixed(ev) \
((ev)->flags &= ~SND_SEQ_EVENT_LENGTH_MASK,\
@@ -140,6 +173,8 @@
* \param dataptr pointer of the external data
*
* Sets the event length mode as variable length and stores the data.
+ *
+ * \sa snd_seq_ev_set_fixed(), snd_seq_ev_set_varusr()
[alsa-cvslog] CVS: alsa-driver Rules.make,1.32,1.33
Update of /cvsroot/alsa/alsa-driver In directory sc8-pr-cvs1:/tmp/cvs-serv20065 Modified Files: Rules.make Log Message: don't overwrite the versioned symbols (only for 2.2/2.4 kernels, e.g. suse9.0) Index: Rules.make === RCS file: /cvsroot/alsa/alsa-driver/Rules.make,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- Rules.make 16 Sep 2003 15:08:52 - 1.32 +++ Rules.make 22 Oct 2003 14:25:06 - 1.33 @@ -235,12 +235,14 @@ $(MODINCL)/$(MODPREFIX)%.ver: %.c @if [ ! -r $(MODINCL)/$(MODPREFIX)$*.stamp -o $(MODINCL)/$(MODPREFIX)$*.stamp -ot $< ]; then \ + if [ ! -f $(CONFIG_SND_KERNELDIR)/include/linux/modules/$*.stamp ]; then \ echo '$(CC) -D__KERNEL__ $(CFLAGS) $(EXTRA_CFLAGS) -E -D__GENKSYMS__ $<'; \ echo '| $(GENKSYMS) $(genksyms_smp_prefix) > [EMAIL PROTECTED]'; \ $(CC) -D__KERNEL__ $(CFLAGS) $(EXTRA_CFLAGS) -E -D__GENKSYMS__ $< \ | $(GENKSYMS) $(genksyms_smp_prefix) > [EMAIL PROTECTED]; \ if [ -r $@ ] && cmp -s $@ [EMAIL PROTECTED]; then echo $@ is unchanged; rm -f [EMAIL PROTECTED]; \ else echo mv [EMAIL PROTECTED] $@; mv -f [EMAIL PROTECTED] $@; fi; \ + fi; \ fi; touch $(MODINCL)/$(MODPREFIX)$*.stamp $(addprefix $(MODINCL)/$(MODPREFIX),$(export-objs:.o=.ver)): $(TOPDIR)/include/config.h $(TOPDIR)/include/config1.h --- 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
[alsa-cvslog] CVS: alsa-kernel/core hwdep.c,1.22,1.23
Update of /cvsroot/alsa/alsa-kernel/core In directory sc8-pr-cvs1:/tmp/cvs-serv19425 Modified Files: hwdep.c Log Message: allow dsp_load callback without dsp_status callback. Index: hwdep.c === RCS file: /cvsroot/alsa/alsa-kernel/core/hwdep.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- hwdep.c 30 Sep 2003 09:28:26 - 1.22 +++ hwdep.c 21 Oct 2003 09:52:46 - 1.23 @@ -214,7 +214,7 @@ snd_hwdep_dsp_image_t info; int err; - if (! hw->ops.dsp_load || ! hw->ops.dsp_status) + if (! hw->ops.dsp_load) return -ENXIO; memset(&info, 0, sizeof(info)); if (copy_from_user(&info, _info, sizeof(info))) --- 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
[alsa-cvslog] CVS: alsa-kernel/core pcm_native.c,1.83,1.84
Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1:/tmp/cvs-serv19234
Modified Files:
pcm_native.c
Log Message:
- don't hold power lock while draining
- call trigger callback when suspending/resuming a draining substream
Index: pcm_native.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/pcm_native.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- pcm_native.c10 Oct 2003 14:44:56 - 1.83
+++ pcm_native.c21 Oct 2003 09:51:35 - 1.84
@@ -888,7 +888,8 @@
snd_pcm_runtime_t *runtime = substream->runtime;
if (runtime->trigger_master != substream)
return 0;
- if (runtime->status->suspended_state != SNDRV_PCM_STATE_RUNNING)
+ if (runtime->status->suspended_state != SNDRV_PCM_STATE_RUNNING &&
+ runtime->status->suspended_state != SNDRV_PCM_STATE_DRAINING)
return 0;
return substream->ops->trigger(substream, SNDRV_PCM_TRIGGER_SUSPEND);
}
@@ -962,7 +963,8 @@
snd_pcm_runtime_t *runtime = substream->runtime;
if (runtime->trigger_master != substream)
return 0;
- if (runtime->status->suspended_state != SNDRV_PCM_STATE_RUNNING)
+ if (runtime->status->suspended_state != SNDRV_PCM_STATE_RUNNING &&
+ runtime->status->suspended_state != SNDRV_PCM_STATE_DRAINING)
return 0;
return substream->ops->trigger(substream, SNDRV_PCM_TRIGGER_RESUME);
}
@@ -1243,7 +1245,9 @@
}
set_current_state(TASK_INTERRUPTIBLE);
snd_pcm_stream_unlock_irq(substream);
+ snd_power_unlock(card);
tout = schedule_timeout(10 * HZ);
+ snd_power_lock(card);
snd_pcm_stream_lock_irq(substream);
if (tout == 0) {
state = runtime->status->state == SNDRV_PCM_STATE_SUSPENDED ?
SUSPENDED : EXPIRED;
---
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
[alsa-cvslog] CVS: alsa-kernel/core pcm.c,1.32,1.33
Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1:/tmp/cvs-serv24649/core
Modified Files:
pcm.c
Log Message:
removed the export of snd_pcm_lock(). replaced with the normal mutex.
Index: pcm.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/pcm.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- pcm.c 17 Oct 2003 15:38:59 - 1.32
+++ pcm.c 20 Oct 2003 15:28:38 - 1.33
@@ -43,15 +43,6 @@
static int snd_pcm_dev_disconnect(snd_device_t *device);
static int snd_pcm_dev_unregister(snd_device_t *device);
-void snd_pcm_lock(int xup)
-{
- if (!xup) {
- down(®ister_mutex);
- } else {
- up(®ister_mutex);
- }
-}
-
static int snd_pcm_control_ioctl(snd_card_t * card,
snd_ctl_file_t * control,
unsigned int cmd, unsigned long arg)
@@ -836,10 +827,10 @@
snd_pcm_t *pcm = snd_magic_cast(snd_pcm_t, device->device_data, return -ENXIO);
snd_assert(pcm != NULL && device != NULL, return -ENXIO);
- snd_pcm_lock(0);
+ down(®ister_mutex);
idx = (pcm->card->number * SNDRV_PCM_DEVICES) + pcm->device;
if (snd_pcm_devices[idx]) {
- snd_pcm_lock(1);
+ up(®ister_mutex);
return -EBUSY;
}
snd_pcm_devices[idx] = pcm;
@@ -861,7 +852,7 @@
}
if ((err = snd_register_device(devtype, pcm->card, pcm->device,
pcm->streams[cidx].reg, str)) < 0) {
snd_pcm_devices[idx] = NULL;
- snd_pcm_lock(1);
+ up(®ister_mutex);
return err;
}
for (substream = pcm->streams[cidx].substream; substream; substream =
substream->next)
@@ -872,7 +863,7 @@
notify = list_entry(list, snd_pcm_notify_t, list);
notify->n_register(pcm);
}
- snd_pcm_lock(1);
+ up(®ister_mutex);
return 0;
}
@@ -882,7 +873,7 @@
struct list_head *list;
int idx;
- snd_pcm_lock(0);
+ down(®ister_mutex);
idx = (pcm->card->number * SNDRV_PCM_DEVICES) + pcm->device;
snd_pcm_devices[idx] = NULL;
list_for_each(list, &snd_pcm_notify_list) {
@@ -890,7 +881,7 @@
notify = list_entry(list, snd_pcm_notify_t, list);
notify->n_disconnect(pcm);
}
- snd_pcm_lock(1);
+ up(®ister_mutex);
return 0;
}
@@ -902,7 +893,7 @@
snd_pcm_t *pcm = snd_magic_cast(snd_pcm_t, device->device_data, return -ENXIO);
snd_assert(pcm != NULL, return -ENXIO);
- snd_pcm_lock(0);
+ down(®ister_mutex);
idx = (pcm->card->number * SNDRV_PCM_DEVICES) + pcm->device;
snd_pcm_devices[idx] = NULL;
for (cidx = 0; cidx < 2; cidx++) {
@@ -924,7 +915,7 @@
notify = list_entry(list, snd_pcm_notify_t, list);
notify->n_unregister(pcm);
}
- snd_pcm_lock(1);
+ up(®ister_mutex);
return snd_pcm_free(pcm);
}
@@ -933,7 +924,7 @@
int idx;
snd_assert(notify != NULL && notify->n_register != NULL &&
notify->n_unregister != NULL, return -EINVAL);
- snd_pcm_lock(0);
+ down(®ister_mutex);
if (nfree) {
list_del(¬ify->list);
for (idx = 0; idx < SNDRV_CARDS * SNDRV_PCM_DEVICES; idx++) {
@@ -949,7 +940,7 @@
notify->n_register(snd_pcm_devices[idx]);
}
}
- snd_pcm_lock(1);
+ up(®ister_mutex);
return 0;
}
@@ -1014,7 +1005,6 @@
module_init(alsa_pcm_init)
module_exit(alsa_pcm_exit)
-EXPORT_SYMBOL(snd_pcm_lock);
EXPORT_SYMBOL(snd_pcm_devices);
EXPORT_SYMBOL(snd_pcm_new);
EXPORT_SYMBOL(snd_pcm_new_stream);
---
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
[alsa-cvslog] CVS: alsa-kernel/Documentation/DocBook writing-an-alsa-driver.tmpl,1.14,1.15
Update of /cvsroot/alsa/alsa-kernel/Documentation/DocBook In directory sc8-pr-cvs1:/tmp/cvs-serv24061/Documentation/DocBook Modified Files: writing-an-alsa-driver.tmpl Log Message: minor corrections for the recent updates. Index: writing-an-alsa-driver.tmpl === RCS file: /cvsroot/alsa/alsa-kernel/Documentation/DocBook/writing-an-alsa-driver.tmpl,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- writing-an-alsa-driver.tmpl 12 Aug 2003 15:38:01 - 1.14 +++ writing-an-alsa-driver.tmpl 20 Oct 2003 15:26:16 - 1.15 @@ -341,10 +341,6 @@ drivers will be on pci directory, because its API is identical with the standard PCI cards. - - -At this moment, only VX-pocket driver exists. - @@ -4094,14 +4090,11 @@ The wait callback is used for a certain wait at the standard initialization of the codec. If the chip requires the extra wait-time, define this callback. - This callback is always non-atomic, because it's never called - in the resume mode. The init callback is used for - additional initialization of the codec. This callback is called - after the reset, and should be atomic in the resume mode. + additional initialization of the codec. @@ -4674,10 +4667,7 @@ -Note that you have to pre-allocate to use this function -(i.e. you cannot use this function for - -a scatter-gather buffer). +Note that you have to pre-allocate to use this function. @@ -4905,6 +4895,8 @@ When a SG-handler is used, you need to set snd_pcm_sgbuf_ops_page as the page callback. + (See + page callback section.) --- This SF.net email sponsored by: Enterprise Linux Forum Conference & Expo The Event For Linux Datacenter Solutions & Strategies in The Enterprise Linux in the Boardroom; in the Front Office; & in the Server Room http://www.enterpriselinuxforum.com ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-kernel/include pcm.h,1.34,1.35
Update of /cvsroot/alsa/alsa-kernel/include In directory sc8-pr-cvs1:/tmp/cvs-serv24649/include Modified Files: pcm.h Log Message: removed the export of snd_pcm_lock(). replaced with the normal mutex. Index: pcm.h === RCS file: /cvsroot/alsa/alsa-kernel/include/pcm.h,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- pcm.h 15 May 2003 13:13:43 - 1.34 +++ pcm.h 20 Oct 2003 15:28:38 - 1.35 @@ -461,8 +461,6 @@ extern snd_pcm_t *snd_pcm_devices[]; extern snd_minor_t snd_pcm_reg[2]; -void snd_pcm_lock(int unlock); - int snd_pcm_new(snd_card_t * card, char *id, int device, int playback_count, int capture_count, snd_pcm_t **rpcm); --- This SF.net email sponsored by: Enterprise Linux Forum Conference & Expo The Event For Linux Datacenter Solutions & Strategies in The Enterprise Linux in the Boardroom; in the Front Office; & in the Server Room http://www.enterpriselinuxforum.com ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
