from:"Takashi Iwai"

[alsa-cvslog] CVS: alsa-kernel/isa/opti9xx opti92x-ad1848.c,1.44,1.45

2004-06-15 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/isa/opti9xx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19213

Modified Files:
opti92x-ad1848.c 
Log Message:
Fixed spin deadlocks.



Index: opti92x-ad1848.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/opti9xx/opti92x-ad1848.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- opti92x-ad1848.c19 Apr 2004 19:16:49 -  1.44
+++ opti92x-ad1848.c15 Jun 2004 10:39:57 -  1.45
@@ -474,7 +474,6 @@
unsigned char dma_bits;
unsigned char mpu_port_bits = 0;
unsigned char mpu_irq_bits;
-   unsigned long flags;
 
switch (chip-hardware) {
 #ifndef OPTi93X
@@ -601,13 +600,11 @@
dma_bits |= 0x04;
 #endif /* CS4231 || OPTi93X */
 
-   spin_lock_irqsave(chip-lock, flags);
 #ifndef OPTi93X
 outb(irq_bits  3 | dma_bits, chip-wss_base);
 #else /* OPTi93X */
snd_opti9xx_write(chip, OPTi9XX_MC_REG(3), (irq_bits  3 | dma_bits));
 #endif /* OPTi93X */
-   spin_unlock_irqrestore(chip-lock, flags);
 
 __skip_resources:
if (chip-hardware  OPTi9XX_HW_82C928) {
@@ -767,15 +764,10 @@
 
 static void snd_opti93x_mute(opti93x_t *chip, int mute)
 {
-   unsigned long flags;
-
-   spin_lock_irqsave(chip-lock, flags);
-
mute = mute ? 1 : 0;
-   if (chip-mute == mute) {
-   spin_unlock_irqrestore(chip-lock, flags);
+   if (chip-mute == mute)
return;
-   }
+
chip-mute = mute;
 
snd_opti93x_mute_reg(chip, OPTi93X_CD_LEFT_INPUT, mute);
@@ -800,8 +792,6 @@
snd_opti93x_mute_reg(chip, OPTi93X_MIC_RIGHT_INPUT, mute);
snd_opti93x_mute_reg(chip, OPTi93X_OUT_LEFT, mute);
snd_opti93x_mute_reg(chip, OPTi93X_OUT_RIGHT, mute);
-
-   spin_unlock_irqrestore(chip-lock, flags);
 }
 
 
@@ -873,10 +863,8 @@
 
 static void snd_opti93x_playback_format(opti93x_t *chip, unsigned char fmt)
 {
-   unsigned long flags;
unsigned char mask;
 
-   spin_lock_irqsave(chip-lock, flags);
snd_opti93x_mute(chip, 1);
 
snd_opti93x_mce_up(chip);
@@ -885,14 +873,10 @@
snd_opti93x_mce_down(chip);
 
snd_opti93x_mute(chip, 0);
-   spin_unlock_irqrestore(chip-lock, flags);
 }
 
 static void snd_opti93x_capture_format(opti93x_t *chip, unsigned char fmt)
 {
-   unsigned long flags;
-
-   spin_lock_irqsave(chip-lock, flags);
snd_opti93x_mute(chip, 1);
 
snd_opti93x_mce_up(chip);
@@ -904,7 +888,6 @@
snd_opti93x_mce_down(chip);
 
snd_opti93x_mute(chip, 0);
-   spin_unlock_irqrestore(chip-lock, flags);
 }
 
 



---
This SF.Net email is sponsored by The 2004 JavaOne(SM) Conference
Learn from the experts at JavaOne(SM), Sun's Worldwide Java Developer
Conference, June 28 - July 1 at the Moscone Center in San Francisco, CA
REGISTER AND SAVE! http://java.sun.com/javaone/sf Priority Code NWMGYKND
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci atiixp.c,1.10,1.11 via82xx.c,1.103,1.104

2004-06-09 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31337/pci

Modified Files:
atiixp.c via82xx.c 
Log Message:
Added the missing RESUME info bits to pcm.


Index: atiixp.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/atiixp.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- atiixp.c24 May 2004 13:16:43 -  1.10
+++ atiixp.c9 Jun 2004 17:01:05 -   1.11
@@ -996,6 +996,7 @@
 {
.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 SNDRV_PCM_INFO_BLOCK_TRANSFER |
+SNDRV_PCM_INFO_RESUME |
 SNDRV_PCM_INFO_MMAP_VALID),
.formats =  SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE,
.rates =SNDRV_PCM_RATE_48000,

Index: via82xx.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/via82xx.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- via82xx.c   25 May 2004 17:54:55 -  1.103
+++ via82xx.c   9 Jun 2004 17:01:05 -   1.104
@@ -1035,6 +1035,7 @@
.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
 SNDRV_PCM_INFO_BLOCK_TRANSFER |
 SNDRV_PCM_INFO_MMAP_VALID |
+SNDRV_PCM_INFO_RESUME |
 SNDRV_PCM_INFO_PAUSE),
.formats =  SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
.rates =SNDRV_PCM_RATE_48000,



---
This SF.Net email is sponsored by: GNOME Foundation
Hackers Unite!  GUADEC: The world's #1 Open Source Desktop Event.
GNOME Users and Developers European Conference, 28-30th June in Norway
http://2004/guadec.org
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci intel8x0.c,1.137,1.138

2004-06-09 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31930/pci

Modified Files:
intel8x0.c 
Log Message:
Added the PCI ID for nVidia CK8.



Index: intel8x0.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/intel8x0.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- intel8x0.c  26 Apr 2004 07:47:09 -  1.137
+++ intel8x0.c  9 Jun 2004 17:02:00 -   1.138
@@ -149,6 +149,9 @@
 #ifndef PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO
 #define PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO0x006a
 #endif
+#ifndef PCI_DEVICE_ID_NVIDIA_CK8_AUDIO
+#define PCI_DEVICE_ID_NVIDIA_CK8_AUDIO 0x008a
+#endif
 #ifndef PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO
 #define PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO0x00da
 #endif
@@ -463,6 +466,7 @@
{ 0x1039, 0x7012, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_SIS },   /* SI7012 */
{ 0x10de, 0x01b1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE },/* 
NFORCE */
{ 0x10de, 0x006a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE },/* 
NFORCE2 */
+   { 0x10de, 0x008a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE },/* CK8 
*/
{ 0x10de, 0x00da, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE },/* 
NFORCE3 */
{ 0x10de, 0x00ea, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE },/* 
CK8S */
{ 0x1022, 0x746d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* AMD8111 */
@@ -2614,6 +2618,7 @@
{ PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO, NVidia nForce2 },
{ PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO, NVidia nForce3 },
{ PCI_DEVICE_ID_NVIDIA_CK8S_AUDIO, NVidia CK8S },
+   { PCI_DEVICE_ID_NVIDIA_CK8_AUDIO, NVidia CK8 },
{ 0x746d, AMD AMD8111 },
{ 0x7445, AMD AMD768 },
{ 0x5455, ALi M5455 },



---
This SF.Net email is sponsored by: GNOME Foundation
Hackers Unite!  GUADEC: The world's #1 Open Source Desktop Event.
GNOME Users and Developers European Conference, 28-30th June in Norway
http://2004/guadec.org
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-driver Makefile,1.109,1.110 Makefile.conf.in,1.62,1.63 Rules.make,1.39,1.40 configure.in,1.247,1.248

2004-06-09 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32227

Modified Files:
Makefile Makefile.conf.in Rules.make configure.in 
Log Message:
- fixed the detection of x86-64 arch.
  it has to be before the detection of K8.
- fixed the build with the recent SUSE kernels.


Index: Makefile
===
RCS file: /cvsroot/alsa/alsa-driver/Makefile,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- Makefile27 May 2004 18:24:57 -  1.109
+++ Makefile9 Jun 2004 17:33:47 -   1.110
@@ -103,7 +103,7 @@
 .PHONY: compile
 compile: include/sound/version.h include/sndversions.h
 ifdef NEW_KBUILD
-   $(MAKE) -C $(CONFIG_SND_KERNELDIR) SUBDIRS=$(MAINSRCDIR)/kbuild modules
+   $(MAKE) -C $(CONFIG_SND_KERNELDIR) SUBDIRS=$(MAINSRCDIR)/kbuild $(MAKE_ADDS) 
modules
 else
@for d in $(SUBDIRS); do if ! $(MAKE) -C $$d; then exit 1; fi; done
 endif

Index: Makefile.conf.in
===
RCS file: /cvsroot/alsa/alsa-driver/Makefile.conf.in,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Makefile.conf.in5 Mar 2004 11:49:44 -   1.62
+++ Makefile.conf.in9 Jun 2004 17:33:47 -   1.63
@@ -54,8 +54,9 @@
 SNDVERSIONS= $(TOPDIR)/include/sndversions.h
 DEXPORT= $(TOPDIR)/include/modules
 else
-EXTRA_CFLAGS += -I$(MAINSRCDIR)/include -Iinclude -DALSA_BUILD
-CPPFLAGS := $(subst -Iinclude ,,$(CPPFLAGS))
-CFLAGS := $(subst -Iinclude ,,$(CFLAGS))
+EXTRA_CFLAGS += -DALSA_BUILD
+CPPFLAGS := -I$(MAINSRCDIR)/include $(CPPFLAGS)
+CFLAGS := -I$(MAINSRCDIR)/include $(CFLAGS)
+MAKE_ADDS = @MAKE_ADDS@
 endif
 

Index: Rules.make
===
RCS file: /cvsroot/alsa/alsa-driver/Rules.make,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Rules.make  27 May 2004 18:24:57 -  1.39
+++ Rules.make  9 Jun 2004 17:33:47 -   1.40
@@ -18,7 +18,6 @@
 prepare: $(clean-files)
@for d in $(patsubst %/,%,$(filter %/, $(obj-y))) \
  $(patsubst %/,%,$(filter %/, $(obj-m))) DUMMY; do \
-echo $$d; \
 if [ $$d != DUMMY ]; then $(MAKE) -C $$d prepare; fi; \
done
 

Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-driver/configure.in,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- configure.in31 May 2004 13:13:11 -  1.247
+++ configure.in9 Jun 2004 17:33:47 -   1.248
@@ -74,9 +74,7 @@
   kerneldir=$withval,
   kerneldir=$DEFAULT_KERNEL_DIR
 )
-AC_DEFINE_UNQUOTED(CONFIG_SND_KERNELDIR, $kerneldir)
 CONFIG_SND_KERNELDIR=$kerneldir
-AC_SUBST(CONFIG_SND_KERNELDIR)
 AC_MSG_RESULT($kerneldir)
 
 dnl Check for kernel version...
@@ -442,6 +440,42 @@
   fi
 fi
 
+dnl Check for forced SUSE kernels
+AC_MSG_CHECKING(for SUSE kernel)
+AC_ARG_WITH(suse,
+  [  --with-suse=no,yes,auto  specify SUSE kernel build],
+  suse_kernel=$withval, suse_kernel=auto)
+CONFIG_SUSE_KERNEL=auto
+if test $suse_kernel = yes; then
+  CONFIG_SUSE_KERNEL=y
+  AC_MSG_RESULT(yes)
+else
+  if test $suse_kernel = no; then
+CONFIG_SUSE_KERNEL=
+AC_MSG_RESULT(no)
+  else
+AC_MSG_RESULT(auto)
+CHECK_KERNEL_CONFIG(CONFIG_SUSE_KERNEL, [SUSE kernel])
+  fi
+fi
+
+MAKE_ADDS=
+if test $CONFIG_SUSE_KERNEL = y; then
+  if test ! -f $CONFIG_SND_KERNELDIR/include/linux/kernel.h; then
+if test $CONFIG_SND_KERNELDIR != /usr/src/linux; then
+  echo Tweaking the kernel source directories for SUSE kernels...
+  MAKE_ADDS=O=$CONFIG_SND_KERNELDIR
+  CONFIG_SND_KERNELDIR=/usr/src/linux
+  KERNEL_INC=-I$CONFIG_SND_KERNELDIR/include
+fi
+  fi
+fi
+
+dnl define kernel directory now
+AC_DEFINE_UNQUOTED(CONFIG_SND_KERNELDIR, $CONFIG_SND_KERNELDIR)
+AC_SUBST(CONFIG_SND_KERNELDIR)
+AC_SUBST(MAKE_ADDS)
+
 dnl Check kernel headers for 2.2
 MODIFY_KERNEL_HEADER(linux/kmod.h, __LINUX_KMOD_H__)
 CHECK_KERNEL_HEADER(linux/compiler.h)
@@ -623,6 +657,8 @@
fprintf(file, i486);
 #elif defined(CONFIG_M586)
fprintf(file, i586);
+#elif defined(CONFIG_X86_64) /* this needs to be chcked before K8 */
+   fprintf(file, x86_64);
 #elif defined(CONFIG_M586TSC)
fprintf(file, i586tsc);
 #elif defined(CONFIG_M586MMX)
@@ -675,8 +711,6 @@
fprintf(file, sparc);
 #elif defined(CONFIG_SPARC64)
fprintf(file, sparc64);
-#elif defined(CONFIG_X86_64)
-   fprintf(file, x86_64);
 #elif defined(CONFIG_ARCH_SA1100)
fprintf(file, sa1100);
 #elif defined(CONFIG_ARCH_PXA)



---
This SF.Net email is sponsored by: GNOME Foundation
Hackers Unite!  GUADEC: The world's #1 Open Source Desktop Event.
GNOME Users and Developers European Conference, 28-30th June in Norway

[alsa-cvslog] CVS: alsa-kernel/core/oss pcm_plugin.c,1.18,1.19

2004-06-09 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/core/oss
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2694/core/oss

Modified Files:
pcm_plugin.c 
Log Message:
Clean up and optimization of PCM format-specific functions.

- Use array indexing instead of huge swith/case.
- Removed superfluous handling of floats.
- Use memcpy for silencing to simplify the codes.



Index: pcm_plugin.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/oss/pcm_plugin.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- pcm_plugin.c5 Feb 2004 15:38:42 -   1.18
+++ pcm_plugin.c9 Jun 2004 17:36:14 -   1.19
@@ -846,41 +846,31 @@
 size_t samples, int format)
 {
/* FIXME: sub byte resolution and odd dst_offset */
-   char *dst;
+   unsigned char *dst;
unsigned int dst_step;
int width;
-   u_int64_t silence;
+   const unsigned char *silence;
if (!dst_area-addr)
return 0;
dst = dst_area-addr + (dst_area-first + dst_area-step * dst_offset) / 8;
width = snd_pcm_format_physical_width(format);
+   if (width = 0)
+   return -EINVAL;
+   if (dst_area-step == (unsigned int) width  width = 8)
+   return snd_pcm_format_set_silence(format, dst, samples);
silence = snd_pcm_format_silence_64(format);
-   if (dst_area-step == (unsigned int) width) {
-   size_t dwords = samples * width / 64;
-   u_int64_t *dst64 = (u_int64_t *)dst;
-
-   samples -= dwords * 64 / width;
-   while (dwords--  0)
-   *dst64++ = silence;
-   if (samples == 0)
-   return 0;
-   dst = (char *)dst64;
-   }
+   if (! silence)
+   return -EINVAL;
dst_step = dst_area-step / 8;
-   switch (width) {
-   case 4: {
-   u_int8_t s0 = silence  0xf0;
-   u_int8_t s1 = silence  0x0f;
+   if (width == 4) {
+   /* Ima ADPCM */
int dstbit = dst_area-first % 8;
int dstbit_step = dst_area-step % 8;
while (samples--  0) {
-   if (dstbit) {
+   if (dstbit)
*dst = 0xf0;
-   *dst |= s1;
-   } else {
+   else
*dst = 0x0f;
-   *dst |= s0;
-   }
dst += dst_step;
dstbit += dstbit_step;
if (dstbit == 8) {
@@ -888,41 +878,12 @@
dstbit = 0;
}
}
-   break;
-   }
-   case 8: {
-   u_int8_t sil = silence;
-   while (samples--  0) {
-   *dst = sil;
-   dst += dst_step;
-   }
-   break;
-   }
-   case 16: {
-   u_int16_t sil = silence;
-   while (samples--  0) {
-   *(u_int16_t*)dst = sil;
-   dst += dst_step;
-   }
-   break;
-   }
-   case 32: {
-   u_int32_t sil = silence;
-   while (samples--  0) {
-   *(u_int32_t*)dst = sil;
-   dst += dst_step;
-   }
-   break;
-   }
-   case 64: {
+   } else {
+   width /= 8;
while (samples--  0) {
-   *(u_int64_t*)dst = silence;
+   memcpy(dst, silence, width);
dst += dst_step;
}
-   break;
-   }
-   default:
-   snd_BUG();
}
return 0;
 }
@@ -942,18 +903,18 @@
if (!dst_area-addr)
return 0;
width = snd_pcm_format_physical_width(format);
+   if (width = 0)
+   return -EINVAL;
if (src_area-step == (unsigned int) width 
-   dst_area-step == (unsigned int) width) {
+   dst_area-step == (unsigned int) width  width = 8) {
size_t bytes = samples * width / 8;
-   samples -= bytes * 8 / width;
memcpy(dst, src, bytes);
-   if (samples == 0)
-   return 0;
+   return 0;
}
src_step = src_area-step / 8;
dst_step = dst_area-step / 8;
-   switch (width) {
-   case 4: {
+   if (width == 4) {
+   /* Ima ADPCM */
int srcbit = src_area-first % 8;
int srcbit_step = src_area-step % 8;
int dstbit = dst_area-first % 8;
@@ -963,12 +924,11 @@
if (srcbit)
srcval = *src

[alsa-cvslog] CVS: alsa-kernel/core pcm_misc.c,1.13,1.14

2004-06-09 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2694/core

Modified Files:
pcm_misc.c 
Log Message:
Clean up and optimization of PCM format-specific functions.

- Use array indexing instead of huge swith/case.
- Removed superfluous handling of floats.
- Use memcpy for silencing to simplify the codes.



Index: pcm_misc.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/pcm_misc.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pcm_misc.c  4 May 2004 15:09:50 -   1.13
+++ pcm_misc.c  9 Jun 2004 17:36:14 -   1.14
@@ -23,12 +23,169 @@
 #include linux/time.h
 #include sound/core.h
 #include sound/pcm.h
-#define bswap_16 swab16
-#define bswap_32 swab32
-#define bswap_64 swab64
 #define SND_PCM_FORMAT_UNKNOWN (-1)
-#define snd_enum_to_int(v) (v)
-#define snd_int_to_enum(v) (v)
+
+struct pcm_format_data {
+   char width; /* bit width */
+   char phys;  /* physical bit width */
+   char le;/* 0 = big-endian, 1 = little-endian, -1 = others */
+   char signd; /* 0 = unsigned, 1 = signed, -1 = others */
+   unsigned char silence[8];   /* silence data to fill */
+};
+
+static struct pcm_format_data pcm_formats[SNDRV_PCM_FORMAT_LAST+1] = {
+   [SNDRV_PCM_FORMAT_S8] = {
+   .width = 8, .phys = 8, .le = -1, .signd = 1,
+   .silence = {},
+   },
+   [SNDRV_PCM_FORMAT_U8] = {
+   .width = 8, .phys = 8, .le = -1, .signd = 0,
+   .silence = { 0x80 },
+   },
+   [SNDRV_PCM_FORMAT_S16_LE] = {
+   .width = 16, .phys = 16, .le = 1, .signd = 1,
+   .silence = {},
+   },
+   [SNDRV_PCM_FORMAT_S16_BE] = {
+   .width = 16, .phys = 16, .le = 0, .signd = 1,
+   .silence = {},
+   },
+   [SNDRV_PCM_FORMAT_U16_LE] = {
+   .width = 16, .phys = 16, .le = 1, .signd = 0,
+   .silence = { 0x00, 0x80 },
+   },
+   [SNDRV_PCM_FORMAT_U16_BE] = {
+   .width = 16, .phys = 16, .le = 0, .signd = 0,
+   .silence = { 0x80, 0x00 },
+   },
+   [SNDRV_PCM_FORMAT_S24_LE] = {
+   .width = 24, .phys = 32, .le = 1, .signd = 1,
+   .silence = {},
+   },
+   [SNDRV_PCM_FORMAT_S24_BE] = {
+   .width = 24, .phys = 32, .le = 0, .signd = 1,
+   .silence = {},
+   },
+   [SNDRV_PCM_FORMAT_U24_LE] = {
+   .width = 24, .phys = 32, .le = 1, .signd = 0,
+   .silence = { 0x00, 0x00, 0x80 },
+   },
+   [SNDRV_PCM_FORMAT_U24_BE] = {
+   .width = 24, .phys = 32, .le = 0, .signd = 0,
+   .silence = { 0x80, 0x00, 0x00 },
+   },
+   [SNDRV_PCM_FORMAT_S32_LE] = {
+   .width = 32, .phys = 32, .le = 1, .signd = 1,
+   .silence = {},
+   },
+   [SNDRV_PCM_FORMAT_S32_BE] = {
+   .width = 32, .phys = 32, .le = 0, .signd = 1,
+   .silence = {},
+   },
+   [SNDRV_PCM_FORMAT_U32_LE] = {
+   .width = 32, .phys = 32, .le = 1, .signd = 0,
+   .silence = { 0x00, 0x00, 0x00, 0x80 },
+   },
+   [SNDRV_PCM_FORMAT_U32_BE] = {
+   .width = 32, .phys = 32, .le = 0, .signd = 0,
+   .silence = { 0x80, 0x00, 0x00, 0x00 },
+   },
+   [SNDRV_PCM_FORMAT_FLOAT_LE] = {
+   .width = 32, .phys = 32, .le = 1, .signd = -1,
+   .silence = {},
+   },
+   [SNDRV_PCM_FORMAT_FLOAT_BE] = {
+   .width = 32, .phys = 32, .le = 0, .signd = -1,
+   .silence = {},
+   },
+   [SNDRV_PCM_FORMAT_FLOAT64_LE] = {
+   .width = 64, .phys = 64, .le = 1, .signd = -1,
+   .silence = {},
+   },
+   [SNDRV_PCM_FORMAT_FLOAT64_BE] = {
+   .width = 64, .phys = 64, .le = 0, .signd = -1,
+   .silence = {},
+   },
+   [SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE] = {
+   .width = 32, .phys = 32, .le = 1, .signd = -1,
+   .silence = {},
+   },
+   [SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE] = {
+   .width = 32, .phys = 32, .le = 0, .signd = -1,
+   .silence = {},
+   },
+   [SNDRV_PCM_FORMAT_MU_LAW] = {
+   .width = 8, .phys = 8, .le = -1, .signd = -1,
+   .silence = { 0x7f },
+   },
+   [SNDRV_PCM_FORMAT_A_LAW] = {
+   .width = 8, .phys = 8, .le = -1, .signd = -1,
+   .silence = { 0x55 },
+   },
+   [SNDRV_PCM_FORMAT_IMA_ADPCM] = {
+   .width = 4, .phys = 4, .le = -1, .signd = -1,
+   .silence = {},
+   },
+   /* FIXME: the following three formats are not defined properly yet */
+   [SNDRV_PCM_FORMAT_MPEG] = {
+   .le = -1, .signd = -1,
+   },
+   [SNDRV_PCM_FORMAT_GSM] = {
+   .le =

[alsa-cvslog] CVS: alsa-kernel/include pcm.h,1.40,1.41

2004-06-09 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2694/include

Modified Files:
pcm.h 
Log Message:
Clean up and optimization of PCM format-specific functions.

- Use array indexing instead of huge swith/case.
- Removed superfluous handling of floats.
- Use memcpy for silencing to simplify the codes.



Index: pcm.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/pcm.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- pcm.h   19 Mar 2004 20:17:34 -  1.40
+++ pcm.h   9 Jun 2004 17:36:15 -   1.41
@@ -851,7 +851,7 @@
 int snd_pcm_format_big_endian(snd_pcm_format_t format);
 int snd_pcm_format_width(snd_pcm_format_t format); /* in bits */
 int snd_pcm_format_physical_width(snd_pcm_format_t format);/* in bits */
-u_int64_t snd_pcm_format_silence_64(snd_pcm_format_t format);
+const unsigned char *snd_pcm_format_silence_64(snd_pcm_format_t format);
 int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int 
frames);
 snd_pcm_format_t snd_pcm_build_linear_format(int width, int unsignd, int big_endian);
 ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples);



---
This SF.Net email is sponsored by: GNOME Foundation
Hackers Unite!  GUADEC: The world's #1 Open Source Desktop Event.
GNOME Users and Developers European Conference, 28-30th June in Norway
http://2004/guadec.org
___
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.135,1.136 ac97_patch.c,1.52,1.53

2004-05-30 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26533

Modified Files:
ac97_codec.c ac97_patch.c 
Log Message:
Fixed mutex deadlocks.



Index: ac97_codec.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_codec.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- ac97_codec.c28 May 2004 09:27:09 -  1.135
+++ ac97_codec.c30 May 2004 16:40:04 -  1.136
@@ -642,7 +642,7 @@
snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, page);
err = func(kcontrol, ucontrol);
snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, page_save);
-   down(ac97-mutex); /* unlock paging */
+   up(ac97-mutex); /* unlock paging */
} else
err = func(kcontrol, ucontrol);
return err;

Index: ac97_patch.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_patch.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ac97_patch.c28 May 2004 09:27:09 -  1.52
+++ ac97_patch.c30 May 2004 16:40:05 -  1.53
@@ -62,7 +62,7 @@
snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, page);
ret = snd_ac97_update_bits(ac97, reg, mask, value);
snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, page_save);
-   down(ac97-mutex); /* unlock paging */
+   up(ac97-mutex); /* unlock paging */
return ret;
 }
 



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
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.134,1.135 ac97_id.h,1.8,1.9 ac97_local.h,1.6,1.7 ac97_patch.c,1.51,1.52 ac97_patch.h,1.15,1.16

2004-05-28 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8224

Modified Files:
ac97_codec.c ac97_id.h ac97_local.h ac97_patch.c ac97_patch.h 
Log Message:
- Added the single mixer control with AC97 2.3 paging.
- Handle the paging for some ALC655/658 registers.
- Added the experimental support for ALC850.



Index: ac97_codec.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_codec.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- ac97_codec.c27 May 2004 18:15:54 -  1.134
+++ ac97_codec.c28 May 2004 09:27:09 -  1.135
@@ -114,6 +114,7 @@
 { 0x414c4720, 0xfff0, ALC650,patch_alc650,   NULL },
 { 0x414c4760, 0xfff0, ALC655,patch_alc655,   NULL },
 { 0x414c4780, 0xfff0, ALC658,patch_alc655,   NULL },
+{ 0x414c4790, 0xfff0, ALC850,patch_alc850,   NULL },
 { 0x414c4730, 0x, ALC101,NULL,   NULL },
 { 0x414c4740, 0xfff0, ALC202,NULL,   NULL },
 { 0x414c4750, 0xfff0, ALC250,NULL,   NULL },
@@ -274,7 +275,7 @@
 {
if (!snd_ac97_valid_reg(ac97, reg))
return;
-   if ((ac97-id  0xff00) == 0x414c4300) {
+   if ((ac97-id  0xff00) == AC97_ID_ALC100) {
/* Fix H/W bug of ALC100/100P */
if (reg == AC97_MASTER || reg == AC97_HEADPHONE)
ac97-bus-write(ac97, AC97_RESET, 0);  /* reset audio codec */
@@ -545,7 +546,7 @@
int reg = kcontrol-private_value  0xff;
int shift = (kcontrol-private_value  8)  0xff;
int mask = (kcontrol-private_value  16)  0xff;
-   int invert = (kcontrol-private_value  24)  0xff;
+   int invert = (kcontrol-private_value  24)  0x01;

ucontrol-value.integer.value[0] = (snd_ac97_read_cache(ac97, reg)  shift)  
mask;
if (invert)
@@ -559,7 +560,7 @@
int reg = kcontrol-private_value  0xff;
int shift = (kcontrol-private_value  8)  0xff;
int mask = (kcontrol-private_value  16)  0xff;
-   int invert = (kcontrol-private_value  24)  0xff;
+   int invert = (kcontrol-private_value  24)  0x01;
unsigned short val;

val = (ucontrol-value.integer.value[0]  mask);
@@ -625,6 +626,40 @@
(val1  shift_left) | (val2  shift_right));
 }
 
+int snd_ac97_getput_page(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol,
+int (*func)(snd_kcontrol_t *, snd_ctl_elem_value_t *))
+{
+   ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
+   int reg = kcontrol-private_value  0xff;
+   int err;
+
+   if ((ac97-ext_id  AC97_EI_REV_MASK) = AC97_EI_REV_23 
+   (reg = 0x60  reg  0x70)) {
+   unsigned short page_save;
+   unsigned short page = (kcontrol-private_value  25)  0x0f;
+   down(ac97-mutex); /* lock paging */
+   page_save = snd_ac97_read(ac97, AC97_INT_PAGING)  AC97_PAGE_MASK;
+   snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, page);
+   err = func(kcontrol, ucontrol);
+   snd_ac97_update_bits(ac97, AC97_INT_PAGING, AC97_PAGE_MASK, page_save);
+   down(ac97-mutex); /* unlock paging */
+   } else
+   err = func(kcontrol, ucontrol);
+   return err;
+}
+
+/* for rev2.3 paging */
+int snd_ac97_page_get_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+   return snd_ac97_getput_page(kcontrol, ucontrol, snd_ac97_get_single);
+}
+
+/* for rev2.3 paging */
+int snd_ac97_page_put_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+   return snd_ac97_getput_page(kcontrol, ucontrol, snd_ac97_put_single);
+}
+
 static const snd_kcontrol_new_t snd_ac97_controls_master_mono[2] = {
 AC97_SINGLE(Master Mono Playback Switch, AC97_MASTER_MONO, 15, 1, 1),
 AC97_SINGLE(Master Mono Playback Volume, AC97_MASTER_MONO, 0, 31, 1)
@@ -1435,9 +1470,7 @@
if ((err = snd_ac97_cmute_new(card, PCM Playback Switch, AC97_PCM, 
ac97))  0)
return err;
/* FIXME: C-Media chips have no PCM volume!! */
-   if (/*ac97-id == 0x434d4941 ||*/
-   ac97-id == 0x434d4942 ||
-   ac97-id == 0x434d4961)
+   if (ac97-id == AC97_ID_CM9739)
snd_ac97_write_cache(ac97, AC97_PCM, 0x9f1f);
else {
if ((err = snd_ac97_cvol_new(card, PCM Playback Volume, 
AC97_PCM, 31, ac97))  0)
@@ -2080,18 +2113,28 @@
snd_ac97_write(ac97, AC97_GENERAL_PURPOSE, 0);
 
snd_ac97_write(ac97, AC97_POWERDOWN, ac97-regs[AC97_POWERDOWN]);
-   ac97-bus-write(ac97, AC97_MASTER, 0x8101);
-   for (i = 0; i  10; i++) {
-   if

[alsa-cvslog] CVS: alsa-kernel/pci/ac97 ac97_codec.c,1.133,1.134

2004-05-27 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21673

Modified Files:
ac97_codec.c 
Log Message:
Avoid warning message during codec probing in case SKIP_AUDIO flag is not set.

Index: ac97_codec.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_codec.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- ac97_codec.c24 May 2004 13:24:42 -  1.133
+++ ac97_codec.c27 May 2004 18:15:54 -  1.134
@@ -1816,11 +1816,13 @@
bus-wait(ac97);
else {
udelay(50);
-   err = -ENXIO;
-   if (! (ac97-scaps  AC97_SCAP_SKIP_AUDIO))
-   err = ac97_reset_wait(ac97, HZ/2, 0);
-   if (err  0  ! (ac97-scaps  AC97_SCAP_SKIP_MODEM))
+   if (ac97-scaps  AC97_SCAP_SKIP_AUDIO)
err = ac97_reset_wait(ac97, HZ/2, 1);
+   else {
+   err = ac97_reset_wait(ac97, HZ/2, 0);
+   if (err  0)
+   err = ac97_reset_wait(ac97, 0, 1);
+   }
if (err  0) {
snd_printk(KERN_WARNING AC'97 %d does not respond - RESET\n, 
ac97-num);
/* proceed anyway - it's often non-critical */



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-driver/pci atiixp_modem.c,1.1,1.2

2004-05-27 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-driver/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22454

Modified Files:
atiixp_modem.c 
Log Message:
Fixed trigger with GPIO handling

Index: atiixp_modem.c
===
RCS file: /cvsroot/alsa/alsa-driver/pci/atiixp_modem.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- atiixp_modem.c  24 May 2004 13:27:31 -  1.1
+++ atiixp_modem.c  27 May 2004 18:19:47 -  1.2
@@ -682,33 +682,36 @@
 {
atiixp_t *chip = snd_pcm_substream_chip(substream);
atiixp_dma_t *dma = (atiixp_dma_t *)substream-runtime-private_data;
-   int err = 0;
+   int i;
 
snd_assert(dma-ops-enable_transfer  dma-ops-flush_dma, return -EINVAL);
 
+   if (cmd != SNDRV_PCM_TRIGGER_START  cmd != SNDRV_PCM_TRIGGER_STOP)
+   return -EINVAL;
+
+   for (i = 0; i  NUM_ATI_CODECS; i++) {
+   if (chip-ac97[i])
+   snd_ac97_update_bits(chip-ac97[i], AC97_GPIO_STATUS,
+AC97_GPIO_LINE1_OH,
+cmd == SNDRV_PCM_TRIGGER_START ?
+AC97_GPIO_LINE1_OH : 0);
+   }
+
spin_lock(chip-reg_lock);
-   switch (cmd) {
-   case SNDRV_PCM_TRIGGER_START:
+   if (cmd == SNDRV_PCM_TRIGGER_START) {
dma-ops-enable_transfer(chip, 1);
dma-running = 1;
-   break;
-   case SNDRV_PCM_TRIGGER_STOP:
+   } else {
dma-ops-enable_transfer(chip, 0);
dma-running = 0;
-   break;
-   default:
-   err = -EINVAL;
-   break;
}
-   if (! err) {
+   snd_atiixp_check_bus_busy(chip);
+   if (cmd == SNDRV_PCM_TRIGGER_STOP) {
+   dma-ops-flush_dma(chip);
snd_atiixp_check_bus_busy(chip);
-   if (cmd == SNDRV_PCM_TRIGGER_STOP) {
-   dma-ops-flush_dma(chip);
-   snd_atiixp_check_bus_busy(chip);
-   }
}
spin_unlock(chip-reg_lock);
-   return err;
+   return 0;
 }
 
 



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-driver Makefile,1.108,1.109 Rules.make,1.38,1.39

2004-05-27 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23376

Modified Files:
Makefile Rules.make 
Log Message:
fixed make clean on 2.6.x kernel without invoking the standard make clean
to avoid clean-up of files in the kernel tree.


Index: Makefile
===
RCS file: /cvsroot/alsa/alsa-driver/Makefile,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- Makefile14 May 2004 13:44:13 -  1.108
+++ Makefile27 May 2004 18:24:57 -  1.109
@@ -198,9 +198,8 @@
 .PHONY: clean
 clean: clean1
 ifdef NEW_KBUILD
-   find . \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' -o -name '.*.d' -o 
-name '.*.tmp' -o -name '*.mod.c' \) -type f -print | xargs rm -f
rm -rf kbuild/.tmp_versions
-   @for d in $(SUBDIRS); do if ! $(MAKE) -C $(CONFIG_SND_KERNELDIR) 
SUBDIRS=$(MAINSRCDIR)/$$d clean; then exit 1; fi; done
+   @for d in $(SUBDIRS); do if ! $(MAKE) -C $$d cleanup; then exit 1; fi; done
 else
@for d in $(SUBDIRS); do if ! $(MAKE) -C $$d clean; then exit 1; fi; done
 endif

Index: Rules.make
===
RCS file: /cvsroot/alsa/alsa-driver/Rules.make,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Rules.make  30 Jan 2004 11:44:58 -  1.38
+++ Rules.make  27 May 2004 18:24:57 -  1.39
@@ -27,13 +27,21 @@
 modules_install:
 ifneq $(strip $(ALL_MOBJS)) 
mkdir -p $(DESTDIR)$(moddir)/$(MODCURDIR)
-   cp $(ALL_MOBJS:.o=.ko) $(DESTDIR)$(moddir)/$(MODCURDIR)
+   cp $(sort $(ALL_MOBJS:.o=.ko)) $(DESTDIR)$(moddir)/$(MODCURDIR)
 endif
@for d in $(patsubst %/,%,$(filter %/, $(obj-y))) \
  $(patsubst %/,%,$(filter %/, $(obj-m))) DUMMY; do \
 if [ $$d != DUMMY ]; then $(MAKE) -C $$d modules_install; fi; \
done
 
+# apply patches beforehand
+cleanup:
+   rm -f *.[oas] *.ko .*.cmd .*.d .*.tmp *.mod.c $(clean-files)
+   @for d in $(patsubst %/,%,$(filter %/, $(obj-y))) \
+ $(patsubst %/,%,$(filter %/, $(obj-m))) DUMMY; do \
+if [ $$d != DUMMY ]; then $(MAKE) -C $$d cleanup; fi; \
+   done
+
 else
 
 TOPDIR = $(MAINSRCDIR)



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/parisc harmony.c,1.11,1.12

2004-05-26 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/parisc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25680

Modified Files:
harmony.c 
Log Message:
fixed typos.



Index: harmony.c
===
RCS file: /cvsroot/alsa/alsa-kernel/parisc/harmony.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- harmony.c   24 May 2004 14:51:51 -  1.11
+++ harmony.c   26 May 2004 16:02:12 -  1.12
@@ -556,7 +556,7 @@
harmony-sample_rate = snd_card_harmony_rate_bits(runtime-rate);
 
/* data format */
-   harmony-data_format = snd_harmony_set_data_format(haromny, runtime-format);
+   harmony-data_format = snd_harmony_set_data_format(harmony, runtime-format);
 
/* number of channels */
if (runtime-channels == 2)
@@ -587,7 +587,7 @@
harmony-sample_rate = snd_card_harmony_rate_bits(runtime-rate);

/* data format */
-   harmony-data_format = snd_harmony_set_data_format(haromny, runtime-format);
+   harmony-data_format = snd_harmony_set_data_format(harmony, runtime-format);

/* number of channels */
if (runtime-channels == 1)



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci/ice1712 ice1724.c,1.32,1.33

2004-05-25 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci/ice1712
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27243

Modified Files:
ice1724.c 
Log Message:
avoid to change the AC97 rate registers.  this seems conflicting
with the rate conversion on VT172x.



Index: ice1724.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/ice1724.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ice1724.c   24 May 2004 13:18:20 -  1.32
+++ ice1724.c   25 May 2004 09:56:22 -  1.33
@@ -448,15 +448,6 @@
if (ice-akm[i].ops.set_rate_val)
ice-akm[i].ops.set_rate_val(ice-akm[i], rate);
}
-
-   /* set up AC97 registers if needed */
-   if (! (ice-eeprom.data[ICE_EEP2_ACLINK]  VT1724_CFG_PRO_I2S)  ice-ac97) {
-   snd_ac97_set_rate(ice-ac97, AC97_PCM_FRONT_DAC_RATE, rate);
-   snd_ac97_set_rate(ice-ac97, AC97_PCM_SURR_DAC_RATE, rate);
-   snd_ac97_set_rate(ice-ac97, AC97_PCM_LFE_DAC_RATE, rate);
-   snd_ac97_set_rate(ice-ac97, AC97_SPDIF, rate);
-   snd_ac97_set_rate(ice-ac97, AC97_PCM_LR_ADC_RATE, rate);
-   }
 }
 
 static int snd_vt1724_pcm_hw_params(snd_pcm_substream_t * substream,
@@ -716,15 +707,9 @@
ratec = AC97_RATES_FRONT_DAC;
else
ratec = AC97_RATES_ADC;
-   runtime-hw.rates = ice-ac97-rates[ratec];
runtime-hw.rate_max = 48000;
-   if (runtime-hw.rates == SNDRV_PCM_RATE_48000) {
-   runtime-hw.rate_min = 48000;
-   return 0;
-   } else {
-   runtime-hw.rates = SNDRV_PCM_RATE_KNOT | 
SNDRV_PCM_RATE_8000_48000;
-   return snd_pcm_hw_constraint_list(runtime, 0, 
SNDRV_PCM_HW_PARAM_RATE, hw_constraints_rates_48);
-   }
+   runtime-hw.rates = SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_48000;
+   return snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, 
hw_constraints_rates_48);
}
return 0;
 }



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-driver/pci/emu10k1 emu10k1x.c,1.2,1.3

2004-05-25 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-driver/pci/emu10k1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21261

Modified Files:
emu10k1x.c 
Log Message:
- fixed the channels to stereo only.
- enable interrupts for all voices.



Index: emu10k1x.c
===
RCS file: /cvsroot/alsa/alsa-driver/pci/emu10k1/emu10k1x.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- emu10k1x.c  24 May 2004 17:18:21 -  1.2
+++ emu10k1x.c  25 May 2004 12:22:31 -  1.3
@@ -182,7 +182,7 @@
.rates =SNDRV_PCM_RATE_48000,
.rate_min = 48000,
.rate_max = 48000,
-   .channels_min = 1,
+   .channels_min = 2,
.channels_max = 2,
.buffer_bytes_max = (32*1024),
.period_bytes_min = 64,
@@ -728,9 +728,9 @@
 
outl(HCFG_LOCKSOUNDCACHE|HCFG_AUDIOENABLE, chip-port+HCFG);
 
-   snd_emu10k1x_intr_enable(chip, (INTE_CH_0_LOOP|INTE_CH_0_HALF_LOOP));
-   //  snd_emu10k1x_intr_enable(chip, (INTE_CH_0_LOOP1);
-   //  snd_emu10k1x_intr_enable(chip, INTE_CH_0_LOOP2);
+   snd_emu10k1x_intr_enable(chip, (INTE_CH_0_LOOP|INTE_CH_0_HALF_LOOP) |
+((INTE_CH_0_LOOP|INTE_CH_0_HALF_LOOP)  1) |
+((INTE_CH_0_LOOP|INTE_CH_0_HALF_LOOP)  2));
 
if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,
  chip, ops))  0) {



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci via82xx.c,1.101,1.102

2004-05-25 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20304

Modified Files:
via82xx.c 
Log Message:
added the DXS entry for Mitac/Vobis/Yakumo laptop.


Index: via82xx.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/via82xx.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- via82xx.c   21 May 2004 11:11:39 -  1.101
+++ via82xx.c   25 May 2004 15:10:38 -  1.102
@@ -2114,6 +2114,7 @@
{ .vendor = 0x1043, .device = 0x8095, .action = VIA_DXS_NO_VRA }, /* 
ASUS A7V8X (FIXME: possibly VIA_DXS_ENABLE?)*/
{ .vendor = 0x1043, .device = 0x80a1, .action = VIA_DXS_NO_VRA }, /* 
ASUS A7V8-X */
{ .vendor = 0x1043, .device = 0x80b0, .action = VIA_DXS_NO_VRA }, /* 
ASUS A7V600  K8V*/ 
+   { .vendor = 0x1071, .device = 0x8375, .action = VIA_DXS_NO_VRA }, /* 
Vobis/Yakumo/Mitac notebook */
{ .vendor = 0x10cf, .device = 0x118e, .action = VIA_DXS_ENABLE }, /* 
FSC laptop */
{ .vendor = 0x1106, .device = 0x4161, .action = VIA_DXS_NO_VRA }, /* 
ASRock K7VT2 */
{ .vendor = 0x1106, .device = 0xaa01, .action = VIA_DXS_NO_VRA }, /* 
EPIA MII */



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-driver/isa/wavefront wavefront_synth.c,1.3,1.4

2004-05-25 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-driver/isa/wavefront
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20528

Modified Files:
wavefront_synth.c 
Log Message:
fixed the compilation with older kernels.
(adding errno as static for them)


Index: wavefront_synth.c
===
RCS file: /cvsroot/alsa/alsa-driver/isa/wavefront/wavefront_synth.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wavefront_synth.c   24 Apr 2004 17:26:50 -  1.3
+++ wavefront_synth.c   25 May 2004 15:11:49 -  1.4
@@ -5,6 +5,8 @@
 
 #if LINUX_VERSION_CODE  KERNEL_VERSION(2,6,5)
 #define __KERNEL_SYSCALLS__
+#include linux/unistd.h
+static int errno;
 #endif
 
 #include ../../alsa-kernel/isa/wavefront/wavefront_synth.c



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/include ac97_codec.h,1.45,1.46

2004-05-25 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19335

Modified Files:
ac97_codec.h 
Log Message:
added ac97_can_spdif() for checking the SPDIF support.


Index: ac97_codec.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/ac97_codec.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ac97_codec.h24 May 2004 13:24:42 -  1.45
+++ ac97_codec.h25 May 2004 17:52:57 -  1.46
@@ -484,6 +484,10 @@
 {
return (ac97-ext_id  AC97_EI_AMAP) != 0;
 }
+static inline int ac97_can_spdif(ac97_t * ac97)
+{
+   return (ac97-ext_id  AC97_EI_SPDIF) != 0;
+}
 
 /* functions */
 int snd_ac97_bus(snd_card_t * card, ac97_bus_t * _bus, ac97_bus_t ** rbus); /* create 
new AC97 bus */



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci via82xx.c,1.102,1.103

2004-05-25 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19775

Modified Files:
via82xx.c 
Log Message:
- use snd_pcm_limit_hw_rates() and removed redundant codes.
- fixed the rate constraints when 'IEC958 Output Switch' is on.
- check the SPDIF support on AC97 and don't build IEC958 stuffs if not available.


Index: via82xx.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/via82xx.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- via82xx.c   25 May 2004 15:10:38 -  1.102
+++ via82xx.c   25 May 2004 17:54:55 -  1.103
@@ -1060,19 +1060,6 @@
int err;
unsigned long flags;
struct via_rate_lock *ratep;
-   struct ratetbl {
-   int rate;
-   unsigned int bit;
-   } ratebits[] = {
-   {8000, SNDRV_PCM_RATE_8000},
-   {11025, SNDRV_PCM_RATE_11025},
-   {16000, SNDRV_PCM_RATE_16000},
-   {22050, SNDRV_PCM_RATE_22050},
-   {32000, SNDRV_PCM_RATE_32000},
-   {44100, SNDRV_PCM_RATE_44100},
-   {48000, SNDRV_PCM_RATE_48000},
-   };
-   int i;
 
runtime-hw = snd_via82xx_hw;

@@ -1080,10 +1067,10 @@
ratep = chip-rates[viadev-direction];
spin_lock_irqsave(ratep-lock, flags);
ratep-used++;
-   if (chip-spdif_on) {
-   runtime-hw.rates = 
SNDRV_PCM_RATE_32000|SNDRV_PCM_RATE_44100|SNDRV_PCM_RATE_48000;
-   runtime-hw.rate_min = 32000;
-   runtime-hw.rate_max = 48000;
+   if (chip-spdif_on  viadev-reg_offset == 0x30) {
+   /* DXS#3 and spdif is on */
+   runtime-hw.rates = chip-ac97-rates[AC97_RATES_SPDIF];
+   snd_pcm_limit_hw_rates(runtime);
} else if (chip-dxs_fixed  viadev-reg_offset  0x40) {
/* fixed DXS playback rate */
runtime-hw.rates = SNDRV_PCM_RATE_48000;
@@ -1091,27 +1078,10 @@
} else if (! ratep-rate) {
int idx = viadev-direction ? AC97_RATES_ADC : AC97_RATES_FRONT_DAC;
runtime-hw.rates = chip-ac97-rates[idx];
-   for (i = 0; i  (int)ARRAY_SIZE(ratebits); i++) {
-   if (runtime-hw.rates  ratebits[i].bit) {
-   runtime-hw.rate_min = ratebits[i].rate;
-   break;
-   }
-   }
-   for (i = ARRAY_SIZE(ratebits) - 1; i = 0; i--) {
-   if (runtime-hw.rates  ratebits[i].bit) {
-   runtime-hw.rate_max = ratebits[i].rate;
-   break;
-   }
-   }
+   snd_pcm_limit_hw_rates(runtime);
} else {
/* a fixed rate */
runtime-hw.rates = SNDRV_PCM_RATE_KNOT;
-   for (i = 0; i  (int)ARRAY_SIZE(ratebits); i++) {
-   if (ratep-rate == ratebits[i].rate) {
-   runtime-hw.rates = ratebits[i].bit;
-   break;
-   }
-   }
runtime-hw.rate_max = runtime-hw.rate_min = ratep-rate;
}
spin_unlock_irqrestore(ratep-lock, flags);
@@ -1363,6 +1333,10 @@
 snd_dma_pci_data(chip-pci), 
64*1024, 128*1024))  0)
return err;
 
+   /* SPDIF supported? */
+   if (! ac97_can_spdif(chip-ac97))
+   return 0;
+
/* PCM #1:  DXS3 playback (for spdif) */
err = snd_pcm_new(chip-card, chip-card-shortname, 1, 1, 0, pcm);
if (err  0)
@@ -1660,9 +1634,11 @@
if (err  0)
return err;
}
-   err = snd_ctl_add(chip-card, snd_ctl_new1(snd_via8233_dxs3_spdif_control, 
chip));
-   if (err  0)
-   return err;
+   if (ac97_can_spdif(chip-ac97)) {
+   err = snd_ctl_add(chip-card, 
snd_ctl_new1(snd_via8233_dxs3_spdif_control, chip));
+   if (err  0)
+   return err;
+   }
if (chip-chip_type != TYPE_VIA8233A) {
err = snd_ctl_add(chip-card, 
snd_ctl_new1(snd_via8233_dxs_volume_control, chip));
if (err  0)
@@ -1672,6 +1648,7 @@
/* select spdif data slot 10/11 */
pci_read_config_byte(chip-pci, VIA8233_SPDIF_CTRL, val);
val = (val  ~VIA8233_SPDIF_SLOT_MASK) | VIA8233_SPDIF_SLOT_1011;
+   val = ~VIA8233_SPDIF_DX3; /* SPDIF off as default */
pci_write_config_byte(chip-pci, VIA8233_SPDIF_CTRL, val);
 
return 0;



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.

[alsa-cvslog] CVS: alsa-kernel/Documentation ALSA-Configuration.txt,1.44,1.45

2004-05-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/Documentation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11892/Documentation

Modified Files:
ALSA-Configuration.txt 
Log Message:
- fixed the description of model module parameters for ice1712 and ice1724
  drivers.
- added the support of VT1720-based mobo.
  (still experimental and supporting AC97 only)


Index: ALSA-Configuration.txt
===
RCS file: /cvsroot/alsa/alsa-kernel/Documentation/ALSA-Configuration.txt,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ALSA-Configuration.txt  7 May 2004 10:18:59 -   1.44
+++ ALSA-Configuration.txt  24 May 2004 13:18:20 -  1.45
@@ -614,7 +614,7 @@
 model   - Use the given board model, one of the following:
  delta1010, dio2496, delta66, delta44, audiophile, delta410,
  delta1010lt, vx442, ewx2496, ews88mt, ews88mt_new, ews88d,
- dmx6fire, dsp24, dsp24_71, ez8
+ dmx6fire, dsp24, dsp24_value, dsp24_71, ez8
 omni   - Omni I/O support for MidiMan M-Audio Delta44/66
 cs8427_timeout - reset timeout for the CS8427 chip (S/PDIF transciever)
  in msec resolution, default value is 500 (0.5 sec)
@@ -632,7 +632,8 @@
* TerraTec Aureon Sky-5.1, Space-7.1
 
 model   - Use the given board model, one of the following:
- revo71, amp2000, prodigy71, aureon51, aureon71
+ revo71, amp2000, prodigy71, aureon51, aureon71,
+ k8x800
 
 Module supports up to 8 cards and autoprobe.
 



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci/ice1712 vt1720_mobo.c,NONE,1.1 vt1720_mobo.h,NONE,1.1 Makefile,1.11,1.12 ice1724.c,1.31,1.32

2004-05-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci/ice1712
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11892/pci/ice1712

Modified Files:
Makefile ice1724.c 
Added Files:
vt1720_mobo.c vt1720_mobo.h 
Log Message:
- fixed the description of model module parameters for ice1712 and ice1724
  drivers.
- added the support of VT1720-based mobo.
  (still experimental and supporting AC97 only)


--- NEW FILE: vt1720_mobo.c ---
/*
 *   ALSA driver for VT1720/VT1724 (Envy24PT/Envy24HT)
 *
 *   Lowlevel functions for VT1720-based motherboards
 *
 *  Copyright (c) 2004 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 sound/driver.h
#include asm/io.h
#include linux/delay.h
#include linux/interrupt.h
#include linux/init.h
#include linux/slab.h
#include sound/core.h

#include ice1712.h
#include vt1720_mobo.h


static int __devinit k8x800_init(ice1712_t *ice)
{
ice-vt1720 = 1;

/* VT1616 codec */
ice-num_total_dacs = 6;
ice-num_total_adcs = 2;

/* WM8728 codec */
/* FIXME: TODO */

return 0;
}

static int __devinit k8x800_add_controls(ice1712_t *ice)
{
/* FIXME: needs some quirks for VT1616? */
return 0;
}

/* EEPROM image */

static unsigned char k8x800_eeprom[] __devinitdata = {
0x01,   /* SYSCONF: clock 256, 1ADC, 2DACs */
0x02,   /* ACLINK: ACLINK, packed */
0x00,   /* I2S: - */
0x00,   /* SPDIF: - */
0xff,   /* GPIO_DIR */
0xff,   /* GPIO_DIR1 */
0x00,   /* - */
0xff,   /* GPIO_MASK */
0xff,   /* GPIO_MASK1 */
0x00,   /* - */
0x00,   /* GPIO_STATE */
0x00,   /* GPIO_STATE1 */
0x00,   /* - */
};


/* entry point */
struct snd_ice1712_card_info snd_vt1720_mobo_cards[] __devinitdata = {
{
.subvendor = VT1720_SUBDEVICE_K8X800,
.name = Albatron K8X800 Pro II,
.model = k8x800,
.chip_init = k8x800_init,
.build_controls = k8x800_add_controls,
.eeprom_size = sizeof(k8x800_eeprom),
.eeprom_data = k8x800_eeprom,
},
{
.subvendor = VT1720_SUBDEVICE_ZNF3_150,
.name = Chaintech ZNF3-150,
/* identical with k8x800 */
.chip_init = k8x800_init,
.build_controls = k8x800_add_controls,
.eeprom_size = sizeof(k8x800_eeprom),
.eeprom_data = k8x800_eeprom,
},
{ } /* terminator */
};


--- NEW FILE: vt1720_mobo.h ---
#ifndef __SOUND_VT1720_MOBO_H
#define __SOUND_VT1720_MOBO_H

/*
 *   ALSA driver for VT1720/VT1724 (Envy24PT/Envy24HT)
 *
 *   Lowlevel functions for VT1720-based motherboards
 *
 *  Copyright (c) 2004 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
 *
 */  

#define VT1720_MOBO_DEVICE_DESC{Albatron,K8X800 Pro II},\
   {Chaintech,ZNF3-150},

#define VT1720_SUBDEVICE_K8X800 0xf217052c
#define VT1720_SUBDEVICE_ZNF3_150   0x0f2741f6

extern struct snd_ice1712_card_info  snd_vt1720_mobo_cards[];

#endif /* __SOUND_VT1720_MOBO_H */

Index: Makefile
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile18 May 2004 18:32:40 -  1.11
+++ Makefile24 May 2004 13:18:20 -  1.12
@@ -5,7 +5,7 @@
 
 snd-ice17xx-ak4xxx

[alsa-cvslog] CVS: alsa-kernel/core memalloc.c,1.31,1.32

2004-05-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12140/core

Modified Files:
memalloc.c 
Log Message:
- added ifdef CONFIG_PCI around the enable module option to avoid the compile
  warnings without PCI support.


Index: memalloc.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/memalloc.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- memalloc.c  16 Apr 2004 09:06:57 -  1.31
+++ memalloc.c  24 May 2004 13:19:55 -  1.32
@@ -45,10 +45,14 @@
 #ifndef SNDRV_CARDS
 #define SNDRV_CARDS8
 #endif
+
+/* FIXME: so far only some PCI devices have the preallocation table */
+#ifdef CONFIG_PCI
 static int enable[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 1};
 static int boot_devs;
 module_param_array(enable, bool, boot_devs, 0444);
 MODULE_PARM_DESC(enable, Enable cards to allocate buffers.);
+#endif
 
 /*
  */



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/include ac97_codec.h,1.44,1.45

2004-05-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13026/include

Modified Files:
ac97_codec.h 
Log Message:
- added the global mutex for ac97_t (ad18xx mutex is removed).
  used to protect paging and AD18xx multi-codecs.
- set PAGE_INT register explicitly before accessing (for STAC9758).
- moved ALC650 revision check to patch_alc650().
- support stereo Mic playback.
- moved STAC9708 quirk to patch_stac9708().
- don't clear PC_BEEP high bits (ac97 2.3 sets frequency there).
- avoid the unnecessary RESET-waiting for audio/modem codec.
- fixed the evaluation of modem codec to call mpatch callback properly.
- determine the SPDIF rate in the build path.
- added suffix argument to snd_ac97_rename|remove|swap_ctl().
- added snd_ac97_rename_vol_ctl().


Index: ac97_codec.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/ac97_codec.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ac97_codec.h7 Apr 2004 07:21:33 -   1.44
+++ ac97_codec.h24 May 2004 13:24:42 -  1.45
@@ -441,6 +441,7 @@
unsigned short subsystem_vendor;
unsigned short subsystem_device;
spinlock_t reg_lock;
+   struct semaphore mutex; /* mutex for AD18xx multi-codecs and paging (2.3) */
unsigned short num; /* number of codec: 0 = primary, 1 = secondary */
unsigned short addr;/* physical address of codec [0-3] */
unsigned int id;/* identification of codec */
@@ -461,7 +462,6 @@
unsigned short id[3];   // codec IDs (lower 16-bit 
word)
unsigned short pcmreg[3];   // PCM registers
unsigned short codec_cfg[3];// CODEC_CFG bits
-   struct semaphore mutex;
} ad18xx;
unsigned int dev_flags; /* device specific */
} spec;



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/isa/wavefront wavefront_synth.c,1.16,1.17

2004-05-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/isa/wavefront
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13223/isa/wavefront

Modified Files:
wavefront_synth.c 
Log Message:
removed unneeded static errno definition.


Index: wavefront_synth.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/wavefront/wavefront_synth.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wavefront_synth.c   24 Apr 2004 14:57:27 -  1.16
+++ wavefront_synth.c   24 May 2004 13:25:30 -  1.17
@@ -1921,8 +1921,6 @@
 #include linux/syscalls.h
 #include asm/uaccess.h
 
-static int errno;
-
 static int __init
 wavefront_download_firmware (snd_wavefront_t *dev, char *path)
 



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-driver INSTALL,1.166,1.167

2004-05-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13602

Modified Files:
INSTALL 
Log Message:
added snd-atiixp-modem driver for ATI IXP modem (experimental).


Index: INSTALL
===
RCS file: /cvsroot/alsa/alsa-driver/INSTALL,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- INSTALL 14 May 2004 13:42:47 -  1.166
+++ INSTALL 24 May 2004 13:27:30 -  1.167
@@ -239,6 +239,13 @@
 
 Module supports up to 8 cards.
 
+  Module snd-atiixp-modem
+  ---
+
+Module for ATI IXP 150/200/250 AC97 modem
+
+Module supports up to 8 cards.
+
 
 Trouble Shooting
 



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-driver/pci atiixp_modem.c,NONE,1.1 Kconfig,1.18,1.19 Makefile,1.24,1.25

2004-05-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-driver/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13602/pci

Modified Files:
Kconfig Makefile 
Added Files:
atiixp_modem.c 
Log Message:
added snd-atiixp-modem driver for ATI IXP modem (experimental).


--- NEW FILE: atiixp_modem.c ---
/*
 *   ALSA driver for ATI IXP 150/200/250 AC97 modem controllers
 *
 *  Copyright (c) 2004 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 sound/driver.h
#include asm/io.h
#include linux/delay.h
#include linux/interrupt.h
#include linux/init.h
#include linux/pci.h
#include linux/slab.h
#include linux/moduleparam.h
#include sound/core.h
#include sound/pcm.h
#include sound/pcm_params.h
#include sound/info.h
#include sound/ac97_codec.h
#include sound/initval.h

MODULE_AUTHOR(Takashi Iwai [EMAIL PROTECTED]);
MODULE_DESCRIPTION(ATI IXP MC97 controller);
MODULE_LICENSE(GPL);
MODULE_CLASSES({sound});
MODULE_DEVICES({{ATI,IXP150/200/250}});

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 this card */
static int ac97_clock[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 48000};
static int boot_devs;

module_param_array(index, int, boot_devs, 0444);
MODULE_PARM_DESC(index, Index value for ATI IXP controller.);
MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
module_param_array(id, charp, boot_devs, 0444);
MODULE_PARM_DESC(id, ID string for ATI IXP controller.);
MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
module_param_array(enable, bool, boot_devs, 0444);
MODULE_PARM_DESC(enable, Enable audio part of ATI IXP controller.);
MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
module_param_array(ac97_clock, int, boot_devs, 0444);
MODULE_PARM_DESC(ac97_clock, AC'97 codec clock (default 48000Hz).);
MODULE_PARM_SYNTAX(ac97_clock, SNDRV_ENABLED ,default:48000);


/*
 */

#define ATI_REG_ISR 0x00/* interrupt source */
#define  ATI_REG_ISR_MODEM_IN_XRUN  (1U0)
#define  ATI_REG_ISR_MODEM_IN_STATUS(1U1)
#define  ATI_REG_ISR_MODEM_OUT1_XRUN(1U2)
#define  ATI_REG_ISR_MODEM_OUT1_STATUS  (1U3)
#define  ATI_REG_ISR_MODEM_OUT2_XRUN(1U4)
#define  ATI_REG_ISR_MODEM_OUT2_STATUS  (1U5)
#define  ATI_REG_ISR_MODEM_OUT3_XRUN(1U6)
#define  ATI_REG_ISR_MODEM_OUT3_STATUS  (1U7)
#define  ATI_REG_ISR_PHYS_INTR  (1U8)
#define  ATI_REG_ISR_PHYS_MISMATCH  (1U9)
#define  ATI_REG_ISR_CODEC0_NOT_READY   (1U10)
#define  ATI_REG_ISR_CODEC1_NOT_READY   (1U11)
#define  ATI_REG_ISR_CODEC2_NOT_READY   (1U12)
#define  ATI_REG_ISR_NEW_FRAME  (1U13)
#define  ATI_REG_ISR_MODEM_GPIO_DATA(1U14)

#define ATI_REG_IER 0x04/* interrupt enable */
#define  ATI_REG_IER_MODEM_IN_XRUN_EN   (1U0)
#define  ATI_REG_IER_MODEM_STATUS_EN(1U1)
#define  ATI_REG_IER_MODEM_OUT1_XRUN_EN (1U2)
#define  ATI_REG_IER_MODEM_OUT2_XRUN_EN (1U4)
#define  ATI_REG_IER_MODEM_OUT3_XRUN_EN (1U6)
#define  ATI_REG_IER_PHYS_INTR_EN   (1U8)
#define  ATI_REG_IER_PHYS_MISMATCH_EN   (1U9)
#define  ATI_REG_IER_CODEC0_INTR_EN (1U10)
#define  ATI_REG_IER_CODEC1_INTR_EN (1U11)
#define  ATI_REG_IER_CODEC2_INTR_EN (1U12)
#define  ATI_REG_IER_NEW_FRAME_EN   (1U13)/* (RO */
#define  ATI_REG_IER_MODEM_GPIO_DATA_EN (1U14)/* (WO) modem is running */
#define  ATI_REG_IER_MODEM_SET_BUS_BUSY (1U15)

#define ATI_REG_CMD 0x08/* command */
#define  ATI_REG_CMD_POWERDOWN  (1U0)
#define  ATI_REG_CMD_MODEM_RECEIVE_EN   (1U1) /* modem only */
#define  ATI_REG_CMD_MODEM_SEND1_EN (1U2) /* modem only */
#define  ATI_REG_CMD_MODEM_SEND2_EN (1U3) /* modem only */
#define  ATI_REG_CMD_MODEM_SEND3_EN (1U4) /* modem only */
#define  ATI_REG_CMD_MODEM_STATUS_MEM   (1U5) /* modem only */
#define  ATI_REG_CMD_MODEM_IN_DMA_EN(1U8) /* modem only */
#define  ATI_REG_CMD_MODEM_OUT_DMA1_EN  (1U9) /* modem only */
#define  ATI_REG_CMD_MODEM_OUT_DMA2_EN  (1U10)/* modem only */
#define  ATI_REG_CMD_MODEM_OUT_DMA3_EN  (1U11)/* modem only */
#define  ATI_REG_CMD_AUDIO_PRESENT  (1U20)
#define  ATI_REG_CMD_MODEM_GPIO_THRU_DMA(1U22)/* modem only */
#define

[alsa-cvslog] CVS: alsa-driver/utils mod-deps.c,1.8,1.9

2004-05-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-driver/utils
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13914/utils

Modified Files:
mod-deps.c 
Log Message:
- fixed the build of snd-msnd-pinnacle driver.
  added the dependency to CONFIG_X86 in Kconfig.


Index: mod-deps.c
===
RCS file: /cvsroot/alsa/alsa-driver/utils/mod-deps.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mod-deps.c  30 Mar 2004 07:20:31 -  1.8
+++ mod-deps.c  24 May 2004 13:29:29 -  1.9
@@ -111,9 +111,11 @@
PPC,
PPC64,
X86_64,
+   X86,
IA32_EMULATION,
/* architecture specific */
ARCH_SA1100,
+   X86_PC9800,
/* other drivers */
RTC,
GAMEPORT,
@@ -168,16 +170,21 @@

fullfile = malloc(strlen(basedir) + strlen(hiddendir) + 1 + strlen(filename) + 
1);
sprintf(fullfile, %s/%s, basedir, filename);
-   if ((err = read_file_1(fullfile, template))  0)
+   if ((err = read_file_1(fullfile, template))  0) {
+   free(fullfile);
return err;
+   }
if (!strncmp(filename, core/, 5))
sprintf(fullfile, %s/acore/%s, hiddendir, filename + 5);
else
sprintf(fullfile, %s/%s, hiddendir, filename);
if (access(fullfile, R_OK) == 0) {
-   if ((err = read_file_1(fullfile, template))  0)
+   if ((err = read_file_1(fullfile, template))  0) {
+   free(fullfile);
return err;
+   }
}
+   free(fullfile);
return 0;
 }
 



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-driver/isa Kconfig,1.7,1.8 Makefile,1.13,1.14

2004-05-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-driver/isa
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13914/isa

Modified Files:
Kconfig Makefile 
Log Message:
- fixed the build of snd-msnd-pinnacle driver.
  added the dependency to CONFIG_X86 in Kconfig.


Index: Kconfig
===
RCS file: /cvsroot/alsa/alsa-driver/isa/Kconfig,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Kconfig 30 Mar 2004 07:02:21 -  1.7
+++ Kconfig 24 May 2004 13:29:28 -  1.8
@@ -3,7 +3,7 @@
 
 config SND_MSND_PINNACLE
tristate Turtle Beach MultiSound Pinnacle/Fiji driver
-   depends on SND
+   depends on SND  X86
select SND_RAWMIDI
select SND_PCM
help

Index: Makefile
===
RCS file: /cvsroot/alsa/alsa-driver/isa/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile4 Feb 2004 19:32:52 -   1.13
+++ Makefile24 May 2004 13:29:28 -  1.14
@@ -8,9 +8,7 @@
 #
 # ALSA extra code
 #
-ifeq (y,$(CONFIG_X86))
-obj-y  += msnd/
-endif
+obj-$(CONFIG_SND) += msnd/
 
 isapnp-files := als100.isapnp azt2320.isapnp dt019x.isapnp opl3sa2.isapnp \
cmi8330.isapnp es18xx.isapnp sscape.isapnp



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-driver/pci/ice1712 vt1720_mobo.c,NONE,1.1

2004-05-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-driver/pci/ice1712
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14496/pci/ice1712

Added Files:
vt1720_mobo.c 
Log Message:
- added VT1720-based mobo support.


--- NEW FILE: vt1720_mobo.c ---
#define __NO_VERSION__
#include ../../alsa-kernel/pci/ice1712/vt1720_mobo.c



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/drivers/vx vx_pcm.c,1.3,1.4

2004-05-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/drivers/vx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22534

Modified Files:
vx_pcm.c 
Log Message:
fixed sleep while atomic in the trigger callback.



Index: vx_pcm.c
===
RCS file: /cvsroot/alsa/alsa-kernel/drivers/vx/vx_pcm.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vx_pcm.c11 Feb 2004 14:33:48 -  1.3
+++ vx_pcm.c24 May 2004 14:06:17 -  1.4
@@ -394,17 +394,14 @@
 * enough sound buffer for this pipe)
 */
if (state) {
-   int delay = CAN_START_DELAY;
for (i = 0 ; i  MAX_WAIT_FOR_DSP; i++) {
-   snd_vx_delay(chip, delay);
err = vx_pipe_can_start(chip, pipe);
if (err  0)
break;
/* Wait for a few, before asking again
 * to avoid flooding the DSP with our requests
 */
-   if ((i % 4 ) == 0)
-   delay = 1;
+   mdelay(1);
}
}
 
@@ -418,15 +415,12 @@
 * reaching the expected state before returning
 * Check one pipe only (since they are synchronous)
 */
-   delay = WAIT_STATE_DELAY;
for (i = 0; i  MAX_WAIT_FOR_DSP; i++) {
-   snd_vx_delay(chip, delay);
err = vx_get_pipe_state(chip, pipe, cur_state);
if (err  0 || cur_state == state)
break;
err = -EIO;
-   if ((i % 4 ) == 0)
-   delay = 1;
+   mdelay(1);
}
return err  0 ? -EIO : 0;
 }



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/parisc harmony.c,1.10,1.11

2004-05-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/parisc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32133

Modified Files:
harmony.c 
Log Message:
- fixed the buffer handling without dma_alloc_coherent support.



Index: harmony.c
===
RCS file: /cvsroot/alsa/alsa-kernel/parisc/harmony.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- harmony.c   7 May 2004 17:04:31 -   1.10
+++ harmony.c   24 May 2004 14:51:51 -  1.11
@@ -751,6 +751,8 @@
int err;

err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
+   if (err  0  substream-dma_device.type == SNDRV_DMA_TYPE_CONTINUOUS)
+   substream-runtime-dma_addr = __pa(substream-runtime-dma_area);
DPRINTK(KERN_INFO PFX HW Params returned %d, dma_addr %lx\n, err,
(unsigned long)substream-runtime-dma_addr);
return err;
@@ -784,7 +786,7 @@
.pointer =  snd_card_harmony_capture_pointer,
 };
 
-static int snd_card_harmony_pcm_init(snd_card_harmony_t *harmony, int device)
+static int snd_card_harmony_pcm_init(snd_card_harmony_t *harmony)
 {
snd_pcm_t *pcm;
int err;
@@ -797,7 +799,7 @@

snd_harmony_disable_interrupts(harmony);

-   if ((err = snd_pcm_new(harmony-card, Harmony, device, 1, 1, pcm))  0)
+   if ((err = snd_pcm_new(harmony-card, Harmony, 0, 1, 1, pcm))  0)
return err;

snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, 
snd_card_harmony_playback_ops);
@@ -813,26 +815,46 @@
harmony-dma_dev.dev = harmony-pa_dev-dev;
err = snd_dma_alloc_pages(harmony-dma_dev, HARMONY_BUF_SIZE*GRAVEYARD_BUFS,
  harmony-graveyard_dma);
-   if (err  0)
+   if (err == -ENOMEM) {
+   /* use continuous buffers */
+   harmony-dma_dev.type = SNDRV_DMA_TYPE_CONTINUOUS;
+   harmony-dma_dev.dev = snd_dma_continuous_data(GFP_KERNEL);
+   err = snd_dma_alloc_pages(harmony-dma_dev, 
HARMONY_BUF_SIZE*GRAVEYARD_BUFS,
+ harmony-graveyard_dma);
+   }
+   if (err  0) {
+   printk(KERN_ERR PFX can't allocate graveyard buffer\n);
return err;
+   }
harmony-graveyard_count = 0;

/* initialize silence buffers */
err = snd_dma_alloc_pages(harmony-dma_dev, HARMONY_BUF_SIZE*SILENCE_BUFS,
  harmony-silence_dma);
-   if (err  0)
+   if (err  0) {
+   printk(KERN_ERR PFX can't allocate silence buffer\n);
return err;
+   }
harmony-silence_count = 0;
 
+   if (harmony-dma_dev.type == SNDRV_DMA_TYPE_CONTINUOUS) {
+   harmony-graveyard_dma.addr = __pa(harmony-graveyard_dma.area);
+   harmony-silence_dma.addr = __pa(harmony-silence_dma.area);
+   }
+
harmony-ply_stopped = harmony-cap_stopped = 1;

harmony-playback_substream = NULL;
harmony-capture_substream = NULL;
harmony-graveyard_count = 0;
-   
-   snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
- harmony-pa_dev-dev,
- MAX_BUFFER_SIZE, MAX_BUFFER_SIZE);
+
+   err = snd_pcm_lib_preallocate_pages_for_all(pcm, harmony-dma_dev.type,
+   harmony-dma_dev.dev,
+   MAX_BUFFER_SIZE, MAX_BUFFER_SIZE);
+   if (err  0) {
+   printk(KERN_ERR PFX buffer allocation error %d\n, err);
+   // return err;
+   }
 
return 0;
 }
@@ -1037,7 +1059,7 @@
snd_card_free(card);
return err;
}
-   if ((err = snd_card_harmony_pcm_init(chip, dev))  0) {
+   if ((err = snd_card_harmony_pcm_init(chip))  0) {
printk(KERN_ERR PFX PCM Init failed\n);
snd_card_free(card);
return err;



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-lib/src/conf/cards VIA686A.conf,NONE,1.1 Makefile.am,1.20,1.21

2004-05-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-lib/src/conf/cards
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv322

Modified Files:
Makefile.am 
Added Files:
VIA686A.conf 
Log Message:
added missing VIA686A.conf

--- NEW FILE: VIA686A.conf ---
#
# Configuration for the VIA686A chip
#
# SPDIF support is not complete - it might not work, especially with AC3
# passthru mode...
#

confdir:pcm/front.conf

VIA686A.pcm.front.0 {
@args [ CARD ]
@args.CARD {
type string
}
type hw
card $CARD
device 0
}   

confdir:pcm/iec958.conf

VIA686A.pcm.iec958.0 {
@args [ CARD AES0 AES1 AES2 AES3 ]
@args.CARD {
type string
}
@args.AES0 {
type integer
}
@args.AES1 {
type integer
}
@args.AES2 {
type integer
}
@args.AES3 {
type integer
}
type hooks
slave.pcm {
type hw
card $CARD
device 0
}
hooks.0 {
type ctl_elems
hook_args [
{
name IEC958 Playback AC97-SPSA
device 0
lock true
preserve true
value 0
}
{
name IEC958 Playback Default
device 0
lock true
preserve true
value [ $AES0 $AES1 $AES2 $AES3 ]
}
{
name IEC958 Playback Switch
device 0
lock true
preserve true
value true
}
]
}
}

Index: Makefile.am
===
RCS file: /cvsroot/alsa/alsa-lib/src/conf/cards/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Makefile.am 6 May 2004 13:19:05 -   1.20
+++ Makefile.am 24 May 2004 14:54:54 -  1.21
@@ -25,6 +25,7 @@
SI7018.conf \
TRID4DWAVENX.conf \
YMF744.conf \
+   VIA686A.conf \
VIA8233.conf \
VIA8233A.conf \
VX222.conf \



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-lib/doc doxygen.cfg,1.26,1.27 index.doxygen,1.8,1.9

2004-05-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-lib/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv830/doc

Modified Files:
doxygen.cfg index.doxygen 
Log Message:
fixed documents to process properly via doxygen.


Index: doxygen.cfg
===
RCS file: /cvsroot/alsa/alsa-lib/doc/doxygen.cfg,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- doxygen.cfg 2 Mar 2004 17:13:49 -   1.26
+++ doxygen.cfg 24 May 2004 14:57:47 -  1.27
@@ -60,6 +60,7 @@
   ../src/pcm/pcm_meter.c \
   ../src/pcm/pcm_ladspa.c \
   ../src/pcm/pcm_asym.c \
+  ../src/pcm/pcm_iec958.c \
   ../src/pcm/pcm_misc.c \
   ../src/rawmidi \
   ../src/timer \

Index: index.doxygen
===
RCS file: /cvsroot/alsa/alsa-lib/doc/index.doxygen,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- index.doxygen   7 Jan 2004 14:36:39 -   1.8
+++ index.doxygen   24 May 2004 14:57:47 -  1.9
@@ -32,6 +32,7 @@
 UL
   LIPage \ref control explains the primitive controls API.
   LIPage \ref hcontrol explains the high-level primitive controls API.
+  LIPage \ref mixer explains the mixer controls API.
   LIPage \ref pcm explains the design of the PCM (digital audio) API.
   LIPage \ref pcm_plugins explains the design of PCM (digital audio) plugins.
   LIPage \ref rawmidi explains the design of the RawMidi API.



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-lib/src/hwdep hwdep.c,1.30,1.31

2004-05-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-lib/src/hwdep
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv830/src/hwdep

Modified Files:
hwdep.c 
Log Message:
fixed documents to process properly via doxygen.


Index: hwdep.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/hwdep/hwdep.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- hwdep.c 19 Feb 2003 15:39:37 -  1.30
+++ hwdep.c 24 May 2004 14:57:47 -  1.31
@@ -1,4 +1,4 @@
-/*
+/**
  * \file hwdep/hwdep.c
  * \brief HwDep Interface (hardware dependent)
  * \author Jaroslav Kysela [EMAIL PROTECTED]



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-lib/src/pcm pcm_share.c,1.80,1.81

2004-05-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv830/src/pcm

Modified Files:
pcm_share.c 
Log Message:
fixed documents to process properly via doxygen.


Index: pcm_share.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_share.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- pcm_share.c 26 Apr 2004 07:40:14 -  1.80
+++ pcm_share.c 24 May 2004 14:57:48 -  1.81
@@ -1,4 +1,4 @@
-/*
+/**
  * \file pcm/pcm_share.c
  * \ingroup PCM_Plugins
  * \brief PCM Share Plugin Interface



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-lib/src/timer timer.c,1.42,1.43 timer_query.c,1.12,1.13

2004-05-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-lib/src/timer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv830/src/timer

Modified Files:
timer.c timer_query.c 
Log Message:
fixed documents to process properly via doxygen.


Index: timer.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/timer/timer.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- timer.c 6 Apr 2004 17:29:26 -   1.42
+++ timer.c 24 May 2004 14:57:48 -  1.43
@@ -1,4 +1,4 @@
-/*
+/**
  * \file timer/timer.c
  * \brief Timer Interface
  * \author Jaroslav Kysela [EMAIL PROTECTED]

Index: timer_query.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/timer/timer_query.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- timer_query.c   11 Mar 2003 18:51:35 -  1.12
+++ timer_query.c   24 May 2004 14:57:48 -  1.13
@@ -1,4 +1,4 @@
-/*
+/**
  * \file timer/timer_query.c
  * \author Jaroslav Kysela [EMAIL PROTECTED]
  * \date 2001



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/drivers/vx vx_pcm.c,1.4,1.5

2004-05-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/drivers/vx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30955/drivers/vx

Modified Files:
vx_pcm.c 
Log Message:
fixed the compile warnings due to the last change.


Index: vx_pcm.c
===
RCS file: /cvsroot/alsa/alsa-kernel/drivers/vx/vx_pcm.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vx_pcm.c24 May 2004 14:06:17 -  1.4
+++ vx_pcm.c24 May 2004 17:11:58 -  1.5
@@ -48,6 +48,7 @@
 #include sound/driver.h
 #include linux/slab.h
 #include linux/vmalloc.h
+#include linux/delay.h
 #include sound/core.h
 #include sound/asoundef.h
 #include sound/pcm.h
@@ -381,7 +382,7 @@
  */
 static int vx_toggle_pipe(vx_core_t *chip, vx_pipe_t *pipe, int state)
 {
-   int err, i, cur_state, delay;
+   int err, i, cur_state;
 
/* Check the pipe is not already in the requested state */
if (vx_get_pipe_state(chip, pipe, cur_state)  0)



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/include vx_core.h,1.1,1.2

2004-05-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31124/include

Modified Files:
vx_core.h 
Log Message:
added 'Clock Mode' control to choose the clock source.


Index: vx_core.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/vx_core.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vx_core.h   23 May 2003 16:00:44 -  1.1
+++ vx_core.h   24 May 2004 17:12:43 -  1.2
@@ -182,6 +182,7 @@
/* clock and audio sources */
unsigned int audio_source;  /* current audio input source */
unsigned int audio_source_target;
+   unsigned int clock_mode;/* clock mode (VX_CLOCK_MODE_XXX) */
unsigned int clock_source;  /* current clock source (INTERNAL_QUARTZ or 
UER_SYNC) */
unsigned int freq;  /* current frequency */
unsigned int freq_detected; /* detected frequency from digital in */
@@ -364,6 +365,13 @@
UER_SYNC
 };
 
+/* clock mode */
+enum {
+   VX_CLOCK_MODE_AUTO, /* depending on the current audio source */
+   VX_CLOCK_MODE_INTERNAL, /* fixed to internal quartz */
+   VX_CLOCK_MODE_EXTERNAL  /* fixed to UER sync */
+};
+
 /* SPDIF/UER type */
 enum {
VX_UER_MODE_CONSUMER,



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-driver/pci/emu10k1 emu10k1x.c,1.1,1.2

2004-05-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-driver/pci/emu10k1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32559

Modified Files:
emu10k1x.c 
Log Message:
Martin Langer [EMAIL PROTECTED]:

- include sound/info.h added
- move snd_iprintf to the right position; it compiles now
- fix typo in snd_iprintf



Index: emu10k1x.c
===
RCS file: /cvsroot/alsa/alsa-driver/pci/emu10k1/emu10k1x.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emu10k1x.c  14 May 2004 13:42:49 -  1.1
+++ emu10k1x.c  24 May 2004 17:18:21 -  1.2
@@ -33,6 +33,7 @@
 #include sound/initval.h
 #include sound/pcm.h
 #include sound/ac97_codec.h
+#include sound/info.h
 
 MODULE_AUTHOR(Francisco Moraes [EMAIL PROTECTED]);
 MODULE_DESCRIPTION(EMU10K1X);
@@ -744,10 +745,11 @@
   snd_info_buffer_t * buffer)
 {
emu10k1x_t *emu = snd_magic_cast(emu10k1x_t, entry-private_data, return);
-   snd_iprintf(buffer, Registers:\n\n);
unsigned long value,value1,value2;
unsigned long flags;
int i;
+
+   snd_iprintf(buffer, Registers:\n\n);
for(i = 0; i  0x40; i+=4) {
spin_lock_irqsave(emu-emu_lock, flags);
value = inl(emu-port + i);
@@ -759,11 +761,11 @@
value = snd_emu10k1x_ptr_read(emu, i, 0);
value1 = snd_emu10k1x_ptr_read(emu, i, 1);
value2 = snd_emu10k1x_ptr_read(emu, i, 2);
-   snd_iprintf(buffer, %02X: %08lX %08lX %08lX\n, i, value, value, 
value2);
+   snd_iprintf(buffer, %02X: %08lX %08lX %08lX\n, i, value, value1, 
value2);
}
 }
 
-int __devinit snd_emu10k1x_proc_init(emu10k1x_t * emu)
+static int __devinit snd_emu10k1x_proc_init(emu10k1x_t * emu)
 {
snd_info_entry_t *entry;




---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci via82xx.c,1.100,1.101

2004-05-21 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24567

Modified Files:
via82xx.c 
Log Message:
- added the DXS entry for ECS K7VTA3 v8.0
- fixed the DXS entry for ASUS A7V8X to NO_VRA.



Index: via82xx.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/via82xx.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- via82xx.c   6 May 2004 13:27:23 -   1.100
+++ via82xx.c   21 May 2004 11:11:39 -  1.101
@@ -2110,7 +2110,8 @@
static struct dxs_whitelist whitelist[] = {
{ .vendor = 0x1005, .device = 0x4710, .action = VIA_DXS_ENABLE }, /* 
Avance Logic Mobo */
{ .vendor = 0x1019, .device = 0x0996, .action = VIA_DXS_48K },
-   { .vendor = 0x1043, .device = 0x8095, .action = VIA_DXS_ENABLE }, /* 
ASUS A7V8X */
+   { .vendor = 0x1019, .device = 0x0a81, .action = VIA_DXS_NO_VRA }, /* 
ECS K7VTA3 v8.0 */
+   { .vendor = 0x1043, .device = 0x8095, .action = VIA_DXS_NO_VRA }, /* 
ASUS A7V8X (FIXME: possibly VIA_DXS_ENABLE?)*/
{ .vendor = 0x1043, .device = 0x80a1, .action = VIA_DXS_NO_VRA }, /* 
ASUS A7V8-X */
{ .vendor = 0x1043, .device = 0x80b0, .action = VIA_DXS_NO_VRA }, /* 
ASUS A7V600  K8V*/ 
{ .vendor = 0x10cf, .device = 0x118e, .action = VIA_DXS_ENABLE }, /* 
FSC laptop */



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-lib/src/pcm pcm_multi.c,1.87,1.88

2004-05-21 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8375

Modified Files:
pcm_multi.c 
Log Message:
fixed unneeded cast.



Index: pcm_multi.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_multi.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- pcm_multi.c 17 Mar 2004 11:48:15 -  1.87
+++ pcm_multi.c 21 May 2004 15:10:58 -  1.88
@@ -893,7 +893,7 @@
continue;
}
if (strcmp(id, master) == 0) {
-   if (snd_config_get_integer(n, ((long)master_slave))  0) {
+   if (snd_config_get_integer(n, master_slave)  0) {
SNDERR(Invalid type for %s, id);
return -EINVAL;
}



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci Kconfig,1.27,1.28

2004-05-18 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6008

Modified Files:
Kconfig 
Log Message:
- improved the description of ice1724 driver on Kconfig.
- better support of VT1720 with snd-ice1724 driver.
- check PCI subsystem IDs when no EEPROM is available (ice1724 only)
- change the driver name string if given in the board list.
- merged prodigy 7.1 support into aureon.c.  they are almost identical.
- allow to use PDMA4 and RMDA1 for non-SPDIF purpose if specified (ice1724 only).


Index: Kconfig
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/Kconfig,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Kconfig 23 Apr 2004 15:07:54 -  1.27
+++ Kconfig 18 May 2004 18:32:40 -  1.28
@@ -270,15 +270,15 @@
  TerraTec - EWX 24/96, EWS 88MT, EWS 88D, DMX 6Fire.
 
 config SND_ICE1724
-   tristate ICE/VT1724 (Envy24HT)
+   tristate ICE/VT1724/1720 (Envy24HT/PT)
depends on SND
select SND_MPU401_UART
select SND_AC97_CODEC
help
- Say 'Y' or 'M' to include support for ICE/VT1724 (Envy24HT) based
+ Say 'Y' or 'M' to include support for ICE/VT1724/1720 (Envy24HT/PT) based
  soundcards.
  Currently supported hardware is: MidiMan M Audio - Revolution 7.1,
- AMP Ltd AUDIO2000.
+ AMP Ltd AUDIO2000, Terratec Aureon 5.1 Sky/7.1, AudioTrak Prodigy 7.1.
 
 config SND_INTEL8X0
tristate Intel i8x0/MX440, SiS 7012; Ali 5455; NForce Audio; AMD768/8111



---
This SF.Net email is sponsored by: SourceForge.net Broadband
Sign-up now for SourceForge Broadband and get the fastest
6.0/768 connection for only $19.95/mo for the first 3 months!
http://ads.osdn.com/?ad_id=2562alloc_id=6184op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci/ice1712 Makefile,1.10,1.11 aureon.c,1.9,1.10 aureon.h,1.3,1.4 ice1712.c,1.52,1.53 ice1712.h,1.20,1.21 ice1724.c,1.30,1.31 prodigy.c,1.5,NONE prodigy.h,1.1,NONE

2004-05-18 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci/ice1712
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6008/ice1712

Modified Files:
Makefile aureon.c aureon.h ice1712.c ice1712.h ice1724.c 
Removed Files:
prodigy.c prodigy.h 
Log Message:
- improved the description of ice1724 driver on Kconfig.
- better support of VT1720 with snd-ice1724 driver.
- check PCI subsystem IDs when no EEPROM is available (ice1724 only)
- change the driver name string if given in the board list.
- merged prodigy 7.1 support into aureon.c.  they are almost identical.
- allow to use PDMA4 and RMDA1 for non-SPDIF purpose if specified (ice1724 only).


Index: Makefile
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile10 Nov 2003 18:00:48 -  1.10
+++ Makefile18 May 2004 18:32:40 -  1.11
@@ -5,7 +5,7 @@
 
 snd-ice17xx-ak4xxx-objs := ak4xxx.o
 snd-ice1712-objs := ice1712.o delta.o hoontech.o ews.o
-snd-ice1724-objs := ice1724.o amp.o revo.o aureon.o prodigy.o
+snd-ice1724-objs := ice1724.o amp.o revo.o aureon.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_ICE1712) += snd-ice1712.o snd-ice17xx-ak4xxx.o

Index: aureon.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/aureon.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- aureon.c14 May 2004 13:08:15 -  1.9
+++ aureon.c18 May 2004 18:32:40 -  1.10
@@ -38,6 +38,25 @@
  *   the analog mixing but not easily controllable (it's not connected
  *   directly from envy24ht chip).  so let's leave it as it is.
  *
+ *
+ *   Lowlevel functions for AudioTrak Prodigy 7.1 (and possibly 192) cards
+ *  Copyright (c) 2003 Dimitromanolakis Apostolos [EMAIL PROTECTED]
+ *
+ *   version 0.82: Stable / not all features work yet (no communication with AC97 
secondary)
+ *   added 64x/128x oversampling switch (should be 64x only for 96khz)
+ *   fixed some recording labels (still need to check the rest)
+ *   recording is working probably thanks to correct wm8770 initialization
+ *
+ *   version 0.5: Initial release:
+ *   working: analog output, mixer, headphone amplifier switch
+ *   not working: prety much everything else, at least i could verify that
+ *we have no digital output, no capture, pretty bad clicks and 
poops
+ *on mixer switch and other coll stuff.
+ *
+ * - Prodigy boards are equipped with AC97 STAC9744 chip , too.  it's used to do
+ *   the analog mixing but not easily controllable (it's not connected
+ *   directly from envy24ht chip).  so let's leave it as it is.
+ *
  */  
 
 #include sound/driver.h
@@ -77,12 +96,18 @@
 static void aureon_spi_write(ice1712_t *ice, unsigned int cs, unsigned int data, int 
bits)
 {
unsigned int tmp;
+   unsigned int cscs;
int i;
 
tmp = snd_ice1712_gpio_read(ice);
 
+   if (ice-eeprom.subvendor == VT1724_SUBDEVICE_PRODIGY71)
+   cscs = PRODIGY_CS8415_CS;
+   else
+   cscs = AUREON_CS8415_CS;
+
snd_ice1712_gpio_set_mask(ice, ~(AUREON_WM_RW|AUREON_WM_DATA|AUREON_WM_CLK|
-AUREON_WM_CS|AUREON_CS8415_CS));
+AUREON_WM_CS|cscs));
tmp |= AUREON_WM_RW;
tmp = ~cs;
snd_ice1712_gpio_write(ice, tmp);
@@ -395,7 +420,7 @@
return ( tmp  AUREON_HP_SEL )!= 0;
 }
 
-static int aureon_hpamp_info(snd_kcontrol_t *k, snd_ctl_elem_info_t *uinfo)
+static int aureon_bool_info(snd_kcontrol_t *k, snd_ctl_elem_info_t *uinfo)
 {
uinfo-type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
uinfo-count = 1;
@@ -421,6 +446,76 @@
 }
 
 /*
+ * Deemphasis
+ */
+static int aureon_deemp_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+   ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+   ucontrol-value.integer.value[0] = (wm_get(ice, WM_DAC_CTRL2)  0xf) == 0xf;
+   return 0;
+}
+
+static int aureon_deemp_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+   ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+   int temp, temp2;
+   temp2 = temp = wm_get(ice, WM_DAC_CTRL2);
+   if (ucontrol-value.integer.value[0])
+   temp |= 0xf;
+   else
+   temp = ~0xf;
+   if (temp != temp2) {
+   wm_put(ice, WM_DAC_CTRL2, temp);
+   return 1;
+   }
+   return 0;
+}
+
+/*
+ * ADC Oversampling
+ */
+static int aureon_oversampling_info(snd_kcontrol_t *k, snd_ctl_elem_info_t *uinfo)
+{
+   static char *texts[2] = { 128x, 64x };
+
+   uinfo-type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+   uinfo-count = 1;
+   uinfo-value.enumerated.items = 2;
+
+   if (uinfo-value.enumerated.item = uinfo-value.enumerated.items)
+

[alsa-cvslog] CVS: alsa-driver/pci/ice1712 prodigy.c,1.1,NONE

2004-05-18 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-driver/pci/ice1712
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6327

Removed Files:
prodigy.c 
Log Message:
merged into aureon.c

--- prodigy.c DELETED ---



---
This SF.Net email is sponsored by: SourceForge.net Broadband
Sign-up now for SourceForge Broadband and get the fastest
6.0/768 connection for only $19.95/mo for the first 3 months!
http://ads.osdn.com/?ad_id=2562alloc_id=6184op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/isa/cs423x cs4236.c,1.42,1.43

2004-05-14 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/isa/cs423x
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22077

Modified Files:
cs4236.c 
Log Message:
Added the new pnp id for an Intel mobo.



Index: cs4236.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/cs423x/cs4236.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- cs4236.c7 Apr 2004 17:48:14 -   1.42
+++ cs4236.c14 May 2004 10:15:54 -  1.43
@@ -199,6 +199,8 @@
{ .id = CSC0225, .devs = { { CSC }, { CSC0010 }, { CSC0003 } } },
/* Intel Marlin Spike Motherboard (#2) - CS4235 */
{ .id = CSC0225, .devs = { { CSC0100 }, { CSC0110 }, { CSC0103 } } },
+   /* Unknown Intel mainboard - CS4235 */
+   { .id = CSC0225, .devs = { { CSC0100 }, { CSC0110 } } },
/* Genius Sound Maker 3DJ - CS4237B */
{ .id = CSC0437, .devs = { { CSC }, { CSC0010 }, { CSC0003 } } },
/* Digital PC 5000 Onboard - CS4236B */



---
This SF.Net email is sponsored by: SourceForge.net Broadband
Sign-up now for SourceForge Broadband and get the fastest
6.0/768 connection for only $19.95/mo for the first 3 months!
http://ads.osdn.com/?ad_id=2562alloc_id=6184op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci/rme9652 hdsp.c,1.57,1.58 rme9652.c,1.44,1.45

2004-05-14 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci/rme9652
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25421

Modified Files:
hdsp.c rme9652.c 
Log Message:
fixed invalid spin_lock/unlock_irq() in the prepare callback.



Index: hdsp.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/rme9652/hdsp.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- hdsp.c  3 May 2004 09:01:17 -   1.57
+++ hdsp.c  14 May 2004 10:30:59 -  1.58
@@ -4123,10 +4123,10 @@
return -EIO;
}
 
-   spin_lock_irq(hdsp-lock);
+   spin_lock(hdsp-lock);
if (!hdsp-running)
hdsp_reset_hw_pointer(hdsp);
-   spin_unlock_irq(hdsp-lock);
+   spin_unlock(hdsp-lock);
return result;
 }
 

Index: rme9652.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/rme9652/rme9652.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- rme9652.c   13 Apr 2004 14:59:17 -  1.44
+++ rme9652.c   14 May 2004 10:31:00 -  1.45
@@ -2263,10 +2263,10 @@
rme9652_t *rme9652 = _snd_pcm_substream_chip(substream);
int result = 0;
 
-   spin_lock_irq(rme9652-lock);
+   spin_lock(rme9652-lock);
if (!rme9652-running)
rme9652_reset_hw_pointer(rme9652);
-   spin_unlock_irq(rme9652-lock);
+   spin_unlock(rme9652-lock);
return result;
 }
 



---
This SF.Net email is sponsored by: SourceForge.net Broadband
Sign-up now for SourceForge Broadband and get the fastest
6.0/768 connection for only $19.95/mo for the first 3 months!
http://ads.osdn.com/?ad_id=2562alloc_id=6184op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci/ice1712 aureon.c,1.6,1.7

2004-05-14 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci/ice1712
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28876

Modified Files:
aureon.c 
Log Message:
added headphone amplifier switch.
initial patch by Radoslaw AstralStorm Szkodzinski.


Index: aureon.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/aureon.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- aureon.c7 May 2004 10:18:59 -   1.6
+++ aureon.c14 May 2004 10:49:26 -  1.7
@@ -291,6 +291,57 @@
 }
 
 /*
+ * Taken from prodigy.c
+ */
+static int aureon_set_headphone_amp(ice1712_t *ice, int enable)
+{
+   unsigned int tmp, tmp2;
+
+   tmp2 = tmp = snd_ice1712_gpio_read(ice);
+   if (enable)
+   tmp |= AUREON_HP_SEL;
+   else
+   tmp = ~ AUREON_HP_SEL;
+   if (tmp != tmp2) {
+   snd_ice1712_gpio_write(ice, tmp);
+   return 1;
+   }
+   return 0;
+}
+
+static int aureon_get_headphone_amp(ice1712_t *ice)
+{
+   unsigned int tmp = snd_ice1712_gpio_read(ice);
+
+   return ( tmp  AUREON_HP_SEL )!= 0;
+}
+
+static int aureon_hpamp_info(snd_kcontrol_t *k, snd_ctl_elem_info_t *uinfo)
+{
+   uinfo-type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+   uinfo-count = 1;
+   uinfo-value.integer.min = 0;
+   uinfo-value.integer.max = 1;
+   return 0;
+}
+
+static int aureon_hpamp_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+   ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+
+   ucontrol-value.integer.value[0] = aureon_get_headphone_amp(ice);
+   return 0;
+}
+
+
+static int aureon_hpamp_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+   ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+
+   return aureon_set_headphone_amp(ice,ucontrol-value.integer.value[0]);
+}
+
+/*
  * mixers
  */
 
@@ -336,6 +387,13 @@
.get = wm_adc_mux_get,
.put = wm_adc_mux_put,
},
+   {
+   .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+   .name = Headphone Amplifier Switch,
+   .info = aureon_hpamp_info,
+   .get = aureon_hpamp_get,
+   .put = aureon_hpamp_put
+   },
 };
 
 



---
This SF.Net email is sponsored by: SourceForge.net Broadband
Sign-up now for SourceForge Broadband and get the fastest
6.0/768 connection for only $19.95/mo for the first 3 months!
http://ads.osdn.com/?ad_id=2562alloc_id=6184op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci/ice1712 aureon.c,1.7,1.8 aureon.h,1.2,1.3

2004-05-14 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci/ice1712
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30609

Modified Files:
aureon.c aureon.h 
Log Message:
Added the support of Aureon 7.1-Universe.


Index: aureon.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/aureon.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- aureon.c14 May 2004 10:49:26 -  1.7
+++ aureon.c14 May 2004 11:00:23 -  1.8
@@ -569,5 +569,13 @@
.eeprom_size = sizeof(aureon71_eeprom),
.eeprom_data = aureon71_eeprom,
},
+   {
+   .subvendor = VT1724_SUBDEVICE_AUREON71_UNIVERSE,
+   .name = Terratec Aureon 7.1-Universe,
+   .chip_init = aureon_init,
+   .build_controls = aureon_add_controls,
+   .eeprom_size = sizeof(aureon71_eeprom),
+   .eeprom_data = aureon71_eeprom,
+   },
{ } /* terminator */
 };

Index: aureon.h
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/aureon.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- aureon.h30 Jan 2004 16:45:54 -  1.2
+++ aureon.h14 May 2004 11:00:24 -  1.3
@@ -25,10 +25,12 @@
  */  
 
 #define  AUREON_DEVICE_DESC   {Terratec,Aureon 5.1 Sky},\
-  {Terratec,Aureon 7.1 Space},
+  {Terratec,Aureon 7.1 Space},\
+  {Terratec,Aureon 7.1 Universe},
 
 #define VT1724_SUBDEVICE_AUREON51_SKY  0x3b154711  /* Aureon 5.1 Sky */
 #define VT1724_SUBDEVICE_AUREON71_SPACE0x3b154511  /* Aureon 7.1 Space */
+#define VT1724_SUBDEVICE_AUREON71_UNIVERSE 0x3b155311  /* Aureon 7.1 Universe 
*/
 
 extern struct snd_ice1712_card_info  snd_vt1724_aureon_cards[];
 



---
This SF.Net email is sponsored by: SourceForge.net Broadband
Sign-up now for SourceForge Broadband and get the fastest
6.0/768 connection for only $19.95/mo for the first 3 months!
http://ads.osdn.com/?ad_id=2562alloc_id=6184op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-driver/usb/usx2y usbusx2y.c,1.9,1.10

2004-05-14 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-driver/usb/usx2y
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20113

Modified Files:
usbusx2y.c 
Log Message:
- avoid entry in system log when device disconnects (for RELEASE build)



Index: usbusx2y.c
===
RCS file: /cvsroot/alsa/alsa-driver/usb/usx2y/usbusx2y.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- usbusx2y.c  7 Apr 2004 11:46:35 -   1.9
+++ usbusx2y.c  14 May 2004 12:51:04 -  1.10
@@ -98,7 +98,7 @@
 
 
 MODULE_AUTHOR(Karsten Wiese [EMAIL PROTECTED]);
-MODULE_DESCRIPTION(TASCAM NAME_ALLCAPS Version 0.6.0);
+MODULE_DESCRIPTION(TASCAM NAME_ALLCAPS Version 0.6.1);
 MODULE_LICENSE(GPL);
 MODULE_CLASSES({sound});
 MODULE_DEVICES({{TASCAM(0x1604), NAME_ALLCAPS(0x8001)(0x8007) }});
@@ -155,7 +155,7 @@
usX2Y-In04IntCalls++;
 
if (urb-status) {
-   snd_printk( Interrupt Pipe 4 came back with status=%i\n, 
urb-status);
+   snd_printd(Interrupt Pipe 4 came back with status=%i\n, urb-status);
return;
}
 



---
This SF.Net email is sponsored by: SourceForge.net Broadband
Sign-up now for SourceForge Broadband and get the fastest
6.0/768 connection for only $19.95/mo for the first 3 months!
http://ads.osdn.com/?ad_id=2562alloc_id=6184op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci/ice1712 aureon.c,1.8,1.9

2004-05-14 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci/ice1712
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23852

Modified Files:
aureon.c 
Log Message:
fixes by Christoph Haderer [EMAIL PROTECTED]:
- added the support of DAC/ADC mute switches
- fixed the capture route enum.



Index: aureon.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/aureon.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- aureon.c14 May 2004 11:00:23 -  1.8
+++ aureon.c14 May 2004 13:08:15 -  1.9
@@ -135,6 +135,47 @@
 }
 
 /*
+ * DAC mute control
+ */
+static int wm_dac_mute_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+{
+   uinfo-type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+   uinfo-count = 1;
+   uinfo-value.integer.min = 0;
+   uinfo-value.integer.max = 1;
+   return 0;
+}
+
+static int wm_dac_mute_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+   ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+   unsigned short val;
+
+   down(ice-gpio_mutex);
+   val = wm_get(ice, snd_ctl_get_ioffidx(kcontrol, ucontrol-id)+WM_MUTE);
+   ucontrol-value.integer.value[0] = ~val4  0x1;
+   up(ice-gpio_mutex);
+   return 0;
+}
+
+static int wm_dac_mute_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+   ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+   unsigned short new, old;
+   int change;
+
+   snd_ice1712_save_gpio_status(ice);
+   old = wm_get(ice, snd_ctl_get_ioffidx(kcontrol, ucontrol-id)+WM_MUTE);
+   new = (~ucontrol-value.integer.value[0]40x10) | (old~0x10);
+   change = (new != old);
+   if (change)
+   wm_put(ice, snd_ctl_get_ioffidx(kcontrol, ucontrol-id)+WM_MUTE, new);
+   snd_ice1712_restore_gpio_status(ice);
+
+   return change;
+}
+
+/*
  * DAC volume attenuation mixer control
  */
 static int wm_dac_vol_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
@@ -192,6 +233,47 @@
 }
 
 /*
+ * ADC mute control
+ */
+static int wm_adc_mute_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+{
+   uinfo-type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+   uinfo-count = 1;
+   uinfo-value.integer.min = 0;
+   uinfo-value.integer.max = 1;
+   return 0;
+}
+
+static int wm_adc_mute_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+   ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+   unsigned short val;
+
+   down(ice-gpio_mutex);
+   val = wm_get(ice, snd_ctl_get_ioffidx(kcontrol, ucontrol-id)+WM_ADC_GAIN);
+   ucontrol-value.integer.value[0] = ~val5  0x1;
+   up(ice-gpio_mutex);
+   return 0;
+}
+
+static int wm_adc_mute_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+   ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+   unsigned short new, old;
+   int change;
+
+   snd_ice1712_save_gpio_status(ice);
+   old = wm_get(ice, snd_ctl_get_ioffidx(kcontrol, ucontrol-id)+WM_ADC_GAIN);
+   new = (~ucontrol-value.integer.value[0]50x20) | (old~0x20);
+   change = (new != old);
+   if (change)
+   wm_put(ice, snd_ctl_get_ioffidx(kcontrol, ucontrol-id)+WM_ADC_GAIN, 
new);
+   snd_ice1712_restore_gpio_status(ice);
+
+   return change;
+}
+
+/*
  * ADC gain mixer control
  */
 static int wm_adc_vol_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
@@ -227,10 +309,10 @@
snd_ice1712_save_gpio_status(ice);
idx  = snd_ctl_get_ioffidx(kcontrol, ucontrol-id) + WM_ADC_GAIN;
nvol = ucontrol-value.integer.value[0];
-   ovol = wm_get(ice, idx)  0x1f;
-   change = (ovol != nvol);
+   ovol = wm_get(ice, idx);
+   change = ((ovol  0x1f)  != nvol);
if (change)
-   wm_put(ice, idx, nvol);
+   wm_put(ice, idx, nvol | (ovol  ~0x1f));
snd_ice1712_restore_gpio_status(ice);
return change;
 }
@@ -241,18 +323,15 @@
 static int wm_adc_mux_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
 {
static char *texts[] = {
-   CD Left,
-   CD Right,
-   Aux Left,
-   Aux Right,
-   Line Left,
-   Line Right,
-   Mic Left,
-   Mic Right,
+   CD,   //AIN1
+   Aux,  //AIN2
+   Line, //AIN3
+   Mic,  //AIN4
+   AC97  //AIN5
};
uinfo-type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-   uinfo-count = 2;
-   uinfo-value.enumerated.items = 8;
+   uinfo-count = 1;
+   uinfo-value.enumerated.items = 5;
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]);
@@ -291,7 +370,7 @@
 }
 
 /*
- * Taken

[alsa-cvslog] CVS: alsa-driver INSTALL,1.165,1.166

2004-05-14 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31910

Modified Files:
INSTALL 
Log Message:
- added emu10k1x driver by Francisco Moraes [EMAIL PROTECTED].


Index: INSTALL
===
RCS file: /cvsroot/alsa/alsa-driver/INSTALL,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- INSTALL 1 May 2004 12:11:29 -   1.165
+++ INSTALL 14 May 2004 13:42:47 -  1.166
@@ -232,6 +232,13 @@
 
 See docs/hdspm.txt for details.
 
+  Module snd-emu10k1x
+  ---
+
+Module for Creative Emu10k1X (SB Live Dell OEM version)
+
+Module supports up to 8 cards.
+
 
 Trouble Shooting
 



---
This SF.Net email is sponsored by: SourceForge.net Broadband
Sign-up now for SourceForge Broadband and get the fastest
6.0/768 connection for only $19.95/mo for the first 3 months!
http://ads.osdn.com/?ad_id=2562alloc_id=6184op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci atiixp.c,1.8,1.9

2004-05-13 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13142/pci

Modified Files:
atiixp.c 
Log Message:
- probe only audio codecs.
- use enums instead of embedded numbers.
- added KERN_ERR prefix to the error messages.


Index: atiixp.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/atiixp.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- atiixp.c4 May 2004 15:24:29 -   1.8
+++ atiixp.c13 May 2004 18:40:18 -  1.9
@@ -224,7 +224,12 @@
 /*
  * stream enum
  */
-enum { ATI_DMA_PLAYBACK, ATI_DMA_CAPTURE, ATI_DMA_SPDIF };
+enum { ATI_DMA_PLAYBACK, ATI_DMA_CAPTURE, ATI_DMA_SPDIF, NUM_ATI_DMAS }; /* DMAs */
+enum { ATI_PCM_OUT, ATI_PCM_IN, ATI_PCM_SPDIF, NUM_ATI_PCMS }; /* AC97 pcm slots */
+enum { ATI_PCMDEV_ANALOG, ATI_PCMDEV_DIGITAL, NUM_ATI_PCMDEVS }; /* pcm devices */
+
+#define NUM_ATI_CODECS 3
+
 
 /*
  * constants and callbacks for each DMA type
@@ -232,6 +237,7 @@
 struct snd_atiixp_dma_ops {
int type;   /* ATI_DMA_XXX */
unsigned int llp_offset;/* LINKPTR offset */
+   unsigned int dt_cur;/* DT_CUR offset */
void (*enable_dma)(atiixp_t *chip, int on); /* called from open callback */
void (*enable_transfer)(atiixp_t *chip, int on); /* called from trigger 
(START/STOP) */
void (*flush_dma)(atiixp_t *chip);  /* called from trigger (STOP 
only) */
@@ -266,14 +272,14 @@
int irq;

ac97_bus_t *ac97_bus;
-   ac97_t *ac97[3];/* IXP can have up to 3 codecs */
+   ac97_t *ac97[NUM_ATI_CODECS];
 
spinlock_t reg_lock;
spinlock_t ac97_lock;
 
-   atiixp_dma_t dmas[3];   /* playback, capture, spdif */
-   struct ac97_pcm *pcms[3];   /* playback, capture, spdif */
-   snd_pcm_t *pcmdevs[2];  /* PCM devices: analog i/o, spdif */
+   atiixp_dma_t dmas[NUM_ATI_DMAS];
+   struct ac97_pcm *pcms[NUM_ATI_PCMS];
+   snd_pcm_t *pcmdevs[NUM_ATI_PCMDEVS];
 
int max_channels;   /* max. channels for PCM out */
 
@@ -543,8 +549,8 @@
 #ifdef CONFIG_PM
 static int snd_atiixp_aclink_down(atiixp_t *chip)
 {
-   if (atiixp_read(chip, MODEM_MIRROR)  0x1) /* modem running, too? */
-   return -EBUSY;
+   // if (atiixp_read(chip, MODEM_MIRROR)  0x1) /* modem running, too? */
+   //  return -EBUSY;
atiixp_update(chip, CMD,
 ATI_REG_CMD_POWERDOWN | ATI_REG_CMD_AC_RESET,
 ATI_REG_CMD_POWERDOWN);
@@ -650,7 +656,7 @@
unsigned long flags;
 
spin_lock_irqsave(chip-reg_lock, flags);
-   curptr = readl(chip-remap_addr + dma-ops-llp_offset + 12); /* 
XXX_DMA_DT_CUR */
+   curptr = readl(chip-remap_addr + dma-ops-dt_cur);
if (curptr  dma-buf_addr) {
snd_printdd(curptr = %x, base = %x\n, curptr, dma-buf_addr);
curptr = 0;
@@ -1194,6 +1200,7 @@
 static atiixp_dma_ops_t snd_atiixp_playback_dma_ops = {
.type = ATI_DMA_PLAYBACK,
.llp_offset = ATI_REG_OUT_DMA_LINKPTR,
+   .dt_cur = ATI_REG_OUT_DMA_DT_CUR,
.enable_dma = atiixp_out_enable_dma,
.enable_transfer = atiixp_out_enable_transfer,
.flush_dma = atiixp_out_flush_dma,
@@ -1202,6 +1209,7 @@
 static atiixp_dma_ops_t snd_atiixp_capture_dma_ops = {
.type = ATI_DMA_CAPTURE,
.llp_offset = ATI_REG_IN_DMA_LINKPTR,
+   .dt_cur = ATI_REG_IN_DMA_DT_CUR,
.enable_dma = atiixp_in_enable_dma,
.enable_transfer = atiixp_in_enable_transfer,
.flush_dma = atiixp_in_flush_dma,
@@ -1210,6 +1218,7 @@
 static atiixp_dma_ops_t snd_atiixp_spdif_dma_ops = {
.type = ATI_DMA_SPDIF,
.llp_offset = ATI_REG_SPDF_DMA_LINKPTR,
+   .dt_cur = ATI_REG_SPDF_DMA_DT_CUR,
.enable_dma = atiixp_spdif_enable_dma,
.enable_transfer = atiixp_spdif_enable_transfer,
.flush_dma = atiixp_spdif_flush_dma,
@@ -1240,36 +1249,36 @@
chip-pcms[i] = pbus-pcms[i];
 
chip-max_channels = 2;
-   if (pbus-pcms[0].r[0].slots  (1  AC97_SLOT_PCM_SLEFT)) {
-   if (pbus-pcms[0].r[0].slots  (1  AC97_SLOT_LFE))
+   if (pbus-pcms[ATI_PCM_OUT].r[0].slots  (1  AC97_SLOT_PCM_SLEFT)) {
+   if (pbus-pcms[ATI_PCM_OUT].r[0].slots  (1  AC97_SLOT_LFE))
chip-max_channels = 6;
else
chip-max_channels = 4;
}
 
/* PCM #0: analog I/O */
-   err = snd_pcm_new(chip-card, ATI IXP AC97, 0, 1, 1, pcm);
+   err = snd_pcm_new(chip-card, ATI IXP AC97, ATI_PCMDEV_ANALOG, 1, 1, pcm);
if (err  0)
return err;
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, snd_atiixp_playback_ops);
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, snd_atiixp_capture_ops);

[alsa-cvslog] CVS: alsa-tools/sscape_ctl sscape_ctl.c,1.5,1.6

2004-05-11 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-tools/sscape_ctl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9027

Modified Files:
sscape_ctl.c 
Log Message:
added GPL note.



Index: sscape_ctl.c
===
RCS file: /cvsroot/alsa/alsa-tools/sscape_ctl/sscape_ctl.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sscape_ctl.c9 Mar 2004 12:43:22 -   1.5
+++ sscape_ctl.c11 May 2004 16:57:47 -  1.6
@@ -1,3 +1,23 @@
+/*
+ * ALSA SoundScape control utility
+ *
+ * Copyright (c) 2003 by Chris Rankin
+ *
+ *   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 stdlib.h
 #include string.h



---
This SF.Net email is sponsored by Sleepycat Software
Learn developer strategies Cisco, Motorola, Ericsson  Lucent use to deliver
higher performing products faster, at low TCO.
http://www.sleepycat.com/telcomwpreg.php?From=osdnemail3
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-utils/alsamixer alsamixer.c,1.71,1.72

2004-05-11 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-utils/alsamixer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9166

Modified Files:
alsamixer.c 
Log Message:
show single values for mono volumes.



Index: alsamixer.c
===
RCS file: /cvsroot/alsa/alsa-utils/alsamixer/alsamixer.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- alsamixer.c 16 Feb 2004 16:44:06 -  1.71
+++ alsamixer.c 11 May 2004 16:58:48 -  1.72
@@ -836,14 +836,21 @@
   mvaddstr (y, x,  );
   if (mixer_type[elem_index]  MIXER_ELEM_HAS_VOLUME) {
 mixer_dc (DC_TEXT);
-sprintf (string, %ld, vleft);
-mvaddstr (y, x + 3 - strlen (string), string);
-mixer_dc (DC_CBAR_FRAME);
-mvaddch (y, x + 3, '');
-mvaddch (y, x + 4, '');
-mixer_dc (DC_TEXT);
-sprintf (string, %ld, vright);
-mvaddstr (y, x + 5, string);
+if (chn_right == SND_MIXER_SCHN_UNKNOWN) {
+  /* mono */
+  sprintf (string, %ld, vleft);
+  mvaddstr (y, x + 4 - strlen (string) / 2, string);
+} else {
+  /* stereo */
+  sprintf (string, %ld, vleft);
+  mvaddstr (y, x + 3 - strlen (string), string);
+  mixer_dc (DC_CBAR_FRAME);
+  mvaddch (y, x + 3, '');
+  mvaddch (y, x + 4, '');
+  mixer_dc (DC_TEXT);
+  sprintf (string, %ld, vright);
+  mvaddstr (y, x + 5, string);
+}
   }
   y--;
   



---
This SF.Net email is sponsored by Sleepycat Software
Learn developer strategies Cisco, Motorola, Ericsson  Lucent use to deliver
higher performing products faster, at low TCO.
http://www.sleepycat.com/telcomwpreg.php?From=osdnemail3
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-utils/speaker-test - New directory

2004-05-10 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-utils/speaker-test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2332/speaker-test

Log Message:
Directory /cvsroot/alsa/alsa-utils/speaker-test added to the repository




---
This SF.Net email is sponsored by Sleepycat Software
Learn developer strategies Cisco, Motorola, Ericsson  Lucent use to deliver
higher performing products faster, at low TCO.
http://www.sleepycat.com/telcomwpreg.php?From=osdnemail3
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-utils/speaker-test .cvsignore,NONE,1.1 Makefile.am,NONE,1.1 readme.txt,NONE,1.1 speaker-test.c,NONE,1.1

2004-05-10 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-utils/speaker-test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2654/speaker-test

Added Files:
.cvsignore Makefile.am readme.txt speaker-test.c 
Log Message:
added speaker-test utility by James Courtier-Dutton [EMAIL PROTECTED]

imported version: 0.0.4.


--- NEW FILE: .cvsignore ---
.deps
speaker-test
Makefile
Makefile.in

--- NEW FILE: Makefile.am ---
INCLUDES = -I$(top_srcdir)/include
bin_PROGRAMS = speaker-test
speaker_test_SOURCES = speaker-test.c
EXTRA_DIST = readme.txt



--- NEW FILE: readme.txt ---
To make or build just type

make

To test: -
1) Just stereo sound from one stereo jack: -
./speaker-test -Dfront -c 2
2) A 4 speaker setup from two stereo jacks: -
./speaker-test -Dsurround40 -c 4
3) A 5.1 speaker setup from three stereo jacks: -
./speaker-test -Dsurround51 -c 6


--- NEW FILE: speaker-test.c ---
/*
 * Copyright (C) 2000-2004 James Courtier-Dutton
 *
 * This file is part of the speaker-test tool.
 *
 * This small program sends a simple sinusoidal wave to your speakers.
 *
 * speaker-test 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.
 *
 * xine 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
 *
 *
 * Main program by James Courtier-Dutton (including some source code fragments from 
the alsa project.)
 * Some cleanup from Daniel Caujolle-Bert [EMAIL PROTECTED]
 *
 * $Id: speaker_test.c,v 1.00 2003/11/26 19:43:38 jcdutton Exp $
 */

#include stdio.h
#include stdlib.h
#include string.h
#include sched.h
#include errno.h
#include getopt.h
#include aconfig.h

#include alsa/asoundlib.h
#include sys/time.h
#include math.h

static char  *device  = plughw:0,0;   /* playback device */
static snd_pcm_format_t   format  = SND_PCM_FORMAT_S16; /* sample format */
static unsigned int   rate= 44100;  /* stream rate */
static unsigned int   channels= 1;  /* count of channels */
static unsigned int   buffer_time = 50; /* ring buffer length in 
us */
static unsigned int   period_time = 10; /* period time in us */
static double freq= 440;/* sinusoidal wave 
frequency in Hz */
static snd_output_t  *output  = NULL;
static snd_pcm_uframes_t  buffer_size;
static snd_pcm_uframes_t  period_size;
static const char*channel_name[] = {
  Front Left ,
  Front Right ,
  Rear Left ,
  Rear Right ,
  Center ,
  LFE 
};

static void generate_sine(signed short *samples, int channel, int count, double 
*_phase) {
  double phase = *_phase;
  double max_phase = 1.0 / freq;
  double step = 1.0 / (double)rate;
  double res;
  intchn, ires;

  while (count--  0) {
res = sin((phase * 2 * M_PI) / max_phase - M_PI) * 32767;
/* printf(%e\n,res); */
ires = res;

for(chn=0;chnchannels;chn++) {
  if (chn==channel)
*samples++ = ires;
  else
*samples++ = 0;
}

phase += step;
if (phase = max_phase)
  phase -= max_phase;
  }

  *_phase = phase;
}

/* FIXME: Implement, because it is a better test than sine wave
 * because we can tell where pink noise is coming from more easily that a sine wave
 */
#if 0
static void generate_pink_noise( snd_pcm_uframes_t offset, int count, double *_phase) {
}
#endif

static int set_hwparams(snd_pcm_t *handle, snd_pcm_hw_params_t *params, 
snd_pcm_access_t access) {
  unsigned int rrate;
  int  err, dir;
  snd_pcm_uframes_t period_size_min;
  snd_pcm_uframes_t period_size_max;
  snd_pcm_uframes_t buffer_size_min;
  snd_pcm_uframes_t buffer_size_max;
  snd_pcm_uframes_t buffer_time_to_size;



  /* choose all parameters */
  err = snd_pcm_hw_params_any(handle, params);
  if (err  0) {
printf(Broken configuration for playback: no configurations available: %s\n, 
snd_strerror(err));
return err;
  }

  /* set the interleaved read/write format */
  err = snd_pcm_hw_params_set_access(handle, params, access);
  if (err  0) {
printf(Access type not available for playback: %s\n, snd_strerror(err));
return err;
  }

  /* set the sample format */
  err = snd_pcm_hw_params_set_format(handle, params, format);
  if (err  0) {
printf(Sample format not available for playback: %s\n, snd_strerror(err));
return err;
  }

  /* set the count of channels */
  err = snd_pcm_hw_params_set_channels(handle, params, channels);
  if (err  0) {

[alsa-cvslog] CVS: alsa-utils Makefile.am,1.29,1.30 configure.in,1.83,1.84

2004-05-10 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-utils
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2654

Modified Files:
Makefile.am configure.in 
Log Message:
added speaker-test utility by James Courtier-Dutton [EMAIL PROTECTED]

imported version: 0.0.4.


Index: Makefile.am
===
RCS file: /cvsroot/alsa/alsa-utils/Makefile.am,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Makefile.am 25 Feb 2004 11:25:26 -  1.29
+++ Makefile.am 10 May 2004 14:28:02 -  1.30
@@ -4,7 +4,7 @@
 else
 ALSAMIXER_DIR=
 endif
-SUBDIRS=include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq utils
+SUBDIRS=include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq 
speaker-test utils
 EXTRA_DIST=ChangeLog INSTALL TODO README configure cvscompile depcomp
 AUTOMAKE_OPTIONS=foreign
 

Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-utils/configure.in,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- configure.in3 Apr 2004 09:41:15 -   1.83
+++ configure.in10 May 2004 14:28:03 -  1.84
@@ -84,4 +84,5 @@
  alsaconf/alsaconf alsaconf/Makefile \
  aplay/Makefile include/Makefile iecset/Makefile utils/Makefile \
  utils/alsa-utils.spec seq/Makefile seq/aconnect/Makefile \
- seq/aplaymidi/Makefile seq/aseqnet/Makefile)
+ seq/aplaymidi/Makefile seq/aseqnet/Makefile \
+ speaker-test/Makefile)



---
This SF.Net email is sponsored by Sleepycat Software
Learn developer strategies Cisco, Motorola, Ericsson  Lucent use to deliver
higher performing products faster, at low TCO.
http://www.sleepycat.com/telcomwpreg.php?From=osdnemail3
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pcmcia/pdaudiocf pdaudiocf.h,1.5,1.6 pdaudiocf_irq.c,1.4,1.5

2004-05-07 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pcmcia/pdaudiocf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23826

Modified Files:
pdaudiocf.h pdaudiocf_irq.c 
Log Message:
- fixed the changed function decleration.
- fixed the return value from cast check.


Index: pdaudiocf.h
===
RCS file: /cvsroot/alsa/alsa-kernel/pcmcia/pdaudiocf/pdaudiocf.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pdaudiocf.h 8 Apr 2004 16:35:01 -   1.5
+++ pdaudiocf.h 7 May 2004 10:10:26 -   1.6
@@ -140,7 +140,7 @@
 int snd_pdacf_resume(snd_card_t *card, unsigned int state);
 #endif
 int snd_pdacf_pcm_new(pdacf_t *chip);
-void pdacf_interrupt(int irq, void *dev, struct pt_regs *regs);
+irqreturn_t pdacf_interrupt(int irq, void *dev, struct pt_regs *regs);
 void pdacf_tasklet(unsigned long private_data);
 void pdacf_reinit(pdacf_t *chip, int resume);
 

Index: pdaudiocf_irq.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pcmcia/pdaudiocf/pdaudiocf_irq.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pdaudiocf_irq.c 5 May 2004 13:29:56 -   1.4
+++ pdaudiocf_irq.c 7 May 2004 10:10:26 -   1.5
@@ -28,7 +28,7 @@
  */
 irqreturn_t pdacf_interrupt(int irq, void *dev, struct pt_regs *regs)
 {
-   pdacf_t *chip = snd_magic_cast(pdacf_t, dev, return);
+   pdacf_t *chip = snd_magic_cast(pdacf_t, dev, return IRQ_NONE);
unsigned short stat;
 
if ((chip-chip_status  (PDAUDIOCF_STAT_IS_STALE|



---
This SF.Net email is sponsored by Sleepycat Software
Learn developer strategies Cisco, Motorola, Ericsson  Lucent use to deliver
higher performing products faster, at low TCO.
http://www.sleepycat.com/telcomwpreg.php?From=osdnemail3
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/Documentation ALSA-Configuration.txt,1.43,1.44

2004-05-07 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/Documentation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25277/Documentation

Modified Files:
ALSA-Configuration.txt 
Log Message:
- added model module option to specify board model to snd-ice1712 and snd-ice1724
  drivers.
- removed ez8 option from ice1724.  this can be specified as model=ez8 option.
- rewritten some struct init in C99 style.
- function for accessing i2c of ice1724 (for future use).


Index: ALSA-Configuration.txt
===
RCS file: /cvsroot/alsa/alsa-kernel/Documentation/ALSA-Configuration.txt,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ALSA-Configuration.txt  6 May 2004 13:17:02 -   1.43
+++ ALSA-Configuration.txt  7 May 2004 10:18:59 -   1.44
@@ -611,6 +611,10 @@
 * Hoontech SoundTrack DSP 24 Media 7.1
 * Digigram VX442
 
+model   - Use the given board model, one of the following:
+ delta1010, dio2496, delta66, delta44, audiophile, delta410,
+ delta1010lt, vx442, ewx2496, ews88mt, ews88mt_new, ews88d,
+ dmx6fire, dsp24, dsp24_71, ez8
 omni   - Omni I/O support for MidiMan M-Audio Delta44/66
 cs8427_timeout - reset timeout for the CS8427 chip (S/PDIF transciever)
  in msec resolution, default value is 500 (0.5 sec)
@@ -627,6 +631,9 @@
* AMP Ltd AUDIO2000
* TerraTec Aureon Sky-5.1, Space-7.1
 
+model   - Use the given board model, one of the following:
+ revo71, amp2000, prodigy71, aureon51, aureon71
+
 Module supports up to 8 cards and autoprobe.
 
   Module snd-intel8x0



---
This SF.Net email is sponsored by Sleepycat Software
Learn developer strategies Cisco, Motorola, Ericsson  Lucent use to deliver
higher performing products faster, at low TCO.
http://www.sleepycat.com/telcomwpreg.php?From=osdnemail3
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/parisc harmony.c,1.9,1.10

2004-05-07 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/parisc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16528

Modified Files:
harmony.c 
Log Message:
- fixed the buffer allocation with the new API.
- optimized the rate and format setting.
- removed redundant call of buffer release.
- removed invalid __devinit prefix.



Index: harmony.c
===
RCS file: /cvsroot/alsa/alsa-kernel/parisc/harmony.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- harmony.c   24 Apr 2004 20:01:49 -  1.9
+++ harmony.c   7 May 2004 17:04:31 -   1.10
@@ -96,16 +96,14 @@
 #define MAX_PCM_SUBSTREAMS 4
 #define MAX_MIDI_DEVICES   0
 
-#define BUFFER_SIZE4096
-#define MAX_BUFS   10
+#define HARMONY_BUF_SIZE   4096
+#define MAX_BUFS   10
+#define MAX_BUFFER_SIZE(MAX_BUFS * HARMONY_BUF_SIZE)
 
 /* number of silence  graveyard buffers */
 #define GRAVEYARD_BUFS 3
 #define SILENCE_BUFS   3
 
-#define MAX_BUFFER_SIZE(MAX_BUFS * BUFFER_SIZE)
-#define HARMONY_BUF_SIZE   BUFFER_SIZE
-
 #define HARMONY_CNTL_C 0x8000
 
 #define HARMONY_DSTATUS_PN 0x0200
@@ -200,18 +198,16 @@
 
struct parisc_device *pa_dev;
 
+   struct snd_dma_device dma_dev;
+
/* the graveyard buffer is used as recording buffer when playback, 
 * because harmony always want a buffer to put recorded data */
-
-   unsigned char *graveyard_addr;
-   dma_addr_t graveyard_dma;
+   struct snd_dma_buffer graveyard_dma;
int graveyard_count;

/* same thing for silence buffer */
-   unsigned char *silence_addr;
-   dma_addr_t silence_dma;
+   struct snd_dma_buffer silence_dma;
int silence_count;
-   struct snd_dma_device dma_dev;
 
/* alsa stuff */
snd_card_t *card;
@@ -270,6 +266,15 @@
 #define HARMONY_SR_33KHZ   0x16
 #define HARMONY_SR_6KHZ0x17
 
+/* bits corresponding to the entries of snd_card_harmony_rates */
+static unsigned int rate_bits[14] = {
+   HARMONY_SR_5KHZ, HARMONY_SR_6KHZ, HARMONY_SR_8KHZ,
+   HARMONY_SR_9KHZ, HARMONY_SR_11KHZ, HARMONY_SR_16KHZ,
+   HARMONY_SR_18KHZ, HARMONY_SR_22KHZ, HARMONY_SR_27KHZ,
+   HARMONY_SR_32KHZ, HARMONY_SR_33KHZ, HARMONY_SR_37KHZ,
+   HARMONY_SR_44KHZ, HARMONY_SR_48KHZ
+};
+
 /* snd_card_harmony_rate_bits
  * @rate:  index of current data rate in list
  * returns: harmony hex code for registers
@@ -279,26 +284,9 @@
unsigned int idx;

for (idx = 0; idx = RATES; idx++)
-   if (snd_card_harmony_rates[idx] == rate) break;
-   
-   switch (idx) {
-   case 0: return HARMONY_SR_5KHZ;
-   case 1: return HARMONY_SR_6KHZ;
-   case 2: return HARMONY_SR_8KHZ;
-   case 3: return HARMONY_SR_9KHZ;
-   case 4: return HARMONY_SR_11KHZ;
-   case 5: return HARMONY_SR_16KHZ;
-   case 6: return HARMONY_SR_18KHZ;
-   case 7: return HARMONY_SR_22KHZ;
-   case 8: return HARMONY_SR_27KHZ;
-   case 9: return HARMONY_SR_32KHZ;
-   case 10: return HARMONY_SR_33KHZ;
-   case 11: return HARMONY_SR_37KHZ;
-   case 12: return HARMONY_SR_44KHZ;
-   case 13: return HARMONY_SR_48KHZ;
-   default:  /* fallback */
-   return HARMONY_SR_44KHZ;
-   }
+   if (snd_card_harmony_rates[idx] == rate)
+   return rate_bits[idx];
+   return HARMONY_SR_44KHZ; /* fallback */
 }
 
 /*
@@ -323,27 +311,6 @@
 }
 
 /*
- * silence a buffer
- * XXX: alsa could probably do this by itself
- * XXX: memset hpmc, commented.
- */
-
-void snd_harmony_silence(snd_card_harmony_t *harmony,
-   void *addr, int length)
-{
-   u8 silence_char;
-   
-   switch(harmony-data_format) {
-   case HARMONY_DF_8BIT_ULAW: silence_char = 0x55; break;
-   case HARMONY_DF_8BIT_ALAW: silence_char = 0xff; break;
-   case HARMONY_DF_16BIT_LINEAR:
-   default:
-  
silence_char = 0;
-   }
-   //memset(addr, silence_char, length);
-}
-
-/*
  * interruption controls routines
  */
 
@@ -391,9 +358,9 @@
snd_pcm_period_elapsed(harmony-playback_substream);
harmony-ply_total++;
} else {
-   gsc_writel(harmony-silence_dma + 
-   (HARMONY_BUF_SIZE*harmony-silence_count),
-   hpa+REG_PNXTADD);
+   gsc_writel(harmony-silence_dma.addr + 
+  (HARMONY_BUF_SIZE*harmony-silence_count),
+

[alsa-cvslog] CVS: alsa-kernel/Documentation ALSA-Configuration.txt,1.42,1.43 CMIPCI.txt,1.5,1.6

2004-05-06 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/Documentation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23545/Documentation

Modified Files:
ALSA-Configuration.txt CMIPCI.txt 
Log Message:
make soft_ac3 option conditional again.

this will make it possible for old chips to feed the IEC958 data
without conversion (sometimes useful, e.g. for apps using mmap).


Index: ALSA-Configuration.txt
===
RCS file: /cvsroot/alsa/alsa-kernel/Documentation/ALSA-Configuration.txt,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ALSA-Configuration.txt  4 May 2004 15:21:57 -   1.42
+++ ALSA-Configuration.txt  6 May 2004 13:17:02 -   1.43
@@ -271,7 +271,8 @@
 
 mpu_port   - 0x300,0x310,0x320,0x330, 0 = disable (default)
 fm_port - 0x388 (default), 0 = disable (default)
-soft_ac3- Sofware-conversion of raw SPDIF packets (obsoleted now)
+soft_ac3- Sofware-conversion of raw SPDIF packets (model 033 only)
+  (default = 1)
 joystick_port - Joystick port address (0 = disable, 1 = auto-detect)
 
 Module supports autoprobe and multiple chips (max 8).

Index: CMIPCI.txt
===
RCS file: /cvsroot/alsa/alsa-kernel/Documentation/CMIPCI.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CMIPCI.txt  21 May 2003 10:51:41 -  1.5
+++ CMIPCI.txt  6 May 2004 13:17:02 -   1.6
@@ -180,8 +180,8 @@
 device automatically to the previous state.
 
 On the model 033, AC3 is implemented by the software conversion in
-the driver.  This prevents the mmap support.  If you need mmap
-support, pass the soft_ac3=0 module option.  This doesn't matter
+the alsa-lib.  If you need to bypass the software conversion of IEC958
+subframes, pass the soft_ac3=0 module option.  This doesn't matter
 on the newer models.
 
 



---
This SF.Net email is sponsored by Sleepycat Software
Learn developer strategies Cisco, Motorola, Ericsson  Lucent use to deliver
higher performing products faster, at low TCO.
http://www.sleepycat.com/telcomwpreg.php?From=osdnemail3
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci cmipci.c,1.64,1.65

2004-05-06 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23545/pci

Modified Files:
cmipci.c 
Log Message:
make soft_ac3 option conditional again.

this will make it possible for old chips to feed the IEC958 data
without conversion (sometimes useful, e.g. for apps using mmap).


Index: cmipci.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/cmipci.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- cmipci.c4 May 2004 15:21:57 -   1.64
+++ cmipci.c6 May 2004 13:17:02 -   1.65
@@ -58,7 +58,7 @@
 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable switches */
 static long mpu_port[SNDRV_CARDS];
 static long fm_port[SNDRV_CARDS];
-static int soft_ac3[SNDRV_CARDS]; /* obsoleted */
+static int soft_ac3[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)]=1};
 #ifdef SUPPORT_JOYSTICK
 static int joystick_port[SNDRV_CARDS];
 #endif
@@ -80,7 +80,7 @@
 MODULE_PARM_DESC(fm_port, FM port.);
 MODULE_PARM_SYNTAX(fm_port, SNDRV_ENABLED 
,allows:{{0},{0x388},{0x3c8},{0x3e0},{0x3e8}},dialog:list);
 module_param_array(soft_ac3, bool, boot_devs, 0444);
-MODULE_PARM_DESC(soft_ac3, Sofware-conversion of raw SPDIF packets [obsoleted].);
+MODULE_PARM_DESC(soft_ac3, Sofware-conversion of raw SPDIF packets (model 033 
only).);
 #ifdef SUPPORT_JOYSTICK
 module_param_array(joystick_port, int, boot_devs, 0444);
 MODULE_PARM_DESC(joystick_port, Joystick port address.);
@@ -418,7 +418,6 @@
unsigned int is_dac;/* is dac? */
int bytes_per_frame;
int shift;
-   int ac3_shift;  /* extra shift: 1 on soft ac3 mode */
 };
 
 /* mixer elements toggled/resumed during ac3 playback */
@@ -456,6 +455,7 @@
unsigned int can_ac3_sw: 1;
unsigned int can_ac3_hw: 1;
unsigned int can_multi_ch: 1;
+   unsigned int do_soft_ac3: 1;
 
unsigned int spdif_playback_avail: 1;   /* spdif ready? */
unsigned int spdif_playback_enabled: 1; /* spdif switch enabled? */
@@ -2500,7 +2500,10 @@
if (! detect) {
cm-chip_version = 33;
cm-max_channels = 2;
-   cm-can_ac3_sw = 1;
+   if (cm-do_soft_ac3)
+   cm-can_ac3_sw = 1;
+   else
+   cm-can_ac3_hw = 1;
cm-has_dual_dac = 1;
} else {
cm-chip_version = 37;
@@ -2532,6 +2535,8 @@
if (cm-can_multi_ch)
sprintf(cm-card-driver + strlen(cm-card-driver),
-MC%d, cm-max_channels);
+   else if (cm-can_ac3_sw)
+   strcpy(cm-card-driver + strlen(cm-card-driver), -SWIEC);
 }
 
 
@@ -2628,6 +2633,7 @@
 
cm-chip_version = 0;
cm-max_channels = 2;
+   cm-do_soft_ac3 = soft_ac3[dev];
 
query_chip(cm);
 



---
This SF.Net email is sponsored by Sleepycat Software
Learn developer strategies Cisco, Motorola, Ericsson  Lucent use to deliver
higher performing products faster, at low TCO.
http://www.sleepycat.com/telcomwpreg.php?From=osdnemail3
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-lib/src/conf/cards CMI8338-SWIEC.conf,NONE,1.1 Makefile.am,1.19,1.20 aliases.conf,1.4,1.5

2004-05-06 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-lib/src/conf/cards
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24020

Modified Files:
Makefile.am aliases.conf 
Added Files:
CMI8338-SWIEC.conf 
Log Message:
added CMI8338-SWIEC for cmipci with software IEC958

--- NEW FILE: CMI8338-SWIEC.conf ---
#
# Configuration for the CMI8338/8738 chip (w/o multi-channel support)
# using software IEC958 subframe conversion
#

confdir:pcm/front.conf

CMI8338-SWIEC.pcm.front.0 {
@args [ CARD ]
@args.CARD {
type string
}
type hw
card $CARD
device 0
}   

confdir:pcm/rear.conf

# 2nd DAC
# FIXME: we need a volume attenuator for rear channel.
CMI8338-SWIEC.pcm.rear.0 {
@args [ CARD ]
@args.CARD {
type string
}
type hw
card $CARD
device 1
}

confdir:pcm/surround40.conf

# for the old CM8738 with 2nd DAC for rear
CMI8338-SWIEC.pcm.surround40.0 {
@args [ CARD ]
@args.CARD {
type string
}
type multi
master 1
slaves [
{
pcm {
@func concat
strings [
cards.CMI8338-SWIEC.pcm.front.0:CARD= $CARD
]
}
channels 2
}
{
pcm {
@func concat
strings [
cards.CMI8338-SWIEC.pcm.rear.0:CARD= $CARD
]
}
channels 2
}
]
bindings [
{ slave 0 channel 0 }
{ slave 0 channel 1 }
{ slave 1 channel 0 }
{ slave 1 channel 1 }
]
}

confdir:pcm/iec958.conf

CMI8338-SWIEC.pcm.iec958.0 {
@args [ CARD AES0 AES1 AES2 AES3 ]
@args.CARD {
type string
}
@args.AES0 {
type integer
}
@args.AES1 {
type integer
}
@args.AES2 {
type integer
}
@args.AES3 {
type integer
}
type asym
playback.pcm {
type iec958
slave.pcm {
type hw
card $CARD
device 2
}
status [ $AES0 $AES1 $AES2 $AES3 ]
}
capture.pcm {
type hw
card $CARD
device 2
}
}

Index: Makefile.am
===
RCS file: /cvsroot/alsa/alsa-lib/src/conf/cards/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile.am 4 May 2004 15:27:17 -   1.19
+++ Makefile.am 6 May 2004 13:19:05 -   1.20
@@ -8,6 +8,7 @@
Audigy.conf \
Audigy2.conf \
CMI8338.conf \
+   CMI8338-SWIEC.conf \
CMI8738-MC6.conf \
CS46xx.conf \
EMU10K1.conf \

Index: aliases.conf
===
RCS file: /cvsroot/alsa/alsa-lib/src/conf/cards/aliases.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- aliases.conf27 Nov 2003 16:50:52 -  1.4
+++ aliases.conf6 May 2004 13:19:05 -   1.5
@@ -9,6 +9,7 @@
 YMF754 cards.YMF744
 CMIPCI cards.CMI8338
 CMI8738 cards.CMI8338
+CMI8738-SWIEC cards.CMI8338-SWIEC
 CMI8738-MC4 cards.CMI8738-MC6
 'E-mu APS' cards.EMU10K1
 'GUS Max' cards.GUS



---
This SF.Net email is sponsored by Sleepycat Software
Learn developer strategies Cisco, Motorola, Ericsson  Lucent use to deliver
higher performing products faster, at low TCO.
http://www.sleepycat.com/telcomwpreg.php?From=osdnemail3
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci via82xx.c,1.99,1.100

2004-05-06 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25736

Modified Files:
via82xx.c 
Log Message:
renamed the elements of 'input source select' control to avoid confusion.

formerly used words 'Line' and 'Mic', which have nothing to do with
the actual connections.



Index: via82xx.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/via82xx.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- via82xx.c   4 May 2004 15:09:08 -   1.99
+++ via82xx.c   6 May 2004 13:27:23 -   1.100
@@ -1419,8 +1419,11 @@
 
 static int snd_via8233_capture_source_info(snd_kcontrol_t *kcontrol, 
snd_ctl_elem_info_t *uinfo)
 {
+   /* formerly they were Line and Mic, but it looks like that they
+* have nothing to do with the actual physical connections...
+*/
static char *texts[2] = {
-   Line, Mic
+   Input1, Input2
};
uinfo-type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
uinfo-count = 1;



---
This SF.Net email is sponsored by Sleepycat Software
Learn developer strategies Cisco, Motorola, Ericsson  Lucent use to deliver
higher performing products faster, at low TCO.
http://www.sleepycat.com/telcomwpreg.php?From=osdnemail3
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci via82xx.c,1.98,1.99

2004-05-04 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11537/pci

Modified Files:
via82xx.c 
Log Message:
fixed again the DXS entry for m680x to 48k-fixed rate.


Index: via82xx.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/via82xx.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- via82xx.c   2 May 2004 10:15:40 -   1.98
+++ via82xx.c   4 May 2004 15:09:08 -   1.99
@@ -2123,7 +2123,7 @@
{ .vendor = 0x1462, .device = 0x5901, .action = VIA_DXS_NO_VRA }, /* 
MSI KT6 Delta-SR */
{ .vendor = 0x1584, .device = 0x8120, .action = VIA_DXS_ENABLE }, /* 
Gericom/Targa/Vobis/Uniwill laptop */
{ .vendor = 0x161f, .device = 0x202b, .action = VIA_DXS_NO_VRA }, /* 
Amira Note book */
-   { .vendor = 0x161f, .device = 0x2032, .action = VIA_DXS_ENABLE }, /* 
m680x machines */
+   { .vendor = 0x161f, .device = 0x2032, .action = VIA_DXS_48K }, /* 
m680x machines */
{ .vendor = 0x1631, .device = 0xe004, .action = VIA_DXS_ENABLE }, /* 
Easy Note 3174, Packard Bell */
{ .vendor = 0x1695, .device = 0x3005, .action = VIA_DXS_ENABLE }, /* 
EPoX EP-8K9A */
{ .vendor = 0x1849, .device = 0x3059, .action = VIA_DXS_NO_VRA }, /* 
ASRock K7VM2 */



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-lib/src/pcm pcm_misc.c,1.40,1.41

2004-05-04 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11877/src/pcm

Modified Files:
pcm_misc.c 
Log Message:
fixed the bit width of IEC958_SUBFRAME_* formats from 24 to 32.


Index: pcm_misc.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_misc.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- pcm_misc.c  15 Apr 2004 12:52:58 -  1.40
+++ pcm_misc.c  4 May 2004 15:10:38 -   1.41
@@ -232,7 +232,7 @@
return 64;
case SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE:
case SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE:
-   return 24;
+   return 32;
case SNDRV_PCM_FORMAT_MU_LAW:
case SNDRV_PCM_FORMAT_A_LAW:
return 8;



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-lib/src confmisc.c,1.30,1.31

2004-05-04 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-lib/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12057/src

Modified Files:
confmisc.c 
Log Message:
avoid the compile warnings (about cast) with the recent GCC.


Index: confmisc.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/confmisc.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- confmisc.c  23 Jul 2002 19:51:17 -  1.30
+++ confmisc.c  4 May 2004 15:11:58 -   1.31
@@ -865,6 +865,7 @@
 {
snd_pcm_info_t *info;
const char *id;
+   void *data;
snd_pcm_t *pcm;
int err;
 
@@ -875,7 +876,8 @@
SNDERR(field pcm_handle not found);
return -EINVAL;
}
-   err = snd_config_get_pointer(private_data, (const void **)pcm);
+   err = snd_config_get_pointer(private_data, data);
+   pcm = data;
if (err  0) {
SNDERR(field pcm_handle is not a pointer);
return err;



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-lib/include pcm.h,1.184,1.185

2004-05-04 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-lib/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12324/include

Modified Files:
pcm.h 
Log Message:
added a new plugin iec958 to convert IEC958 subframes.


Index: pcm.h
===
RCS file: /cvsroot/alsa/alsa-lib/include/pcm.h,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- pcm.h   26 Mar 2004 16:08:01 -  1.184
+++ pcm.h   4 May 2004 15:13:23 -   1.185
@@ -354,6 +354,8 @@
SND_PCM_TYPE_DSNOOP,
/** Direct Sharing plugin */
SND_PCM_TYPE_DSHARE,
+   /** IEC958 subframe plugin */
+   SND_PCM_TYPE_IEC958,
SND_PCM_TYPE_LAST = SND_PCM_TYPE_DSNOOP
 };
 



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-lib/src/pcm pcm_iec958.c,NONE,1.1 Makefile.am,1.51,1.52 pcm.c,1.286,1.287 pcm_symbols.c,1.10,1.11

2004-05-04 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12324/src/pcm

Modified Files:
Makefile.am pcm.c pcm_symbols.c 
Added Files:
pcm_iec958.c 
Log Message:
added a new plugin iec958 to convert IEC958 subframes.


--- NEW FILE: pcm_iec958.c ---
/**
 * \file pcm/pcm_iec958.c
 * \ingroup PCM_Plugins
 * \brief PCM IEC958 Subframe Conversion Plugin Interface
 * \author Takashi Iwai [EMAIL PROTECTED]
 * \date 2004
 */
/*
 *  PCM - IEC958 Subframe Conversion Plugin
 *  Copyright (c) 2004 by Takashi Iwai [EMAIL PROTECTED]
 *
 *
 *   This library is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU Lesser General Public License as
 *   published by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
 *
 *   You should have received a copy of the GNU Lesser General Public
 *   License along with this library; if not, write to the Free Software
 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 *
 */
  
#include byteswap.h
#include pcm_local.h
#include pcm_plugin.h

#ifndef PIC
/* entry for static linking */
const char *_snd_module_pcm_iec958 = ;
#endif

/*
 */

#ifndef DOC_HIDDEN

typedef struct snd_pcm_iec958 snd_pcm_iec958_t;

typedef void (*iec958_f)(snd_pcm_iec958_t *iec,
 const snd_pcm_channel_area_t *dst_areas,
 snd_pcm_uframes_t dst_offset,
 const snd_pcm_channel_area_t *src_areas,
 snd_pcm_uframes_t src_offset,
 unsigned int channels, snd_pcm_uframes_t frames);

struct snd_pcm_iec958 {
/* This field need to be the first */
snd_pcm_plugin_t plug;
unsigned int getput_idx;
iec958_f func;
snd_pcm_format_t sformat;
snd_pcm_format_t format;
unsigned int counter;
unsigned char status[24];
unsigned int byteswap;
};

#endif /* DOC_HIDDEN */

/*
 * Determine parity for time slots 4 upto 30
 * to be sure that bit 4 upt 31 will carry
 * an even number of ones and zeros.
 */
static unsigned int iec958_parity(unsigned int data)
{
unsigned int parity;
int bit;

data = 4; /* start from bit 4 */
parity = 0;
for (bit = 4; bit = 30; bit++) {
if (data  1)
parity++;
data = 1;
}
return (parity  1);
}

/*
 * Compose 32bit IEC958 subframe, two sub frames
 * build one frame with two channels.
 *
 * bit 0-3  = preamble
 * 4-7  = AUX (=0)
 * 8-27 = data (12-27 for 16bit, 8-27 for 20bit, and 24bit without AUX)
 * 28   = validity (0 for valid data, else 'in error')
 * 29   = user data (0)
 * 30   = channel status (24 bytes for 192 frames)
 * 31   = parity
 */

static inline u_int32_t iec958_subframe(snd_pcm_iec958_t *iec, u_int32_t data, int 
channel)
{
unsigned int byte = iec-counter  3;
unsigned int mask = 1  (iec-counter - (byte  3));

/* bit 4-27 */
data = 4;
data = ~0xf;

/* set IEC status bits (up to 192 bits) */
if (iec-status[byte]  mask)
data |= 0x4000;

if (iec958_parity(data))/* parity bit 4-30 */
data |= 0x8000;

/* Preamble */
if (! iec-counter)
data |= 0x03;   /* Block start, 'Z' */
else if (! channel)
data |= 0x05;   /* odd sub frame, 'Y' */
else
data |= 0x09;   /* even sub frame, 'X' */

if (iec-byteswap)
data = bswap_32(data);

return data;
}

static inline int32_t iec958_to_s32(snd_pcm_iec958_t *iec, u_int32_t data)
{
if (iec-byteswap)
data = bswap_32(data);
data = ~0xf;
data = 4;
return (int32_t)data;
}

static void snd_pcm_iec958_decode(snd_pcm_iec958_t *iec,
  const snd_pcm_channel_area_t *dst_areas,
  snd_pcm_uframes_t dst_offset,
  const snd_pcm_channel_area_t *src_areas,
  snd_pcm_uframes_t src_offset,
  unsigned int channels, snd_pcm_uframes_t frames)
{
#define PUT32_LABELS
#include plugin_ops.h
#undef PUT32_LABELS
void *put = put32_labels[iec-getput_idx];
unsigned int channel;
for (channel = 0; channel  channels; ++channel) {
const u_int32_t *src;
char *dst;
int src_step, dst_step;
snd_pcm_uframes_t frames1

[alsa-cvslog] CVS: alsa-kernel/pci/nm256 nm256.c,1.37,1.38

2004-05-04 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci/nm256
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13394/pci/nm256

Modified Files:
nm256.c 
Log Message:
- added a blacklist to avoid the possible hang-up at module loading.
- added notes about the hang-up problem to ALSA-Configuration.txt.


Index: nm256.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/nm256/nm256.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- nm256.c 14 Apr 2004 17:27:05 -  1.37
+++ nm256.c 4 May 2004 15:19:25 -   1.38
@@ -1532,6 +1532,21 @@
 }
 
 
+struct nm256_quirk {
+   unsigned short vendor;
+   unsigned short device;
+   int type;
+};
+
+#define NM_BLACKLISTED 1
+
+static struct nm256_quirk nm256_quirks[] __devinitdata = {
+   /* HP omnibook 4150 has cs4232 codec internally */
+   { .vendor = 0x103c, .device = 0x0007, .type = NM_BLACKLISTED },
+   { } /* terminator */
+};
+
+
 static int __devinit snd_nm256_probe(struct pci_dev *pci,
 const struct pci_device_id *pci_id)
 {
@@ -1540,6 +1555,8 @@
nm256_t *chip;
int err;
unsigned int xbuffer_top;
+   struct nm256_quirk *q;
+   u16 subsystem_vendor, subsystem_device;
 
if ((err = pci_enable_device(pci))  0)
return err;
@@ -1551,6 +1568,18 @@
return -ENOENT;
}
 
+   pci_read_config_word(pci, PCI_SUBSYSTEM_VENDOR_ID, subsystem_vendor);
+   pci_read_config_word(pci, PCI_SUBSYSTEM_ID, subsystem_device);
+
+   for (q = nm256_quirks; q-vendor; q++) {
+   if (q-vendor == subsystem_vendor  q-device == subsystem_device) {
+   if (q-type == NM_BLACKLISTED) {
+   printk(KERN_INFO nm256: The device is blacklisted.  
Loading stopped\n);
+   return -ENODEV;
+   }
+   }
+   }
+
card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/Documentation ALSA-Configuration.txt,1.40,1.41

2004-05-04 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/Documentation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13394/Documentation

Modified Files:
ALSA-Configuration.txt 
Log Message:
- added a blacklist to avoid the possible hang-up at module loading.
- added notes about the hang-up problem to ALSA-Configuration.txt.


Index: ALSA-Configuration.txt
===
RCS file: /cvsroot/alsa/alsa-kernel/Documentation/ALSA-Configuration.txt,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ALSA-Configuration.txt  3 May 2004 08:43:04 -   1.40
+++ ALSA-Configuration.txt  4 May 2004 15:19:25 -   1.41
@@ -789,6 +789,8 @@
 
 Module supports autoprobe and multiple chips (max 8).
 
+The power-management is supported.
+
 Note: on some notebooks the buffer address cannot be detected
 automatically, or causes hang-up during initialization.
 In such a case, specify the buffer top address explicity via
@@ -798,9 +800,24 @@
   Sony F270: buffer_top=0x272800
 The driver supports only ac97 codec.  It's possible to force
 to initialize/use ac97 although it's not detected.  In such a
-case, use force_ac97=1 option.
+case, use force_ac97=1 option - but *NO* guarantee whether it
+works!
 
-The power-management is supported.
+Note: The NM256 chip can be linked internally with non-AC97
+codecs.  This driver supports only the AC97 codec, and won't work
+with machines with other (most likely CS423x or OPL3SAx) chips,
+even though the device is detected in lspci.  In such a case, try
+other drivers, e.g. snd-cs4232 or snd-opl3sa2.  Some has ISA-PnP
+but some doesn't have ISA PnP.  You'll need to speicfy isapnp=0
+and proper hardware parameters in the case without ISA PnP.
+
+Note: This driver is really crappy.  It's a porting from the
+OSS driver, which is a result of black-magic reverse engineering.
+The detection of codec will fail if the driver is loaded *after*
+X-server as described above.  You might be able to force to load
+the module, but it may result in hang-up.   Hence, make sure that
+you load this module *before* X if you encounter this kind of
+problem.
 
   Module snd-opl3sa2
   --



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/Documentation ALSA-Configuration.txt,1.41,1.42

2004-05-04 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/Documentation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13916/Documentation

Modified Files:
ALSA-Configuration.txt 
Log Message:
dropped the software encoding of AC3 stream in the driver.
this is done now in alsa-lib.
soft_ac3 module option is kept for backward compatibility but not
referred at all.


Index: ALSA-Configuration.txt
===
RCS file: /cvsroot/alsa/alsa-kernel/Documentation/ALSA-Configuration.txt,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ALSA-Configuration.txt  4 May 2004 15:19:25 -   1.41
+++ ALSA-Configuration.txt  4 May 2004 15:21:57 -   1.42
@@ -271,8 +271,7 @@
 
 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)
+soft_ac3- Sofware-conversion of raw SPDIF packets (obsoleted now)
 joystick_port - Joystick port address (0 = disable, 1 = auto-detect)
 
 Module supports autoprobe and multiple chips (max 8).



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci atiixp.c,1.7,1.8

2004-05-04 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14557/pci

Modified Files:
atiixp.c 
Log Message:
- fixed the direct SPDIF playback mode.  (still experimental)
- use the different driver id name for the direct spdif mode, so that
  alsa-lib can read another corresponding configuration.


Index: atiixp.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/atiixp.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- atiixp.c23 Apr 2004 15:07:54 -  1.7
+++ atiixp.c4 May 2004 15:24:29 -   1.8
@@ -862,9 +862,7 @@
  ATI_REG_CMD_INTERLEAVE_OUT : 0);
} else {
atiixp_update(chip, CMD, ATI_REG_CMD_SPDF_CONFIG_MASK, 0);
-   atiixp_update(chip, CMD, ATI_REG_CMD_INTERLEAVE_SPDF,
- substream-runtime-format == SNDRV_PCM_FORMAT_S16_LE ?
- ATI_REG_CMD_INTERLEAVE_SPDF : 0);
+   atiixp_update(chip, CMD, ATI_REG_CMD_INTERLEAVE_SPDF, 0);
}
spin_unlock(chip-reg_lock);
return 0;
@@ -1024,9 +1022,8 @@
runtime-hw.rates = chip-pcms[pcm_type]-rates;
snd_pcm_limit_hw_rates(runtime);
} else {
-   /* SPDIF */
-   runtime-hw.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_44100 | 
SNDRV_PCM_RATE_32000;
-   runtime-hw.rate_min = 32000;
+   /* direct SPDIF */
+   runtime-hw.formats = SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE;
}
if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) 
 0)
return err;
@@ -1277,7 +1274,10 @@
return err;
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, snd_atiixp_spdif_ops);
pcm-private_data = chip;
-   strcpy(pcm-name, ATI IXP IEC958);
+   if (chip-spdif_over_aclink)
+   strcpy(pcm-name, ATI IXP IEC958 (AC97));
+   else
+   strcpy(pcm-name, ATI IXP IEC958 (Direct));
chip-pcmdevs[1] = pcm;
 
snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
@@ -1584,7 +1584,7 @@
 
pci_read_config_byte(pci, PCI_REVISION_ID, revision);
 
-   strcpy(card-driver, ATIIXP);
+   strcpy(card-driver, spdif_aclink[dev] ? ATIIXP : ATIIXP-SPDMA);
strcpy(card-shortname, ATI IXP);
if ((err = snd_atiixp_create(card, pci, chip))  0)
goto __error;



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-lib/src/conf/cards ATIIXP-SPDMA.conf,NONE,1.1 Makefile.am,1.18,1.19

2004-05-04 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-lib/src/conf/cards
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15112

Modified Files:
Makefile.am 
Added Files:
ATIIXP-SPDMA.conf 
Log Message:
added the new configuration for ATI IXP direct SPDIF mode.



--- NEW FILE: ATIIXP-SPDMA.conf ---
#
# Configuration for the ATI IXP 150/200/250 chips
#

confdir:pcm/front.conf

ATIIXP-SPDMA.pcm.front.0 {
@args [ CARD ]
@args.CARD {
type string
}
type hw
card $CARD
device 0
}   

confdir:pcm/surround40.conf

ATIIXP-SPDMA.pcm.surround40.0 {
@args [ CARD ]
@args.CARD {
type string
}
type hooks
slave.pcm {
type hw
card $CARD
device 0
}
hooks.0 {
type ctl_elems
hook_args [
{
name Line-In As Surround
preserve true
value true
lock true
optional true
}
{
name Surround Down Mix
preserve true
value off
lock true
optional true
}
]
}
}

confdir:pcm/surround41.conf
confdir:pcm/surround50.conf
confdir:pcm/surround51.conf

ATIIXP-SPDMA.pcm.surround51.0 {
@args [ CARD ]
@args.CARD {
type string
}
type hooks
slave.pcm {
type hw
card $CARD
device 0
}
hooks.0 {
type ctl_elems
hook_args [
{
name Line-In As Surround
preserve true
value true
lock true
optional true
}
{
name Mic As Center/LFE
preserve true
value true
lock true
optional true
}
{
name Surround Down Mix
preserve true
value off
lock true
optional true
}
{
name Center/LFE Down Mix
preserve true
value off
lock true
optional true
}
]
}
}

confdir:pcm/iec958.conf

ATIIXP-SPDMA.pcm.iec958.0 {
@args [ CARD AES0 AES1 AES2 AES3 ]
@args.CARD {
type string
}
@args.AES0 {
type integer
}
@args.AES1 {
type integer
}
@args.AES2 {
type integer
}
@args.AES3 {
type integer
}
type iec958
slave {
pcm {
type hw
card $CARD
device 1
}
format IEC958_SUBFRAME_LE
}
status [ $AES0 $AES1 $AES2 $AES3 ]
}

Index: Makefile.am
===
RCS file: /cvsroot/alsa/alsa-lib/src/conf/cards/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.am 24 Feb 2004 16:25:26 -  1.18
+++ Makefile.am 4 May 2004 15:27:17 -   1.19
@@ -1,6 +1,7 @@
 alsadir = $(datadir)/alsa/cards
 cfg_files = aliases.conf \
ATIIXP.conf \
+   ATIIXP-SPDMA.conf \
AU8810.conf \
AU8820.conf \
AU8830.conf \



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/Documentation Audigy-mixer.txt,NONE,1.1

2004-05-04 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/Documentation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20286

Added Files:
Audigy-mixer.txt 
Log Message:
added the document about Audigy mixer implementation by Peter Zubaj.
it is not target to users, rather to developers.



--- NEW FILE: Audigy-mixer.txt ---

Sound Blaster Audigy mixer / default DSP code
===

This is based on SB-Live-mixer.txt.

The EMU10K2 chips have a DSP part which can be programmed to support 
various ways of sample processing, which is described here.
(This acticle does not deal with the overall functionality of the 
EMU10K2 chips. See the manuals section for further details.)

The ALSA driver programs this portion of chip by default code
(can be altered later) which offers the following functionality:


1) Digital mixer controls
-

These controls are built using the DSP instructions. They offer extended
functionality. Only the default build-in code in the ALSA driver is described
here. Note that the controls work as attenuators: the maximum value is the 
neutral position leaving the signal unchanged. Note that if the  same destination 
is mentioned in multiple controls, the signal is accumulated and can be wrapped 
(set to maximal or minimal value without checking of overflow).


Explanation of used abbreviations:

DAC- digital to analog converter
ADC- analog to digital converter
I2S- one-way three wire serial bus for digital sound by Philips Semiconductors
 (this standard is used for connecting standalone DAC and ADC converters)
LFE- low frequency effects (subwoofer signal)
AC97   - a chip containing an analog mixer, DAC and ADC converters
IEC958 - S/PDIF
FX-bus - the EMU10K2 chip has an effect bus containing 64 accumulators.
 Each of the synthesizer voices can feed its output to these accumulators
 and the DSP microcontroller can operate with the resulting sum.

name='PCM Front Playback Volume',index=0

This control is used to attenuate samples for left and right front PCM FX-bus
accumulators. ALSA uses accumulators 8 and 9 for left and right front PCM 
samples for 5.1 playback. The result samples are forwarded to the front DAC PCM 
slots of the Philips DAC.

name='PCM Surround Playback Volume',index=0

This control is used to attenuate samples for left and right surround PCM FX-bus
accumulators. ALSA uses accumulators 2 and 3 for left and right surround PCM 
samples for 5.1 playback. The result samples are forwarded to the surround DAC PCM 
slots of the Philips DAC.

name='PCM Center Playback Volume',index=0

This control is used to attenuate samples for center PCM FX-bus accumulator.
ALSA uses accumulator 6 for center PCM sample for 5.1 playback. The result sample
is forwarded to the center DAC PCM slot of the Philips DAC.

name='PCM LFE Playback Volume',index=0

This control is used to attenuate sample for LFE PCM FX-bus accumulator. 
ALSA uses accumulator 7 for LFE PCM sample for 5.1 playback. The result sample 
is forwarded to the LFE DAC PCM slot of the Philips DAC.

name='PCM Playback Volume',index=0

This control is used to attenuate samples for left and right PCM FX-bus
accumulators. ALSA uses accumulators 0 and 1 for left and right PCM samples for
stereo playback. The result samples are forwarded to the front DAC PCM slots 
of the Philips DAC.

name='PCM Capture Volume',index=0

This control is used to attenuate samples for left and right PCM FX-bus
accumulator. ALSA uses accumulators 0 and 1 for left and right PCM.
The result is forwarded to the ADC capture FIFO (thus to the standard capture
PCM device).

name='Music Playback Volume',index=0

This control is used to attenuate samples for left and right MIDI FX-bus
accumulators. ALSA uses accumulators 4 and 5 for left and right MIDI samples.
The result samples are forwarded to the front DAC PCM slots of the AC97 codec.

name='Music Capture Volume',index=0

These controls are used to attenuate samples for left and right MIDI FX-bus
accumulator. ALSA uses accumulators 4 and 5 for left and right PCM.
The result is forwarded to the ADC capture FIFO (thus to the standard capture
PCM device).

name='Mic Playback Volume',index=0

This control is used to attenuate samples for left and right Mic input.
For Mic input is used AC97 codec. The result samples are forwarded to 
the front DAC PCM slots of the Philips DAC. Samples are forwarded to Mic
capture FIFO (device 1 - 16bit/8KHz mono) too without volume control.

name='Mic Capture Volume',index=0

This control is used to attenuate samples for left and right Mic input.
The result is forwarded to the ADC capture FIFO (thus to the standard capture
PCM device).

name='Audigy CD Playback Volume',index=0

This control is used to attenuate samples from left and right IEC958 TTL
digital inputs (usually used by a CDROM drive). The result samples are
forwarded to the front DAC PCM slots of the

[alsa-cvslog] CVS: alsa-lib/src/pcm pcm_ladspa.c,1.16,1.17

2004-05-04 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20885

Modified Files:
pcm_ladspa.c 
Log Message:
fixed debug messages by Erik Inge Bolso.



Index: pcm_ladspa.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_ladspa.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pcm_ladspa.c25 Feb 2004 11:24:30 -  1.16
+++ pcm_ladspa.c4 May 2004 15:54:01 -   1.17
@@ -492,7 +492,7 @@
list_for_each(pos1, plugin-instances) {
instance = list_entry(pos1, snd_pcm_ladspa_instance_t, 
list);
if (instance-channel == NO_ASSIGN) {
-   SNDERR(channel %u is not assigned for plugin 
'%s' depth %u, plugin-desc-Name, instance-channel, instance-depth);
+   SNDERR(channel %u is not assigned for plugin 
'%s' depth %u, instance-channel, plugin-desc-Name, instance-depth);
return -EINVAL;
}
if (instance-channel != channel) {
@@ -902,7 +902,7 @@
if (err = 0) {
err = 
snd_pcm_ladspa_find_port(array[channel], lplug, io-pdesc | LADSPA_PORT_AUDIO, port);
if (err  0) {
-   SNDERR(Unable to find an audio port 
(%li) for channel %s, port);
+   SNDERR(Unable to find an audio port 
(%li) for channel %s, port, id);
return err;
}
continue;



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/include uda1341.h,1.5,1.6

2004-05-03 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15639/include

Modified Files:
uda1341.h 
Log Message:
- clean up PM codes using the new PM callback functions.





---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci es1968.c,1.65,1.66

2004-05-03 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15122/pci

Modified Files:
es1968.c 
Log Message:
- set ACPI D3 at suspend.
- fixed the interrupt disabling at shutdown.
- enabled PM for compaq Armada.


Index: es1968.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/es1968.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- es1968.c14 Apr 2004 17:27:04 -  1.65
+++ es1968.c3 May 2004 17:34:48 -   1.66
@@ -2426,6 +2426,7 @@
snd_pcm_suspend_all(chip-pcm);
snd_ac97_suspend(chip-ac97);
snd_es1968_bob_stop(chip);
+   snd_es1968_set_acpi(chip, ACPI_D3);
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
return 0;
 }
@@ -2463,8 +2464,11 @@
 
 static int snd_es1968_free(es1968_t *chip)
 {
-   if (chip-res_io_port)
-   snd_es1968_reset(chip);
+   if (chip-res_io_port) {
+   synchronize_irq(chip-irq);
+   outw(1, chip-io_port + 0x04); /* clear WP interrupts */
+   outw(0, chip-io_port + ESM_PORT_HOST_IRQ); /* disable IRQ */
+   }
 
 #ifdef SUPPORT_JOYSTICK
if (chip-res_joystick) {
@@ -2498,6 +2502,7 @@
 };
 
 static struct ess_device_list pm_whitelist[] __devinitdata = {
+   { TYPE_MAESTRO2E, 0x0e11 }, /* Compaq Armada */
{ TYPE_MAESTRO2E, 0x1028 },
{ TYPE_MAESTRO2E, 0x103c },
{ TYPE_MAESTRO2E, 0x1179 },



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/core init.c,1.45,1.46 sound.c,1.61,1.62

2004-05-03 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15469/core

Modified Files:
init.c sound.c 
Log Message:
- added the generic PM callback registration.
- rewritten ISA callbacks to use the new one.


Index: init.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/init.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- init.c  8 Apr 2004 16:34:59 -   1.45
+++ init.c  3 May 2004 17:36:07 -   1.46
@@ -739,8 +739,7 @@
return 0;
 }
 
-#ifdef CONFIG_ISA
-static int snd_isa_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data)
+static int snd_generic_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data)
 {
snd_card_t *card = dev-data;
 
@@ -758,28 +757,29 @@
 }
 
 /**
- * snd_card_set_isa_pm_callback - set the ISA power-management callbacks
+ * snd_card_set_dev_pm_callback - set the generic power-management callbacks
  * @card: soundcard structure
+ * @type: PM device type (PM_XXX)
  * @suspend: suspend callback function
  * @resume: resume callback function
  * @private_data: private data to pass to the callback functions
  *
  * Registers the power-management and sets the lowlevel callbacks for
- * the given ISA card.  These callbacks are called from the ALSA's
- * common PM handler and from the control API.
+ * the given card with the given PM type.  These callbacks are called
+ * from the ALSA's common PM handler and from the control API.
  */
-int snd_card_set_isa_pm_callback(snd_card_t *card,
+int snd_card_set_dev_pm_callback(snd_card_t *card, int type,
 int (*suspend)(snd_card_t *, unsigned int),
 int (*resume)(snd_card_t *, unsigned int),
 void *private_data)
 {
-   card-pm_dev = pm_register(PM_ISA_DEV, 0, snd_isa_pm_callback);
+   card-pm_dev = pm_register(type, 0, snd_generic_pm_callback);
if (! card-pm_dev)
return -ENOMEM;
card-pm_dev-data = card;
-   return snd_card_set_pm_callback(card, suspend, resume, private_data);
+   snd_card_set_pm_callback(card, suspend, resume, private_data);
+   return 0;
 }
-#endif
 
 #ifdef CONFIG_PCI
 int snd_card_pci_suspend(struct pci_dev *dev, u32 state)

Index: sound.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/sound.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sound.c 8 Apr 2004 16:34:59 -   1.61
+++ sound.c 3 May 2004 17:36:07 -   1.62
@@ -467,13 +467,11 @@
 #ifdef CONFIG_PM
 EXPORT_SYMBOL(snd_power_wait);
 EXPORT_SYMBOL(snd_card_set_pm_callback);
+EXPORT_SYMBOL(snd_card_set_dev_pm_callback);
 #ifdef CONFIG_PCI
 EXPORT_SYMBOL(snd_card_pci_suspend);
 EXPORT_SYMBOL(snd_card_pci_resume);
 #endif
-#ifdef CONFIG_ISA
-EXPORT_SYMBOL(snd_card_set_isa_pm_callback);
-#endif
 #endif
   /* device.c */
 EXPORT_SYMBOL(snd_device_new);



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
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.27,1.28

2004-05-03 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/Documentation/DocBook
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15859/Documentation/DocBook

Modified Files:
writing-an-alsa-driver.tmpl 
Log Message:
- fixed some obsolete descriptions and typos.
- a bit more detailed description about addition of the new driver.


Index: writing-an-alsa-driver.tmpl
===
RCS file: /cvsroot/alsa/alsa-kernel/Documentation/DocBook/writing-an-alsa-driver.tmpl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- writing-an-alsa-driver.tmpl 13 Apr 2004 14:58:59 -  1.27
+++ writing-an-alsa-driver.tmpl 3 May 2004 17:37:55 -   1.28
@@ -5507,10 +5507,14 @@
Suppose that you'll create a new PCI driver for the card
quotexyz/quote.  The card module name would be
snd-xyz.  The new driver is usually put into alsa-driver
-   tree.  Then the driver is evaluated, audited and tested
+   tree, filenamealsa-driver/pci/filename directory in
+   the case of PCI cards.
+   Then the driver is evaluated, audited and tested
by developers and users.  After a certain time, the driver
-   will go to alsa-kernel tree and eventually integrated into
-   Linux 2.6 tree.
+   will go to alsa-kernel tree (to the corresponding directory,
+   such as filenamealsa-kernel/pci/filename) and eventually
+   integrated into Linux 2.6 tree (the directory would be
+   filenamelinux/sound/pci/filename).
/para
 
para
@@ -5537,7 +5541,7 @@
 programlisting
 ![CDATA[
   snd-xyz-objs := xyz.o
-  extra-obj-$(CONFIG_SND_XYZ) += snd-xyz.o
+  obj-$(CONFIG_SND_XYZ) += snd-xyz.o
 ]]
 /programlisting
   /informalexample
@@ -5554,8 +5558,8 @@
   informalexample
 programlisting
 ![CDATA[
-  config SND_BT87X
-  tristate Foobar XYX
+  config SND_XYZ
+  tristate Foobar XYZ
   depends on SND
   select SND_PCM
   help
@@ -5606,7 +5610,8 @@
orderedlist
listitem
para
-   Add a new directory (xyz) to extra-subdir-y list in alsa-driver/pci/Makefile
+   Add a new directory (filenamexyz/filename) in
+   filenamealsa-driver/pci/Makefile/filename like below
 
   informalexample
 programlisting
@@ -5620,7 +5625,7 @@
 
listitem
para
-   Under the directory xyz, create a Makefile
+   Under the directory filenamexyz/filename, create a Makefile
 
   example
titleSample Makefile for a driver xyz/title



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-utils/seq/aplaymidi .cvsignore,1.1,1.2

2004-05-03 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-utils/seq/aplaymidi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18196

Modified Files:
.cvsignore 
Log Message:
added binaries.



Index: .cvsignore
===
RCS file: /cvsroot/alsa/alsa-utils/seq/aplaymidi/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore  23 Feb 2004 10:58:35 -  1.1
+++ .cvsignore  3 May 2004 17:47:57 -   1.2
@@ -1,3 +1,5 @@
 .deps
 Makefile
 Makefile.in
+aplaymidi
+arecordmidi



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/include core.h,1.50,1.51

2004-05-03 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15469/include

Modified Files:
core.h 
Log Message:
- added the generic PM callback registration.
- rewritten ISA callbacks to use the new one.


Index: core.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/core.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- core.h  8 Apr 2004 16:34:59 -   1.50
+++ core.h  3 May 2004 17:36:07 -   1.51
@@ -205,10 +205,12 @@
 int (*suspend)(snd_card_t *, unsigned int),
 int (*resume)(snd_card_t *, unsigned int),
 void *private_data);
-int snd_card_set_isa_pm_callback(snd_card_t *card,
+int snd_card_set_dev_pm_callback(snd_card_t *card, int type,
 int (*suspend)(snd_card_t *, unsigned int),
 int (*resume)(snd_card_t *, unsigned int),
 void *private_data);
+#define snd_card_set_isa_pm_callback(card,suspend,resume,data) \
+   snd_card_set_dev_pm_callback(card, PM_ISA_DEV, suspend, resume, data)
 #ifndef SND_PCI_PM_CALLBACKS
 int snd_card_pci_suspend(struct pci_dev *dev, u32 state);
 int snd_card_pci_resume(struct pci_dev *dev);
@@ -222,6 +224,7 @@
 #define snd_power_get_state(card)  SNDRV_CTL_POWER_D0
 #define snd_power_change_state(card, state)do { (void)(card); } while (0)
 #define snd_card_set_pm_callback(card,suspend,resume,data) -EINVAL
+#define snd_card_set_dev_pm_callback(card,suspend,resume,data) -EINVAL
 #define snd_card_set_isa_pm_callback(card,suspend,resume,data) -EINVAL
 #define SND_PCI_PM_CALLBACKS
 #endif



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci via82xx.c,1.97,1.98

2004-05-02 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29179

Modified Files:
via82xx.c 
Log Message:
added DXS whitelist for (eMachines) m680x.


Index: via82xx.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/via82xx.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- via82xx.c   23 Apr 2004 15:08:11 -  1.97
+++ via82xx.c   2 May 2004 10:15:40 -   1.98
@@ -2123,6 +2123,7 @@
{ .vendor = 0x1462, .device = 0x5901, .action = VIA_DXS_NO_VRA }, /* 
MSI KT6 Delta-SR */
{ .vendor = 0x1584, .device = 0x8120, .action = VIA_DXS_ENABLE }, /* 
Gericom/Targa/Vobis/Uniwill laptop */
{ .vendor = 0x161f, .device = 0x202b, .action = VIA_DXS_NO_VRA }, /* 
Amira Note book */
+   { .vendor = 0x161f, .device = 0x2032, .action = VIA_DXS_ENABLE }, /* 
m680x machines */
{ .vendor = 0x1631, .device = 0xe004, .action = VIA_DXS_ENABLE }, /* 
Easy Note 3174, Packard Bell */
{ .vendor = 0x1695, .device = 0x3005, .action = VIA_DXS_ENABLE }, /* 
EPoX EP-8K9A */
{ .vendor = 0x1849, .device = 0x3059, .action = VIA_DXS_NO_VRA }, /* 
ASRock K7VM2 */



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-lib/src/mixer simple.c,1.63,1.64

2004-05-02 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-lib/src/mixer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23073

Modified Files:
simple.c 
Log Message:
fixed the event handling of enum elements.


Index: simple.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/mixer/simple.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- simple.c15 Apr 2004 12:52:49 -  1.63
+++ simple.c2 May 2004 11:59:08 -   1.64
@@ -329,8 +329,12 @@
csw = s-str[CAPT].sw;
s-str[CAPT].sw = ~0U;
 
-   if (s-ctls[CTL_ENUMLIST].elem)
-   return elem_read_enum(s);
+   if (s-ctls[CTL_ENUMLIST].elem) {
+   err = elem_read_enum(s);
+   if (err  0)
+   return err;
+   goto __skip_cswitch;
+   }
 
if (s-ctls[CTL_PLAYBACK_VOLUME].elem)
err = elem_read_volume(s, PLAY, CTL_PLAYBACK_VOLUME);



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/isa/cs423x cs4231_lib.c,1.39,1.40

2004-05-01 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/isa/cs423x
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22069

Modified Files:
cs4231_lib.c 
Log Message:
checks the PCM substream pointers to fix oops/panic in the interrupt
handler.




Index: cs4231_lib.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/cs423x/cs4231_lib.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- cs4231_lib.c8 Apr 2004 17:10:08 -   1.39
+++ cs4231_lib.c1 May 2004 09:01:11 -   1.40
@@ -979,19 +979,26 @@
}   
if (chip-single_dma  chip-hardware != CS4231_HW_INTERWAVE) {
if (status  CS4231_PLAYBACK_IRQ) {
-   if (chip-mode  CS4231_MODE_PLAY)
-   snd_pcm_period_elapsed(chip-playback_substream);
+   if (chip-mode  CS4231_MODE_PLAY) {
+   if (chip-playback_substream)
+   
snd_pcm_period_elapsed(chip-playback_substream);
+   }
if (chip-mode  CS4231_MODE_RECORD) {
-   snd_cs4231_overrange(chip);
-   snd_pcm_period_elapsed(chip-capture_substream);
+   if (chip-capture_substream) {
+   snd_cs4231_overrange(chip);
+   
snd_pcm_period_elapsed(chip-capture_substream);
+   }
}
}
} else {
-   if (status  CS4231_PLAYBACK_IRQ)
-   snd_pcm_period_elapsed(chip-playback_substream);
+   if (status  CS4231_PLAYBACK_IRQ) {
+   if (chip-playback_substream)
+   snd_pcm_period_elapsed(chip-playback_substream);
if (status  CS4231_RECORD_IRQ) {
-   snd_cs4231_overrange(chip);
-   snd_pcm_period_elapsed(chip-capture_substream);
+   if (chip-capture_substream) {
+   snd_cs4231_overrange(chip);
+   snd_pcm_period_elapsed(chip-capture_substream);
+   }
}
}
 



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-driver INSTALL,1.164,1.165

2004-05-01 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23586

Modified Files:
INSTALL 
Log Message:
- clean up module options with the new style.
- added devices option to assign multiple serial devices.
- added handshake option to enable/disable handshaking.
- reflect id to the rawmidi name.


Index: INSTALL
===
RCS file: /cvsroot/alsa/alsa-driver/INSTALL,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- INSTALL 17 Mar 2004 11:13:03 -  1.164
+++ INSTALL 1 May 2004 12:11:29 -   1.165
@@ -202,6 +202,12 @@
 adaptor- Type of adaptor.
   0 = Soundcanvas, 1 = MS-124T, 2 = MS-124W S/A,
  3 = MS-124W M/B
+devices- Number of devices assigned to the card.  Default is 1.
+ When this is more than 1, multiple serial devices (up
+ to 8) are assigned to a single card.  The number of
+ the tail of the device file name is increased for
+ each device.
+handshake  - Enable/disable handshaking (default = 1)  
 
 Module supports up to 8 cards.
 



---
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149alloc_id=8166op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-driver/drivers serialmidi.c,1.10,1.11

2004-05-01 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-driver/drivers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23586/drivers

Modified Files:
serialmidi.c 
Log Message:
- clean up module options with the new style.
- added devices option to assign multiple serial devices.
- added handshake option to enable/disable handshaking.
- reflect id to the rawmidi name.


Index: serialmidi.c
===
RCS file: /cvsroot/alsa/alsa-driver/drivers/serialmidi.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- serialmidi.c21 Jan 2004 18:24:57 -  1.10
+++ serialmidi.c1 May 2004 12:11:30 -   1.11
@@ -27,10 +27,10 @@
 #include linux/init.h
 #include linux/slab.h
 #include linux/tty.h
+#include linux/moduleparam.h
 #include asm/uaccess.h
 #include sound/core.h
 #include sound/rawmidi.h
-#define SNDRV_GET_ID
 #include sound/initval.h
 #include linux/delay.h
 
@@ -57,28 +57,35 @@
 static int speed[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 38400}; /* 
9600,19200,38400,57600,115200 */
 static int adaptor[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 
SERIAL_ADAPTOR_SOUNDCANVAS};
 static int outs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1}; /* 1 to 16 */
+static int devices[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1}; /* 1 to 8 */
+static int handshake[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1}; /* bool */
+static int boot_devs;
 
-MODULE_PARM(index, 1- __MODULE_STRING(SNDRV_CARDS) i);
+module_param_array(index, int, boot_devs, 0444);
 MODULE_PARM_DESC(index, Index value for serial device.);
 MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
-MODULE_PARM(id, 1- __MODULE_STRING(SNDRV_CARDS) s);
+module_param_array(id, charp, boot_devs, 0444);
 MODULE_PARM_DESC(id, ID string for serial device.);
 MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
-MODULE_PARM(enable, 1- __MODULE_STRING(SNDRV_CARDS) i);
+module_param_array(enable, bool, boot_devs, 0444);
 MODULE_PARM_DESC(enable, Enable serial device.);
 MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
-MODULE_PARM(sdev, 1- __MODULE_STRING(SNDRV_CARDS) s);
+module_param_array(sdev, charp, boot_devs, 0444);
 MODULE_PARM_DESC(sdev, Device file string for serial device.);
 MODULE_PARM_SYNTAX(sdev, SNDRV_ID_DESC);
-MODULE_PARM(speed, 1- __MODULE_STRING(SNDRV_CARDS) i);
+module_param_array(speed, int, boot_devs, 0444);
 MODULE_PARM_DESC(speed, Speed in bauds.);
 MODULE_PARM_SYNTAX(speed, SNDRV_ENABLED 
,allows:{9600,19200,38400,57600,115200},dialog:list);
-MODULE_PARM(adaptor, 1- __MODULE_STRING(SNDRV_CARDS) i);
+module_param_array(adaptor, int, boot_devs, 0444);
 MODULE_PARM_DESC(adaptor, Type of adaptor.);
 MODULE_PARM_SYNTAX(adaptor, SNDRV_ENABLED 
,allows:{{0=Soundcanvas,1=MS-124T,2=MS-124W S/A,3=MS-124W M/B}},dialog:list);
-MODULE_PARM(outs, 1- __MODULE_STRING(SNDRV_CARDS) i);
+module_param_array(outs, int, boot_devs, 0444);
 MODULE_PARM_DESC(outs, Number of MIDI outputs.);
 MODULE_PARM_SYNTAX(outs, SNDRV_ENABLED ,allows:{{1,16}},dialog:list);
+module_param_array(devices, int, boot_devs, 0444);
+MODULE_PARM_DESC(devices, Number of devices to attach to the card.);
+module_param_array(handshake, int, boot_devs, 0444);
+MODULE_PARM_DESC(handshake, Do handshaking.);
 
 #define SERIAL_MODE_NOT_OPENED (0)
 #define SERIAL_MODE_BIT_INPUT  (0)
@@ -89,6 +96,7 @@
 typedef struct _snd_serialmidi {
snd_card_t *card;
char *sdev; /* serial device name (e.g. /dev/ttyS0) */
+   int dev_idx;
unsigned int speed; /* speed in bauds */
unsigned int adaptor;   /* see SERIAL_ADAPTOR_ */
unsigned long mode; /* see SERIAL_MODE_* */
@@ -104,6 +112,7 @@
void (*old_write_wakeup)(struct tty_struct *);
int old_exclusive;
int old_low_latency;
+   int handshake;
unsigned char tx_buf[TX_BUF_SIZE];
 } serialmidi_t;
 
@@ -203,14 +212,16 @@
break;
}
 
-   cflag = speed | CREAD | CSIZE | CS8 | CRTSCTS | HUPCL;
-   // cflag = speed | CREAD | CSIZE | CS8 | HUPCL;
+   if (serial-handshake)
+   cflag = speed | CREAD | CSIZE | CS8 | CRTSCTS | HUPCL;
+   else
+   cflag = speed | CREAD | CSIZE | CS8 | HUPCL;
 
switch (serial-adaptor) {
case SERIAL_ADAPTOR_MS124W_SA:
case SERIAL_ADAPTOR_MS124W_MB:
case SERIAL_ADAPTOR_MS124T:
-   
+   /* TODO */
break;
}

@@ -435,11 +446,11 @@
 snd_rawmidi_t *rrawmidi;
 int err;
 
-if ((err = snd_rawmidi_new(serial-card, UART Serial MIDI, 0, serial-outs, 
1, rrawmidi))  0)
+if ((err = snd_rawmidi_new(serial-card, UART Serial MIDI, serial-dev_idx, 
serial-outs, 1, rrawmidi))  0)
 return err;
 snd_rawmidi_set_ops(rrawmidi, SNDRV_RAWMIDI_STREAM_INPUT, 
snd_serialmidi_input);
 snd_rawmidi_set_ops(rrawmidi,

[alsa-cvslog] CVS: alsa-driver/pci/ac97 Makefile,1.7,1.8

2004-04-24 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-driver/pci/ac97
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5781/pci/ac97

Modified Files:
Makefile 
Log Message:
- clean up old dependencies
- added the patch stuff for ac97_proc.c


Index: Makefile
===
RCS file: /cvsroot/alsa/alsa-driver/pci/ac97/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile24 Feb 2004 15:23:10 -  1.7
+++ Makefile24 Apr 2004 19:56:17 -  1.8
@@ -5,14 +5,12 @@
 include $(SND_TOPDIR)/toplevel.config
 include $(SND_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
-obj-$(CONFIG_SND_ATIIXP) += snd-ac97-codec.o
-obj-$(CONFIG_SND_INTEL8X0M) += snd-ac97-codec.o
-
 export-objs  := ac97_codec.o ak4531_codec.o
 
+clean-files := ac97_proc.c
+
 include $(SND_TOPDIR)/alsa-kernel/pci/ac97/Makefile
 
 include $(SND_TOPDIR)/Rules.make
+
+ac97_proc.c: ac97_proc.patch $(SND_TOPDIR)/alsa-kernel/pci/ac97/ac97_proc.c



---
This SF.net email is sponsored by: The Robotic Monkeys at ThinkGeek
For a limited time only, get FREE Ground shipping on all orders of $35
or more. Hurry up and shop folks, this offer expires April 30th!
http://www.thinkgeek.com/freeshipping/?cpg=12297
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/ppc keywest.c,1.16,1.17 pmac.h,1.13,1.14 powermac.c,1.16,1.17 tumbler.c,1.29,1.30

2004-04-23 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/ppc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16927

Modified Files:
keywest.c pmac.h powermac.c tumbler.c 
Log Message:
fixed the oops on resume and the initialization of chip.


Index: keywest.c
===
RCS file: /cvsroot/alsa/alsa-kernel/ppc/keywest.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- keywest.c   25 Sep 2003 18:55:43 -  1.16
+++ keywest.c   23 Apr 2004 14:18:25 -  1.17
@@ -79,12 +79,7 @@
 
new_client-id = keywest_ctx-id++; /* Automatically unique */
keywest_ctx-client = new_client;
-
-   if ((err = keywest_ctx-init_client(keywest_ctx))  0) {
-   snd_printk(KERN_ERR tumbler: cannot initialize the MCS\n);
-   goto __err;
-   }
-
+   
/* Tell the i2c layer a new client has arrived */
if (i2c_attach_client(new_client)) {
snd_printk(KERN_ERR tumbler: cannot attach i2c client\n);
@@ -121,6 +116,17 @@
}
 }
 
+int __init snd_pmac_tumbler_post_init(void)
+{
+   int err;
+   
+   if ((err = keywest_ctx-init_client(keywest_ctx))  0) {
+   snd_printk(KERN_ERR tumbler: %i :cannot initialize the MCS\n, err);
+   return err;
+   }
+   return 0;
+}
+
 /* exported */
 int __init snd_pmac_keywest_init(pmac_keywest_t *i2c)
 {

Index: pmac.h
===
RCS file: /cvsroot/alsa/alsa-kernel/ppc/pmac.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pmac.h  15 Apr 2004 16:23:18 -  1.13
+++ pmac.h  23 Apr 2004 14:18:25 -  1.14
@@ -179,6 +179,7 @@
 int snd_pmac_burgundy_init(pmac_t *chip);
 int snd_pmac_daca_init(pmac_t *chip);
 int snd_pmac_tumbler_init(pmac_t *chip);
+int snd_pmac_tumbler_post_init(void);
 
 /* i2c functions */
 typedef struct snd_pmac_keywest {

Index: powermac.c
===
RCS file: /cvsroot/alsa/alsa-kernel/ppc/powermac.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- powermac.c  7 Apr 2004 17:48:22 -   1.16
+++ powermac.c  23 Apr 2004 14:18:25 -  1.17
@@ -104,7 +104,7 @@
sprintf(card-shortname, PowerMac %s, name_ext);
sprintf(card-longname, %s (Dev %d) Sub-frame %d,
card-shortname, chip-device_id, chip-subframe);
-   if ((err = snd_pmac_tumbler_init(chip))  0)
+   if ( snd_pmac_tumbler_init(chip)  0 || snd_pmac_tumbler_post_init()  
0)
goto __error;
break;
case PMAC_AWACS:

Index: tumbler.c
===
RCS file: /cvsroot/alsa/alsa-kernel/ppc/tumbler.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- tumbler.c   9 Mar 2004 16:58:22 -   1.29
+++ tumbler.c   23 Apr 2004 14:18:25 -  1.30
@@ -684,6 +684,8 @@
 
 static int snapper_set_capture_source(pmac_tumbler_t *mix)
 {
+   if (! mix-i2c.client)
+   return -ENODEV;
return snd_pmac_keywest_write_byte(mix-i2c, TAS_REG_ACS,
   mix-capture_source ? 2 : 0);
 }



---
This SF.net email is sponsored by: The Robotic Monkeys at ThinkGeek
For a limited time only, get FREE Ground shipping on all orders of $35
or more. Hurry up and shop folks, this offer expires April 30th!
http://www.thinkgeek.com/freeshipping/?cpg=12297
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci/ac97 ac97_patch.c,1.47,1.48

2004-04-23 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27991/pci/ac97

Modified Files:
ac97_patch.c 
Log Message:
fixed the compilation without CONFIG_SND_DEBUG.


Index: ac97_patch.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_patch.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ac97_patch.c21 Apr 2004 18:50:52 -  1.47
+++ ac97_patch.c23 Apr 2004 15:05:27 -  1.48
@@ -472,8 +472,8 @@
 
/* Gateway M675 notebook */
if (ac97-pci  
-   ac97-pci-subsystem_vendor == 0x107b 
-   ac97-pci-subsystem_device == 0x0601)
+   ac97-subsystem_vendor == 0x107b 
+   ac97-subsystem_device == 0x0601)
pregs = m675_regs;
 
// patch for SigmaTel



---
This SF.net email is sponsored by: The Robotic Monkeys at ThinkGeek
For a limited time only, get FREE Ground shipping on all orders of $35
or more. Hurry up and shop folks, this offer expires April 30th!
http://www.thinkgeek.com/freeshipping/?cpg=12297
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci Kconfig,1.26,1.27 atiixp.c,1.6,1.7

2004-04-23 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28575/pci

Modified Files:
Kconfig atiixp.c 
Log Message:
- added IXP 300 to descriptions and comments.
- fixed the codec probing without the proper interrupts.
- added the experimental PM support.


Index: Kconfig
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/Kconfig,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Kconfig 13 Apr 2004 15:26:27 -  1.26
+++ Kconfig 23 Apr 2004 15:07:54 -  1.27
@@ -16,11 +16,11 @@
  Say 'Y' or 'M' to include support for ALI PCI Audio M5451 sound core.
 
 config SND_ATIIXP
-   tristate ATI IXP 150/200/250
+   tristate ATI IXP 150/200/250/300
depends on SND
select SND_AC97_CODEC
help
- Say 'Y' or 'M' to include support for ATI IXP 150/200/250 AC97 controller.
+ Say 'Y' or 'M' to include support for ATI IXP 150/200/250/300 AC97 
controller.
 
 config SND_AU8810
 tristate Aureal Advantage

Index: atiixp.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/atiixp.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- atiixp.c16 Apr 2004 14:48:14 -  1.6
+++ atiixp.c23 Apr 2004 15:07:54 -  1.7
@@ -38,7 +38,7 @@
 MODULE_DESCRIPTION(ATI IXP AC97 controller);
 MODULE_LICENSE(GPL);
 MODULE_CLASSES({sound});
-MODULE_DEVICES({{ATI,IXP150/200/250}});
+MODULE_DEVICES({{ATI,IXP150/200/250/300}});
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;  /* ID for this card */
@@ -273,6 +273,7 @@
 
atiixp_dma_t dmas[3];   /* playback, capture, spdif */
struct ac97_pcm *pcms[3];   /* playback, capture, spdif */
+   snd_pcm_t *pcmdevs[2];  /* PCM devices: analog i/o, spdif */
 
int max_channels;   /* max. channels for PCM out */
 
@@ -280,6 +281,10 @@
 
int spdif_over_aclink;  /* passed from the module option */
struct semaphore open_mutex;/* playback open mutex */
+
+#ifdef CONFIG_PM
+   u32 pci_state[16];
+#endif
 };
 
 
@@ -535,12 +540,10 @@
return 0;
 }
 
-#if 0 /* for P/M */
+#ifdef CONFIG_PM
 static int snd_atiixp_aclink_down(atiixp_t *chip)
 {
-   unsigned long flags;
-
-   if (atiixp_read(chip, MODEM_MIRROR)  ATI_REG_MODEM_MIRROR_RUNNING)
+   if (atiixp_read(chip, MODEM_MIRROR)  0x1) /* modem running, too? */
return -EBUSY;
atiixp_update(chip, CMD,
 ATI_REG_CMD_POWERDOWN | ATI_REG_CMD_AC_RESET,
@@ -1255,6 +1258,7 @@
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, snd_atiixp_capture_ops);
pcm-private_data = chip;
strcpy(pcm-name, ATI IXP AC97);
+   chip-pcmdevs[0] = pcm;
 
snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
  snd_dma_pci_data(chip-pci), 64*1024, 
128*1024);
@@ -1274,6 +1278,7 @@
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, snd_atiixp_spdif_ops);
pcm-private_data = chip;
strcpy(pcm-name, ATI IXP IEC958);
+   chip-pcmdevs[1] = pcm;
 
snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
  snd_dma_pci_data(chip-pci), 64*1024, 
128*1024);
@@ -1344,6 +1349,7 @@
ac97_bus_t bus, *pbus;
ac97_t ac97;
int i, err;
+   int codec_count;
static unsigned int codec_skip[3] = {
ATI_REG_ISR_CODEC0_NOT_READY,
ATI_REG_ISR_CODEC1_NOT_READY,
@@ -1362,6 +1368,7 @@
return err;
chip-ac97_bus = pbus;
 
+   codec_count = 0;
for (i = 0; i  3; i++) {
if (chip-codec_not_ready_bits  codec_skip[i])
continue;
@@ -1369,8 +1376,25 @@
ac97.private_data = chip;
ac97.pci = chip-pci;
ac97.num = i;
-   if ((err = snd_ac97_mixer(pbus, ac97, chip-ac97[i]))  0)
-   return err;
+   if ((err = snd_ac97_mixer(pbus, ac97, chip-ac97[i]))  0) {
+   if (chip-codec_not_ready_bits)
+   /* codec(s) was detected but not available.
+* return the error
+*/
+   return err;
+   else {
+   /* codec(s) was NOT detected, so just ignore here */
+   chip-ac97[i] = NULL; /* to be sure */
+   snd_printd(atiixp: codec %d not found\n, i);
+   continue;
+   }
+   }
+   codec_count++;
+   }
+
+   if (!

[alsa-cvslog] CVS: alsa-kernel/pci via82xx.c,1.96,1.97

2004-04-23 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28649/pci

Modified Files:
via82xx.c 
Log Message:
- added the experimental PM support.


Index: via82xx.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/via82xx.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- via82xx.c   13 Apr 2004 14:59:00 -  1.96
+++ via82xx.c   23 Apr 2004 15:08:11 -  1.97
@@ -369,6 +369,14 @@
 
unsigned char old_legacy;
unsigned char old_legacy_cfg;
+#ifdef CONFIG_PM
+   unsigned char legacy_saved;
+   unsigned char legacy_cfg_saved;
+   unsigned char spdif_ctrl_saved;
+   unsigned char capture_src_saved[2];
+   unsigned int mpu_port_saved;
+   u32 pci_state[16];
+#endif
 
unsigned char playback_volume[4][2]; /* for VIA8233/C/8235; default = 0 */
 
@@ -385,6 +393,7 @@
unsigned int no_vra: 1; /* no need to set VRA on DXS channels */
unsigned int spdif_on: 1;   /* only spdif rates work to external DACs */
 
+   snd_pcm_t *pcms[2];
snd_rawmidi_t *rmidi;
 
ac97_bus_t *ac97_bus;
@@ -1290,6 +1299,7 @@
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, snd_via8233_capture_ops);
pcm-private_data = chip;
strcpy(pcm-name, chip-card-shortname);
+   chip-pcms[0] = pcm;
/* set up playbacks */
for (i = 0; i  4; i++)
init_viadev(chip, i, 0x10 * i, 0);
@@ -1308,6 +1318,7 @@
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, snd_via8233_capture_ops);
pcm-private_data = chip;
strcpy(pcm-name, chip-card-shortname);
+   chip-pcms[1] = pcm;
/* set up playback */
init_viadev(chip, chip-multi_devno, VIA_REG_MULTPLAY_STATUS, 0);
/* set up capture */
@@ -1342,6 +1353,7 @@
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, snd_via8233_capture_ops);
pcm-private_data = chip;
strcpy(pcm-name, chip-card-shortname);
+   chip-pcms[0] = pcm;
/* set up playback */
init_viadev(chip, chip-multi_devno, VIA_REG_MULTPLAY_STATUS, 0);
/* capture */
@@ -1358,6 +1370,7 @@
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, snd_via8233_playback_ops);
pcm-private_data = chip;
strcpy(pcm-name, chip-card-shortname);
+   chip-pcms[1] = pcm;
/* set up playback */
init_viadev(chip, chip-playback_devno, 0x30, 0);
 
@@ -1388,6 +1401,7 @@
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, snd_via686_capture_ops);
pcm-private_data = chip;
strcpy(pcm-name, chip-card-shortname);
+   chip-pcms[0] = pcm;
init_viadev(chip, 0, VIA_REG_PLAYBACK_STATUS, 0);
init_viadev(chip, 1, VIA_REG_CAPTURE_STATUS, 1);
 
@@ -1674,6 +1688,9 @@
if (mpu_port[dev] = 0x200) {   /* force MIDI */
mpu_port[dev] = 0xfffc;
pci_write_config_dword(chip-pci, 0x18, mpu_port[dev] | 0x01);
+#ifdef CONFIG_PM
+   chip-mpu_port_saved = mpu_port[dev];
+#endif
} else {
mpu_port[dev] = pci_resource_start(chip-pci, 2);
}
@@ -1732,6 +1749,11 @@
gameport_register_port(chip-gameport);
 #endif
 
+#ifdef CONFIG_PM
+   chip-legacy_saved = legacy;
+   chip-legacy_cfg_saved = legacy_cfg;
+#endif
+
return 0;
 }
 
@@ -1872,6 +1894,74 @@
return 0;
 }
 
+#ifdef CONFIG_PM
+/*
+ * power management
+ */
+static int snd_via82xx_suspend(snd_card_t *card, unsigned int state)
+{
+   via82xx_t *chip = snd_magic_cast(via82xx_t, card-pm_private_data, return 
-EINVAL);
+   int i;
+
+   for (i = 0; i  2; i++)
+   if (chip-pcms[i])
+   snd_pcm_suspend_all(chip-pcms[i]);
+   for (i = 0; i  chip-num_devs; i++)
+   snd_via82xx_channel_reset(chip, chip-devs[i]);
+   synchronize_irq(chip-irq);
+   snd_ac97_suspend(chip-ac97);
+
+   /* save misc values */
+   if (chip-chip_type != TYPE_VIA686) {
+   pci_read_config_byte(chip-pci, VIA8233_SPDIF_CTRL, 
chip-spdif_ctrl_saved);
+   chip-capture_src_saved[0] = inb(chip-port + VIA_REG_CAPTURE_CHANNEL);
+   chip-capture_src_saved[1] = inb(chip-port + VIA_REG_CAPTURE_CHANNEL 
+ 0x10);
+   }
+
+   pci_save_state(chip-pci, chip-pci_state);
+   pci_set_power_state(chip-pci, 3);
+   pci_disable_device(chip-pci);
+   snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
+   return 0;
+}
+
+static int snd_via82xx_resume(snd_card_t *card, unsigned int state)
+{
+   via82xx_t *chip = snd_magic_cast(via82xx_t, card-pm_private_data, return 
-EINVAL);
+   int idx, i;
+
+   pci_enable_device(chip-pci);
+   pci_restore_state(chip-pci, chip-pci_state);
+   pci_set_power_state(chip-pci, 0);
+
+

[alsa-cvslog] CVS: alsa-driver/pci/ac97 ac97_proc.patch,NONE,1.1 .cvsignore,1.2,1.3 ac97_proc.c,1.1,NONE

2004-04-20 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-driver/pci/ac97
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26173

Modified Files:
.cvsignore 
Added Files:
ac97_proc.patch 
Removed Files:
ac97_proc.c 
Log Message:
make ac97_proc.patch for disabling register write code for 2.2 kernels.
(2.2 kernels don't have sscanf).



--- NEW FILE: ac97_proc.patch ---
--- ac97_proc.c 2004-04-16 20:16:21.0 +0200
+++ ac97_proc.c 2004-04-20 12:09:36.014644842 +0200
@@ -1,3 +1,4 @@
+#define __NO_VERSION__
 /*
  *  Copyright (c) by Jaroslav Kysela [EMAIL PROTECTED]
  *  Universal interface for Audio Codec '97
@@ -27,8 +28,8 @@
 #include sound/core.h
 #include sound/ac97_codec.h
 #include sound/asoundef.h
-#include ac97_local.h
-#include ac97_id.h
+#include ../../alsa-kernel/pci/ac97/ac97_local.h
+#include ../../alsa-kernel/pci/ac97/ac97_id.h
 
 /*
  * proc interface
@@ -321,6 +322,7 @@
}
 }
 
+#if LINUX_VERSION_CODE = KERNEL_VERSION(2, 4, 0)
 #ifdef CONFIG_SND_DEBUG
 /* direct register write for debugging */
 static void snd_ac97_proc_regs_write(snd_info_entry_t *entry, snd_info_buffer_t 
*buffer)
@@ -337,6 +339,7 @@
}
 }
 #endif
+#endif
 
 static void snd_ac97_proc_regs_read_main(ac97_t *ac97, snd_info_buffer_t * buffer, 
int subidx)
 {
@@ -393,11 +396,13 @@
sprintf(name, %s#%d-%d+regs, prefix, ac97-addr, ac97-num);
if ((entry = snd_info_create_card_entry(ac97-bus-card, name, 
ac97-bus-proc)) != NULL) {
snd_info_set_text_ops(entry, ac97, 1024, snd_ac97_proc_regs_read);
+#if LINUX_VERSION_CODE = KERNEL_VERSION(2, 4, 0)
 #ifdef CONFIG_SND_DEBUG
entry-mode |= S_IWUSR;
entry-c.text.write_size = 1024;
entry-c.text.write = snd_ac97_proc_regs_write;
 #endif
+#endif
if (snd_info_register(entry)  0) {
snd_info_free_entry(entry);
entry = NULL;

Index: .cvsignore
===
RCS file: /cvsroot/alsa/alsa-driver/pci/ac97/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore  10 Nov 2003 17:32:40 -  1.2
+++ .cvsignore  20 Apr 2004 10:32:41 -  1.3
@@ -1,4 +1,5 @@
 .depend
+ac97_proc.c
 .*.cmd
 *.ko
 *.mod.c

--- ac97_proc.c DELETED ---



---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci atiixp.c,1.5,1.6

2004-04-16 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17338

Modified Files:
atiixp.c 
Log Message:
- added the PCI id entry for SB300.
- added the missing terminator to the PCI id list.


Index: atiixp.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/atiixp.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- atiixp.c13 Apr 2004 14:59:00 -  1.5
+++ atiixp.c16 Apr 2004 14:48:14 -  1.6
@@ -286,7 +286,9 @@
 /*
  */
 static struct pci_device_id snd_atiixp_ids[] = {
-   { 0x1002, 0x4341, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+   { 0x1002, 0x4341, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SB200 */
+   { 0x1002, 0x4361, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SB300 */
+   { 0, }
 };
 
 MODULE_DEVICE_TABLE(pci, snd_atiixp_ids);



---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/pci/ac97 ac97_patch.c,1.44,1.45

2004-04-16 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1747

Modified Files:
ac97_patch.c 
Log Message:
added the mic/center sharing switch of cm9739 codec again.


Index: ac97_patch.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_patch.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ac97_patch.c16 Apr 2004 15:01:08 -  1.44
+++ ac97_patch.c16 Apr 2004 18:25:15 -  1.45
@@ -1362,8 +1362,34 @@
/* BIT 8: SPD32 - 32bit SPDIF - not supported yet */
 };
 
+static int snd_ac97_cm9739_center_mic_get(snd_kcontrol_t * kcontrol, 
snd_ctl_elem_value_t * ucontrol)
+{
+   ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
+   if (ac97-regs[AC97_CM9739_MULTI_CHAN]  0x1000)
+   ucontrol-value.integer.value[0] = 1;
+   else
+   ucontrol-value.integer.value[0] = 0;
+   return 0;
+}
+
+static int snd_ac97_cm9739_center_mic_put(snd_kcontrol_t * kcontrol, 
snd_ctl_elem_value_t * ucontrol)
+{
+   ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
+   return snd_ac97_update_bits(ac97, AC97_CM9739_MULTI_CHAN, 0x3000,
+   ucontrol-value.integer.value[0] ? 
+   0x1000 : 0x2000);
+}
+
 static const snd_kcontrol_new_t snd_ac97_cm9739_controls[] = {
AC97_SINGLE(Line-In As Surround, AC97_CM9739_MULTI_CHAN, 10, 1, 0),
+   {
+   .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+   .name = Mic As Center/LFE,
+   .info = snd_ac97_info_single,
+   .get = snd_ac97_cm9739_center_mic_get,
+   .put = snd_ac97_cm9739_center_mic_put,
+   .private_value = AC97_SINGLE_VALUE(0, 0, 1, 0) /* only mask needed */
+   },
 };
 
 static int patch_cm9739_specific(ac97_t * ac97)
@@ -1398,10 +1424,13 @@
}
 
/* set-up multi channel */
-   /* bit 13: enable internal vref output for mic */
-   /* bit 12: enable center/lfe */
/* bit 14: 0 = SPDIF, 1 = EAPD */
-   val = (1  12) | (1  13);
+   /* bit 13: enable internal vref output for mic */
+   /* bit 12: disable center/lfe (swithable) */
+   /* bit 10: disable surround/line (switchable) */
+   /* bit 9: mix 2 surround off */
+   /* bit 0: dB */
+   val = (1  13);
if (! (ac97-ext_id  AC97_EI_SPDIF))
val |= (1  14);
snd_ac97_write_cache(ac97, AC97_CM9739_MULTI_CHAN, val);



---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/core pcm_native.c,1.87,1.88

2004-04-15 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32337

Modified Files:
pcm_native.c 
Log Message:
fixed the deadlock of power_lock in suspend (by Terry Loftin)


Index: pcm_native.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/pcm_native.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- pcm_native.c26 Jan 2004 15:35:19 -  1.87
+++ pcm_native.c15 Apr 2004 09:16:13 -  1.88
@@ -1038,7 +1038,7 @@
 
snd_power_lock(card);
if ((res = snd_power_wait(card, SNDRV_CTL_POWER_D0, substream-ffile)) = 0)
-   return snd_pcm_action_lock_irq(snd_pcm_action_resume, substream, 0, 
0);
+   res = snd_pcm_action_lock_irq(snd_pcm_action_resume, substream, 0, 0);
snd_power_unlock(card);
return res;
 }



---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-lib/src/pcm pcm.c,1.282,1.283 pcm_hw.c,1.124,1.125 pcm_local.h,1.133,1.134

2004-04-15 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3952/src/pcm

Modified Files:
pcm.c pcm_hw.c pcm_local.h 
Log Message:
fixed the handling of EINTR in read/write.
EINTR can be returned during ACPI suspend/resume.


Index: pcm.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm.c,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -r1.282 -r1.283
--- pcm.c   5 Apr 2004 17:59:34 -   1.282
+++ pcm.c   15 Apr 2004 12:22:26 -  1.283
@@ -6066,7 +6066,7 @@
xfer += frames;
}
  _end:
-   return xfer  0 ? (snd_pcm_sframes_t) xfer : err;
+   return xfer  0 ? (snd_pcm_sframes_t) xfer : snd_pcm_check_error(pcm, err);
 }
 
 snd_pcm_sframes_t snd_pcm_write_areas(snd_pcm_t *pcm, const snd_pcm_channel_area_t 
*areas,
@@ -6149,7 +6149,7 @@
}
}
  _end:
-   return xfer  0 ? (snd_pcm_sframes_t) xfer : err;
+   return xfer  0 ? (snd_pcm_sframes_t) xfer : snd_pcm_check_error(pcm, err);
 }
 
 snd_pcm_uframes_t _snd_pcm_mmap_hw_ptr(snd_pcm_t *pcm)

Index: pcm_hw.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_hw.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- pcm_hw.c17 Mar 2004 11:48:15 -  1.124
+++ pcm_hw.c15 Apr 2004 12:22:26 -  1.125
@@ -612,7 +612,7 @@
fprintf(stderr, hw_writei: frames = %li, result = %i, result = %li\n, size, 
result, xferi.result);
 #endif
if (result  0)
-   return err;
+   return snd_pcm_check_error(pcm, err);
return xferi.result;
 }
 
@@ -630,7 +630,7 @@
fprintf(stderr, hw_writen: frames = %li, result = %i, result = %li\n, size, 
result, xfern.result);
 #endif
if (result  0)
-   return err;
+   return snd_pcm_check_error(pcm, err);
return xfern.result;
 }
 
@@ -648,7 +648,7 @@
fprintf(stderr, hw_readi: frames = %li, result = %i, result = %li\n, size, 
result, xferi.result);
 #endif
if (result  0)
-   return err;
+   return snd_pcm_check_error(pcm, err);
UPDATE_SHADOW_PTR(hw);
return xferi.result;
 }
@@ -667,7 +667,7 @@
fprintf(stderr, hw_readn: frames = %li, result = %i, result = %li\n, size, 
result, xfern.result);
 #endif
if (result  0)
-   return err;
+   return snd_pcm_check_error(pcm, err);
UPDATE_SHADOW_PTR(hw);
return xfern.result;
 }

Index: pcm_local.h
===
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_local.h,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- pcm_local.h 17 Mar 2004 11:48:15 -  1.133
+++ pcm_local.h 15 Apr 2004 12:22:27 -  1.134
@@ -265,6 +265,22 @@
 int snd_pcm_channel_info_shm(snd_pcm_t *pcm, snd_pcm_channel_info_t *info, int shmid);
 int _snd_pcm_poll_descriptor(snd_pcm_t *pcm);
 
+/* handle special error cases */
+static inline int snd_pcm_check_error(snd_pcm_t *pcm, int err)
+{
+   if (err == -EINTR) {
+   switch (snd_pcm_state(pcm)) {
+   case SND_PCM_STATE_XRUN:
+   return -EPIPE;
+   case SND_PCM_STATE_SUSPENDED:
+   return -ESTRPIPE;
+   case SND_PCM_STATE_DISCONNECTED:
+   return -ENOTTY;
+   }
+   }
+   return err;
+}
+
 static inline snd_pcm_uframes_t snd_pcm_mmap_playback_avail(snd_pcm_t *pcm)
 {
snd_pcm_sframes_t avail;



---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-lib/src/pcm pcm.c,1.283,1.284 pcm_local.h,1.134,1.135 pcm_misc.c,1.39,1.40

2004-04-15 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9382/src/pcm

Modified Files:
pcm.c pcm_local.h pcm_misc.c 
Log Message:
fixed compile warnings.


Index: pcm.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm.c,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- pcm.c   15 Apr 2004 12:22:26 -  1.283
+++ pcm.c   15 Apr 2004 12:52:51 -  1.284
@@ -2168,9 +2168,10 @@
silence = snd_pcm_format_silence_64(format);
if (dst_area-step == (unsigned int) width) {
unsigned int dwords = samples * width / 64;
+   u_int64_t *dstp = (u_int64_t *)dst;
samples -= dwords * 64 / width;
while (dwords--  0)
-   *((u_int64_t*)dst)++ = silence;
+   *dstp++ = silence;
if (samples == 0)
return 0;
}

Index: pcm_local.h
===
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_local.h,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- pcm_local.h 15 Apr 2004 12:22:27 -  1.134
+++ pcm_local.h 15 Apr 2004 12:52:58 -  1.135
@@ -276,6 +276,8 @@
return -ESTRPIPE;
case SND_PCM_STATE_DISCONNECTED:
return -ENOTTY;
+   default:
+   break;
}
}
return err;

Index: pcm_misc.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_misc.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- pcm_misc.c  18 Dec 2002 12:03:28 -  1.39
+++ pcm_misc.c  15 Apr 2004 12:52:58 -  1.40
@@ -564,28 +564,30 @@
}
case 16: {
u_int16_t silence = snd_pcm_format_silence_64(format);
+   u_int16_t *pdata = (u_int16_t *)data;
if (! silence)
memset(data, 0, samples * 2);
else {
while (samples--  0)
-   *((u_int16_t *)data)++ = silence;
+   *pdata++ = silence;
}
break;
}
case 24: {
u_int32_t silence = snd_pcm_format_silence_64(format);
+   u_int8_t *pdata = (u_int8_t *)data;
if (! silence)
memset(data, 0, samples * 3);
else {
while (samples--  0) {
 #ifdef SNDRV_LITTLE_ENDIAN
-   *((u_int8_t *)data)++ = silence  0;
-   *((u_int8_t *)data)++ = silence  8;
-   *((u_int8_t *)data)++ = silence  16;
+   *pdata++ = silence  0;
+   *pdata++ = silence  8;
+   *pdata++ = silence  16;
 #else
-   *((u_int8_t *)data)++ = silence  16;
-   *((u_int8_t *)data)++ = silence  8;
-   *((u_int8_t *)data)++ = silence  0;
+   *pdata++ = silence  16;
+   *pdata++ = silence  8;
+   *pdata++ = silence  0;
 #endif
}
}
@@ -593,21 +595,23 @@
}
case 32: {
u_int32_t silence = snd_pcm_format_silence_64(format);
+   u_int32_t *pdata = (u_int32_t *)data;
if (! silence)
memset(data, 0, samples * 4);
else {
while (samples--  0)
-   *((u_int32_t *)data)++ = silence;
+   *pdata++ = silence;
}
break;
}
case 64: {
u_int64_t silence = snd_pcm_format_silence_64(format);
+   u_int64_t *pdata = (u_int64_t *)data;
if (! silence)
memset(data, 0, samples * 8);
else {
while (samples--  0)
-   *((u_int64_t *)data)++ = silence;
+   *pdata++ = silence;
}
break;
}



---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-lib/src/mixer simple.c,1.62,1.63

2004-04-15 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-lib/src/mixer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9382/src/mixer

Modified Files:
simple.c 
Log Message:
fixed compile warnings.


Index: simple.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/mixer/simple.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- simple.c14 Mar 2004 18:39:58 -  1.62
+++ simple.c15 Apr 2004 12:52:49 -  1.63
@@ -1105,7 +1105,7 @@
  * \return 0 on success otherwise a negative error code
  */
 int snd_mixer_selem_register(snd_mixer_t *mixer, struct
-snd_mixer_selem_regopt *options,
+snd_mixer_selem_regopt *options ATTRIBUTE_UNUSED,
 snd_mixer_class_t **classp)
 {
snd_mixer_class_t *class = calloc(1, sizeof(*class));



---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

[alsa-cvslog] CVS: alsa-kernel/core/seq/oss seq_oss_synth.h,1.2,1.3

2004-04-15 Thread Takashi Iwai

Update of /cvsroot/alsa/alsa-kernel/core/seq/oss
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11001/core/seq/oss

Modified Files:
seq_oss_synth.h 
Log Message:
added the missing __user to prorotype.


Index: seq_oss_synth.h
===
RCS file: /cvsroot/alsa/alsa-kernel/core/seq/oss/seq_oss_synth.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- seq_oss_synth.h 30 Dec 2001 09:26:45 -  1.2
+++ seq_oss_synth.h 15 Apr 2004 13:03:16 -  1.3
@@ -37,7 +37,7 @@
 void snd_seq_oss_synth_cleanup(seq_oss_devinfo_t *dp);
 
 void snd_seq_oss_synth_reset(seq_oss_devinfo_t *dp, int dev);
-int snd_seq_oss_synth_load_patch(seq_oss_devinfo_t *dp, int dev, int fmt, const char 
*buf, int p, int c);
+int snd_seq_oss_synth_load_patch(seq_oss_devinfo_t *dp, int dev, int fmt, const char 
__user *buf, int p, int c);
 int snd_seq_oss_synth_is_valid(seq_oss_devinfo_t *dp, int dev);
 int snd_seq_oss_synth_sysex(seq_oss_devinfo_t *dp, int dev, unsigned char *buf, 
snd_seq_event_t *ev);
 int snd_seq_oss_synth_addr(seq_oss_devinfo_t *dp, int dev, snd_seq_event_t *ev);



---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 1555 matches

Mail list logo