[alsa-cvslog] CVS: alsa-driver/include config.h.in,1.22,1.23 adriver.h,1.58,1.59
Update of /cvsroot/alsa/alsa-driver/include In directory sc8-pr-cvs1:/tmp/cvs-serv2593/include Modified Files: config.h.in adriver.h Log Message: Added PDE() check in linux/fs.h Index: config.h.in === RCS file: /cvsroot/alsa/alsa-driver/include/config.h.in,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- config.h.in 30 May 2003 12:27:03 - 1.22 +++ config.h.in 6 Oct 2003 10:09:33 - 1.23 @@ -33,6 +33,7 @@ #undef CONFIG_HAVE_STRLCPY #undef CONFIG_HAVE_SNPRINTF #undef CONFIG_HAVE_VMALLOC_TO_PAGE +#undef CONFIG_HAVE_PDE /* 2.2 kernels */ #undef CONFIG_OLD_KILL_FASYNC Index: adriver.h === RCS file: /cvsroot/alsa/alsa-driver/include/adriver.h,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- adriver.h 30 Sep 2003 08:54:47 - 1.58 +++ adriver.h 6 Oct 2003 10:09:33 - 1.59 @@ -127,7 +127,7 @@ #if LINUX_VERSION_CODE KERNEL_VERSION(2, 5, 3) !defined(need_resched) #define need_resched() (current-need_resched) #endif -#if LINUX_VERSION_CODE KERNEL_VERSION(2, 5, 4) !defined(WE_ARE_WOLK) +#ifndef CONFIG_HAVE_PDE #include linux/fs.h static inline struct proc_dir_entry *PDE(const struct inode *inode) { --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/usb/us428 usbus428.c,1.4,1.5 usbus428audio.c,1.3,1.4 usbus428ctldefs.h,1.1,1.2
Update of /cvsroot/alsa/alsa-driver/usb/us428 In directory sc8-pr-cvs1:/tmp/cvs-serv30438 Modified Files: usbus428.c usbus428audio.c usbus428ctldefs.h Log Message: - fixed the draining behavior (by Karsten). - fixed the use of no-name union. the old gcc doesn't accept this style as default. Index: usbus428.c === RCS file: /cvsroot/alsa/alsa-driver/usb/us428/usbus428.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- usbus428.c 25 Sep 2003 09:47:41 - 1.4 +++ usbus428.c 6 Oct 2003 13:15:17 - 1.5 @@ -173,7 +173,7 @@ if (0 == us428-AS04.urb[j]-status) { us428_p4out_t *p4out = us428ctls-p4out + send; // FIXME if more then 1 p4out is new, 1 gets lost. usb_fill_bulk_urb(us428-AS04.urb[j], us428-chip.dev, - usb_sndbulkpipe(us428-chip.dev, 0x04), p4out-vol, + usb_sndbulkpipe(us428-chip.dev, 0x04), p4out-val.vol, p4out-type == eLT_Light ? sizeof(us428_lights_t) : 5, snd_us428_Out04Int, us428); #ifdef OLD_USB Index: usbus428audio.c === RCS file: /cvsroot/alsa/alsa-driver/usb/us428/usbus428audio.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- usbus428audio.c 30 Sep 2003 08:54:47 - 1.3 +++ usbus428audio.c 6 Oct 2003 13:15:17 - 1.4 @@ -401,13 +401,15 @@ } if (pcm_captsubs) - if (pcm_captsubs-runtime-status-state == SNDRV_PCM_STATE_RUNNING) + if (pcm_captsubs-runtime-status-state == SNDRV_PCM_STATE_RUNNING + || pcm_captsubs-runtime-status-state == SNDRV_PCM_STATE_DRAINING) runtime = pcm_captsubs-runtime; if (NULL == runtime){ snd_us428_substream_t *playsubs = captsubs-stream-substream + SNDRV_PCM_STREAM_PLAYBACK; snd_pcm_substream_t *pcm_playsubs = playsubs-pcm_substream; if (pcm_playsubs) - if (pcm_playsubs-runtime-status-state == SNDRV_PCM_STATE_RUNNING) + if (pcm_playsubs-runtime-status-state == SNDRV_PCM_STATE_RUNNING + || pcm_playsubs-runtime-status-state == SNDRV_PCM_STATE_DRAINING) runtime = pcm_playsubs-runtime; } Index: usbus428ctldefs.h === RCS file: /cvsroot/alsa/alsa-driver/usb/us428/usbus428ctldefs.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- usbus428ctldefs.h 8 Sep 2003 10:57:41 - 1.1 +++ usbus428ctldefs.h 6 Oct 2003 13:15:17 - 1.2 @@ -118,7 +118,7 @@ union { usX2Y_volume_t vol; us428_lights_t lights; - }; + } val; } us428_p4out_t; #define N_us428_ctl_BUFS 16 --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/utils Modules.dep,1.25,1.26
Update of /cvsroot/alsa/alsa-driver/utils In directory sc8-pr-cvs1:/tmp/cvs-serv6563/utils Modified Files: Modules.dep Log Message: Manuel Jander [EMAIL PROTECTED]: added Aureal au88x0 drivers: snd-au8810, snd-au8820 and snd-au8830. Index: Modules.dep === RCS file: /cvsroot/alsa/alsa-driver/utils/Modules.dep,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- Modules.dep 8 Sep 2003 10:57:41 - 1.25 +++ Modules.dep 6 Oct 2003 14:01:07 - 1.26 @@ -19,3 +19,8 @@ %dir linux/sound/usb/us428 |snd-usb-us428 snd-usb-audio snd-hwdep + +%dir linux/sound/pci/au88x0 +|snd-au8810 snd-pcm snd-ac97-codec snd-mpu401-uart +|snd-au8820 snd-pcm snd-ac97-codec snd-mpu401-uart +|snd-au8830 snd-pcm snd-ac97-codec snd-mpu401-uart --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/pci/au88x0/test au88x0_a3d.c,NONE,1.1 au88x0_a3d.h,NONE,1.1
Update of /cvsroot/alsa/alsa-driver/pci/au88x0/test In directory sc8-pr-cvs1:/tmp/cvs-serv6563/pci/au88x0/test Added Files: au88x0_a3d.c au88x0_a3d.h Log Message: Manuel Jander [EMAIL PROTECTED]: added Aureal au88x0 drivers: snd-au8810, snd-au8820 and snd-au8830. --- NEW FILE: au88x0_a3d.c --- /*** *au88x0_a3d.c * * Fri Jul 18 14:16:22 2003 * Copyright 2003 mjander * [EMAIL PROTECTED] * * A3D. You may think i'm crazy, but this may work someday. Who knows... / /* CA3dSourceHw */ void Asp4A3DTopology::MakeConnections(void) { if (this_34 == 0) { /* Connect A3DOUT to MIXIN */ Asp4Topology::Route((int) 1, (uchar) this_0c-this_0c, (uchar) this_08-this_04, (uchar) this_10 + 0x50, (uchar) this_14+0x50); /* Connect MIXIN's this_10 and this_14 to MIXOUT this_18 */ (CAsp4Mix)this_18::EnableInput(int this_10); (CAsp4Mix)this_18::EnableInput(int this_14); /* Connect MIXOUT this_18 to SRCIN this_0c */ Asp4Topology::Route((int) 1, (uchar) this_0c, (uchar) this_18-this_08 + 0x30, (uchar) this_0c + 0x40); /* Connect SRCOUT this_0c to A3DIN this_20 */ Asp4Topology::Route((int) 1, (uchar) 0x11, (uchar) this_0c-this0c + 0x20, (uchar) this_20 + 0x70); } else { if (this_08) { /* Connect this_08 to SRCIN this_0c */ Asp4Topology::Route((int) 1, (uchar) this_0c, (uchar) this_08-this_04, (uchar) this_0c + 0x40); /* Connect SRCOUT this_0c to A3DIN this_20 */ Asp4Topology::Route((int) 1, (uchar) 0x11, (uchar) this_0c-this0c + 0x20, (uchar) this_20 + 0x70); } else { // I'm tired. I going to sleep now . } } } void CA3dSourceHw::CA3dSourceHw(CAsp4HwIO *hwio, int a,int b) { CA3dSourceHw-this00 = hwio; CA3dSourceHw-this04 = a; CA3dSourceHw-this08 = b; } void CA3dSourceHw::Initialize(int a, int b) { CA3dSourceHw-this04 = a; CA3dSourceHw-this08 = b; CA3dSourceHw::ZeroState(void); } #define addr(a,b,c) (a + (c 0xd) + (d*(1 + (8*4 - 3)*8))*4) void CA3dSourceHw::SetTimeConsts(short a, short b, short c, short d) { hwwrite(vortex-mmio, addr(0x1837C, this04, this08), a); hwwrite(vortex-mmio, addr(0x18388, this04, this08), b); hwwrite(vortex-mmio, addr(0x18380, this04, this08), c); hwwrite(vortex-mmio, addr(0x18384, this04, this08), d); } void CA3dSourceHw::GetTimeConsts(short a, short b, short c, short d) { } /* Atmospheric absorbtion. */ void CA3dSourceHw::SetAtmosTarget(short a,short b,short c,short d,short e) { hwwrite(vortex-mmio, addr(0x190Ec, this04, this08), (e 0x10) | d); hwwrite(vortex-mmio, addr(0x190F4, this04, this08), (b 0x10) | a); hwwrite(vortex-mmio, addr(0x190FC, this04, this08), c); } void CA3dSourceHw::SetAtmosTarget(short *a,short *b,short *c,short *d,short *e) { } void CA3dSourceHw::SetAtmosCurrent(short a,short b,short c,short d,short e) { hwwrite(vortex-mmio, addr(0x190E8, this04, this08), (e 0x10) | d); hwwrite(vortex-mmio, addr(0x190f0, this04, this08), (b 0x10) | a); hwwrite(vortex-mmio, addr(0x190f8, this04, this08), c); } void CA3dSourceHw::GetAtmosCurrent(short *a,short *b,short *c,short *d,short *e) { *d = hwread(vortex-mmio, addr(0x180e8, this04, this08)); *e = hwread(vortex-mmio, addr(0x190e8, this04, this08)); *b = hwread(vortex-mmio, addr(0x180f0, this04, this08)); *a = hwread(vortex-mmio, addr(0x190f0, this04, this08)); *c = hwread(vortex-mmio, addr(0x180f8, this04, this08)); } void CA3dSourceHw::SetAtmosState(short a,short b,short c,short d) { hwwrite(vortex-mmio, addr(0x1838C, this04, this08), a); hwwrite(vortex-mmio, addr(0x18390, this04, this08), b); hwwrite(vortex-mmio, addr(0x18394, this04, this08), c); hwwrite(vortex-mmio, addr(0x18398, this04, this08), d); } void CA3dSourceHw::GetAtmosState(short a,short b,short c,short d) { } #define addr2(a,b,c, i) (a + (((this080xb)+i)2) + (this04*(5*9*2 - 1)*4*2)) void CA3dSourceHw::SetHrtfTarget(short const *a,short const *b) { int i; for (i=0; i0x38; i++) hwwrite(vortex-mmio, addr2(0x19100, this04, this08, i), (b[i]0x10) | a[i]); } void CA3dSourceHw::GetHrtfTarget(short const *a,short const *b) { } void CA3dSourceHw::SetHrtfCurrent(short const *a,short const *b) {
[alsa-cvslog] CVS: alsa-driver/pci Kconfig,1.5,1.6 Makefile,1.9,1.10
Update of /cvsroot/alsa/alsa-driver/pci In directory sc8-pr-cvs1:/tmp/cvs-serv6563/pci Modified Files: Kconfig Makefile Log Message: Manuel Jander [EMAIL PROTECTED]: added Aureal au88x0 drivers: snd-au8810, snd-au8820 and snd-au8830. Index: Kconfig === RCS file: /cvsroot/alsa/alsa-driver/pci/Kconfig,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Kconfig 22 Jul 2003 13:39:10 - 1.5 +++ Kconfig 6 Oct 2003 14:01:01 - 1.6 @@ -11,3 +11,21 @@ help Say 'Y' or 'M' to include support for Digigram miXart soundcard. +config SND_AU8810 +tristate Aureal Advantage +depends on SND +help + Say 'Y' or 'M' to include support for Aureal Advatage soundcards. + +config SND_AU8820 +tristate Aureal Vortex +depends on SND +help + Say 'Y' or 'M' to include support for Aureal Vortex soundcards. + +config SND_AU8830 +tristate Aureal Vortex 2 +depends on SND +help + Say 'Y' or 'M' to include support for Aureal Vortex 2 soundcards. + Index: Makefile === RCS file: /cvsroot/alsa/alsa-driver/pci/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Makefile22 Jul 2003 13:39:10 - 1.9 +++ Makefile6 Oct 2003 14:01:02 - 1.10 @@ -9,7 +9,7 @@ EXTRA_CLEAN = cs4281.c es1968.c intel8x0.c maestro3.c -extra-subdir-y := pdplus mixart +extra-subdir-y := pdplus mixart au88x0 extra-subdir-m := $(extra-subdir-y) # --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/hdsploader configure.in,1.2,1.3
Update of /cvsroot/alsa/alsa-tools/hdsploader In directory sc8-pr-cvs1:/tmp/cvs-serv25497 Modified Files: configure.in Log Message: added the options --with-kernel and --with-soundbase. Index: configure.in === RCS file: /cvsroot/alsa/alsa-tools/hdsploader/configure.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- configure.in14 Jul 2003 14:48:33 - 1.2 +++ configure.in6 Oct 2003 15:39:12 - 1.3 @@ -8,4 +8,45 @@ CFLAGS=$CFLAGS $ALSA_CFLAGS LDFLAGS=$LDFLAGS $ALSA_LIBS +dnl kernel header files +AC_MSG_CHECKING(for kernel header files) +AC_ARG_WITH(kernel, + [ --with-kernel=ver specify kernel version (for example 2.5.5-pre1)], + [kerneldir=$withval], [kerneldir=]) +if test $kerneldir != -a -r /lib/modules/$kerneldir/build/include/sound; then + kerneldir=/lib/modules/$kerneldir/build/include + AC_MSG_RESULT($kerneldir) +else + if test -z $kerneldir; then +AC_MSG_RESULT(not specified) + else +AC_MSG_RESULT(directory /lib/modules/$kerneldir/build/include/sound not found) + fi + kerneldir= +fi + +dnl path for sound/asound.h +AC_MSG_CHECKING(for directory with ALSA kernel headers) +AC_ARG_WITH(soundbase, + [ --with-soundbase=dirspecify base directory with kernel sound headers (optional)], + [soundbasedir=$withval], [soundbasedir=$kerneldir]) +if test $soundbasedir != -a -r $soundbasedir/sound ; then + ALSA_CFLAGS=$ALSA_CFLAGS -I$soundbasedir + CFLAGS=$CFLAGS -I$soundbasedir + AC_MSG_RESULT($ALSA_CFLAGS) +else + if test x$prefix != xNONE; then +aprefix=$prefix + else +aprefix=$ac_default_prefix + fi + if test -z $soundbasedir -a -r $aprefix/include/sound; then +ALSA_CFLAGS=$ALSA_CFLAGS -I$aprefix/include +CFLAGS=$CFLAGS -I$aprefix/include +AC_MSG_RESULT($ALSA_CFLAGS) + else +AC_MSG_RESULT(not specified - using C compilator defaults) + fi +fi + AC_OUTPUT(Makefile firmware/Makefile) --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools Makefile,1.26,1.27
Update of /cvsroot/alsa/alsa-tools In directory sc8-pr-cvs1:/tmp/cvs-serv28404 Modified Files: Makefile Log Message: added us428control utility by Karsten Wiese [EMAIL PROTECTED] Index: Makefile === RCS file: /cvsroot/alsa/alsa-tools/Makefile,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- Makefile25 Sep 2003 19:53:08 - 1.26 +++ Makefile6 Oct 2003 15:57:22 - 1.27 @@ -1,8 +1,8 @@ VERSION = 0.9.7 TOP = . SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \ - mixartloader rmedigicontrol sb16_csp seq sscape_ctl usx2yloader \ - vxloader + mixartloader rmedigicontrol sb16_csp seq sscape_ctl us428control \ + usx2yloader vxloader all: @for i in $(SUBDIRS); do cd $(TOP)/$$i; ./cvscompile; cd ..; make -C $$i; done --- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-tools/us428control .cvsignore,NONE,1.1 Cus428State.cc,NONE,1.1 Cus428State.h,NONE,1.1 Cus428_ctls.cc,NONE,1.1 Cus428_ctls.h,NONE,1.1 Makefile.am,NONE,1.1 configure.in,NONE,1.1 cvscompile,NONE,1.1 us428control.cc,NONE,1.1 usbus428ctldefs.h,NONE,1.1
Update of /cvsroot/alsa/alsa-tools/us428control In directory sc8-pr-cvs1:/tmp/cvs-serv28404/us428control Added Files: .cvsignore Cus428State.cc Cus428State.h Cus428_ctls.cc Cus428_ctls.h Makefile.am configure.in cvscompile us428control.cc usbus428ctldefs.h Log Message: added us428control utility by Karsten Wiese [EMAIL PROTECTED] --- NEW FILE: .cvsignore --- Makefile Makefile.in install-sh missing mkinstalldirs aclocal.m4 configure config.log config.cache config.status us428control depcomp .deps autom4te.cache --- NEW FILE: Cus428State.cc --- /* * Controller for Tascam US-X2Y * * 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 stdio.h #include string.h #include Cus428State.h extern int verbose; void us428_lights::init_us428_lights() { int i = 0; memset(this, 0, sizeof(*this)); for (i = 0; i 7; ++i) Light[ i].Offset = i + 0x19; } int Cus428State::LightSend() { int Next = us428ctls_sharedmem-p4outLast + 1; if(Next 0 || Next = N_us428_p4out_BUFS) Next = 0; memcpy(us428ctls_sharedmem-p4out[Next].lights, Light, sizeof(us428_lights)); us428ctls_sharedmem-p4out[Next].type = eLT_Light; return us428ctls_sharedmem-p4outLast = Next; } void Cus428State::SliderChangedTo(int S, unsigned char New) { 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; memcpy(us428ctls_sharedmem-p4out[Next].vol, V, sizeof(V)); us428ctls_sharedmem-p4out[Next].type = eLT_Volume; us428ctls_sharedmem-p4outLast = Next; } void Cus428State::KnobChangedTo(eKnobs K, bool V) { switch (K) { case eK_InputMonitor: if (verbose 1) printf(Knob InputMonitor now %i, V); if (V) { LightSet(eL_InputMonitor, ! LightIs(eL_InputMonitor)); LightSend(); } if (verbose 1) printf( Light is %i\n, LightIs(eL_InputMonitor)); break; default: if (verbose 1) printf(Knob %i now %i\n, K, V); } } --- NEW FILE: Cus428State.h --- /* * Controller for Tascam US-X2Y * * 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 */ #ifndef Cus428State_h #define Cus428State_h #include Cus428_ctls.h class Cus428State: public us428_lights, public Cus428_ctls{ public: Cus428State(struct us428ctls_sharedmem* Pus428ctls_sharedmem) :us428ctls_sharedmem(Pus428ctls_sharedmem) { init_us428_lights(); } enum eKnobs{ eK_RECORD = 72, eK_PLAY = 73, eK_STOP, eK_InputMonitor = 80 }; void KnobChangedTo(eKnobs K, bool V); void SliderChangedTo(int S, unsigned char New); private: int LightSend(); struct us428ctls_sharedmem* us428ctls_sharedmem; }; extern Cus428State* OneState; #endif --- NEW FILE: Cus428_ctls.cc --- /* * Controller for Tascam US-X2Y * * 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