[alsa-cvslog] CVS: alsa-kernel/core/seq seq_lock.c,1.7,1.8

2003-09-30 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/core/seq
In directory sc8-pr-cvs1:/tmp/cvs-serv13340/core/seq

Modified Files:
seq_lock.c 
Log Message:
Revised schedule() and set_current_state() calls.
Replaced need_resched() with cond_resched() call.


Index: seq_lock.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/seq/seq_lock.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- seq_lock.c  2 Dec 2002 15:11:45 -   1.7
+++ seq_lock.c  30 Sep 2003 09:28:26 -  1.8
@@ -25,44 +25,6 @@
 
 #if defined(CONFIG_SMP) || defined(CONFIG_SND_DEBUG)
 
-#if 0 /* NOT USED */
-/* (interruptible) sleep_on during the specified spinlock */
-void snd_seq_sleep_in_lock(wait_queue_head_t *p, spinlock_t *lock)
-{
-   wait_queue_t wait;
-
-   set_current_state(TASK_INTERRUPTIBLE);
-   init_waitqueue_entry(wait, current);
-
-   add_wait_queue(p, wait);
-
-   spin_unlock(lock);
-   schedule();
-   spin_lock_irq(lock);
-
-   remove_wait_queue(p, wait);
-}
-
-/* (interruptible) sleep_on with timeout during the specified spinlock */
-long snd_seq_sleep_timeout_in_lock(wait_queue_head_t *p, spinlock_t *lock, long 
timeout)
-{
-   wait_queue_t wait;
-
-   set_current_state(TASK_INTERRUPTIBLE);
-   init_waitqueue_entry(wait, current);
-
-   add_wait_queue(p, wait);
-
-   spin_unlock(lock);
-   timeout = schedule_timeout(timeout);
-   spin_lock_irq(lock);
-
-   remove_wait_queue(p, wait);
-
-   return timeout;
-}
-#endif /* NOT USED */
-
 /* wait until all locks are released */
 void snd_use_lock_sync_helper(snd_use_lock_t *lockp, const char *file, int line)
 {



---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/core control.c,1.37,1.38 hwdep.c,1.21,1.22 init.c,1.38,1.39 pcm_lib.c,1.43,1.44 pcm_native.c,1.81,1.82 rawmidi.c,1.37,1.38 timer.c,1.46,1.47

2003-09-30 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1:/tmp/cvs-serv13340/core

Modified Files:
control.c hwdep.c init.c pcm_lib.c pcm_native.c rawmidi.c 
timer.c 
Log Message:
Revised schedule() and set_current_state() calls.
Replaced need_resched() with cond_resched() call.


Index: control.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/control.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- control.c   25 Sep 2003 18:55:42 -  1.37
+++ control.c   30 Sep 2003 09:28:26 -  1.38
@@ -822,10 +822,9 @@
}
init_waitqueue_entry(wait, current);
add_wait_queue(ctl-change_sleep, wait);
-   spin_unlock_irq(ctl-read_lock);
set_current_state(TASK_INTERRUPTIBLE);
+   spin_unlock_irq(ctl-read_lock);
schedule();
-   set_current_state(TASK_RUNNING);
remove_wait_queue(ctl-change_sleep, wait);
if (signal_pending(current))
return result  0 ? result : -ERESTARTSYS;

Index: hwdep.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/hwdep.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- hwdep.c 25 Sep 2003 18:55:42 -  1.21
+++ hwdep.c 30 Sep 2003 09:28:26 -  1.22
@@ -129,13 +129,14 @@
} else
break;
set_current_state(TASK_INTERRUPTIBLE);
+   up(hw-open_mutex);
schedule();
+   down(hw-open_mutex);
if (signal_pending(current)) {
err = -ERESTARTSYS;
break;
}
}
-   set_current_state(TASK_RUNNING);
remove_wait_queue(hw-open_wait, wait);
if (err = 0) {
err = snd_card_file_add(hw-card, file);

Index: init.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/init.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- init.c  6 Jun 2003 09:21:49 -   1.38
+++ init.c  30 Sep 2003 09:28:26 -  1.39
@@ -697,8 +697,8 @@
}
if (file  (file-f_flags  O_NONBLOCK))
return -EAGAIN;
-   snd_power_unlock(card);
set_current_state(TASK_UNINTERRUPTIBLE);
+   snd_power_unlock(card);
schedule_timeout(30 * HZ);
snd_power_lock(card);
}

Index: pcm_lib.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/pcm_lib.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- pcm_lib.c   22 Jul 2003 18:43:18 -  1.43
+++ pcm_lib.c   30 Sep 2003 09:28:26 -  1.44
@@ -2106,11 +2106,11 @@
init_waitqueue_entry(wait, current);
add_wait_queue(runtime-sleep, wait);
while (1) {
-   set_current_state(TASK_INTERRUPTIBLE);
if (signal_pending(current)) {
state = SIGNALED;
break;
}
+   set_current_state(TASK_INTERRUPTIBLE);
snd_pcm_stream_unlock_irq(substream);
tout = schedule_timeout(10 * HZ);
snd_pcm_stream_lock_irq(substream);
@@ -2139,7 +2139,6 @@
}
}
   _end_loop:
-   set_current_state(TASK_RUNNING);
remove_wait_queue(runtime-sleep, wait);
 
switch (state) {
@@ -2401,11 +2400,11 @@
init_waitqueue_entry(wait, current);
add_wait_queue(runtime-sleep, wait);
while (1) {
-   set_current_state(TASK_INTERRUPTIBLE);
if (signal_pending(current)) {
state = SIGNALED;
break;
}
+   set_current_state(TASK_INTERRUPTIBLE);
snd_pcm_stream_unlock_irq(substream);
tout = schedule_timeout(10 * HZ);
snd_pcm_stream_lock_irq(substream);
@@ -2435,7 +2434,6 @@
}
}
   _end_loop:
-   

[alsa-cvslog] CVS: alsa-kernel/include rawmidi.h,1.10,1.11

2003-09-30 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1:/tmp/cvs-serv13340/include

Modified Files:
rawmidi.h 
Log Message:
Revised schedule() and set_current_state() calls.
Replaced need_resched() with cond_resched() call.


Index: rawmidi.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/rawmidi.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rawmidi.h   29 Nov 2002 21:22:24 -  1.10
+++ rawmidi.h   30 Sep 2003 09:28:27 -  1.11
@@ -46,6 +46,7 @@
 #define SNDRV_RAWMIDI_LFLG_INPUT   (11)
 #define SNDRV_RAWMIDI_LFLG_OPEN(30)
 #define SNDRV_RAWMIDI_LFLG_APPEND  (12)
+#defineSNDRV_RAWMIDI_LFLG_NOOPENLOCK   (13)
 
 typedef struct _snd_rawmidi_runtime snd_rawmidi_runtime_t;
 typedef struct _snd_rawmidi_substream snd_rawmidi_substream_t;



---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/pci/ice1712 ice1712.c,1.34,1.35

2003-09-30 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/pci/ice1712
In directory sc8-pr-cvs1:/tmp/cvs-serv998

Modified Files:
ice1712.c 
Log Message:
Moved spdif.setup_rate to snd_ice1712_set_pro_rate() function

Index: ice1712.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/ice1712.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ice1712.c   16 Aug 2003 09:58:29 -  1.34
+++ ice1712.c   30 Sep 2003 11:30:35 -  1.35
@@ -1040,6 +1040,7 @@
default:
snd_BUG();
val = 0;
+   rate = 48000;
break;
}
outb(val, ICEMT(ice, RATE));
@@ -1050,6 +1051,8 @@
if (ice-akm[i].ops.set_rate_val)
ice-akm[i].ops.set_rate_val(ice-akm[i], rate);
}
+   if (ice-spdif.ops.setup_rate)
+   ice-spdif.ops.setup_rate(ice, rate);
 }
 
 static int snd_ice1712_playback_pro_prepare(snd_pcm_substream_t * substream)
@@ -1072,8 +1075,6 @@
ice1712_t *ice = snd_pcm_substream_chip(substream);
 
snd_ice1712_set_pro_rate(ice, params_rate(hw_params), 0);
-   if (ice-spdif.ops.setup_rate)
-   ice-spdif.ops.setup_rate(ice, params_rate(hw_params));
return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
 }
 



---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/include version.h,1.24,1.25

2003-10-01 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1:/tmp/cvs-serv20244/alsa-kernel/include

Modified Files:
version.h 
Log Message:
0.9.7a

Index: version.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/version.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- version.h   25 Sep 2003 18:55:43 -  1.24
+++ version.h   1 Oct 2003 08:41:15 -   1.25
@@ -1,3 +1,3 @@
-/* include/version.h.  Generated automatically by configure.  */
-#define CONFIG_SND_VERSION 0.9.7
+/* include/version.h.  Generated by configure.  */
+#define CONFIG_SND_VERSION 0.9.7a
 #define CONFIG_SND_DATE 



---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-driver configure.in,1.191,1.192

2003-10-01 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-driver
In directory sc8-pr-cvs1:/tmp/cvs-serv20244/alsa-driver

Modified Files:
configure.in 
Log Message:
0.9.7a

Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-driver/configure.in,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- configure.in25 Sep 2003 18:55:42 -  1.191
+++ configure.in1 Oct 2003 08:41:15 -   1.192
@@ -4,7 +4,7 @@
 
 AC_INIT(acore/sound.patch)
 AC_PREFIX_DEFAULT(/usr)
-CONFIG_SND_VERSION=0.9.7
+CONFIG_SND_VERSION=0.9.7a
 
 dnl Checks for programs.
 AC_PROG_CC



---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-driver/include config.h.in,1.22,1.23 adriver.h,1.58,1.59

2003-10-06 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-driver/include
In directory sc8-pr-cvs1:/tmp/cvs-serv2593/include

Modified Files:
config.h.in adriver.h 
Log Message:
Added PDE() check in linux/fs.h

Index: config.h.in
===
RCS file: /cvsroot/alsa/alsa-driver/include/config.h.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- config.h.in 30 May 2003 12:27:03 -  1.22
+++ config.h.in 6 Oct 2003 10:09:33 -   1.23
@@ -33,6 +33,7 @@
 #undef CONFIG_HAVE_STRLCPY
 #undef CONFIG_HAVE_SNPRINTF
 #undef CONFIG_HAVE_VMALLOC_TO_PAGE
+#undef CONFIG_HAVE_PDE
 
 /* 2.2 kernels */
 #undef CONFIG_OLD_KILL_FASYNC

Index: adriver.h
===
RCS file: /cvsroot/alsa/alsa-driver/include/adriver.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- adriver.h   30 Sep 2003 08:54:47 -  1.58
+++ adriver.h   6 Oct 2003 10:09:33 -   1.59
@@ -127,7 +127,7 @@
 #if LINUX_VERSION_CODE  KERNEL_VERSION(2, 5, 3)  !defined(need_resched)
 #define need_resched() (current-need_resched)
 #endif
-#if LINUX_VERSION_CODE  KERNEL_VERSION(2, 5, 4)  !defined(WE_ARE_WOLK)
+#ifndef CONFIG_HAVE_PDE
 #include linux/fs.h
 static inline struct proc_dir_entry *PDE(const struct inode *inode)
 {



---
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-driver configure.in,1.193,1.194

2003-10-10 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-driver
In directory sc8-pr-cvs1:/tmp/cvs-serv3377

Modified Files:
configure.in 
Log Message:
0.9.7b

Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-driver/configure.in,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- configure.in6 Oct 2003 10:09:33 -   1.193
+++ configure.in10 Oct 2003 14:47:38 -  1.194
@@ -4,7 +4,7 @@
 
 AC_INIT(acore/sound.patch)
 AC_PREFIX_DEFAULT(/usr)
-CONFIG_SND_VERSION=0.9.7a
+CONFIG_SND_VERSION=0.9.7b
 
 dnl Checks for programs.
 AC_PROG_CC



---
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: TODO-1.0,NONE,1.1

2003-10-10 Thread Jaroslav Kysela
Update of /cvsroot/alsa
In directory sc8-pr-cvs1:/tmp/cvs-serv12092

Added Files:
TODO-1.0 
Log Message:
Initial version from Takashi



---
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: TODO-1.1,NONE,1.1

2003-10-10 Thread Jaroslav Kysela
Update of /cvsroot/alsa
In directory sc8-pr-cvs1:/tmp/cvs-serv14602

Added Files:
TODO-1.1 
Log Message:
Initial



---
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: TODO-1.0,1.1,1.2

2003-10-10 Thread Jaroslav Kysela
Update of /cvsroot/alsa
In directory sc8-pr-cvs1:/tmp/cvs-serv14672

Modified Files:
TODO-1.0 
Log Message:
Second version



---
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


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

2003-10-11 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-driver/pci/au88x0
In directory sc8-pr-cvs1:/tmp/cvs-serv12951

Modified Files:
au88x0_core.c 
Log Message:
Fixed spinlock call

Index: au88x0_core.c
===
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au88x0_core.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au88x0_core.c   6 Oct 2003 14:01:04 -   1.1
+++ au88x0_core.c   11 Oct 2003 08:15:25 -  1.2
@@ -1777,7 +1777,7 @@
if ((nr_ch == 3) || ((dir == SNDRV_PCM_STREAM_CAPTURE)(nr_ch  2)))
return -EBUSY;

-   spin_lock(vortex-lock);
+   spin_lock(vortex-lock);
if (dma = 0) {
en = 0;
vortex_adb_checkinout(vortex, vortex-dma_adb[dma].resources, en, 
VORTEX_RESOURCE_DMA);
@@ -1884,7 +1884,7 @@
}
}
vortex-dma_adb[dma].nr_ch = nr_ch;
-   spin_unlock(vortex-lock);
+   spin_unlock(vortex-lock);

 #if 0
/* AC97 Codec channel setup. FIXME: this has no effect !! */



---
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-tools/sscape_ctl sscape_ctl.c,1.3,1.4

2003-10-12 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-tools/sscape_ctl
In directory sc8-pr-cvs1:/tmp/cvs-serv26976

Modified Files:
sscape_ctl.c 
Log Message:
Fixed warning

Index: sscape_ctl.c
===
RCS file: /cvsroot/alsa/alsa-tools/sscape_ctl/sscape_ctl.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sscape_ctl.c25 Sep 2003 19:52:14 -  1.3
+++ sscape_ctl.c12 Oct 2003 08:45:32 -  1.4
@@ -14,7 +14,7 @@
 
 const char default_dir[] = /sndscape;
 const char scope[] = scope.cod;
-char _microcode[65536];
+unsigned char _microcode[SSCAPE_MICROCODE_SIZE];
 
 static void
 show_usage(void)
@@ -205,7 +205,7 @@
 struct sscape_bootblock  boot;
 struct sscape_microcode  microcode;
 
-microcode.code = _microcode;
+microcode.code = _microcode;
 if ((len = get_directory(directory, filename, sizeof(filename))) == 0)
 {
   fprintf(stderr, Invalid directory - pathname too long\n);



---
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/isa sscape.c,1.5,1.6

2003-10-12 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/isa
In directory sc8-pr-cvs1:/tmp/cvs-serv26852/isa

Modified Files:
sscape.c 
Log Message:
Chris Rankin [EMAIL PROTECTED] - use #define rather than value for the microcode size

Index: sscape.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/sscape.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sscape.c25 Sep 2003 18:55:43 -  1.5
+++ sscape.c12 Oct 2003 08:44:58 -  1.6
@@ -616,10 +616,10 @@
 */
if (get_user(code, mc-code))
return -EFAULT;
-   if ((err = verify_area(VERIFY_READ, code, 65536)) != 0)
+   if ((err = verify_area(VERIFY_READ, code, SSCAPE_MICROCODE_SIZE)) != 0)
return err;
 
-   if ((ret = upload_dma_data(sscape, code, 65536)) == 0) {
+   if ((ret = upload_dma_data(sscape, code, SSCAPE_MICROCODE_SIZE)) == 0) {
snd_printk(KERN_INFO sscape: MIDI firmware loaded\n);
}
 



---
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/include sscape_ioctl.h,1.2,1.3

2003-10-12 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1:/tmp/cvs-serv26852/include

Modified Files:
sscape_ioctl.h 
Log Message:
Chris Rankin [EMAIL PROTECTED] - use #define rather than value for the microcode size

Index: sscape_ioctl.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/sscape_ioctl.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sscape_ioctl.h  25 Sep 2003 18:55:43 -  1.2
+++ sscape_ioctl.h  12 Oct 2003 08:44:58 -  1.3
@@ -8,9 +8,11 @@
   unsigned version;
 };
 
+#define SSCAPE_MICROCODE_SIZE  65536
+
 struct sscape_microcode
 {
-  unsigned char *code; /* 65536 chars */
+  unsigned char *code;
 };
 
 #define SND_SSCAPE_LOAD_BOOTB  _IOWR('P', 100, struct sscape_bootblock)



---
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-driver configure.in,1.194,1.195

2003-10-12 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-driver
In directory sc8-pr-cvs1:/tmp/cvs-serv7861

Modified Files:
configure.in 
Log Message:
PDE() detection fix

Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-driver/configure.in,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- configure.in10 Oct 2003 14:47:38 -  1.194
+++ configure.in12 Oct 2003 16:39:44 -  1.195
@@ -1027,6 +1027,7 @@
 #define __KERNEL__
 #include $CONFIG_SND_KERNELDIR/include/linux/config.h
 #include $CONFIG_SND_KERNELDIR/include/linux/fs.h
+#include $CONFIG_SND_KERNELDIR/include/linux/proc_fs.h
 ],[
PDE(NULL);
 ],



---
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-driver/include adriver.h,1.59,1.60

2003-10-12 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-driver/include
In directory sc8-pr-cvs1:/tmp/cvs-serv7861/include

Modified Files:
adriver.h 
Log Message:
PDE() detection fix

Index: adriver.h
===
RCS file: /cvsroot/alsa/alsa-driver/include/adriver.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- adriver.h   6 Oct 2003 10:09:33 -   1.59
+++ adriver.h   12 Oct 2003 16:39:45 -  1.60
@@ -129,6 +129,7 @@
 #endif
 #ifndef CONFIG_HAVE_PDE
 #include linux/fs.h
+#include linux/proc_fs.h
 static inline struct proc_dir_entry *PDE(const struct inode *inode)
 {
return (struct proc_dir_entry *) inode-u.generic_ip;



---
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-driver configure.in,1.195,1.196

2003-10-12 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-driver
In directory sc8-pr-cvs1:/tmp/cvs-serv8175

Modified Files:
configure.in 
Log Message:
0.9.7c

Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-driver/configure.in,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- configure.in12 Oct 2003 16:39:44 -  1.195
+++ configure.in12 Oct 2003 16:41:43 -  1.196
@@ -4,7 +4,7 @@
 
 AC_INIT(acore/sound.patch)
 AC_PREFIX_DEFAULT(/usr)
-CONFIG_SND_VERSION=0.9.7b
+CONFIG_SND_VERSION=0.9.7c
 
 dnl Checks for programs.
 AC_PROG_CC



---
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-lib/test pcm.c,1.26,1.27

2003-10-13 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-lib/test
In directory sc8-pr-cvs1:/tmp/cvs-serv15422

Modified Files:
pcm.c 
Log Message:
Fixed typo

Index: pcm.c
===
RCS file: /cvsroot/alsa/alsa-lib/test/pcm.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- pcm.c   3 Sep 2003 19:25:09 -   1.26
+++ pcm.c   13 Oct 2003 10:42:32 -  1.27
@@ -127,7 +127,7 @@
return err;
}
err = snd_pcm_hw_params_get_period_size(params, period_size, dir);
-   if (err  0) {
+   if (err  0) {
printf(Unable to get period size for playback: %s\n, 
snd_strerror(err));
return err;
}



---
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-lib/src/ordinary_mixer ordinary_mixer.c,1.3,1.4

2003-10-13 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-lib/src/ordinary_mixer
In directory sc8-pr-cvs1:/tmp/cvs-serv29050/src/ordinary_mixer

Modified Files:
ordinary_mixer.c 
Log Message:
More changes to the ordinary mixer API

Index: ordinary_mixer.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/ordinary_mixer/ordinary_mixer.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ordinary_mixer.c9 Sep 2003 19:24:40 -   1.3
+++ ordinary_mixer.c13 Oct 2003 12:06:46 -  1.4
@@ -206,8 +206,27 @@
  */ 
 int sndo_mixer_poll_descriptors(sndo_mixer_t *mixer, struct pollfd *pfds, unsigned 
int space)
 {
-   //return snd_mixer_poll_descriptors(mixer-mixer, pfds, space);
-   return -ENODEV;
+   int err, idx, res;
+
+   if (mixer-hctl_count  0) {
+   for (idx = res = 0; idx  mixer-hctl_count  space  0; idx++) {
+   err = snd_hctl_poll_descriptors(mixer-hctl[idx], pfds, space);
+   if (err  0)
+   return err;
+   res += err;
+   space -= err;
+   }
+   return res;
+   } else {
+   struct alisp_seq_iterator *result;
+   long val;
+   err = alsa_lisp_function(mixer-alisp, result, 
sndo_mixer_poll_descriptors, %i, space);
+   if (err  0)
+   return err;
+   assert(0);  /* FIXME: pass pfds to application */
+   err = alsa_lisp_seq_integer(result, val);
+   return err  0 ? err : val;
+   }
 }
 
 /**
@@ -220,8 +239,120 @@
  */ 
 int sndo_mixer_poll_descriptors_revents(sndo_mixer_t *mixer, struct pollfd *pfds, 
unsigned int nfds, unsigned short *revents)
 {
-   //return snd_mixer_poll_descriptors_revents(mixer-mixer, pfds, nfds, revents);
-   return -ENODEV;
+   int err, idx, count, res;
+
+   if (mixer-hctl_count  0) {
+   for (idx = res = 0; idx  mixer-hctl_count  nfds  0; idx++) {
+   err = snd_hctl_poll_descriptors_count(mixer-hctl[idx]);
+   if (err  0)
+   return err;
+   count = err;
+   if (nfds  (unsigned int)err)
+   return -EINVAL;
+   err = snd_hctl_poll_descriptors_revents(mixer-hctl[idx], 
pfds, count, revents);
+   if (err  0)
+   return err;
+   if (err != count)
+   return -EINVAL;
+   pfds += count;
+   nfds -= err;
+   revents += count;
+   res += count;
+   }
+   return res;
+   } else {
+   struct alisp_seq_iterator *result;
+   long val, tmp;
+   
+   assert(0);  /* FIXME: pass pfds to alisp too */
+   err = alsa_lisp_function(mixer-alisp, result, 
sndo_mixer_poll_descriptors_revents, %i, nfds);
+   if (err  0)
+   return err;
+   err = alsa_lisp_seq_integer(result, val);
+   if (err = 0  alsa_lisp_seq_count(result)  1) {
+   alsa_lisp_seq_next(result);
+   err = alsa_lisp_seq_integer(result, tmp);
+   *revents = tmp;
+   } else {
+   *revents = 0;
+   }
+   return err  0 ? err : val;
+   }
+}
+
+#define IOLINES 6
+
+static const char *name_table1[] = {
+   Master,
+   PCM,
+   Line,
+   Mic
+   CD,
+   AUX
+};
+
+#define SPEAKERS 14
+
+static const char *name_table2[] = {
+   Front Left,
+   Front Center Left,
+   Front Center,
+   Front Center Right,
+   Front Right,
+   Front Side Left,
+   Front Side Right,
+   Rear Side Left,
+   Rear Side Right,
+   Rear Left,
+   Rear Center,
+   Rear Right,
+   LFE (Subwoofer),
+   Overhead
+};
+
+#define CSOURCES 5
+
+static const char *name_table3[] = {
+   Mic,
+   Line,
+   CD,
+   AUX,
+   Mix,
+};
+
+static int compose_string(char **result, const char *s1, const char *s2, const char 
*s3, const char *s4)
+{
+   int len = strlen(s1) + strlen(s2) + strlen(s3) + strlen(s4);
+   *result = malloc(len + 1);
+   if (*result == NULL)
+   return -ENOMEM;
+   strcpy(*result, s1);
+   strcat(*result, s2);
+   strcat(*result, s3);
+   strcat(*result, s4);
+   return 0;
+}
+
+/**
+ * \brief get ordinary mixer io control value
+ * \param mixer ordinary mixer handle
+ * \param type io type
+ * \param val returned value
+ * \return zero if success, otherwise a negative error code
+ */ 
+int sndo_mixer_io_get_name(enum sndo_mixer_io_type type, char **name)

[alsa-cvslog] CVS: alsa-lib/include control.h,1.96,1.97 mixer_ordinary.h,1.5,1.6

2003-10-13 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-lib/include
In directory sc8-pr-cvs1:/tmp/cvs-serv29050/include

Modified Files:
control.h mixer_ordinary.h 
Log Message:
More changes to the ordinary mixer API

Index: control.h
===
RCS file: /cvsroot/alsa/alsa-lib/include/control.h,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- control.h   9 Sep 2003 19:24:36 -   1.96
+++ control.h   13 Oct 2003 12:06:45 -  1.97
@@ -455,6 +455,7 @@
 int snd_hctl_nonblock(snd_hctl_t *hctl, int nonblock);
 int snd_hctl_poll_descriptors_count(snd_hctl_t *hctl);
 int snd_hctl_poll_descriptors(snd_hctl_t *hctl, struct pollfd *pfds, unsigned int 
space);
+int snd_hctl_poll_descriptors_revents(snd_hctl_t *ctl, struct pollfd *pfds, unsigned 
int nfds, unsigned short *revents);
 unsigned int snd_hctl_get_count(snd_hctl_t *hctl);
 int snd_hctl_set_compare(snd_hctl_t *hctl, snd_hctl_compare_t hsort);
 snd_hctl_elem_t *snd_hctl_first_elem(snd_hctl_t *hctl);

Index: mixer_ordinary.h
===
RCS file: /cvsroot/alsa/alsa-lib/include/mixer_ordinary.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mixer_ordinary.h9 Sep 2003 19:24:36 -   1.5
+++ mixer_ordinary.h13 Oct 2003 12:06:45 -  1.6
@@ -29,6 +29,25 @@
 
 #include alsa/asoundlib.h
 
+/*
+ * Abbreviations:
+ *
+ * FLVOL- Front Left Volume (0-1000)
+ * FCLVOL   - Front Center Left Volume (0-1000)
+ * FCVOL- Front Center Volume (0-1000)
+ * FCRVOL   - Front Center Right Volume (0-1000)
+ * FRVOL- Front Right Volume (0-1000)
+ * FSLVOL   - Front Side Left Volume (0-1000)
+ * FSRVOL   - Front Side Right Volume (0-1000)
+ * RSLVOL   - Rear Side Left Volume (0-1000)
+ * RSRVOL   - Rear Side Right Volume (0-1000)
+ * RLVOL- Rear Left Volume (0-1000)
+ * RCVOL- Rear Center Volume (0-1000)
+ * RRVOL- Rear Right Volume (0-1000)
+ * LFEVOL   - Low Frequency Effects (Subwoofer) Volume (0-1000)
+ * OVRVOL   - Overhead Volume (0-1000)
+ */
+
 /** Ordinary Mixer I/O type */
 enum sndo_mixer_io_type {
 
@@ -36,158 +55,131 @@
 *  playback section
 */
 
-   /** Master volume - left (0-1000) */
-   SNDO_MIO_MASTER_LVOL = 0,
-   /** Master volume - right (0-1000) */
-   SNDO_MIO_MASTER_RVOL,
-   /** Master volume - left surround (0-1000) */
-   SNDO_MIO_MASTER_LSVOL = 0,
-   /** Master volume - right surround (0-1000) */
-   SNDO_MIO_MASTER_RSVOL,
-   /** Master volume - center (0-1000) */
-   SNDO_MIO_MASTER_CVOL = 0,
-   /** Master volume - LFE (0-1000) */
+   /* Master */
+   SNDO_MIO_MASTER_FLVOL = 0 * 0x40,
+   SNDO_MIO_MASTER_FCLVOL,
+   SNDO_MIO_MASTER_FCVOL,
+   SNDO_MIO_MASTER_FCRVOL,
+   SNDO_MIO_MASTER_FRVOL,
+   SNDO_MIO_MASTER_FSLVOL,
+   SNDO_MIO_MASTER_FSRVOL,
+   SNDO_MIO_MASTER_RSLVOL,
+   SNDO_MIO_MASTER_RSRVOL,
+   SNDO_MIO_MASTER_RLVOL,
+   SNDO_MIO_MASTER_RCVOL,
+   SNDO_MIO_MASTER_RRVOL,
SNDO_MIO_MASTER_LFEVOL,
-   /** Master volume - left mute (0 = off, 1 = on) */
-   SNDO_MIO_MASTER_LMUTE,
-   /** Master volume - right mute (0 = off, 1 = on) */
-   SNDO_MIO_MASTER_RMUTE,
-   /** Master volume - left surround mute (0 = off, 1 = on) */
-   SNDO_MIO_MASTER_LSMUTE,
-   /** Master volume - right surround mute (0 = off, 1 = on) */
-   SNDO_MIO_MASTER_RSMUTE,
-   /** Master volume - center mute (0 = off, 1 = on) */
-   SNDO_MIO_MASTER_CMUTE,
-   /** Master volume - LFE mute (0 = off, 1 = on) */
-   SNDO_MIO_MASTER_LFEMUTE,
-
-   /** PCM volume - left (0-1000) */
-   SNDO_MIO_PCM_LVOL = 0,
-   /** PCM volume - right (0-1000) */
-   SNDO_MIO_PCM_RVOL,
-   /** PCM volume - left surround (0-1000) */
-   SNDO_MIO_PCM_LSVOL = 0,
-   /** PCM volume - right surround (0-1000) */
-   SNDO_MIO_PCM_RSVOL,
-   /** PCM volume - center (0-1000) */
-   SNDO_MIO_PCM_CVOL = 0,
-   /** PCM volume - LFE (0-1000) */
+   SNDO_MIO_MASTER_OVRVOL,
+
+   /* PCM */
+   SNDO_MIO_PCM_FLVOL = 1 * 0x40,
+   SNDO_MIO_PCM_FCLVOL,
+   SNDO_MIO_PCM_FCVOL,
+   SNDO_MIO_PCM_FCRVOL,
+   SNDO_MIO_PCM_FRVOL,
+   SNDO_MIO_PCM_FSLVOL,
+   SNDO_MIO_PCM_FSRVOL,
+   SNDO_MIO_PCM_RSLVOL,
+   SNDO_MIO_PCM_RSRVOL,
+   SNDO_MIO_PCM_RLVOL,
+   SNDO_MIO_PCM_RCVOL,
+   SNDO_MIO_PCM_RRVOL,
SNDO_MIO_PCM_LFEVOL,
-   /** PCM volume - left mute (0 = off, 1 = on) */
-   SNDO_MIO_PCM_LMUTE,
-   /** PCM volume - right mute (0 = off, 1 = on) */
-   SNDO_MIO_PCM_RMUTE,
-   /** PCM volume - left surround mute (0 = off, 1 = on) */
-   SNDO_MIO_PCM_LSMUTE,
-   /** PCM volume - right surround mute (0 = off, 1 = on) */
-   SNDO_MIO_PCM_RSMUTE,
-   /** PCM volume - center mute (0 = off, 1 = on) */
-   

[alsa-cvslog] CVS: alsa-kernel/pci intel8x0.c,1.92,1.93

2003-10-14 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv16331

Modified Files:
intel8x0.c 
Log Message:
Added mpu_port initialization from the kernel command line

Index: intel8x0.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/intel8x0.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- intel8x0.c  23 Sep 2003 14:31:44 -  1.92
+++ intel8x0.c  14 Oct 2003 11:29:03 -  1.93
@@ -2749,7 +2749,7 @@
 
 #ifndef MODULE
 
-/* format is: snd-intel8x0=enable,index,id,ac97_clock */
+/* format is: snd-intel8x0=enable,index,id,ac97_clock,mpu_port */
 
 static int __init alsa_card_intel8x0_setup(char *str)
 {
@@ -2760,7 +2760,11 @@
(void)(get_option(str,enable[nr_dev]) == 2 
   get_option(str,index[nr_dev]) == 2 
   get_id(str,id[nr_dev]) == 2 
-  get_option(str,ac97_clock[nr_dev]) == 2);
+  get_option(str,ac97_clock[nr_dev]) == 2
+#ifdef SUPPORT_MIDI
+   get_option(str,mpu_port[nr_dev]) == 2
+#endif
+  );
nr_dev++;
return 1;
 }



---
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-lib/src/pcm pcm_direct.c,1.6,1.7

2003-10-17 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1:/tmp/cvs-serv5716

Modified Files:
pcm_direct.c 
Log Message:
Fixed problem with Xwindows (socket descriptors)

Index: pcm_direct.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_direct.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pcm_direct.c2 Sep 2003 10:32:33 -   1.6
+++ pcm_direct.c17 Oct 2003 07:38:38 -  1.7
@@ -316,7 +316,7 @@
ret = fork();
if (ret == 0)
server_job(dmix);
-   exit(EXIT_SUCCESS);
+   _exit(EXIT_SUCCESS);
} else {
waitpid(ret, NULL, 0);
}



---
This SF.net email sponsored by: Enterprise Linux Forum Conference  Expo
The Event For Linux Datacenter Solutions  Strategies in The Enterprise 
Linux in the Boardroom; in the Front Office;  in the Server Room 
http://www.enterpriselinuxforum.com
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-lib/include/sound asound.h,1.7,1.8

2003-10-21 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-lib/include/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv9895/include/sound

Modified Files:
asound.h 
Log Message:
- added support for user control elements


Index: asound.h
===
RCS file: /cvsroot/alsa/alsa-lib/include/sound/asound.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- asound.h25 Jul 2003 17:23:18 -  1.7
+++ asound.h21 Oct 2003 17:39:14 -  1.8
@@ -106,9 +106,10 @@
SNDRV_HWDEP_IFACE_SSCAPE,   /* Ensoniq SoundScape ISA card (MC68EC000) */
SNDRV_HWDEP_IFACE_VX,   /* Digigram VX cards */
SNDRV_HWDEP_IFACE_MIXART,   /* Digigram miXart cards */
+   SNDRV_HWDEP_IFACE_USX2Y,/* Tascam US122, US224  US428 usb */
 
/* Don't forget to change the following: */
-   SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_MIXART,
+   SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_USX2Y,
 };
 
 struct sndrv_hwdep_info {
@@ -682,7 +683,7 @@
  *  *
  /
 
-#define SNDRV_CTL_VERSION  SNDRV_PROTOCOL_VERSION(2, 0, 2)
+#define SNDRV_CTL_VERSION  SNDRV_PROTOCOL_VERSION(2, 0, 3)
 
 struct sndrv_ctl_card_info {
int card;   /* card number */
@@ -727,6 +728,7 @@
 #define SNDRV_CTL_ELEM_ACCESS_INACTIVE (18)  /* control does actually 
nothing, but may be updated */
 #define SNDRV_CTL_ELEM_ACCESS_LOCK (19)  /* write lock */
 #define SNDRV_CTL_ELEM_ACCESS_OWNER(110) /* write lock owner */
+#define SNDRV_CTL_ELEM_ACCESS_USER (129) /* user space element */
 #define SNDRV_CTL_ELEM_ACCESS_DINDIRECT(130) /* indirect access for 
matrix dimensions in the info structure */
 #define SNDRV_CTL_ELEM_ACCESS_INDIRECT (131) /* indirect access for element 
value in the value structure */
 
@@ -823,6 +825,9 @@
SNDRV_CTL_IOCTL_ELEM_LOCK = _IOW('U', 0x14, struct sndrv_ctl_elem_id),
SNDRV_CTL_IOCTL_ELEM_UNLOCK = _IOW('U', 0x15, struct sndrv_ctl_elem_id),
SNDRV_CTL_IOCTL_SUBSCRIBE_EVENTS = _IOWR('U', 0x16, int),
+   SNDRV_CTL_IOCTL_ELEM_ADD = _IOWR('U', 0x17, struct sndrv_ctl_elem_info),
+   SNDRV_CTL_IOCTL_ELEM_REPLACE = _IOWR('U', 0x18, struct sndrv_ctl_elem_info),
+   SNDRV_CTL_IOCTL_ELEM_REMOVE = _IOWR('U', 0x19, struct sndrv_ctl_elem_id),
SNDRV_CTL_IOCTL_HWDEP_NEXT_DEVICE = _IOWR('U', 0x20, int),
SNDRV_CTL_IOCTL_HWDEP_INFO = _IOR('U', 0x21, struct sndrv_hwdep_info),
SNDRV_CTL_IOCTL_PCM_NEXT_DEVICE = _IOR('U', 0x30, int),



---
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-utils configure.in,1.65,1.66

2003-10-21 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-utils
In directory sc8-pr-cvs1:/tmp/cvs-serv10416

Modified Files:
configure.in 
Log Message:
0.9.8

Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-utils/configure.in,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- configure.in25 Sep 2003 19:53:43 -  1.65
+++ configure.in21 Oct 2003 17:41:36 -  1.66
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(alsamixer/alsamixer.c)
 AC_PREFIX_DEFAULT(/usr)
-AM_INIT_AUTOMAKE(alsa-utils, 0.9.7)
+AM_INIT_AUTOMAKE(alsa-utils, 0.9.8)
 
 dnl Checks for programs.
 



---
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/pci/emu10k1 emufx.c,1.42,1.43

2003-10-21 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/pci/emu10k1
In directory sc8-pr-cvs1:/tmp/cvs-serv10022/pci/emu10k1

Modified Files:
emufx.c 
Log Message:
- added support for user control elements (untested)
- fixed locking for snd_ctl_remove() function


Index: emufx.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emufx.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- emufx.c 17 Oct 2003 15:39:52 -  1.42
+++ emufx.c 21 Oct 2003 17:40:14 -  1.43
@@ -1009,13 +1009,16 @@
unsigned int i;
snd_ctl_elem_id_t *_id, id;
snd_emu10k1_fx8010_ctl_t *ctl;
+   snd_card_t *card = emu-card;

for (i = 0, _id = icode-gpr_del_controls;
 i  icode-gpr_del_control_count; i++, _id++) {
snd_runtime_check(copy_from_user(id, _id, sizeof(id)) == 0, continue);
+   down_write(card-controls_rwsem);
ctl = snd_emu10k1_look_for_ctl(emu, id);
-   snd_runtime_check(ctl == NULL, continue);
-   snd_ctl_remove(emu-card, ctl-kcontrol);
+   if (ctl)
+   snd_ctl_remove(card, ctl-kcontrol);
+   up_write(card-controls_rwsem);
}
 }
 



---
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-lib/src/control control.c,1.99,1.100 control_hw.c,1.38,1.39 control_local.h,1.29,1.30

2003-10-21 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-lib/src/control
In directory sc8-pr-cvs1:/tmp/cvs-serv9895/src/control

Modified Files:
control.c control_hw.c control_local.h 
Log Message:
- added support for user control elements


Index: control.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/control/control.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- control.c   29 Jul 2003 13:19:19 -  1.99
+++ control.c   21 Oct 2003 17:39:14 -  1.100
@@ -253,6 +253,48 @@
 }
 
 /**
+ * \brief Create and add an user CTL element
+ * \param ctl CTL handle
+ * \param info CTL element info
+ * \return 0 on success otherwise a negative error code
+ *
+ * Note that the new element is locked!
+ */
+int snd_ctl_elem_add(snd_ctl_t *ctl, snd_ctl_elem_info_t *info)
+{
+   assert(ctl  info  info-id.name[0]);
+   return ctl-ops-element_add(ctl, info);
+}
+
+/**
+ * \brief Replace an user CTL element
+ * \param ctl CTL handle
+ * \param info CTL element info
+ * \return 0 on success otherwise a negative error code
+ *
+ * Note that the new element is locked!
+ */
+int snd_ctl_elem_replace(snd_ctl_t *ctl, snd_ctl_elem_info_t *info)
+{
+   assert(ctl  info  info-id.name[0]);
+   return ctl-ops-element_replace(ctl, info);
+}
+
+/**
+ * \brief Remove an user CTL element
+ * \param ctl CTL handle
+ * \param id CTL element identification
+ * \return 0 on success otherwise a negative error code
+ *
+ * Note that the new element is locked!
+ */
+int snd_ctl_elem_remove(snd_ctl_t *ctl, snd_ctl_elem_id_t *id)
+{
+   assert(ctl  id  (id-name[0] || id-numid));
+   return ctl-ops-element_remove(ctl, id);
+}
+
+/**
  * \brief Get CTL element value
  * \param ctl CTL handle
  * \param control CTL element id/value pointer

Index: control_hw.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/control/control_hw.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- control_hw.c25 Jul 2003 17:02:01 -  1.38
+++ control_hw.c21 Oct 2003 17:39:15 -  1.39
@@ -39,7 +39,7 @@
 #endif
 
 #define SNDRV_FILE_CONTROL /dev/snd/controlC%i
-#define SNDRV_CTL_VERSION_MAX  SNDRV_PROTOCOL_VERSION(2, 0, 2)
+#define SNDRV_CTL_VERSION_MAX  SNDRV_PROTOCOL_VERSION(2, 0, 3)
 
 typedef struct {
int card;
@@ -142,6 +142,30 @@
return 0;
 }
 
+static int snd_ctl_hw_elem_add(snd_ctl_t *handle, snd_ctl_elem_info_t *info)
+{
+   snd_ctl_hw_t *hw = handle-private_data;
+   if (ioctl(hw-fd, SNDRV_CTL_IOCTL_ELEM_ADD, info)  0)
+   return -errno;
+   return 0;
+}
+
+static int snd_ctl_hw_elem_replace(snd_ctl_t *handle, snd_ctl_elem_info_t *info)
+{
+   snd_ctl_hw_t *hw = handle-private_data;
+   if (ioctl(hw-fd, SNDRV_CTL_IOCTL_ELEM_REPLACE, info)  0)
+   return -errno;
+   return 0;
+}
+
+static int snd_ctl_hw_elem_remove(snd_ctl_t *handle, snd_ctl_elem_id_t *id)
+{
+   snd_ctl_hw_t *hw = handle-private_data;
+   if (ioctl(hw-fd, SNDRV_CTL_IOCTL_ELEM_REMOVE, id)  0)
+   return -errno;
+   return 0;
+}
+
 static int snd_ctl_hw_elem_read(snd_ctl_t *handle, snd_ctl_elem_value_t *control)
 {
snd_ctl_hw_t *hw = handle-private_data;
@@ -272,6 +296,9 @@
.card_info = snd_ctl_hw_card_info,
.element_list = snd_ctl_hw_elem_list,
.element_info = snd_ctl_hw_elem_info,
+   .element_add = snd_ctl_hw_elem_add,
+   .element_replace = snd_ctl_hw_elem_replace,
+   .element_remove = snd_ctl_hw_elem_remove,
.element_read = snd_ctl_hw_elem_read,
.element_write = snd_ctl_hw_elem_write,
.element_lock = snd_ctl_hw_elem_lock,

Index: control_local.h
===
RCS file: /cvsroot/alsa/alsa-lib/src/control/control_local.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- control_local.h 7 Nov 2002 15:18:47 -   1.29
+++ control_local.h 21 Oct 2003 17:39:15 -  1.30
@@ -29,6 +29,9 @@
int (*card_info)(snd_ctl_t *handle, snd_ctl_card_info_t *info);
int (*element_list)(snd_ctl_t *handle, snd_ctl_elem_list_t *list);
int (*element_info)(snd_ctl_t *handle, snd_ctl_elem_info_t *info);
+   int (*element_add)(snd_ctl_t *handle, snd_ctl_elem_info_t *info);
+   int (*element_replace)(snd_ctl_t *handle, snd_ctl_elem_info_t *info);
+   int (*element_remove)(snd_ctl_t *handle, snd_ctl_elem_id_t *id);
int (*element_read)(snd_ctl_t *handle, snd_ctl_elem_value_t *control);
int (*element_write)(snd_ctl_t *handle, snd_ctl_elem_value_t *control);
int (*element_lock)(snd_ctl_t *handle, snd_ctl_elem_id_t *lock);



---
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive 

[alsa-cvslog] CVS: alsa-driver configure.in,1.197,1.198

2003-10-21 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-driver
In directory sc8-pr-cvs1:/tmp/cvs-serv10308

Modified Files:
configure.in 
Log Message:
0.9.8

Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-driver/configure.in,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- configure.in14 Oct 2003 15:18:06 -  1.197
+++ configure.in21 Oct 2003 17:40:58 -  1.198
@@ -4,7 +4,7 @@
 
 AC_INIT(acore/sound.patch)
 AC_PREFIX_DEFAULT(/usr)
-CONFIG_SND_VERSION=0.9.7c
+CONFIG_SND_VERSION=0.9.8
 
 dnl Checks for programs.
 AC_PROG_CC



---
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/core control.c,1.38,1.39

2003-10-21 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1:/tmp/cvs-serv10022/core

Modified Files:
control.c 
Log Message:
- added support for user control elements (untested)
- fixed locking for snd_ctl_remove() function


Index: control.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/control.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- control.c   30 Sep 2003 09:28:26 -  1.38
+++ control.c   21 Oct 2003 17:40:13 -  1.39
@@ -37,6 +37,9 @@
 
 #define snd_kctl_ioctl(n) list_entry(n, snd_kctl_ioctl_t, list)
 
+/* find id without lock */
+static snd_kcontrol_t *_ctl_find_id(snd_card_t * card, snd_ctl_elem_id_t *id);
+
 static DECLARE_RWSEM(snd_ioctl_rwsem);
 static LIST_HEAD(snd_control_ioctls);
 
@@ -262,6 +265,8 @@
  * snd_ctl_new1() to the given card.
  *
  * Returns zero if successful, or a negative error code on failure.
+ *
+ * It frees automatically the control which cannot be added.
  */
 int snd_ctl_add(snd_card_t * card, snd_kcontrol_t * kcontrol)
 {
@@ -270,13 +275,23 @@
 
snd_runtime_check(card != NULL  kcontrol != NULL, return -EINVAL);
snd_assert(kcontrol-info != NULL, return -EINVAL);
+   id = kcontrol-id;
down_write(card-controls_rwsem);
+   if (_ctl_find_id(card, id)) {
+   up_write(card-controls_rwsem);
+   snd_ctl_free_one(kcontrol);
+   return -EBUSY;
+   }
+   if (card-last_numid  0x8000  card-last_numid + kcontrol-count  
0x8000) {
+   up_write(card-controls_rwsem);
+   snd_ctl_free_one(kcontrol);
+   return -ENOMEM; /* FIXME: find a hole */
+   }
list_add_tail(kcontrol-list, card-controls);
card-controls_count += kcontrol-count;
kcontrol-id.numid = card-last_numid + 1;
card-last_numid += kcontrol-count;
up_write(card-controls_rwsem);
-   id = kcontrol-id;
for (idx = 0; idx  kcontrol-count; idx++, id.index++, id.numid++)
snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_ADD, id);
return 0;
@@ -288,7 +303,8 @@
  * @kcontrol: the control instance to remove
  *
  * Removes the control from the card and then releases the instance.
- * You don't need to call snd_ctl_free_one().
+ * You don't need to call snd_ctl_free_one(). You must be in
+ * the write lock - down_write(card-controls_rwsem).
  * 
  * Returns 0 if successful, or a negative error code on failure.
  */
@@ -298,10 +314,8 @@
unsigned int idx;
 
snd_runtime_check(card != NULL  kcontrol != NULL, return -EINVAL);
-   down_write(card-controls_rwsem);
list_del(kcontrol-list);
card-controls_count -= kcontrol-count;
-   up_write(card-controls_rwsem);
id = kcontrol-id;
for (idx = 0; idx  kcontrol-count; idx++, id.index++, id.numid++)
snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_REMOVE, id);
@@ -322,15 +336,50 @@
 int snd_ctl_remove_id(snd_card_t * card, snd_ctl_elem_id_t *id)
 {
snd_kcontrol_t *kctl;
+   int ret;
 
-   kctl = snd_ctl_find_id(card, id);
-   if (kctl == NULL)
+   down_write(card-controls_rwsem);
+   kctl = _ctl_find_id(card, id);
+   if (kctl == NULL) {
+   up_write(card-controls_rwsem);
return -ENOENT;
-   return snd_ctl_remove(card, kctl);
+   }
+   ret = snd_ctl_remove(card, kctl);
+   up_write(card-controls_rwsem);
+   return ret;
 }
 
-static snd_kcontrol_t *_ctl_find_id
-(snd_card_t * card, snd_ctl_elem_id_t *id); /* w/o lock */
+/**
+ * snd_ctl_remove_unlocked_id - remove the unlocked control of the given id and 
release it
+ * @file: active control handle
+ * @id: the control id to remove
+ *
+ * Finds the control instance with the given id, removes it from the
+ * card list and releases it.
+ * 
+ * Returns 0 if successful, or a negative error code on failure.
+ */
+static int snd_ctl_remove_unlocked_id(snd_ctl_file_t * file, snd_ctl_elem_id_t *id)
+{
+   snd_card_t *card = file-card;
+   snd_kcontrol_t *kctl;
+   int idx, ret;
+
+   down_write(card-controls_rwsem);
+   kctl = _ctl_find_id(card, id);
+   if (kctl == NULL) {
+   up_write(card-controls_rwsem);
+   return -ENOENT;
+   }
+   for (idx = 0; idx  kctl-count; idx++)
+   if (kctl-vd[idx].owner != NULL  kctl-vd[idx].owner != file) {
+   up_write(card-controls_rwsem);
+   return -EBUSY;
+   }
+   ret = snd_ctl_remove(card, kctl);
+   up_write(card-controls_rwsem);
+   return ret;
+}
 
 /**
  * snd_ctl_rename_id - replace the id of a control on the card
@@ -564,7 +613,6 @@
 
 static int snd_ctl_elem_read(snd_card_t *card, snd_ctl_elem_value_t *_control)
 {
-
snd_ctl_elem_value_t *control;
snd_kcontrol_t *kctl;
snd_kcontrol_volatile_t *vd;
@@ 

[alsa-cvslog] CVS: alsa-kernel/include asound.h,1.32,1.33

2003-10-21 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1:/tmp/cvs-serv10022/include

Modified Files:
asound.h 
Log Message:
- added support for user control elements (untested)
- fixed locking for snd_ctl_remove() function


Index: asound.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/asound.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- asound.h8 Sep 2003 10:58:07 -   1.32
+++ asound.h21 Oct 2003 17:40:14 -  1.33
@@ -683,7 +683,7 @@
  *  *
  /
 
-#define SNDRV_CTL_VERSION  SNDRV_PROTOCOL_VERSION(2, 0, 2)
+#define SNDRV_CTL_VERSION  SNDRV_PROTOCOL_VERSION(2, 0, 3)
 
 struct sndrv_ctl_card_info {
int card;   /* card number */
@@ -728,6 +728,7 @@
 #define SNDRV_CTL_ELEM_ACCESS_INACTIVE (18)  /* control does actually 
nothing, but may be updated */
 #define SNDRV_CTL_ELEM_ACCESS_LOCK (19)  /* write lock */
 #define SNDRV_CTL_ELEM_ACCESS_OWNER(110) /* write lock owner */
+#define SNDRV_CTL_ELEM_ACCESS_USER (129) /* user space element */
 #define SNDRV_CTL_ELEM_ACCESS_DINDIRECT(130) /* indirect access for 
matrix dimensions in the info structure */
 #define SNDRV_CTL_ELEM_ACCESS_INDIRECT (131) /* indirect access for element 
value in the value structure */
 
@@ -824,6 +825,9 @@
SNDRV_CTL_IOCTL_ELEM_LOCK = _IOW('U', 0x14, struct sndrv_ctl_elem_id),
SNDRV_CTL_IOCTL_ELEM_UNLOCK = _IOW('U', 0x15, struct sndrv_ctl_elem_id),
SNDRV_CTL_IOCTL_SUBSCRIBE_EVENTS = _IOWR('U', 0x16, int),
+   SNDRV_CTL_IOCTL_ELEM_ADD = _IOWR('U', 0x17, struct sndrv_ctl_elem_info),
+   SNDRV_CTL_IOCTL_ELEM_REPLACE = _IOWR('U', 0x18, struct sndrv_ctl_elem_info),
+   SNDRV_CTL_IOCTL_ELEM_REMOVE = _IOWR('U', 0x19, struct sndrv_ctl_elem_id),
SNDRV_CTL_IOCTL_HWDEP_NEXT_DEVICE = _IOWR('U', 0x20, int),
SNDRV_CTL_IOCTL_HWDEP_INFO = _IOR('U', 0x21, struct sndrv_hwdep_info),
SNDRV_CTL_IOCTL_PCM_NEXT_DEVICE = _IOR('U', 0x30, int),



---
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-oss configure.in,1.17,1.18

2003-10-21 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-oss
In directory sc8-pr-cvs1:/tmp/cvs-serv10858

Modified Files:
configure.in 
Log Message:
0.9.8

Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-oss/configure.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- configure.in28 Jul 2003 12:22:05 -  1.17
+++ configure.in21 Oct 2003 17:43:46 -  1.18
@@ -1,5 +1,5 @@
 AC_INIT(alsa-oss.c)
-AM_INIT_AUTOMAKE(alsa-oss, 0.9.6)
+AM_INIT_AUTOMAKE(alsa-oss, 0.9.8)
 
 AC_PREFIX_DEFAULT(/usr)
 



---
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-tools Makefile,1.27,1.28

2003-10-21 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-tools
In directory sc8-pr-cvs1:/tmp/cvs-serv10923

Modified Files:
Makefile 
Log Message:
0.9.8

Index: Makefile
===
RCS file: /cvsroot/alsa/alsa-tools/Makefile,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Makefile6 Oct 2003 15:57:22 -   1.27
+++ Makefile21 Oct 2003 17:44:03 -  1.28
@@ -1,4 +1,4 @@
-VERSION = 0.9.7
+VERSION = 0.9.8
 TOP = .
 SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \
mixartloader rmedigicontrol sb16_csp seq sscape_ctl us428control \



---
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-lib configure.in,1.113,1.114

2003-10-21 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-lib
In directory sc8-pr-cvs1:/tmp/cvs-serv10375

Modified Files:
configure.in 
Log Message:
0.9.8

Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-lib/configure.in,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- configure.in25 Sep 2003 19:57:58 -  1.113
+++ configure.in21 Oct 2003 17:41:17 -  1.114
@@ -8,7 +8,7 @@
 dnl remove API = c+1:0:0
 dnl *
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(alsa-lib, 0.9.7)
+AM_INIT_AUTOMAKE(alsa-lib, 0.9.8)
 eval LIBTOOL_VERSION_INFO=2:0:0
 dnl *
 AM_CONDITIONAL(INSTALL_M4, test -n ${ACLOCAL})



---
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/isa/sb emu8000.c,1.18,1.19 sb16_csp.c,1.10,1.11

2003-10-22 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/isa/sb
In directory sc8-pr-cvs1:/tmp/cvs-serv10022/isa/sb

Modified Files:
emu8000.c sb16_csp.c 
Log Message:
- added support for user control elements (untested)
- fixed locking for snd_ctl_remove() function


Index: emu8000.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/emu8000.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- emu8000.c   12 Aug 2003 14:27:30 -  1.18
+++ emu8000.c   21 Oct 2003 17:40:14 -  1.19
@@ -1044,8 +1044,10 @@
 
 __error:
for (i = 0; i  EMU8000_NUM_CONTROLS; i++) {
+   down_write(card-controls_rwsem);
if (emu-controls[i])
snd_ctl_remove(card, emu-controls[i]);
+   up_write(card-controls_rwsem);
}
return err;
 }

Index: sb16_csp.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/sb16_csp.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sb16_csp.c  30 May 2003 12:28:35 -  1.10
+++ sb16_csp.c  21 Oct 2003 17:40:14 -  1.11
@@ -1059,10 +1059,12 @@
 
card = p-chip-card;   

+   down_write(card-controls_rwsem);
if (p-qsound_switch)
snd_ctl_remove(card, p-qsound_switch);
if (p-qsound_space)
snd_ctl_remove(card, p-qsound_space);
+   up_write(card-controls_rwsem);
 
/* cancel pending transfer of QSound parameters */
spin_lock_irqsave (p-q_lock, flags);



---
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/core pcm_lib.c,1.45,1.46

2003-10-22 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1:/tmp/cvs-serv4570

Modified Files:
pcm_lib.c 
Log Message:
- don't print debug messages for low count of periods
- added right path for one period to the update pointer routine (interrupt) 


Index: pcm_lib.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/pcm_lib.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- pcm_lib.c   6 Oct 2003 12:19:10 -   1.45
+++ pcm_lib.c   22 Oct 2003 09:32:20 -  1.46
@@ -173,15 +173,21 @@
snd_pcm_sframes_t delta;
 
pos = snd_pcm_update_hw_ptr_pos(substream, runtime);
+   if (runtime-period_size == runtime-buffer_size)
+   goto __next_buf;
new_hw_ptr = runtime-hw_ptr_base + pos;
hw_ptr_interrupt = runtime-hw_ptr_interrupt + runtime-period_size;
 
delta = hw_ptr_interrupt - new_hw_ptr;
if (delta  0) {
if ((snd_pcm_uframes_t)delta  runtime-buffer_size / 2) {
-   snd_printd(KERN_ERR Unexpected hw_pointer value (stream = %i, 
delta: -%ld, max jitter = %ld): wrong interrupt acknowledge?\n, substream-stream, 
(long) delta, runtime-buffer_size / 2);
+#ifdef CONFIG_SND_DEBUG
+   if (runtime-periods  1)
+   snd_printd(KERN_ERR Unexpected hw_pointer value [1] 
(stream = %i, delta: -%ld, max jitter = %ld): wrong interrupt acknowledge?\n, 
substream-stream, (long) delta, runtime-buffer_size / 2);
+#endif
return 0;
}
+ __next_buf:
runtime-hw_ptr_base += runtime-buffer_size;
if (runtime-hw_ptr_base == runtime-boundary)
runtime-hw_ptr_base = 0;
@@ -213,7 +219,10 @@
delta = old_hw_ptr - new_hw_ptr;
if (delta  0) {
if ((snd_pcm_uframes_t)delta  runtime-buffer_size / 2) {
-   snd_printd(KERN_ERR Unexpected hw_pointer value (stream = %i, 
delta: -%ld, max jitter = %ld): wrong interrupt acknowledge?\n, substream-stream, 
(long) delta, runtime-buffer_size / 2);
+#ifdef CONFIG_SND_DEBUG
+   if (runtime-periods  2)
+   snd_printd(KERN_ERR Unexpected hw_pointer value [2] 
(stream = %i, delta: -%ld, max jitter = %ld): wrong interrupt acknowledge?\n, 
substream-stream, (long) delta, runtime-buffer_size / 2);
+#endif
return 0;
}
runtime-hw_ptr_base += runtime-buffer_size;



---
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/pci/nm256 nm256.c,1.31,1.32

2003-10-23 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/pci/nm256
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/pci/nm256

Modified Files:
nm256.c 
Log Message:
- AC97 code
  - introduced ac97_bus_t structure
  - moved attached codecs to /proc/asound/card?/codec97#? directory
  - merged snd_ac97_modem() to snd_ac97_mixer()
- proc cleanups - removed already initialized variables
- enhanced snd_info_set_text_ops() syntax


Index: nm256.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/nm256/nm256.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- nm256.c 14 Oct 2003 14:08:49 -  1.31
+++ nm256.c 23 Oct 2003 14:34:53 -  1.32
@@ -1195,6 +1195,7 @@
 static int __devinit
 snd_nm256_mixer(nm256_t *chip)
 {
+   ac97_bus_t bus, *pbus;
ac97_t ac97;
int i, err;
/* looks like nm256 hangs up when unexpected registers are touched... */
@@ -1208,16 +1209,20 @@
-1
};
 
+   memset(bus, 0, sizeof(bus));
+   bus.reset = snd_nm256_ac97_reset;
+   bus.write = snd_nm256_ac97_write;
+   bus.read = snd_nm256_ac97_read;
+   if ((err = snd_ac97_bus(chip-card, bus, pbus))  0)
+   return err;
+
memset(ac97, 0, sizeof(ac97));
-   ac97.reset = snd_nm256_ac97_reset;
-   ac97.write = snd_nm256_ac97_write;
-   ac97.read = snd_nm256_ac97_read;
ac97.scaps = AC97_SCAP_AUDIO; /* we support audio! */
ac97.limited_regs = 1;
for (i = 0; mixer_regs[i] = 0; i++)
set_bit(mixer_regs[i], ac97.reg_accessed);
ac97.private_data = chip;
-   err = snd_ac97_mixer(chip-card, ac97, chip-ac97);
+   err = snd_ac97_mixer(pbus, ac97, chip-ac97);
if (err  0)
return err;
if (! (chip-ac97-id  (0xf000))) {



---
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


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

2003-10-23 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/pci/cs46xx
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/pci/cs46xx

Modified Files:
cs46xx_lib.c 
Log Message:
- AC97 code
  - introduced ac97_bus_t structure
  - moved attached codecs to /proc/asound/card?/codec97#? directory
  - merged snd_ac97_modem() to snd_ac97_mixer()
- proc cleanups - removed already initialized variables
- enhanced snd_info_set_text_ops() syntax


Index: cs46xx_lib.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/cs46xx/cs46xx_lib.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- cs46xx_lib.c14 Oct 2003 14:08:49 -  1.65
+++ cs46xx_lib.c23 Oct 2003 14:34:53 -  1.66
@@ -1804,6 +1804,13 @@
 /*
  *  Mixer routines
  */
+static void snd_cs46xx_mixer_free_ac97_bus(ac97_bus_t *bus)
+{
+   cs46xx_t *chip = snd_magic_cast(cs46xx_t, bus-private_data, return);
+
+   chip-ac97_bus = NULL;
+}
+
 static void snd_cs46xx_mixer_free_ac97(ac97_t *ac97)
 {
cs46xx_t *chip = snd_magic_cast(cs46xx_t, ac97-private_data, return);
@@ -2445,6 +2452,7 @@
 int __devinit snd_cs46xx_mixer(cs46xx_t *chip)
 {
snd_card_t *card = chip-card;
+   ac97_bus_t bus;
ac97_t ac97;
snd_ctl_elem_id_t id;
int err;
@@ -2453,14 +2461,20 @@
/* detect primary codec */
chip-nr_ac97_codecs = 0;
snd_printdd(snd_cs46xx: detecting primary codec\n);
+   memset(bus, 0, sizeof(bus));
+   bus.write = snd_cs46xx_ac97_write;
+   bus.read = snd_cs46xx_ac97_read;
+#ifdef CONFIG_SND_CS46XX_NEW_DSP
+   bus.reset = snd_cs46xx_codec_reset;
+#endif
+   bus.private_data = chip;
+   bus.private_free = snd_cs46xx_mixer_free_ac97_bus;
+   if ((err = snd_ac97_bus(card, bus, chip-ac97_bus))  0)
+   return err;
+
memset(ac97, 0, sizeof(ac97));
-   ac97.write = snd_cs46xx_ac97_write;
-   ac97.read = snd_cs46xx_ac97_read;
ac97.private_data = chip;
ac97.private_free = snd_cs46xx_mixer_free_ac97;
-#ifdef CONFIG_SND_CS46XX_NEW_DSP
-   ac97.reset = snd_cs46xx_codec_reset;
-#endif
chip-ac97[CS46XX_PRIMARY_CODEC_INDEX] = ac97;
 
snd_cs46xx_ac97_write(ac97, AC97_MASTER, 0x8000);
@@ -2474,7 +2488,7 @@
return -ENXIO;
 
  _ok:
-   if ((err = snd_ac97_mixer(card, ac97, 
chip-ac97[CS46XX_PRIMARY_CODEC_INDEX]))  0)
+   if ((err = snd_ac97_mixer(chip-ac97_bus, ac97, 
chip-ac97[CS46XX_PRIMARY_CODEC_INDEX]))  0)
return err;
snd_printdd(snd_cs46xx: primary codec phase one\n);
chip-nr_ac97_codecs = 1;
@@ -2483,8 +2497,6 @@
snd_printdd(snd_cs46xx: detecting seconadry codec\n);
/* try detect a secondary codec */
memset(ac97, 0, sizeof(ac97));
-   ac97.write = snd_cs46xx_ac97_write;
-   ac97.read = snd_cs46xx_ac97_read;
ac97.private_data = chip;
ac97.private_free = snd_cs46xx_mixer_free_ac97;
ac97.num = CS46XX_SECONDARY_CODEC_INDEX;
@@ -2516,13 +2528,7 @@
/* well, one codec only ... */
goto _end;
  _ok2:
-   /* set secondary codec in extended mode */
-
-   /* use custom reset to set secondary codec in
-  extended mode */
-   ac97.reset = snd_cs46xx_codec_reset;
-
-   if ((err = snd_ac97_mixer(card, ac97, 
chip-ac97[CS46XX_SECONDARY_CODEC_INDEX]))  0)
+   if ((err = snd_ac97_mixer(chip-ac97_bus, ac97, 
chip-ac97[CS46XX_SECONDARY_CODEC_INDEX]))  0)
return err;
chip-nr_ac97_codecs = 2;
 



---
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community?  Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/pci/trident trident_main.c,1.47,1.48

2003-10-23 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/pci/trident
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/pci/trident

Modified Files:
trident_main.c 
Log Message:
- AC97 code
  - introduced ac97_bus_t structure
  - moved attached codecs to /proc/asound/card?/codec97#? directory
  - merged snd_ac97_modem() to snd_ac97_mixer()
- proc cleanups - removed already initialized variables
- enhanced snd_info_set_text_ops() syntax


Index: trident_main.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/trident/trident_main.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- trident_main.c  2 Sep 2003 18:06:12 -   1.47
+++ trident_main.c  23 Oct 2003 14:34:53 -  1.48
@@ -2955,6 +2955,7 @@
 
 static int __devinit snd_trident_mixer(trident_t * trident, int pcm_spdif_device)
 {
+   ac97_bus_t _bus;
ac97_t _ac97;
snd_card_t * card = trident-card;
snd_kcontrol_t *kctl;
@@ -2965,14 +2966,18 @@
if (!uctl)
return -ENOMEM;
 
+   memset(_bus, 0, sizeof(_bus));
+   _bus.write = snd_trident_codec_write;
+   _bus.read = snd_trident_codec_read;
+   if ((err = snd_ac97_bus(trident-card, _bus, trident-ac97_bus))  0)
+   goto __out;
+
memset(_ac97, 0, sizeof(_ac97));
-   _ac97.write = snd_trident_codec_write;
-   _ac97.read = snd_trident_codec_read;
_ac97.private_data = trident;
trident-ac97_detect = 1;
 
   __again:
-   if ((err = snd_ac97_mixer(trident-card, _ac97, trident-ac97))  0) {
+   if ((err = snd_ac97_mixer(trident-ac97_bus, _ac97, trident-ac97))  0) {
if (trident-device == TRIDENT_DEVICE_ID_SI7018) {
if ((err = snd_trident_sis_reset(trident))  0)
goto __out;
@@ -2987,7 +2992,7 @@
if (trident-device == TRIDENT_DEVICE_ID_SI7018 
(inl(TRID_REG(trident, SI_SERIAL_INTF_CTRL))  SI_AC97_PRIMARY_READY) != 
0) {
_ac97.num = 1;
-   err = snd_ac97_mixer(trident-card, _ac97, trident-ac97_sec);
+   err = snd_ac97_mixer(trident-ac97_bus, _ac97, trident-ac97_sec);
if (err  0)
snd_printk(SI7018: the secondary codec - invalid access\n);
 #if 0  // only for my testing purpose --jk
@@ -3295,7 +3300,7 @@
if (trident-device == TRIDENT_DEVICE_ID_SI7018)
s = sis7018;
if (! snd_card_proc_new(trident-card, s, entry))
-   snd_info_set_text_ops(entry, trident, snd_trident_proc_read);
+   snd_info_set_text_ops(entry, trident, 1024, snd_trident_proc_read);
 }
 
 static int snd_trident_dev_free(snd_device_t *device)



---
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community?  Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


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

2003-10-23 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/pci/rme9652
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/pci/rme9652

Modified Files:
hdsp.c rme9652.c 
Log Message:
- AC97 code
  - introduced ac97_bus_t structure
  - moved attached codecs to /proc/asound/card?/codec97#? directory
  - merged snd_ac97_modem() to snd_ac97_mixer()
- proc cleanups - removed already initialized variables
- enhanced snd_info_set_text_ops() syntax


Index: hdsp.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/rme9652/hdsp.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- hdsp.c  25 Sep 2003 18:55:43 -  1.44
+++ hdsp.c  23 Oct 2003 14:34:53 -  1.45
@@ -2994,7 +2994,7 @@
snd_info_entry_t *entry;
 
if (! snd_card_proc_new(hdsp-card, hdsp, entry))
-   snd_info_set_text_ops(entry, hdsp, snd_hdsp_proc_read);
+   snd_info_set_text_ops(entry, hdsp, 1024, snd_hdsp_proc_read);
 }
 
 static void snd_hdsp_free_buffers(hdsp_t *hdsp)

Index: rme9652.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/rme9652/rme9652.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- rme9652.c   3 Sep 2003 13:43:41 -   1.37
+++ rme9652.c   23 Oct 2003 14:34:53 -  1.38
@@ -1835,7 +1835,7 @@
snd_info_entry_t *entry;
 
if (! snd_card_proc_new(rme9652-card, rme9652, entry))
-   snd_info_set_text_ops(entry, rme9652, snd_rme9652_proc_read);
+   snd_info_set_text_ops(entry, rme9652, 1024, snd_rme9652_proc_read);
 }
 
 static void snd_rme9652_free_buffers(rme9652_t *rme9652)



---
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community?  Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/usb usbaudio.c,1.66,1.67

2003-10-23 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/usb
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/usb

Modified Files:
usbaudio.c 
Log Message:
- AC97 code
  - introduced ac97_bus_t structure
  - moved attached codecs to /proc/asound/card?/codec97#? directory
  - merged snd_ac97_modem() to snd_ac97_mixer()
- proc cleanups - removed already initialized variables
- enhanced snd_info_set_text_ops() syntax


Index: usbaudio.c
===
RCS file: /cvsroot/alsa/alsa-kernel/usb/usbaudio.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- usbaudio.c  30 Sep 2003 09:28:27 -  1.66
+++ usbaudio.c  23 Oct 2003 14:34:53 -  1.67
@@ -1819,7 +1819,7 @@
 
sprintf(name, stream%d, stream-pcm_index);
if (! snd_card_proc_new(card, name, entry))
-   snd_info_set_text_ops(entry, stream, proc_pcm_format_read);
+   snd_info_set_text_ops(entry, stream, 1024, proc_pcm_format_read);
 }
 
 



---
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community?  Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/isa/gus gus_irq.c,1.6,1.7 gus_mem.c,1.7,1.8

2003-10-23 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/isa/gus
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/isa/gus

Modified Files:
gus_irq.c gus_mem.c 
Log Message:
- AC97 code
  - introduced ac97_bus_t structure
  - moved attached codecs to /proc/asound/card?/codec97#? directory
  - merged snd_ac97_modem() to snd_ac97_mixer()
- proc cleanups - removed already initialized variables
- enhanced snd_info_set_text_ops() syntax


Index: gus_irq.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gus_irq.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gus_irq.c   23 Apr 2003 10:01:38 -  1.6
+++ gus_irq.c   23 Oct 2003 14:34:52 -  1.7
@@ -136,7 +136,7 @@
snd_info_entry_t *entry;
 
if (! snd_card_proc_new(gus-card, gusirq, entry))
-   snd_info_set_text_ops(entry, gus, snd_gus_irq_info_read);
+   snd_info_set_text_ops(entry, gus, 1024, snd_gus_irq_info_read);
 }
 
 #endif

Index: gus_mem.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gus_mem.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gus_mem.c   31 Jan 2003 15:19:51 -  1.7
+++ gus_mem.c   23 Oct 2003 14:34:52 -  1.8
@@ -265,7 +265,7 @@
return -ENOMEM;
 #ifdef CONFIG_SND_DEBUG
if (! snd_card_proc_new(gus-card, gusmem, entry)) {
-   snd_info_set_text_ops(entry, gus, snd_gf1_mem_info_read);
+   snd_info_set_text_ops(entry, gus, 1024, snd_gf1_mem_info_read);
entry-c.text.read_size = 256 * 1024;
}
 #endif



---
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community?  Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/pci/emu10k1 emumixer.c,1.17,1.18 emuproc.c,1.13,1.14

2003-10-23 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/pci/emu10k1
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/pci/emu10k1

Modified Files:
emumixer.c emuproc.c 
Log Message:
- AC97 code
  - introduced ac97_bus_t structure
  - moved attached codecs to /proc/asound/card?/codec97#? directory
  - merged snd_ac97_modem() to snd_ac97_mixer()
- proc cleanups - removed already initialized variables
- enhanced snd_info_set_text_ops() syntax


Index: emumixer.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emumixer.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- emumixer.c  13 Oct 2003 16:30:45 -  1.17
+++ emumixer.c  23 Oct 2003 14:34:53 -  1.18
@@ -455,18 +455,24 @@
 
 int __devinit snd_emu10k1_mixer(emu10k1_t *emu)
 {
-   ac97_t ac97;
int err, pcm;
snd_kcontrol_t *kctl;
snd_card_t *card = emu-card;
 
if (!emu-no_ac97) {
+   ac97_bus_t bus, *pbus;
+   ac97_t ac97;
+
+   memset(bus, 0, sizeof(bus));
+   bus.write = snd_emu10k1_ac97_write;
+   bus.read = snd_emu10k1_ac97_read;
+   if ((err = snd_ac97_bus(emu-card, bus, pbus))  0)
+   return err;
+   
memset(ac97, 0, sizeof(ac97));
-   ac97.write = snd_emu10k1_ac97_write;
-   ac97.read = snd_emu10k1_ac97_read;
ac97.private_data = emu;
ac97.private_free = snd_emu10k1_mixer_free_ac97;
-   if ((err = snd_ac97_mixer(emu-card, ac97, emu-ac97))  0)
+   if ((err = snd_ac97_mixer(pbus, ac97, emu-ac97))  0)
return err;
if (emu-audigy) {
/* Master/PCM controls on ac97 of Audigy has no effect */

Index: emuproc.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emuproc.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- emuproc.c   1 Mar 2003 19:03:22 -   1.13
+++ emuproc.c   23 Oct 2003 14:34:53 -  1.14
@@ -240,7 +240,7 @@
snd_info_entry_t *entry;

if (! snd_card_proc_new(emu-card, emu10k1, entry))
-   snd_info_set_text_ops(entry, emu, snd_emu10k1_proc_read);
+   snd_info_set_text_ops(entry, emu, 1024, snd_emu10k1_proc_read);
 
if (! snd_card_proc_new(emu-card, fx8010_gpr, entry)) {
entry-content = SNDRV_INFO_CONTENT_DATA;



---
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community?  Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


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

2003-10-24 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-driver/pci/au88x0
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-driver/pci/au88x0

Modified Files:
au88x0_mixer.c 
Log Message:
- AC97 code
  - introduced ac97_bus_t structure
  - moved attached codecs to /proc/asound/card?/codec97#? directory
  - merged snd_ac97_modem() to snd_ac97_mixer()
- proc cleanups - removed already initialized variables
- enhanced snd_info_set_text_ops() syntax


Index: au88x0_mixer.c
===
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au88x0_mixer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- au88x0_mixer.c  6 Oct 2003 14:01:05 -   1.1
+++ au88x0_mixer.c  23 Oct 2003 14:34:51 -  1.2
@@ -12,12 +12,17 @@
 #include au88x0.h
 
 int __devinit snd_vortex_mixer(vortex_t *vortex) {
+ac97_bus_t bus, *pbus;
 ac97_t ac97;
+int err;

+memset(bus, 0, sizeof(bus));
+bus.write = vortex_codec_write;
+bus.read = vortex_codec_read;
+if ((err = snd_ac97_bus(vortex-card, bus, pbus))  0)
+return err;
 memset(ac97, 0, sizeof(ac97));
 // Intialize AC97 codec stuff.
-ac97.write = vortex_codec_write;
-ac97.read = vortex_codec_read;
 ac97.private_data = vortex;
-   return snd_ac97_mixer(vortex-card, ac97, vortex-codec);
+return snd_ac97_mixer(pbus, ac97, vortex-codec);
 }



---
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community?  Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


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

2003-10-24 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/drivers/vx
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/drivers/vx

Modified Files:
vx_core.c 
Log Message:
- AC97 code
  - introduced ac97_bus_t structure
  - moved attached codecs to /proc/asound/card?/codec97#? directory
  - merged snd_ac97_modem() to snd_ac97_mixer()
- proc cleanups - removed already initialized variables
- enhanced snd_info_set_text_ops() syntax


Index: vx_core.c
===
RCS file: /cvsroot/alsa/alsa-kernel/drivers/vx/vx_core.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vx_core.c   8 Jul 2003 10:39:11 -   1.4
+++ vx_core.c   23 Oct 2003 14:34:52 -  1.5
@@ -641,7 +641,7 @@
snd_info_entry_t *entry;
 
if (! snd_card_proc_new(chip-card, vx-status, entry))
-   snd_info_set_text_ops(entry, chip, vx_proc_read);
+   snd_info_set_text_ops(entry, chip, 1024, vx_proc_read);
 }
 
 



---
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community?  Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/pci cmipci.c,1.50,1.51 cs4281.c,1.45,1.46 ens1370.c,1.51,1.52 fm801.c,1.35,1.36 intel8x0.c,1.95,1.96 maestro3.c,1.42,1.43 rme32.c,1.27,1.28 rme96.c,1.29,1.30 sonicvibes.c,1.26,1.27 via82xx.c,1.62,1.63

2003-10-24 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/pci

Modified Files:
cmipci.c cs4281.c ens1370.c fm801.c intel8x0.c maestro3.c 
rme32.c rme96.c sonicvibes.c via82xx.c 
Log Message:
- AC97 code
  - introduced ac97_bus_t structure
  - moved attached codecs to /proc/asound/card?/codec97#? directory
  - merged snd_ac97_modem() to snd_ac97_mixer()
- proc cleanups - removed already initialized variables
- enhanced snd_info_set_text_ops() syntax


Index: cmipci.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/cmipci.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- cmipci.c14 Oct 2003 13:59:20 -  1.50
+++ cmipci.c23 Oct 2003 14:34:52 -  1.51
@@ -2837,7 +2837,7 @@
snd_info_entry_t *entry;
 
if (! snd_card_proc_new(cm-card, cmipci, entry))
-   snd_info_set_text_ops(entry, cm, snd_cmipci_proc_read);
+   snd_info_set_text_ops(entry, cm, 1024, snd_cmipci_proc_read);
 }
 
 

Index: cs4281.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/cs4281.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- cs4281.c14 Oct 2003 14:08:48 -  1.45
+++ cs4281.c23 Oct 2003 14:34:52 -  1.46
@@ -479,6 +479,7 @@
 
int dual_codec;
 
+   ac97_bus_t *ac97_bus;
ac97_t *ac97;
ac97_t *ac97_secondary;
 
@@ -564,7 +565,7 @@
 }
 
 static void snd_cs4281_ac97_write(ac97_t *ac97,
-  unsigned short reg, unsigned short val)
+ unsigned short reg, unsigned short val)
 {
/*
 *  1. Write ACCAD = Command Address Register = 46Ch for AC97 register address
@@ -609,7 +610,7 @@
 }
 
 static unsigned short snd_cs4281_ac97_read(ac97_t *ac97,
-   unsigned short reg)
+  unsigned short reg)
 {
cs4281_t *chip = snd_magic_cast(cs4281_t, ac97-private_data, return -ENXIO);
int count;
@@ -1119,6 +1120,12 @@
.private_value = ((BA0_PPLVC  16) | BA0_PPRVC),
 };
 
+static void snd_cs4281_mixer_free_ac97_bus(ac97_bus_t *bus)
+{
+   cs4281_t *chip = snd_magic_cast(cs4281_t, bus-private_data, return);
+   chip-ac97_bus = NULL;
+}
+
 static void snd_cs4281_mixer_free_ac97(ac97_t *ac97)
 {
cs4281_t *chip = snd_magic_cast(cs4281_t, ac97-private_data, return);
@@ -1131,19 +1138,26 @@
 static int __devinit snd_cs4281_mixer(cs4281_t * chip)
 {
snd_card_t *card = chip-card;
+   ac97_bus_t bus;
ac97_t ac97;
int err;
 
+   memset(bus, 0, sizeof(bus));
+   bus.write = snd_cs4281_ac97_write;
+   bus.read = snd_cs4281_ac97_read;
+   bus.private_data = chip;
+   bus.private_free = snd_cs4281_mixer_free_ac97_bus;
+   if ((err = snd_ac97_bus(card, bus, chip-ac97_bus))  0)
+   return err;
+
memset(ac97, 0, sizeof(ac97));
-   ac97.write = snd_cs4281_ac97_write;
-   ac97.read = snd_cs4281_ac97_read;
ac97.private_data = chip;
ac97.private_free = snd_cs4281_mixer_free_ac97;
-   if ((err = snd_ac97_mixer(card, ac97, chip-ac97))  0)
+   if ((err = snd_ac97_mixer(chip-ac97_bus, ac97, chip-ac97))  0)
return err;
if (chip-dual_codec) {
ac97.num = 1;
-   if ((err = snd_ac97_mixer(card, ac97, chip-ac97_secondary))  0)
+   if ((err = snd_ac97_mixer(chip-ac97_bus, ac97, 
chip-ac97_secondary))  0)
return err;
}
if ((err = snd_ctl_add(card, snd_ctl_new1(snd_cs4281_fm_vol, chip)))  0)
@@ -1215,7 +1229,7 @@
snd_info_entry_t *entry;
 
if (! snd_card_proc_new(chip-card, cs4281, entry))
-   snd_info_set_text_ops(entry, chip, snd_cs4281_proc_read);
+   snd_info_set_text_ops(entry, chip, 1024, snd_cs4281_proc_read);
if (! snd_card_proc_new(chip-card, cs4281_BA0, entry)) {
entry-content = SNDRV_INFO_CONTENT_DATA;
entry-private_data = chip;

Index: ens1370.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ens1370.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ens1370.c   14 Oct 2003 13:59:20 -  1.51
+++ ens1370.c   23 Oct 2003 14:34:52 -  1.52
@@ -1534,16 +1534,21 @@
 static int snd_ensoniq_1371_mixer(ensoniq_t * ensoniq)
 {
snd_card_t *card = ensoniq-card;
+   ac97_bus_t bus, *pbus;
ac97_t ac97;
int err, idx;
 
+   memset(bus, 0, sizeof(bus));
+   bus.write = snd_es1371_codec_write;
+   bus.read = snd_es1371_codec_read;
+   if ((err = snd_ac97_bus(card, bus, pbus))  0)
+   return err;
+
memset(ac97, 0, sizeof(ac97));

[alsa-cvslog] CVS: alsa-kernel/pci/ice1712 ice1712.c,1.35,1.36 ice1724.c,1.18,1.19

2003-10-24 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/pci/ice1712
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/pci/ice1712

Modified Files:
ice1712.c ice1724.c 
Log Message:
- AC97 code
  - introduced ac97_bus_t structure
  - moved attached codecs to /proc/asound/card?/codec97#? directory
  - merged snd_ac97_modem() to snd_ac97_mixer()
- proc cleanups - removed already initialized variables
- enhanced snd_info_set_text_ops() syntax


Index: ice1712.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/ice1712.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ice1712.c   30 Sep 2003 11:30:35 -  1.35
+++ ice1712.c   23 Oct 2003 14:34:53 -  1.36
@@ -1450,13 +1450,17 @@
int err;
 
if (ice_has_con_ac97(ice)) {
+   ac97_bus_t bus, *pbus;
ac97_t ac97;
+   memset(bus, 0, sizeof(bus));
+   bus.write = snd_ice1712_ac97_write;
+   bus.read = snd_ice1712_ac97_read;
+   if ((err = snd_ac97_bus(ice-card, bus, pbus))  0)
+   return err;
memset(ac97, 0, sizeof(ac97));
-   ac97.write = snd_ice1712_ac97_write;
-   ac97.read = snd_ice1712_ac97_read;
ac97.private_data = ice;
ac97.private_free = snd_ice1712_mixer_free_ac97;
-   if ((err = snd_ac97_mixer(ice-card, ac97, ice-ac97))  0)
+   if ((err = snd_ac97_mixer(pbus, ac97, ice-ac97))  0)
printk(KERN_WARNING ice1712: cannot initialize ac97 for 
consumer, skipped\n);
else {
if ((err = snd_ctl_add(ice-card, 
snd_ctl_new1(snd_ice1712_mixer_digmix_route_ac97, ice)))  0)
@@ -1466,13 +1470,17 @@
}
 
if (! (ice-eeprom.data[ICE_EEP1_ACLINK]  ICE1712_CFG_PRO_I2S)) {
+   ac97_bus_t bus, *pbus;
ac97_t ac97;
+   memset(bus, 0, sizeof(bus));
+   bus.write = snd_ice1712_pro_ac97_write;
+   bus.read = snd_ice1712_pro_ac97_read;
+   if ((err = snd_ac97_bus(ice-card, bus, pbus))  0)
+   return err;
memset(ac97, 0, sizeof(ac97));
-   ac97.write = snd_ice1712_pro_ac97_write;
-   ac97.read = snd_ice1712_pro_ac97_read;
ac97.private_data = ice;
ac97.private_free = snd_ice1712_mixer_free_ac97;
-   if ((err = snd_ac97_mixer(ice-card, ac97, ice-ac97))  0)
+   if ((err = snd_ac97_mixer(pbus, ac97, ice-ac97))  0)
printk(KERN_WARNING ice1712: cannot initialize pro ac97, 
skipped\n);
else
return 0;
@@ -1533,7 +1541,7 @@
snd_info_entry_t *entry;
 
if (! snd_card_proc_new(ice-card, ice1712, entry))
-   snd_info_set_text_ops(entry, ice, snd_ice1712_proc_read);
+   snd_info_set_text_ops(entry, ice, 1024, snd_ice1712_proc_read);
 }
 
 /*

Index: ice1724.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ice1712/ice1724.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ice1724.c   10 Sep 2003 18:01:16 -  1.18
+++ ice1724.c   23 Oct 2003 14:34:53 -  1.19
@@ -908,17 +908,21 @@
int err;
 
if (! (ice-eeprom.data[ICE_EEP2_ACLINK]  VT1724_CFG_PRO_I2S)) {
+   ac97_bus_t bus, *pbus;
ac97_t ac97;
/* cold reset */
outb(inb(ICEMT1724(ice, AC97_CMD)) | 0x80, ICEMT1724(ice, AC97_CMD));
mdelay(5); /* FIXME */
outb(inb(ICEMT1724(ice, AC97_CMD))  ~0x80, ICEMT1724(ice, AC97_CMD));
 
+   memset(bus, 0, sizeof(bus));
+   bus.write = snd_vt1724_ac97_write;
+   bus.read = snd_vt1724_ac97_read;
+   if ((err = snd_ac97_bus(ice-card, bus, pbus))  0)
+   return err;
memset(ac97, 0, sizeof(ac97));
-   ac97.write = snd_vt1724_ac97_write;
-   ac97.read = snd_vt1724_ac97_read;
ac97.private_data = ice;
-   if ((err = snd_ac97_mixer(ice-card, ac97, ice-ac97))  0)
+   if ((err = snd_ac97_mixer(pbus, ac97, ice-ac97))  0)
printk(KERN_WARNING ice1712: cannot initialize pro ac97, 
skipped\n);
else
return 0;
@@ -975,7 +979,7 @@
snd_info_entry_t *entry;
 
if (! snd_card_proc_new(ice-card, ice1724, entry))
-   snd_info_set_text_ops(entry, ice, snd_vt1724_proc_read);
+   snd_info_set_text_ops(entry, ice, 1024, snd_vt1724_proc_read);
 }
 
 /*



---
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the 

[alsa-cvslog] CVS: alsa-kernel/i2c/l3 uda1341.c,1.9,1.10

2003-10-24 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/i2c/l3
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/i2c/l3

Modified Files:
uda1341.c 
Log Message:
- AC97 code
  - introduced ac97_bus_t structure
  - moved attached codecs to /proc/asound/card?/codec97#? directory
  - merged snd_ac97_modem() to snd_ac97_mixer()
- proc cleanups - removed already initialized variables
- enhanced snd_info_set_text_ops() syntax


Index: uda1341.c
===
RCS file: /cvsroot/alsa/alsa-kernel/i2c/l3/uda1341.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- uda1341.c   19 Apr 2003 13:34:33 -  1.9
+++ uda1341.c   23 Oct 2003 14:34:52 -  1.10
@@ -421,9 +421,9 @@
snd_info_entry_t *entry;
 
if (! snd_card_proc_new(card, uda1341, entry))
-   snd_info_set_text_ops(entry, clnt, snd_uda1341_proc_read);
+   snd_info_set_text_ops(entry, clnt, 1024, snd_uda1341_proc_read);
if (! snd_card_proc_new(card, uda1341-regs, entry))
-   snd_info_set_text_ops(entry, clnt, snd_uda1341_proc_regs_read);
+   snd_info_set_text_ops(entry, clnt, 1024, snd_uda1341_proc_regs_read);
 }
 
 /* }}} */



---
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community?  Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/core hwdep.c,1.23,1.24 info_oss.c,1.9,1.10 init.c,1.39,1.40 memory.c,1.26,1.27 pcm.c,1.33,1.34 rawmidi.c,1.39,1.40 sound.c,1.50,1.51 sound_oss.c,1.10,1.11 timer.c,1.51,1.52

2003-10-24 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/core

Modified Files:
hwdep.c info_oss.c init.c memory.c pcm.c rawmidi.c sound.c 
sound_oss.c timer.c 
Log Message:
- AC97 code
  - introduced ac97_bus_t structure
  - moved attached codecs to /proc/asound/card?/codec97#? directory
  - merged snd_ac97_modem() to snd_ac97_mixer()
- proc cleanups - removed already initialized variables
- enhanced snd_info_set_text_ops() syntax


Index: hwdep.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/hwdep.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- hwdep.c 21 Oct 2003 09:52:46 -  1.23
+++ hwdep.c 23 Oct 2003 14:34:52 -  1.24
@@ -487,7 +487,6 @@
 
memset(snd_hwdep_devices, 0, sizeof(snd_hwdep_devices));
if ((entry = snd_info_create_module_entry(THIS_MODULE, hwdep, NULL)) != 
NULL) {
-   entry-content = SNDRV_INFO_CONTENT_TEXT;
entry-c.text.read_size = 512;
entry-c.text.read = snd_hwdep_proc_read;
if (snd_info_register(entry)  0) {

Index: info_oss.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/info_oss.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- info_oss.c  13 Oct 2002 13:16:38 -  1.9
+++ info_oss.c  23 Oct 2003 14:34:52 -  1.10
@@ -114,7 +114,6 @@
 
memset(snd_sndstat_strings, 0, sizeof(snd_sndstat_strings));
if ((entry = snd_info_create_module_entry(THIS_MODULE, sndstat, 
snd_oss_root)) != NULL) {
-   entry-content = SNDRV_INFO_CONTENT_TEXT;
entry-c.text.read_size = 2048;
entry-c.text.read = snd_sndstat_proc_read;
if (snd_info_register(entry)  0) {

Index: init.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/init.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- init.c  30 Sep 2003 09:28:26 -  1.39
+++ init.c  23 Oct 2003 14:34:52 -  1.40
@@ -442,7 +442,6 @@
snd_printd(unable to create card entry\n);
goto __skip_info;
}
-   entry-content = SNDRV_INFO_CONTENT_TEXT;
entry-c.text.read_size = PAGE_SIZE;
entry-c.text.read = snd_card_id_read;
if (snd_info_register(entry)  0) {
@@ -527,7 +526,6 @@
 
entry = snd_info_create_module_entry(THIS_MODULE, cards, NULL);
snd_runtime_check(entry != NULL, return -ENOMEM);
-   entry-content = SNDRV_INFO_CONTENT_TEXT;
entry-c.text.read_size = PAGE_SIZE;
entry-c.text.read = snd_card_info_read;
if (snd_info_register(entry)  0) {
@@ -539,7 +537,6 @@
 #ifdef MODULE
entry = snd_info_create_module_entry(THIS_MODULE, modules, NULL);
if (entry) {
-   entry-content = SNDRV_INFO_CONTENT_TEXT;
entry-c.text.read_size = PAGE_SIZE;
entry-c.text.read = snd_card_module_info_read;
if (snd_info_register(entry)  0)

Index: memory.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/memory.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- memory.c28 Feb 2003 14:29:17 -  1.26
+++ memory.c23 Oct 2003 14:34:52 -  1.27
@@ -231,7 +231,6 @@
 
entry = snd_info_create_module_entry(THIS_MODULE, meminfo, NULL);
if (entry) {
-   entry-content = SNDRV_INFO_CONTENT_TEXT;
entry-c.text.read_size = 256;
entry-c.text.read = snd_memory_info_read;
if (snd_info_register(entry)  0) {

Index: pcm.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/pcm.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- pcm.c   20 Oct 2003 15:28:38 -  1.33
+++ pcm.c   23 Oct 2003 14:34:52 -  1.34
@@ -407,11 +407,7 @@
pstr-proc_root = entry;
 
if ((entry = snd_info_create_card_entry(pcm-card, info, pstr-proc_root)) 
!= NULL) {
-   entry-content = SNDRV_INFO_CONTENT_TEXT;
-   entry-mode = S_IFREG | S_IRUGO;
-   entry-c.text.read_size = 256;
-   entry-c.text.read = snd_pcm_stream_proc_info_read;
-   entry-private_data = pstr;
+   snd_info_set_text_ops(entry, pstr, 256, snd_pcm_stream_proc_info_read);
if (snd_info_register(entry)  0) {
snd_info_free_entry(entry);
entry = NULL;
@@ -454,11 +450,7 @@
substream-proc_root = entry;
 
if ((entry = snd_info_create_card_entry(card, info, substream-proc_root)) 
!= NULL) {
-   entry-content = 

[alsa-cvslog] CVS: alsa-driver/pci/pdplus pdplus.c,1.14,1.15

2003-10-24 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-driver/pci/pdplus
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-driver/pci/pdplus

Modified Files:
pdplus.c 
Log Message:
- AC97 code
  - introduced ac97_bus_t structure
  - moved attached codecs to /proc/asound/card?/codec97#? directory
  - merged snd_ac97_modem() to snd_ac97_mixer()
- proc cleanups - removed already initialized variables
- enhanced snd_info_set_text_ops() syntax


Index: pdplus.c
===
RCS file: /cvsroot/alsa/alsa-driver/pci/pdplus/pdplus.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pdplus.c25 Sep 2003 09:58:28 -  1.14
+++ pdplus.c23 Oct 2003 14:34:51 -  1.15
@@ -5796,7 +5796,7 @@
 snd_assert (scard-card != NULL, return);
 
 if (! snd_card_proc_new (scard-card, prodif_plus, entry))
-   snd_info_set_text_ops(entry, scard, pdplus_proc_read);
+   snd_info_set_text_ops(entry, scard, 1024, pdplus_proc_read);
 }
 
 



---
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community?  Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/pci/ymfpci ymfpci_main.c,1.44,1.45

2003-10-24 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/pci/ymfpci
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/pci/ymfpci

Modified Files:
ymfpci_main.c 
Log Message:
- AC97 code
  - introduced ac97_bus_t structure
  - moved attached codecs to /proc/asound/card?/codec97#? directory
  - merged snd_ac97_modem() to snd_ac97_mixer()
- proc cleanups - removed already initialized variables
- enhanced snd_info_set_text_ops() syntax


Index: ymfpci_main.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ymfpci/ymfpci_main.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ymfpci_main.c   17 Oct 2003 10:29:12 -  1.44
+++ ymfpci_main.c   23 Oct 2003 14:34:53 -  1.45
@@ -1708,6 +1708,12 @@
  *  Mixer routines
  */
 
+static void snd_ymfpci_mixer_free_ac97_bus(ac97_bus_t *bus)
+{
+   ymfpci_t *chip = snd_magic_cast(ymfpci_t, bus-private_data, return);
+   chip-ac97_bus = NULL;
+}
+
 static void snd_ymfpci_mixer_free_ac97(ac97_t *ac97)
 {
ymfpci_t *chip = snd_magic_cast(ymfpci_t, ac97-private_data, return);
@@ -1716,17 +1722,24 @@
 
 int __devinit snd_ymfpci_mixer(ymfpci_t *chip, int rear_switch)
 {
+   ac97_bus_t bus;
ac97_t ac97;
snd_kcontrol_t *kctl;
unsigned int idx;
int err;
 
+   memset(bus, 0, sizeof(bus));
+   bus.write = snd_ymfpci_codec_write;
+   bus.read = snd_ymfpci_codec_read;
+   bus.private_data = chip;
+   bus.private_free = snd_ymfpci_mixer_free_ac97_bus;
+   if ((err = snd_ac97_bus(chip-card, bus, chip-ac97_bus))  0)
+   return err;
+
memset(ac97, 0, sizeof(ac97));
-   ac97.write = snd_ymfpci_codec_write;
-   ac97.read = snd_ymfpci_codec_read;
ac97.private_data = chip;
ac97.private_free = snd_ymfpci_mixer_free_ac97;
-   if ((err = snd_ac97_mixer(chip-card, ac97, chip-ac97))  0)
+   if ((err = snd_ac97_mixer(chip-ac97_bus, ac97, chip-ac97))  0)
return err;
 
for (idx = 0; idx  YMFPCI_CONTROLS; idx++) {
@@ -1855,7 +1868,7 @@
snd_info_entry_t *entry;

if (! snd_card_proc_new(card, ymfpci, entry))
-   snd_info_set_text_ops(entry, chip, snd_ymfpci_proc_read);
+   snd_info_set_text_ops(entry, chip, 1024, snd_ymfpci_proc_read);
return 0;
 }
 



---
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community?  Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/isa/sb sb16_csp.c,1.11,1.12

2003-10-25 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/isa/sb
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/isa/sb

Modified Files:
sb16_csp.c 
Log Message:
- AC97 code
  - introduced ac97_bus_t structure
  - moved attached codecs to /proc/asound/card?/codec97#? directory
  - merged snd_ac97_modem() to snd_ac97_mixer()
- proc cleanups - removed already initialized variables
- enhanced snd_info_set_text_ops() syntax


Index: sb16_csp.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/sb16_csp.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sb16_csp.c  21 Oct 2003 17:40:14 -  1.11
+++ sb16_csp.c  23 Oct 2003 14:34:52 -  1.12
@@ -1107,7 +1107,7 @@
snd_info_entry_t *entry;
sprintf(name, cspD%d, device);
if (! snd_card_proc_new(p-chip-card, name, entry))
-   snd_info_set_text_ops(entry, p, info_read);
+   snd_info_set_text_ops(entry, p, 1024, info_read);
return 0;
 }
 



---
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community?  Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


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

2003-10-25 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/pci/korg1212
In directory sc8-pr-cvs1:/tmp/cvs-serv3064/alsa-kernel/pci/korg1212

Modified Files:
korg1212.c 
Log Message:
- AC97 code
  - introduced ac97_bus_t structure
  - moved attached codecs to /proc/asound/card?/codec97#? directory
  - merged snd_ac97_modem() to snd_ac97_mixer()
- proc cleanups - removed already initialized variables
- enhanced snd_info_set_text_ops() syntax


Index: korg1212.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/korg1212/korg1212.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- korg1212.c  12 Aug 2003 14:10:16 -  1.32
+++ korg1212.c  23 Oct 2003 14:34:53 -  1.33
@@ -2093,7 +2093,7 @@
snd_info_entry_t *entry;
 
if (! snd_card_proc_new(korg1212-card, korg1212, entry))
-   snd_info_set_text_ops(entry, korg1212, snd_korg1212_proc_read);
+   snd_info_set_text_ops(entry, korg1212, 1024, snd_korg1212_proc_read);
 }
 
 static int



---
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community?  Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/core/oss pcm_oss.c,1.53,1.54

2003-10-28 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/core/oss
In directory sc8-pr-cvs1:/tmp/cvs-serv11896

Modified Files:
pcm_oss.c 
Log Message:
- avail_min is now 1
- fixed read1() function for avail_min == 1
- fixed conversion between ALSA and OSS position
- fixed info.blocks computing in get_ptr() (included fixup)
- fixed get_space() function (included fixup)


Index: pcm_oss.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/oss/pcm_oss.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- pcm_oss.c   30 Sep 2003 09:28:26 -  1.53
+++ pcm_oss.c   28 Oct 2003 13:29:00 -  1.54
@@ -125,8 +125,8 @@
if (runtime-period_size == runtime-oss.period_bytes)
return frames;
if (runtime-period_size  runtime-oss.period_bytes)
-   return frames * (runtime-oss.period_bytes / runtime-period_size);
-   return frames / (runtime-period_size / runtime-oss.period_bytes);
+   return (frames * runtime-period_size) / runtime-oss.period_bytes;
+   return (frames * runtime-oss.period_bytes) / runtime-period_size;
 }
 
 static int snd_pcm_oss_format_from(int format)
@@ -451,7 +451,7 @@
sw_params-tstamp_mode = SNDRV_PCM_TSTAMP_NONE;
sw_params-period_step = 1;
sw_params-sleep_min = 0;
-   sw_params-avail_min = runtime-period_size;
+   sw_params-avail_min = 1;
sw_params-xfer_align = 1;
if (atomic_read(runtime-mmap_count) ||
(substream-oss.setup  substream-oss.setup-nosilence)) {
@@ -470,7 +470,6 @@
snd_printd(SW_PARAMS failed: %i\n, err);
goto failure;
}
-   runtime-control-avail_min = runtime-period_size;
 
runtime-oss.periods = params_periods(sparams);
oss_period_size = snd_pcm_plug_client_size(substream, 
params_period_size(sparams));
@@ -883,7 +882,7 @@
if (tmp = 0)
return xfer  0 ? (snd_pcm_sframes_t)xfer : 
tmp;
runtime-oss.bytes += tmp;
-   runtime-oss.buffer_used = runtime-oss.period_bytes;
+   runtime-oss.buffer_used = tmp;
}
tmp = bytes;
if ((size_t) tmp  runtime-oss.buffer_used)
@@ -1425,6 +1424,7 @@
snd_pcm_substream_t *substream;
snd_pcm_runtime_t *runtime;
snd_pcm_sframes_t delay;
+   int fixup;
struct count_info info;
int err;
 
@@ -1447,9 +1447,13 @@
if (err == -EPIPE || err == -ESTRPIPE) {
err = 0;
delay = 0;
+   fixup = 0;
+   } else {
+   fixup = runtime-oss.buffer_used;
}
} else {
err = snd_pcm_oss_capture_position_fixup(substream, delay);
+   fixup = -runtime-oss.buffer_used;
}
if (err  0)
return err;
@@ -1469,7 +1473,8 @@
if (substream-stream == SNDRV_PCM_STREAM_PLAYBACK)
snd_pcm_oss_simulate_fill(substream);
} else {
-   info.blocks = delay / runtime-period_size;
+   delay = snd_pcm_oss_bytes(substream, delay) + fixup;
+   info.blocks = delay / runtime-oss.period_bytes;
}
if (copy_to_user(_info, info, sizeof(info)))
return -EFAULT;
@@ -1481,6 +1486,7 @@
snd_pcm_substream_t *substream;
snd_pcm_runtime_t *runtime;
snd_pcm_sframes_t avail;
+   int fixup;
struct audio_buf_info info;
int err;
 
@@ -1500,7 +1506,7 @@
if (runtime-oss.prepare) {
if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
info.bytes = runtime-oss.period_bytes * runtime-periods;
-   info.fragments = runtime-periods;
+   info.fragments = runtime-oss.periods;
} else {
info.bytes = 0;
info.fragments = 0;
@@ -1511,16 +1517,19 @@
if (err == -EPIPE || err == -ESTRPIPE) {
avail = runtime-buffer_size;
err = 0;
+   fixup = 0;
} else {
avail = runtime-buffer_size - avail;
+   fixup = -runtime-oss.buffer_used;
}
} else {
err = snd_pcm_oss_capture_position_fixup(substream, avail);
+   fixup = runtime-oss.buffer_used;
}
if (err  0)
return err;
-   info.bytes = snd_pcm_oss_bytes(substream, avail);
-   info.fragments = avail / runtime-period_size;
+   

[alsa-cvslog] CVS: alsa-kernel/isa/ad1848 ad1848_lib.c,1.29,1.30

2003-10-29 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/isa/ad1848
In directory sc8-pr-cvs1:/tmp/cvs-serv27757

Modified Files:
ad1848_lib.c 
Log Message:
Robert Harris [EMAIL PROTECTED]
Fixed spinlocks


Index: ad1848_lib.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/ad1848/ad1848_lib.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ad1848_lib.c17 Jul 2003 15:16:24 -  1.29
+++ ad1848_lib.c29 Oct 2003 09:29:32 -  1.30
@@ -736,11 +736,13 @@
snd_ad1848_out(chip, AD1848_RIGHT_INPUT, 0x45);
rev = snd_ad1848_in(chip, AD1848_RIGHT_INPUT);
if (rev == 0x65) {
+   spin_unlock_irqrestore(chip-reg_lock, flags);
id = 1;
ad1847 = 1;
break;
}
if (snd_ad1848_in(chip, AD1848_LEFT_INPUT) == 0xaa  rev == 
0x45) {
+   spin_unlock_irqrestore(chip-reg_lock, flags);
id = 1;
break;
}



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/core/oss pcm_oss.c,1.54,1.55

2003-10-29 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/core/oss
In directory sc8-pr-cvs1:/tmp/cvs-serv28002

Modified Files:
pcm_oss.c 
Log Message:
Fixed read for partial OSS period buffer contents

Index: pcm_oss.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/oss/pcm_oss.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- pcm_oss.c   28 Oct 2003 13:29:00 -  1.54
+++ pcm_oss.c   29 Oct 2003 09:30:33 -  1.55
@@ -554,6 +554,7 @@
runtime-oss.prepare = 0;
runtime-oss.prev_hw_ptr_interrupt = 0;
runtime-oss.period_ptr = 0;
+   runtime-oss.buffer_used = 0;
 
return 0;
 }
@@ -882,12 +883,13 @@
if (tmp = 0)
return xfer  0 ? (snd_pcm_sframes_t)xfer : 
tmp;
runtime-oss.bytes += tmp;
+   runtime-oss.period_ptr = tmp;
runtime-oss.buffer_used = tmp;
}
tmp = bytes;
if ((size_t) tmp  runtime-oss.buffer_used)
tmp = runtime-oss.buffer_used;
-   if (copy_to_user(buf, runtime-oss.buffer + 
(runtime-oss.period_bytes - runtime-oss.buffer_used), tmp))
+   if (copy_to_user(buf, runtime-oss.buffer + 
(runtime-oss.period_ptr - runtime-oss.buffer_used), tmp))
return xfer  0 ? (snd_pcm_sframes_t)xfer : -EFAULT;
buf += tmp;
bytes -= tmp;



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/drivers/opl4 opl4_proc.c,1.1,1.2

2003-11-03 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/drivers/opl4
In directory sc8-pr-cvs1:/tmp/cvs-serv3501

Modified Files:
opl4_proc.c 
Log Message:
Clemens Ladisch [EMAIL PROTECTED]
use vmalloc instead of kmalloc for temp buffer in proc read()/write()


Index: opl4_proc.c
===
RCS file: /cvsroot/alsa/alsa-kernel/drivers/opl4/opl4_proc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opl4_proc.c 23 May 2003 11:15:12 -  1.1
+++ opl4_proc.c 3 Nov 2003 10:30:47 -   1.2
@@ -18,6 +18,7 @@
  */
 
 #include opl4_local.h
+#include linux/vmalloc.h
 #include sound/info.h
 
 #ifdef CONFIG_PROC_FS
@@ -59,7 +60,7 @@
if (file-f_pos + size  entry-size)
size = entry-size - file-f_pos;
if (size  0) {
-   buf = kmalloc(size, GFP_KERNEL);
+   buf = vmalloc(size);
if (!buf)
return -ENOMEM;
snd_opl4_read_memory(opl4, buf, file-f_pos, size);
@@ -67,7 +68,7 @@
kfree(buf);
return -EFAULT;
}
-   kfree(buf);
+   vfree(buf);
file-f_pos += size;
return size;
}
@@ -85,7 +86,7 @@
if (file-f_pos + size  entry-size)
size = entry-size - file-f_pos;
if (size  0) {
-   buf = kmalloc(size, GFP_KERNEL);
+   buf = vmalloc(size);
if (!buf)
return -ENOMEM;
if (copy_from_user(buf, _buf, size)) {
@@ -93,7 +94,7 @@
return -EFAULT;
}
snd_opl4_write_memory(opl4, buf, file-f_pos, size);
-   kfree(buf);
+   vfree(buf);
file-f_pos += size;
return size;
}



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-lib/src/control control.c,1.100,1.101

2003-11-03 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-lib/src/control
In directory sc8-pr-cvs1:/tmp/cvs-serv3774

Modified Files:
control.c 
Log Message:
Clemens Ladisch [EMAIL PROTECTED]
clear element count when freeing space in element list


Index: control.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/control/control.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- control.c   21 Oct 2003 17:39:14 -  1.100
+++ control.c   3 Nov 2003 10:31:50 -   1.101
@@ -781,6 +781,7 @@
 {
free(obj-pids);
obj-pids = NULL;
+   obj-space = 0;
 }
 
 /**



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/pci/ac97 ac97_codec.c,1.110,1.111 ac97_patch.c,1.28,1.29 ac97_patch.h,1.10,1.11

2003-11-03 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1:/tmp/cvs-serv5389

Modified Files:
ac97_codec.c ac97_patch.c ac97_patch.h 
Log Message:
Clemens Ladisch [EMAIL PROTECTED]
new controls for AD1981A/B/1980/1985


Index: ac97_codec.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_codec.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- ac97_codec.c27 Oct 2003 10:48:41 -  1.110
+++ ac97_codec.c3 Nov 2003 10:42:12 -   1.111
@@ -101,8 +101,8 @@
 { 0x41445362, 0x, AD1887,patch_ad1881,   NULL },
 { 0x41445363, 0x, AD1886A,   patch_ad1881,   NULL },
 { 0x41445370, 0x, AD1980,patch_ad1980,   NULL },
-{ 0x41445372, 0x, AD1981A,   patch_ad1881,   NULL },
-{ 0x41445374, 0x, AD1981B,   patch_ad1881,   NULL },
+{ 0x41445372, 0x, AD1981A,   patch_ad1981a,  NULL },
+{ 0x41445374, 0x, AD1981B,   patch_ad1981b,  NULL },
 { 0x41445375, 0x, AD1985,patch_ad1985,   NULL },
 { 0x414c4300, 0xfff0, RL5306,NULL,   NULL },
 { 0x414c4310, 0xfff0, RL5382,NULL,   NULL },

Index: ac97_patch.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_patch.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ac97_patch.c27 Oct 2003 10:48:42 -  1.28
+++ ac97_patch.c3 Nov 2003 10:42:13 -   1.29
@@ -708,7 +708,7 @@
 #define AC97_AD198X_2MIC   0x0040  /* 2-channel mic select */
 #define AC97_AD198X_SPRD   0x0080  /* SPREAD enable */
 #define AC97_AD198X_DMIX0  0x0100  /* downmix mode: 0 = 6-to-4, 1 = 6-to-2 
downmix */
-#define AC97_AD198X_DMIX1  0x0300  /* downmix mode: 1 = enabled */
+#define AC97_AD198X_DMIX1  0x0200  /* downmix mode: 1 = enabled */
 #define AC97_AD198X_HPSEL  0x0400  /* headphone amplifier input select */
 #define AC97_AD198X_CLDIS  0x0800  /* center/lfe disable */
 #define AC97_AD198X_LODIS  0x1000  /* LINE_OUT disable */
@@ -717,7 +717,7 @@
 #define AC97_AD198X_DACZ   0x8000  /* DAC zero-fill mode */
 
 
-static int snd_ac97_ad1980_spdif_source_info(snd_kcontrol_t *kcontrol, 
snd_ctl_elem_info_t * uinfo)
+static int snd_ac97_ad198x_spdif_source_info(snd_kcontrol_t *kcontrol, 
snd_ctl_elem_info_t * uinfo)
 {
static char *texts[2] = { AC-Link, A/D Converter };
 
@@ -730,7 +730,7 @@
return 0;
 }
 
-static int snd_ac97_ad1980_spdif_source_get(snd_kcontrol_t * kcontrol, 
snd_ctl_elem_value_t * ucontrol)
+static int snd_ac97_ad198x_spdif_source_get(snd_kcontrol_t * kcontrol, 
snd_ctl_elem_value_t * ucontrol)
 {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
unsigned short val;
@@ -740,7 +740,7 @@
return 0;
 }
 
-static int snd_ac97_ad1980_spdif_source_put(snd_kcontrol_t * kcontrol, 
snd_ctl_elem_value_t * ucontrol)
+static int snd_ac97_ad198x_spdif_source_put(snd_kcontrol_t * kcontrol, 
snd_ctl_elem_value_t * ucontrol)
 {
ac97_t *ac97 = snd_kcontrol_chip(kcontrol);
unsigned short val;
@@ -751,31 +751,162 @@
return snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x0004, val);
 }
 
-static const snd_kcontrol_new_t snd_ac97_ad1980_spdif_source = {
+static const snd_kcontrol_new_t snd_ac97_ad198x_spdif_source = {
.iface  = SNDRV_CTL_ELEM_IFACE_MIXER,
.name   = SNDRV_CTL_NAME_IEC958(,PLAYBACK,NONE) Source,
-   .info   = snd_ac97_ad1980_spdif_source_info,
-   .get= snd_ac97_ad1980_spdif_source_get,
-   .put= snd_ac97_ad1980_spdif_source_put,
+   .info   = snd_ac97_ad198x_spdif_source_info,
+   .get= snd_ac97_ad198x_spdif_source_get,
+   .put= snd_ac97_ad198x_spdif_source_put,
 };
 
-static int patch_ad1980_post_spdif(ac97_t * ac97)
+static int patch_ad198x_post_spdif(ac97_t * ac97)
 {
-   return patch_build_controls(ac97, snd_ac97_ad1980_spdif_source, 1);
+   return patch_build_controls(ac97, snd_ac97_ad198x_spdif_source, 1);
 }
 
+static struct snd_ac97_build_ops patch_ad1981a_build_ops = {
+   .build_post_spdif = patch_ad198x_post_spdif
+};
+
+int patch_ad1981a(ac97_t *ac97)
+{
+   patch_ad1881(ac97);
+   ac97-build_ops = patch_ad1981a_build_ops;
+   snd_ac97_update_bits(ac97, AC97_AD_MISC, AC97_AD198X_MSPLT, AC97_AD198X_MSPLT);
+   ac97-flags |= AC97_STEREO_MUTES;
+   return 0;
+}
+
+static const snd_kcontrol_new_t snd_ac97_ad198x_2cmic =
+AC97_SINGLE(Stereo Mic, AC97_AD_MISC, 6, 1, 0);
+
+static int patch_ad1981b_specific(ac97_t *ac97)
+{
+   return patch_build_controls(ac97, snd_ac97_ad198x_2cmic, 1);
+}
+
+static struct snd_ac97_build_ops patch_ad1981b_build_ops = {
+   .build_post_spdif = patch_ad198x_post_spdif,
+   .build_specific = patch_ad1981b_specific
+};
+
+int 

[alsa-cvslog] CVS: alsa-utils/iecset iecset.c,1.2,1.3

2003-11-03 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-utils/iecset
In directory sc8-pr-cvs1:/tmp/cvs-serv5620

Modified Files:
iecset.c 
Log Message:
Clemens Ladisch [EMAIL PROTECTED]
- add error handler for ALSA errors
- enumerate all controls to find the desired control
  (because SPDIF is device 1 on ymfpci)


Index: iecset.c
===
RCS file: /cvsroot/alsa/alsa-utils/iecset/iecset.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- iecset.c28 Oct 2003 17:42:28 -  1.2
+++ iecset.c3 Nov 2003 10:43:32 -   1.3
@@ -76,6 +76,12 @@
 };
 
 
+static void error(const char *s, int err)
+{
+   fprintf(stderr, %s: %s\n, s, snd_strerror(err));
+}
+
+
 static void usage(void)
 {
int i;
@@ -279,13 +285,16 @@
 int main(int argc, char **argv)
 {
const char *dev = default;
-   const char *spdif_str = IEC958 Playback Default;
+   const char *spdif_str = SND_CTL_NAME_IEC958(, PLAYBACK, DEFAULT);
snd_ctl_t *ctl;
+   snd_ctl_elem_list_t *clist;
+   snd_ctl_elem_id_t *cid;
snd_ctl_elem_value_t *cval;
snd_aes_iec958_t iec958;
int from_stdin = 0;
int dumphex = 0;
-   int i, c;
+   int i, c, err;
+   unsigned int controls, cidx;
char tmpname[32];
int parms[IDX_LAST];
 
@@ -318,20 +327,42 @@
}
}
 
-   if (snd_ctl_open(ctl, dev, 0)  0) {
-   perror(snd_ctl_open);
+   if ((err = snd_ctl_open(ctl, dev, 0))  0) {
+   error(snd_ctl_open, err);
return 1;
}
 
+   snd_ctl_elem_list_alloca(clist);
+   if ((err = snd_ctl_elem_list(ctl, clist))  0) {
+   error(snd_ctl_elem_list, err);
+   return 1;
+   }
+   if ((err = snd_ctl_elem_list_alloc_space(clist, 
snd_ctl_elem_list_get_count(clist)))  0) {
+   error(snd_ctl_elem_list_alloc_space, err);
+   return 1;
+   }
+   if ((err = snd_ctl_elem_list(ctl, clist))  0) {
+   error(snd_ctl_elem_list, err);
+   return 1;
+   }
+
+   controls = snd_ctl_elem_list_get_used(clist);
+   for (cidx = 0; cidx  controls; cidx++) {
+   if (!strcmp(snd_ctl_elem_list_get_name(clist, cidx), spdif_str))
+   break;
+   }
+   if (cidx = controls) {
+   fprintf(stderr, control \%s\ not found\n, spdif_str);
+   return 1;
+   }
+
+   snd_ctl_elem_id_alloca(cid);
+   snd_ctl_elem_list_get_id(clist, cidx, cid);
snd_ctl_elem_value_alloca(cval);
-   snd_ctl_elem_value_set_interface(cval, SND_CTL_ELEM_IFACE_MIXER);
-   snd_ctl_elem_value_set_name(cval, spdif_str);
-   if (snd_ctl_elem_read(ctl, cval)  0) {
-   snd_ctl_elem_value_set_interface(cval, SND_CTL_ELEM_IFACE_PCM);
-   if (snd_ctl_elem_read(ctl, cval)  0) {
-   perror(snd_ctl_elem_read);
-   return 1;
-   }
+   snd_ctl_elem_value_set_id(cval, cid);
+   if ((err = snd_ctl_elem_read(ctl, cval))  0) {
+   error(snd_ctl_elem_read, err);
+   return 1;
}
 
snd_ctl_elem_value_get_iec958(cval, iec958);
@@ -347,12 +378,12 @@
if (update_iec958_status(iec958, parms)) {
/* store the values */
snd_ctl_elem_value_set_iec958(cval, iec958);
-   if (snd_ctl_elem_write(ctl, cval)  0) {
-   perror(snd_ctl_elem_write);
+   if ((err = snd_ctl_elem_write(ctl, cval))  0) {
+   error(snd_ctl_elem_write, err);
return 1;
}
-   if (snd_ctl_elem_read(ctl, cval)  0) {
-   perror(snd_ctl_elem_write);
+   if ((err = snd_ctl_elem_read(ctl, cval))  0) {
+   error(snd_ctl_elem_write, err);
return 1;
}
snd_ctl_elem_value_get_iec958(cval, iec958);



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/drivers/opl4 opl4_proc.c,1.2,1.3

2003-11-04 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/drivers/opl4
In directory sc8-pr-cvs1:/tmp/cvs-serv20510

Modified Files:
opl4_proc.c 
Log Message:
Clemens Ladisch [EMAIL PROTECTED]
oops - use vfree in error paths, too


Index: opl4_proc.c
===
RCS file: /cvsroot/alsa/alsa-kernel/drivers/opl4/opl4_proc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- opl4_proc.c 3 Nov 2003 10:30:47 -   1.2
+++ opl4_proc.c 4 Nov 2003 09:01:57 -   1.3
@@ -65,7 +65,7 @@
return -ENOMEM;
snd_opl4_read_memory(opl4, buf, file-f_pos, size);
if (copy_to_user(_buf, buf, size)) {
-   kfree(buf);
+   vfree(buf);
return -EFAULT;
}
vfree(buf);
@@ -90,7 +90,7 @@
if (!buf)
return -ENOMEM;
if (copy_from_user(buf, _buf, size)) {
-   kfree(buf);
+   vfree(buf);
return -EFAULT;
}
snd_opl4_write_memory(opl4, buf, file-f_pos, size);



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-lib/include pcm.h,1.179,1.180

2003-11-05 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-lib/include
In directory sc8-pr-cvs1:/tmp/cvs-serv15112/include

Modified Files:
pcm.h 
Log Message:
Switch from old to new PCM API retaining binary compatibility
Changed version to 1.0.0pre1


Index: pcm.h
===
RCS file: /cvsroot/alsa/alsa-lib/include/pcm.h,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- pcm.h   18 Mar 2003 20:37:42 -  1.179
+++ pcm.h   5 Nov 2003 10:38:38 -   1.180
@@ -525,132 +525,137 @@
 void snd_pcm_hw_params_copy(snd_pcm_hw_params_t *dst, const snd_pcm_hw_params_t *src);
 
 #ifndef ALSA_LIBRARY_BUILD
-#ifdef ALSA_PCM_NEW_HW_PARAMS_API
 
-int snd_pcm_hw_params_get_access(const snd_pcm_hw_params_t *params, snd_pcm_access_t 
*access) __attribute__ ((weak, alias (__snd_pcm_hw_params_get_access)));
+#ifndef ALSA_PCM_OLD_HW_PARAMS_API
+
+int snd_pcm_hw_params_get_access(const snd_pcm_hw_params_t *params, snd_pcm_access_t 
*access);
 int snd_pcm_hw_params_test_access(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, 
snd_pcm_access_t access);
 int snd_pcm_hw_params_set_access(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, 
snd_pcm_access_t access);
-int snd_pcm_hw_params_set_access_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, 
snd_pcm_access_t *access) __attribute__ ((weak, alias 
(__snd_pcm_hw_params_set_access_last)));
-int snd_pcm_hw_params_set_access_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, 
snd_pcm_access_t *access) __attribute__ ((weak, alias 
(__snd_pcm_hw_params_set_access_last)));
+int snd_pcm_hw_params_set_access_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, 
snd_pcm_access_t *access);
+int snd_pcm_hw_params_set_access_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, 
snd_pcm_access_t *access);
 int snd_pcm_hw_params_set_access_mask(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, 
snd_pcm_access_mask_t *mask);
 int snd_pcm_hw_params_get_access_mask(snd_pcm_hw_params_t *params, 
snd_pcm_access_mask_t *mask);
 
-int snd_pcm_hw_params_get_format(const snd_pcm_hw_params_t *params, snd_pcm_format_t 
*val) __attribute__ ((weak, alias (__snd_pcm_hw_params_get_format)));
+int snd_pcm_hw_params_get_format(const snd_pcm_hw_params_t *params, snd_pcm_format_t 
*val);
 int snd_pcm_hw_params_test_format(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, 
snd_pcm_format_t val);
 int snd_pcm_hw_params_set_format(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, 
snd_pcm_format_t val);
-int snd_pcm_hw_params_set_format_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, 
snd_pcm_format_t *format) __attribute__ ((weak, alias 
(__snd_pcm_hw_params_set_format_first)));
-int snd_pcm_hw_params_set_format_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, 
snd_pcm_format_t *format) __attribute__ ((weak, alias 
(__snd_pcm_hw_params_set_format_last)));
+int snd_pcm_hw_params_set_format_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, 
snd_pcm_format_t *format);
+int snd_pcm_hw_params_set_format_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, 
snd_pcm_format_t *format);
 int snd_pcm_hw_params_set_format_mask(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, 
snd_pcm_format_mask_t *mask);
 void snd_pcm_hw_params_get_format_mask(snd_pcm_hw_params_t *params, 
snd_pcm_format_mask_t *mask);
 
-int snd_pcm_hw_params_get_subformat(const snd_pcm_hw_params_t *params, 
snd_pcm_subformat_t *subformat) __attribute__ ((weak, alias 
(__snd_pcm_hw_params_get_subformat)));
+int snd_pcm_hw_params_get_subformat(const snd_pcm_hw_params_t *params, 
snd_pcm_subformat_t *subformat);
 int snd_pcm_hw_params_test_subformat(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, 
snd_pcm_subformat_t subformat);
 int snd_pcm_hw_params_set_subformat(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, 
snd_pcm_subformat_t subformat);
-int snd_pcm_hw_params_set_subformat_first(snd_pcm_t *pcm, snd_pcm_hw_params_t 
*params, snd_pcm_subformat_t *subformat) __attribute__ ((weak, alias 
(__snd_pcm_hw_params_set_subformat_first)));
-int snd_pcm_hw_params_set_subformat_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, 
snd_pcm_subformat_t *subformat) __attribute__ ((weak, alias 
(__snd_pcm_hw_params_set_subformat_last)));
+int snd_pcm_hw_params_set_subformat_first(snd_pcm_t *pcm, snd_pcm_hw_params_t 
*params, snd_pcm_subformat_t *subformat);
+int snd_pcm_hw_params_set_subformat_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, 
snd_pcm_subformat_t *subformat);
 int snd_pcm_hw_params_set_subformat_mask(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, 
snd_pcm_subformat_mask_t *mask);
 void snd_pcm_hw_params_get_subformat_mask(snd_pcm_hw_params_t *params, 
snd_pcm_subformat_mask_t *mask);
 
-int snd_pcm_hw_params_get_channels(const snd_pcm_hw_params_t *params, unsigned int 
*val) __attribute__ ((weak, alias (__snd_pcm_hw_params_get_channels)));
-int snd_pcm_hw_params_get_channels_min(const snd_pcm_hw_params_t *params, unsigned 
int *val) __attribute__ ((weak, alias (__snd_pcm_hw_params_get_channels_min)));
-int 

[alsa-cvslog] CVS: alsa-lib NOTES,NONE,1.1 Makefile.am,1.28,1.29 configure.in,1.114,1.115

2003-11-05 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-lib
In directory sc8-pr-cvs1:/tmp/cvs-serv15112

Modified Files:
Makefile.am configure.in 
Added Files:
NOTES 
Log Message:
Switch from old to new PCM API retaining binary compatibility
Changed version to 1.0.0pre1


--- NEW FILE: NOTES ---
Old versus new PCM API (values returned using indirect pointers)


From the binary compatibility view, there is no change. For compilation,
1.0 ALSA applications do not need any change. The older applications must
use this include sequence:

#define ALSA_PCM_OLD_HW_PARAMS_API
#define ALSA_PCM_OLD_SW_PARAMS_API
#include alsa/asoundlib.h

If you use already the new API, you may remove old defines selecting
this API, because they are no longer used:

#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API

Index: Makefile.am
===
RCS file: /cvsroot/alsa/alsa-lib/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Makefile.am 26 Aug 2003 12:31:57 -  1.28
+++ Makefile.am 5 Nov 2003 10:38:37 -   1.29
@@ -1,5 +1,5 @@
 SUBDIRS=doc include src aserver alsalisp test utils
-EXTRA_DIST=ChangeLog INSTALL TODO configure cvscompile libtool depcomp version 
MEMORY-LEAK
+EXTRA_DIST=ChangeLog INSTALL TODO NOTES configure cvscompile libtool depcomp version 
MEMORY-LEAK
 
 INCLUDES=-I$(top_srcdir)/include
 

Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-lib/configure.in,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- configure.in21 Oct 2003 17:41:17 -  1.114
+++ configure.in5 Nov 2003 10:38:38 -   1.115
@@ -8,7 +8,7 @@
 dnl remove API = c+1:0:0
 dnl *
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(alsa-lib, 0.9.8)
+AM_INIT_AUTOMAKE(alsa-lib, 1.0.0pre1)
 eval LIBTOOL_VERSION_INFO=2:0:0
 dnl *
 AM_CONDITIONAL(INSTALL_M4, test -n ${ACLOCAL})



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-lib/src/ordinary_pcm ordinary_pcm.c,1.2,1.3

2003-11-05 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-lib/src/ordinary_pcm
In directory sc8-pr-cvs1:/tmp/cvs-serv15112/src/ordinary_pcm

Modified Files:
ordinary_pcm.c 
Log Message:
Switch from old to new PCM API retaining binary compatibility
Changed version to 1.0.0pre1


Index: ordinary_pcm.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/ordinary_pcm/ordinary_pcm.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ordinary_pcm.c  23 Jun 2003 17:41:01 -  1.2
+++ ordinary_pcm.c  5 Nov 2003 10:38:38 -   1.3
@@ -55,8 +55,6 @@
 #include sys/shm.h
 #include sys/mman.h
 #include limits.h
-#define ALSA_PCM_NEW_HW_PARAMS_API
-#define ALSA_PCM_NEW_SW_PARAMS_API
 #include asoundlib.h
 #include pcm_ordinary.h
 



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-lib/test oldapi.c,NONE,1.1 Makefile.am,1.26,1.27 latency.c,1.34,1.35 pcm.c,1.27,1.28

2003-11-05 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-lib/test
In directory sc8-pr-cvs1:/tmp/cvs-serv15112/test

Modified Files:
Makefile.am latency.c pcm.c 
Added Files:
oldapi.c 
Log Message:
Switch from old to new PCM API retaining binary compatibility
Changed version to 1.0.0pre1


--- NEW FILE: oldapi.c ---
/*
 *  Old PCM API compilation test
 *
 * Author: Jaroslav Kysela [EMAIL PROTECTED]
 *
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
 *   the Free Software Foundation; either version 2 of the License, or
 *   (at your option) any later version.
 *
 *   This program is distributed in the hope that it will be useful,
 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *   GNU General Public License for more details.
 *
 *   You should have received a copy of the GNU General Public License
 *   along with this program; if not, write to the Free Software
 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 *
 */

#include stdio.h
#include stdlib.h
#include string.h
#include sched.h
#include errno.h
#include getopt.h
#define ALSA_PCM_OLD_HW_PARAMS_API
#define ALSA_PCM_OLD_SW_PARAMS_API
#include ../include/asoundlib.h
#include sys/time.h

typedef void (myfcn)(void *);

int main(int argc, char *argv[])
{
myfcn *fcn;
snd_pcm_hw_params_get_access(NULL);
fcn = snd_pcm_hw_params_get_access;
return 0;
}

Index: Makefile.am
===
RCS file: /cvsroot/alsa/alsa-lib/test/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Makefile.am 23 Oct 2003 16:53:11 -  1.26
+++ Makefile.am 5 Nov 2003 10:38:39 -   1.27
@@ -1,6 +1,6 @@
 check_PROGRAMS=control pcm latency seq \
   playmidi1 timer rawmidi midiloop \
-  omixer code
+  omixer code oldapi
 
 control_LDADD=../src/libasound.la
 pcm_LDADD=../src/libasound.la
@@ -11,6 +11,7 @@
 rawmidi_LDADD=../src/libasound.la
 midiloop_LDADD=../src/libasound.la
 omixer_LDADD=../src/libasound.la
+oldapi_LDADD=../src/libasound.la
 code_CFLAGS=-Wall -pipe -g -O2
 
 INCLUDES=-I$(top_srcdir)/include

Index: latency.c
===
RCS file: /cvsroot/alsa/alsa-lib/test/latency.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- latency.c   14 Jul 2003 10:22:39 -  1.34
+++ latency.c   5 Nov 2003 10:38:39 -   1.35
@@ -33,8 +33,6 @@
 #include sched.h
 #include errno.h
 #include getopt.h
-#define ALSA_PCM_NEW_HW_PARAMS_API
-#define ALSA_PCM_NEW_SW_PARAMS_API
 #include ../include/asoundlib.h
 #include sys/time.h
 #include math.h

Index: pcm.c
===
RCS file: /cvsroot/alsa/alsa-lib/test/pcm.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- pcm.c   13 Oct 2003 10:42:32 -  1.27
+++ pcm.c   5 Nov 2003 10:38:39 -   1.28
@@ -8,8 +8,6 @@
 #include sched.h
 #include errno.h
 #include getopt.h
-#define ALSA_PCM_NEW_HW_PARAMS_API
-#define ALSA_PCM_NEW_SW_PARAMS_API
 #include ../include/asoundlib.h
 #include sys/time.h
 #include math.h



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-lib/src/pcm pcm.c,1.262,1.263

2003-11-05 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1:/tmp/cvs-serv15112/src/pcm

Modified Files:
pcm.c 
Log Message:
Switch from old to new PCM API retaining binary compatibility
Changed version to 1.0.0pre1


Index: pcm.c
===
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm.c,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- pcm.c   31 Oct 2003 18:52:55 -  1.262
+++ pcm.c   5 Nov 2003 10:38:39 -   1.263
@@ -3005,9 +3005,6 @@
  * \param params Configuration space
  * \param access Returned value
  * \return access type otherwise a negative error code if not exactly one is present
- *
- * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before 
'#include alsa/asoundlib.h'
- *   to enable this new function prototype. Using of older function with same 
name is deprecated.
  */
 #ifndef DOXYGEN
 int INTERNAL(snd_pcm_hw_params_get_access)(const snd_pcm_hw_params_t *params, 
snd_pcm_access_t *access)
@@ -3052,9 +3049,6 @@
  * \param params Configuration space
  * \param access Returned first access type
  * \return 0 otherwise a negative error code
- *
- * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before 
'#include alsa/asoundlib.h'
- *   to enable this new function prototype. Using of older function with same 
name is deprecated.
  */
 #ifndef DOXYGEN
 int INTERNAL(snd_pcm_hw_params_set_access_first)(snd_pcm_t *pcm, snd_pcm_hw_params_t 
*params, snd_pcm_access_t *access)
@@ -3071,9 +3065,6 @@
  * \param params Configuration space
  * \param val Returned last access type
  * \return 0 otherwise a negative error code
- *
- * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before 
'#include alsa/asoundlib.h'
- *   to enable this new function prototype. Using of older function with same 
name is deprecated.
  */
 #ifndef DOXYGEN
 int INTERNAL(snd_pcm_hw_params_set_access_last)(snd_pcm_t *pcm, snd_pcm_hw_params_t 
*params, snd_pcm_access_t *access)
@@ -3115,9 +3106,6 @@
  * \param params Configuration space
  * \param format returned format
  * \return format otherwise a negative error code if not exactly one is present
- *
- * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before 
'#include alsa/asoundlib.h'
- *   to enable this new function prototype. Using of older function with same 
name is deprecated.
  */
 #ifndef DOXYGEN
 int INTERNAL(snd_pcm_hw_params_get_format)(const snd_pcm_hw_params_t *params, 
snd_pcm_format_t *format)
@@ -3158,9 +3146,6 @@
  * \param params Configuration space
  * \param format Returned first format
  * \return 0 otherwise a negative error code
- *
- * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before 
'#include alsa/asoundlib.h'
- *   to enable this new function prototype. Using of older function with same 
name is deprecated.
  */
 #ifndef DOXYGEN
 int INTERNAL(snd_pcm_hw_params_set_format_first)(snd_pcm_t *pcm, snd_pcm_hw_params_t 
*params, snd_pcm_format_t *format)
@@ -3177,9 +3162,6 @@
  * \param params Configuration space
  * \param format Returned last format
  * \return 0 otherwise a negative error code
- *
- * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before 
'#include alsa/asoundlib.h'
- *   to enable this new function prototype. Using of older function with same 
name is deprecated.
  */
 #ifndef DOXYGEN
 int INTERNAL(snd_pcm_hw_params_set_format_last)(snd_pcm_t *pcm, snd_pcm_hw_params_t 
*params, snd_pcm_format_t *format)
@@ -3218,9 +3200,6 @@
  * \param params Configuration space
  * \param subformat Returned subformat value
  * \return subformat otherwise a negative error code if not exactly one is present
- *
- * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before 
'#include alsa/asoundlib.h'
- *   to enable this new function prototype. Using of older function with same 
name is deprecated.
  */
 #ifndef DOXYGEN
 int INTERNAL(snd_pcm_hw_params_get_subformat)(const snd_pcm_hw_params_t *params, 
snd_pcm_subformat_t *subformat)
@@ -3261,9 +3240,6 @@
  * \param params Configuration space
  * \param subformat Returned subformat
  * \return 0 otherwise a negative error code
- *
- * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before 
'#include alsa/asoundlib.h'
- *   to enable this new function prototype. Using of older function with same 
name is deprecated.
  */
 #ifndef DOXYGEN
 int INTERNAL(snd_pcm_hw_params_set_subformat_first)(snd_pcm_t *pcm, 
snd_pcm_hw_params_t *params, snd_pcm_subformat_t *subformat)
@@ -3280,9 +3256,6 @@
  * \param params Configuration space
  * \param subformat Returned subformat
  * \return 0 otherwise a negative error code
- *
- * Note: To use this function add '#define ALSA_PCM_NEW_HW_PARAMS_API' before 
'#include alsa/asoundlib.h'
- *   to enable this new function prototype. Using of older 

[alsa-cvslog] CVS: alsa-utils configure.in,1.69,1.70

2003-11-05 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-utils
In directory sc8-pr-cvs1:/tmp/cvs-serv20794

Modified Files:
configure.in 
Log Message:
- changes against PCM API switch
- 1.0.0 version
- fixed amidi warning


Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-utils/configure.in,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- configure.in29 Oct 2003 13:38:23 -  1.69
+++ configure.in5 Nov 2003 11:08:25 -   1.70
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(alsamixer/alsamixer.c)
 AC_PREFIX_DEFAULT(/usr)
-AM_INIT_AUTOMAKE(alsa-utils, 0.9.8)
+AM_INIT_AUTOMAKE(alsa-utils, 1.0.0)
 
 dnl Checks for programs.
 



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-utils/aplay aplay.c,1.173,1.174

2003-11-05 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-utils/aplay
In directory sc8-pr-cvs1:/tmp/cvs-serv20794/aplay

Modified Files:
aplay.c 
Log Message:
- changes against PCM API switch
- 1.0.0 version
- fixed amidi warning


Index: aplay.c
===
RCS file: /cvsroot/alsa/alsa-utils/aplay/aplay.c,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- aplay.c 11 Sep 2003 11:23:58 -  1.173
+++ aplay.c 5 Nov 2003 11:08:25 -   1.174
@@ -36,8 +36,6 @@
 #include fcntl.h
 #include ctype.h
 #include errno.h
-#define ALSA_PCM_NEW_HW_PARAMS_API
-#define ALSA_PCM_NEW_SW_PARAMS_API
 #include alsa/asoundlib.h
 #include assert.h
 #include sys/poll.h



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-utils/amidi amidi.c,1.1,1.2

2003-11-05 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-utils/amidi
In directory sc8-pr-cvs1:/tmp/cvs-serv20794/amidi

Modified Files:
amidi.c 
Log Message:
- changes against PCM API switch
- 1.0.0 version
- fixed amidi warning


Index: amidi.c
===
RCS file: /cvsroot/alsa/alsa-utils/amidi/amidi.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amidi.c 28 Oct 2003 10:53:43 -  1.1
+++ amidi.c 5 Nov 2003 11:08:25 -   1.2
@@ -355,6 +355,8 @@
running_status = 1;
state = STATE_2PARAM_2;
break;
+   default:
+   break;
}
if (running_status)
fputs(\n  , stdout);



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-tools/ac3dec output.c,1.20,1.21

2003-11-05 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-tools/ac3dec
In directory sc8-pr-cvs1:/tmp/cvs-serv20955/ac3dec

Modified Files:
output.c 
Log Message:
- 1.0.0 version
- change against PCM API switch


Index: output.c
===
RCS file: /cvsroot/alsa/alsa-tools/ac3dec/output.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- output.c16 May 2003 14:37:25 -  1.20
+++ output.c5 Nov 2003 11:09:19 -   1.21
@@ -24,8 +24,6 @@
 #include alloca.h
 #include string.h
 #include unistd.h
-#define ALSA_PCM_NEW_HW_PARAMS_API
-#define ALSA_PCM_NEW_SW_PARAMS_API
 #include alsa/asoundlib.h
 
 typedef signed short sint_16;



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-tools Makefile,1.28,1.29

2003-11-05 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-tools
In directory sc8-pr-cvs1:/tmp/cvs-serv20955

Modified Files:
Makefile 
Log Message:
- 1.0.0 version
- change against PCM API switch


Index: Makefile
===
RCS file: /cvsroot/alsa/alsa-tools/Makefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Makefile21 Oct 2003 17:44:03 -  1.28
+++ Makefile5 Nov 2003 11:09:19 -   1.29
@@ -1,4 +1,4 @@
-VERSION = 0.9.8
+VERSION = 1.0.0
 TOP = .
 SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \
mixartloader rmedigicontrol sb16_csp seq sscape_ctl us428control \



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-oss alsa-oss.c,1.39,1.40 configure.in,1.18,1.19

2003-11-05 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-oss
In directory sc8-pr-cvs1:/tmp/cvs-serv22489

Modified Files:
alsa-oss.c configure.in 
Log Message:
- version change to 1.0.0
- fixes against new PCM API


Index: alsa-oss.c
===
RCS file: /cvsroot/alsa/alsa-oss/alsa-oss.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- alsa-oss.c  15 Oct 2003 17:06:28 -  1.39
+++ alsa-oss.c  5 Nov 2003 11:17:08 -   1.40
@@ -199,7 +199,7 @@
snd_pcm_t *pcm = str-pcm;
snd_pcm_hw_params_t *hw;
int err;
-   unsigned int periods_min;
+   unsigned int rate, periods_min;
if (!pcm)
continue;
str-frame_bytes = snd_pcm_format_physical_width(dsp-format) * 
dsp-channels / 8;
@@ -217,7 +217,8 @@
err = snd_pcm_hw_params_set_periods_integer(pcm, hw);
if (err  0)
return err;
-   err = snd_pcm_hw_params_set_rate_near(pcm, hw, dsp-rate, 0);
+   rate = dsp-rate;
+   err = snd_pcm_hw_params_set_rate_near(pcm, hw, rate, 0);
assert(err = 0);
 
if (str-mmap_buffer) {
@@ -254,15 +255,17 @@
if (err  0)
return err;
}
-   if (dsp-fragshift  0)
-   err = snd_pcm_hw_params_set_period_size_near(pcm, hw, 
(1  dsp-fragshift) / str-frame_bytes, 0);
-   else {
+   if (dsp-fragshift  0) {
+   snd_pcm_uframes_t s = (1  dsp-fragshift) / 
str-frame_bytes;
+   err = snd_pcm_hw_params_set_period_size_near(pcm, hw, 
s, 0);
+   } else {
snd_pcm_uframes_t s = 16;
while (s * 2  dsp-rate / 4) 
s *= 2;
-   err = snd_pcm_hw_params_set_period_size_near(pcm, hw, 
s, 0);
+   err = snd_pcm_hw_params_set_period_size_near(pcm, hw, 
s, 0);
}
-   assert(err = 0);
+   if (err  0)
+   return err;
}
 
err = snd_pcm_hw_params(pcm, hw);
@@ -272,10 +275,16 @@
if (debug)
snd_pcm_dump_setup(pcm, stderr);
 #endif
-   dsp-rate = snd_pcm_hw_params_get_rate(hw, 0);
+   err = snd_pcm_hw_params_get_rate(hw, dsp-rate, 0);
+   if (err  0)
+   return err;
dsp-oss_format = alsa_format_to_oss(dsp-format);
-   str-period_size = snd_pcm_hw_params_get_period_size(hw, 0);
-   str-periods = snd_pcm_hw_params_get_periods(hw, 0);
+   err = snd_pcm_hw_params_get_period_size(hw, str-period_size, 0);
+   if (err  0)
+   return err;
+   err = snd_pcm_hw_params_get_periods(hw, str-periods, 0);
+   if (err  0)
+   return err;
str-buffer_size = str-periods * str-period_size;
free(str-mmap_areas);
str-mmap_areas = 0;

Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-oss/configure.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- configure.in21 Oct 2003 17:43:46 -  1.18
+++ configure.in5 Nov 2003 11:17:08 -   1.19
@@ -1,5 +1,5 @@
 AC_INIT(alsa-oss.c)
-AM_INIT_AUTOMAKE(alsa-oss, 0.9.8)
+AM_INIT_AUTOMAKE(alsa-oss, 1.0.0)
 
 AC_PREFIX_DEFAULT(/usr)
 



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/core/oss pcm_oss.c,1.56,1.57

2003-11-07 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/core/oss
In directory sc8-pr-cvs1:/tmp/cvs-serv26479

Modified Files:
pcm_oss.c 
Log Message:
Fixed semantics in snd_pcm_oss_bytes() function.


Index: pcm_oss.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/oss/pcm_oss.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- pcm_oss.c   30 Oct 2003 11:29:26 -  1.56
+++ pcm_oss.c   7 Nov 2003 09:47:18 -   1.57
@@ -124,11 +124,10 @@
 static long snd_pcm_oss_bytes(snd_pcm_substream_t *substream, long frames)
 {
snd_pcm_runtime_t *runtime = substream-runtime;
-   if (runtime-period_size == runtime-oss.period_bytes)
+   snd_pcm_uframes_t buffer_size = snd_pcm_lib_buffer_bytes(substream);
+   if (buffer_size == runtime-oss.buffer_bytes)
return frames;
-   if (runtime-period_size  runtime-oss.period_bytes)
-   return (frames * runtime-period_size) / runtime-oss.period_bytes;
-   return (frames * runtime-oss.period_bytes) / runtime-period_size;
+   return (runtime-oss.buffer_bytes * frames_to_bytes(runtime, frames)) / 
buffer_size;
 }
 
 static int snd_pcm_oss_format_from(int format)



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/pci/ac97 ac97_codec.c,1.111,1.112

2003-11-09 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1:/tmp/cvs-serv8903

Modified Files:
ac97_codec.c 
Log Message:
Added IC Ensemble/KS Waves ID for stereo enhancement

Index: ac97_codec.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_codec.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- ac97_codec.c3 Nov 2003 10:42:12 -   1.111
+++ ac97_codec.c9 Nov 2003 08:53:15 -   1.112
@@ -204,7 +204,7 @@
   /*  24 */ Wolfson Microelectronics 3D Enhancement,
   /*  25 */ Delta Integration 3D Enhancement,
   /*  26 */ SigmaTel 3D Enhancement,
-  /*  27 */ Reserved 27,
+  /*  27 */ IC Ensemble/KS Waves,
   /*  28 */ Rockwell 3D Stereo Enhancement,
   /*  29 */ Reserved 29,
   /*  30 */ Reserved 30,



---
This SF.Net email sponsored by: ApacheCon 2003,
16-19 November in Las Vegas. Learn firsthand the latest
developments in Apache, PHP, Perl, XML, Java, MySQL,
WebDAV, and more! http://www.apachecon.com/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/isa/gus gus_pcm.c,1.16,1.17

2003-11-17 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/isa/gus
In directory sc8-pr-cvs1:/tmp/cvs-serv31538

Modified Files:
gus_pcm.c 
Log Message:
Omited to remove old code

Index: gus_pcm.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gus_pcm.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gus_pcm.c   17 Nov 2003 09:25:18 -  1.16
+++ gus_pcm.c   17 Nov 2003 10:23:40 -  1.17
@@ -893,7 +893,7 @@
kctl = snd_ctl_new1(snd_gf1_pcm_volume_control1, gus);
else
kctl = snd_ctl_new1(snd_gf1_pcm_volume_control, gus);
-   if ((err = snd_ctl_add(card, kctl = snd_ctl_new1(snd_gf1_pcm_volume_control, 
gus)))  0)
+   if ((err = snd_ctl_add(card, kctl))  0)
return err;
kctl-id.index = control_index;
 



---
This SF. Net email is sponsored by: GoToMyPC
GoToMyPC is the fast, easy and secure way to access your computer from
any Web browser or wireless device. Click here to Try it Free!
https://www.gotomypc.com/tr/OSDN/AW/Q4_2003/t/g22lp?Target=mm/g22lp.tmpl
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/include ac97_codec.h,1.35,1.36

2003-11-18 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1:/tmp/cvs-serv21327/include

Modified Files:
ac97_codec.h 
Log Message:
Moved AC97 slot allocation from intel8x0 to ac97_pcm.c.


Index: ac97_codec.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/ac97_codec.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ac97_codec.h23 Oct 2003 14:34:52 -  1.35
+++ ac97_codec.h18 Nov 2003 11:38:40 -  1.36
@@ -83,6 +83,33 @@
 #define AC97_VENDOR_ID10x7c/* Vendor ID1 */
 #define AC97_VENDOR_ID20x7e/* Vendor ID2 / revision */
 
+/* slot allocation */
+#define AC97_SLOT_TAG  0
+#define AC97_SLOT_CMD_ADDR 1
+#define AC97_SLOT_CMD_DATA 2
+#define AC97_SLOT_PCM_LEFT 3
+#define AC97_SLOT_PCM_RIGHT4
+#define AC97_SLOT_MODEM_LINE1  5
+#define AC97_SLOT_PCM_CENTER   6
+#define AC97_SLOT_MIC  6   /* input */
+#define AC97_SLOT_SPDIF_LEFT1  6
+#define AC97_SLOT_PCM_SLEFT7   /* surround left */
+#define AC97_SLOT_PCM_LEFT_0   7   /* double rate operation */
+#define AC97_SLOT_SPDIF_LEFT   7
+#define AC97_SLOT_PCM_SRIGHT   8   /* surround right */
+#define AC97_SLOT_PCM_RIGHT_0  8   /* double rate operation */
+#define AC97_SLOT_SPDIF_RIGHT  8
+#define AC97_SLOT_LFE  9
+#define AC97_SLOT_SPDIF_RIGHT1 9
+#define AC97_SLOT_MODEM_LINE2  10
+#define AC97_SLOT_PCM_LEFT_1   10  /* double rate operation */
+#define AC97_SLOT_SPDIF_LEFT2  10
+#define AC97_SLOT_HANDSET  11  /* output */
+#define AC97_SLOT_PCM_RIGHT_1  11  /* double rate operation */
+#define AC97_SLOT_SPDIF_RIGHT2 11
+#define AC97_SLOT_MODEM_GPIO   12  /* modem GPIO */
+#define AC97_SLOT_PCM_CENTER_1 12  /* double rate operation */
+
 /* basic capabilities (reset register) */
 #define AC97_BC_DEDICATED_MIC  0x0001  /* Dedicated Mic PCM In Channel */
 #define AC97_BC_RESERVED1  0x0002  /* Reserved (was Modem Line Codec support) */
@@ -280,6 +307,7 @@
 #define AC97_SCAP_CENTER_LFE_DAC (13)/* center and LFE DACs are present */
 #define AC97_SCAP_SKIP_AUDIO   (14)  /* skip audio part of codec */
 #define AC97_SCAP_SKIP_MODEM   (15)  /* skip modem part of codec */
+#define AC97_SCAP_INDEP_SDIN   (16)  /* independent SDIN */
 
 /* ac97-flags */
 #define AC97_HAS_PC_BEEP   (10)  /* force PC Speaker usage */
@@ -303,6 +331,32 @@
 typedef struct _snd_ac97_bus ac97_bus_t;
 typedef struct _snd_ac97 ac97_t;
 
+enum ac97_pcm_cfg {
+   AC97_PCM_CFG_FRONT = 2,
+   AC97_PCM_CFG_REAR = 10, /* alias surround */
+   AC97_PCM_CFG_LFE = 11,  /* center + lfe */
+   AC97_PCM_CFG_40 = 4,/* front + rear */
+   AC97_PCM_CFG_51 = 6,/* front + rear + center/lfe */
+   AC97_PCM_CFG_SPDIF = 20
+};
+
+/* PCM allocation */
+struct ac97_pcm {
+   ac97_bus_t *bus;
+   unsigned int stream: 1,/* stream type: 1 = capture */
+exclusive: 1, /* exclusive mode, don't override with 
other pcms */
+copy_flag: 1; /* lowlevel driver must fill all entries */
+   unsigned short aslots; /* active slots */
+   unsigned int rates;/* available rates */
+   struct {
+   unsigned short slots;  /* driver input: requested AC97 slot 
numbers */
+   unsigned short rslots[4];  /* allocated slots per codecs */
+   unsigned char rate_table[4];
+   ac97_t *codec[4];  /* allocated codecs */
+   } r[2];/* 0 = standard rates, 1 = double rates */
+   unsigned long private_value;   /* used by the hardware driver */
+};
+
 struct snd_ac97_build_ops {
int (*build_3d) (ac97_t *ac97);
int (*build_specific) (ac97_t *ac97);
@@ -321,8 +375,14 @@
void (*private_free) (ac97_bus_t *bus);
/* --- */
snd_card_t *card;
-   unsigned int num;   /* bus number */
-   unsigned int clock; /* AC'97 clock (usually 48000Hz) */
+   unsigned short num; /* bus number */
+   unsigned short vra: 1,  /* bridge supports VRA */
+  isdin: 1;/* independent SDIN */
+   unsigned int clock; /* AC'97 base clock (usually 48000Hz) */
+   spinlock_t bus_lock;/* used mainly for slot allocation */
+   unsigned short used_slots[2][4]; /* actually used PCM slots */
+   unsigned short pcms_count; /* count of PCMs */
+   struct ac97_pcm *pcms;
ac97_t *codec[4];
snd_info_entry_t *proc;
 };
@@ -393,7 +453,6 @@
 void snd_ac97_write_cache(ac97_t *ac97, unsigned short reg, unsigned short value);
 int snd_ac97_update(ac97_t *ac97, unsigned short reg, unsigned short value);
 int snd_ac97_update_bits(ac97_t *ac97, unsigned short reg, unsigned short mask, 
unsigned short value);
-int 

[alsa-cvslog] CVS: alsa-kernel/pci/ac97 ac97_pcm.c,NONE,1.1 Makefile,1.12,1.13 ac97_codec.c,1.112,1.113

2003-11-18 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1:/tmp/cvs-serv21327/pci/ac97

Modified Files:
Makefile ac97_codec.c 
Added Files:
ac97_pcm.c 
Log Message:
Moved AC97 slot allocation from intel8x0 to ac97_pcm.c.


--- NEW FILE: ac97_pcm.c ---
/*
 *  Copyright (c) by Jaroslav Kysela [EMAIL PROTECTED]
 *  Universal interface for Audio Codec '97
 *
 *  For more details look to AC '97 component specification revision 2.2
 *  by Intel Corporation (http://developer.intel.com) and to datasheets
 *  for specific codecs.
 *
 *
 *   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 linux/delay.h
#include linux/init.h
#include linux/slab.h
#include sound/core.h
#include sound/pcm.h
#include sound/control.h
#include sound/ac97_codec.h
#include ac97_patch.h
#include ac97_id.h
#include ac97_local.h

#define chip_t ac97_t

/*
 *  PCM support
 */

static unsigned char rate_reg_tables[2][4][9] = {
{
  /* standard rates */
  {
/* 34 front, 78 rear, 69 center/lfe */
AC97_PCM_FRONT_DAC_RATE,/* slot 3 */
AC97_PCM_FRONT_DAC_RATE,/* slot 4 */
0xff,   /* slot 5 */
AC97_PCM_LFE_DAC_RATE,  /* slot 6 */
AC97_PCM_SURR_DAC_RATE, /* slot 7 */
AC97_PCM_SURR_DAC_RATE, /* slot 8 */
AC97_PCM_LFE_DAC_RATE,  /* slot 9 */
0xff,   /* slot 10 */
0xff,   /* slot 11 */
  },
  {
/* 78 front, 69 rear, 1011 center/lfe */
0xff,   /* slot 3 */
0xff,   /* slot 4 */
0xff,   /* slot 5 */
AC97_PCM_SURR_DAC_RATE, /* slot 6 */
AC97_PCM_FRONT_DAC_RATE,/* slot 7 */
AC97_PCM_FRONT_DAC_RATE,/* slot 8 */
AC97_PCM_SURR_DAC_RATE, /* slot 9 */
AC97_PCM_LFE_DAC_RATE,  /* slot 10 */
AC97_PCM_LFE_DAC_RATE,  /* slot 11 */
  },
  {
/* 69 front, 1011 rear, 34 center/lfe */
AC97_PCM_LFE_DAC_RATE,  /* slot 3 */
AC97_PCM_LFE_DAC_RATE,  /* slot 4 */
0xff,   /* slot 5 */
AC97_PCM_FRONT_DAC_RATE,/* slot 6 */
0xff,   /* slot 7 */
0xff,   /* slot 8 */
AC97_PCM_FRONT_DAC_RATE,/* slot 9 */
AC97_PCM_SURR_DAC_RATE, /* slot 10 */
AC97_PCM_SURR_DAC_RATE, /* slot 11 */
  },
  {
/* 1011 front, 34 rear, 78 center/lfe */
AC97_PCM_SURR_DAC_RATE, /* slot 3 */
AC97_PCM_SURR_DAC_RATE, /* slot 4 */
0xff,   /* slot 5 */
0xff,   /* slot 6 */
AC97_PCM_LFE_DAC_RATE,  /* slot 7 */
AC97_PCM_LFE_DAC_RATE,  /* slot 8 */
AC97_PCM_FRONT_DAC_RATE,/* slot 9 */
AC97_PCM_FRONT_DAC_RATE,/* slot 10 */
AC97_PCM_FRONT_DAC_RATE,/* slot 11 */
  },
},
{
  /* FIXME: double rates */
  {
/* 34 front, 78 rear, 69 center/lfe */
AC97_PCM_FRONT_DAC_RATE,/* slot 3 */
AC97_PCM_FRONT_DAC_RATE,/* slot 4 */
0xff,   /* slot 5 */
AC97_PCM_LFE_DAC_RATE,  /* slot 6 */
AC97_PCM_SURR_DAC_RATE, /* slot 7 */
AC97_PCM_SURR_DAC_RATE, /* slot 8 */
AC97_PCM_LFE_DAC_RATE,  /* slot 9 */
0xff,   /* slot 10 */
0xff,   /* slot 11 */
  },
  {
/* 78 front, 69 rear, 1011 center/lfe */
0xff,   /* slot 3 */
0xff,   /* slot 4 */
0xff,   /* slot 5 */
AC97_PCM_SURR_DAC_RATE, /* slot 6 */
AC97_PCM_FRONT_DAC_RATE,/* slot 7 */
AC97_PCM_FRONT_DAC_RATE,/* slot 8 */
AC97_PCM_SURR_DAC_RATE, /* slot 9 */
AC97_PCM_LFE_DAC_RATE,  /* slot 10 */
AC97_PCM_LFE_DAC_RATE,  /* slot 11 */
  },
  {
/* 69 front, 1011 rear, 34 center/lfe

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

2003-11-18 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv21327/pci

Modified Files:
intel8x0.c 
Log Message:
Moved AC97 slot allocation from intel8x0 to ac97_pcm.c.


Index: intel8x0.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/intel8x0.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- intel8x0.c  23 Oct 2003 14:34:52 -  1.96
+++ intel8x0.c  18 Nov 2003 11:38:40 -  1.97
@@ -366,9 +366,8 @@
unsigned int roff_picb;
unsigned int int_sta_mask;  /* interrupt status mask */
unsigned int ali_slot;  /* ALI DMA slot */
-   ac97_t *ac97;
-   unsigned short ac97_rate_regs[3];
-   int ac97_rates_idx;
+   struct ac97_pcm *pcm;
+   int pcm_open_flag;
 } ichdev_t;
 
 typedef struct _snd_intel8x0 intel8x0_t;
@@ -887,11 +886,28 @@
 static int snd_intel8x0_hw_params(snd_pcm_substream_t * substream,
  snd_pcm_hw_params_t * hw_params)
 {
-   return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
+   ichdev_t *ichdev = get_ichdev(substream);
+   int err;
+
+   err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
+   if (err  0)
+   return err;
+   if (ichdev-pcm_open_flag)
+   snd_ac97_pcm_close(ichdev-pcm);
+   err = snd_ac97_pcm_open(ichdev-pcm, params_rate(hw_params),
+   params_channels(hw_params),
+   ichdev-pcm-r[0].slots);
+   if (err = 0)
+   ichdev-pcm_open_flag = 1;
+   return err;
 }
 
 static int snd_intel8x0_hw_free(snd_pcm_substream_t * substream)
 {
+   ichdev_t *ichdev = get_ichdev(substream);
+
+   if (ichdev-pcm_open_flag)
+   snd_ac97_pcm_close(ichdev-pcm);
return snd_pcm_lib_free_pages(substream);
 }
 
@@ -934,7 +950,6 @@
intel8x0_t *chip = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream-runtime;
ichdev_t *ichdev = get_ichdev(substream);
-   int i;
 
ichdev-physbuf = runtime-dma_addr;
ichdev-size = snd_pcm_lib_buffer_bytes(substream);
@@ -944,14 +959,9 @@
snd_intel8x0_setup_multi_channels(chip, runtime-channels);
spin_unlock(chip-reg_lock);
}
-   if (ichdev-ac97) {
-   for (i = 0; i  3; i++)
-   if (ichdev-ac97_rate_regs[i])
-   snd_ac97_set_rate(ichdev-ac97, 
ichdev-ac97_rate_regs[i], runtime-rate);
-   /* FIXME: hack to enable spdif support */
-   if (ichdev-ichd == ICHD_PCMOUT  chip-device_type == DEVICE_SIS)
-   snd_ac97_set_rate(ichdev-ac97, AC97_SPDIF, runtime-rate);
-   }
+   /* FIXME: hack to enable spdif support */
+   if (ichdev-ichd == ICHD_PCMOUT  chip-device_type == DEVICE_SIS)
+   snd_ac97_set_rate(ichdev-pcm-r[0].codec[0], AC97_SPDIF, 
runtime-rate);
snd_intel8x0_setup_periods(chip, ichdev);
return 0;
 }
@@ -1030,13 +1040,11 @@
 
ichdev-substream = substream;
runtime-hw = snd_intel8x0_stream;
-   if (ichdev-ac97  ichdev-ac97_rates_idx = 0) {
-   runtime-hw.rates = ichdev-ac97-rates[ichdev-ac97_rates_idx];
-   for (i = 0; i  ARRAY_SIZE(rates); i++) {
-   if (runtime-hw.rates  (1  i)) {
-   runtime-hw.rate_min = rates[i];
-   break;
-   }
+   runtime-hw.rates = ichdev-pcm-rates;
+   for (i = 0; i  ARRAY_SIZE(rates); i++) {
+   if (runtime-hw.rates  (1  i)) {
+   runtime-hw.rate_min = rates[i];
+   break;
}
}
if (chip-device_type == DEVICE_SIS) {
@@ -1512,7 +1520,7 @@
rec = tbl + i;
if (i  0  rec-ac97_idx) {
/* activate PCM only when associated AC'97 codec */
-   if (! chip-ichd[rec-ac97_idx].ac97)
+   if (! chip-ichd[rec-ac97_idx].pcm)
continue;
}
err = snd_intel8x0_pcm1(chip, device, rec);
@@ -1542,44 +1550,67 @@
chip-ac97[ac97-num] = NULL;
 }
 
-struct _ac97_rate_regs {
-   unsigned int ichd;
-   unsigned short regs[3];
-   short rates_idx;
-};
-
-static struct _ac97_rate_regs intel_ac97_rate_regs[] __devinitdata = {
-   { ICHD_PCMOUT, { AC97_PCM_FRONT_DAC_RATE, AC97_PCM_SURR_DAC_RATE, 
AC97_PCM_LFE_DAC_RATE }, AC97_RATES_FRONT_DAC },
-   { ICHD_PCMIN, { AC97_PCM_LR_ADC_RATE, 0, 0 }, AC97_RATES_ADC },
-   { ICHD_MIC, { AC97_PCM_MIC_ADC_RATE, 0, 0 }, AC97_RATES_MIC_ADC },
-   { ICHD_MIC2, { AC97_PCM_MIC_ADC_RATE, 0, 0 }, AC97_RATES_MIC_ADC },
-   { ICHD_PCM2IN, { 

[alsa-cvslog] CVS: alsa-driver/pci/ac97 ac97_pcm.c,NONE,1.1

2003-11-18 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-driver/pci/ac97
In directory sc8-pr-cvs1:/tmp/cvs-serv25912

Added Files:
ac97_pcm.c 
Log Message:
Added missing file

--- NEW FILE: ac97_pcm.c ---
#define __NO_VERSION__
#include ../../alsa-kernel/pci/ac97/ac97_pcm.c



---
This SF. Net email is sponsored by: GoToMyPC
GoToMyPC is the fast, easy and secure way to access your computer from
any Web browser or wireless device. Click here to Try it Free!
https://www.gotomypc.com/tr/OSDN/AW/Q4_2003/t/g22lp?Target=mm/g22lp.tmpl
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-driver configure.in,1.201,1.202

2003-11-18 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-driver
In directory sc8-pr-cvs1:/tmp/cvs-serv30536

Modified Files:
configure.in 
Log Message:
1.0.0pre1

Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-driver/configure.in,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- configure.in11 Nov 2003 13:12:15 -  1.201
+++ configure.in18 Nov 2003 15:51:09 -  1.202
@@ -4,7 +4,7 @@
 
 AC_INIT(acore/sound.patch)
 AC_PREFIX_DEFAULT(/usr)
-CONFIG_SND_VERSION=0.9.8
+CONFIG_SND_VERSION=1.0.0pre1
 
 dnl Checks for programs.
 AC_PROG_CC



---
This SF. Net email is sponsored by: GoToMyPC
GoToMyPC is the fast, easy and secure way to access your computer from
any Web browser or wireless device. Click here to Try it Free!
https://www.gotomypc.com/tr/OSDN/AW/Q4_2003/t/g22lp?Target=mm/g22lp.tmpl
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-oss configure.in,1.19,1.20

2003-11-18 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-oss
In directory sc8-pr-cvs1:/tmp/cvs-serv30759

Modified Files:
configure.in 
Log Message:
1.0.0pre1

Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-oss/configure.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- configure.in5 Nov 2003 11:17:08 -   1.19
+++ configure.in18 Nov 2003 15:52:24 -  1.20
@@ -1,5 +1,5 @@
 AC_INIT(alsa-oss.c)
-AM_INIT_AUTOMAKE(alsa-oss, 1.0.0)
+AM_INIT_AUTOMAKE(alsa-oss, 1.0.0pre1)
 
 AC_PREFIX_DEFAULT(/usr)
 



---
This SF. Net email is sponsored by: GoToMyPC
GoToMyPC is the fast, easy and secure way to access your computer from
any Web browser or wireless device. Click here to Try it Free!
https://www.gotomypc.com/tr/OSDN/AW/Q4_2003/t/g22lp?Target=mm/g22lp.tmpl
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-tools Makefile,1.29,1.30

2003-11-18 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-tools
In directory sc8-pr-cvs1:/tmp/cvs-serv30667

Modified Files:
Makefile 
Log Message:
1.0.0pre1

Index: Makefile
===
RCS file: /cvsroot/alsa/alsa-tools/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Makefile5 Nov 2003 11:09:19 -   1.29
+++ Makefile18 Nov 2003 15:51:59 -  1.30
@@ -1,4 +1,4 @@
-VERSION = 1.0.0
+VERSION = 1.0.0pre1
 TOP = .
 SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \
mixartloader rmedigicontrol sb16_csp seq sscape_ctl us428control \



---
This SF. Net email is sponsored by: GoToMyPC
GoToMyPC is the fast, easy and secure way to access your computer from
any Web browser or wireless device. Click here to Try it Free!
https://www.gotomypc.com/tr/OSDN/AW/Q4_2003/t/g22lp?Target=mm/g22lp.tmpl
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/include version.h,1.27,1.28

2003-11-18 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1:/tmp/cvs-serv31436

Modified Files:
version.h 
Log Message:
1.0.0pre1

Index: version.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/version.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- version.h   21 Oct 2003 17:43:25 -  1.27
+++ version.h   18 Nov 2003 15:54:09 -  1.28
@@ -1,3 +1,3 @@
 /* include/version.h.  Generated by configure.  */
-#define CONFIG_SND_VERSION 0.9.8
+#define CONFIG_SND_VERSION 1.0.0pre1
 #define CONFIG_SND_DATE 



---
This SF. Net email is sponsored by: GoToMyPC
GoToMyPC is the fast, easy and secure way to access your computer from
any Web browser or wireless device. Click here to Try it Free!
https://www.gotomypc.com/tr/OSDN/AW/Q4_2003/t/g22lp?Target=mm/g22lp.tmpl
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-utils configure.in,1.70,1.71

2003-11-18 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-utils
In directory sc8-pr-cvs1:/tmp/cvs-serv7949

Modified Files:
configure.in 
Log Message:
1.0.0pre1

Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-utils/configure.in,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- configure.in5 Nov 2003 11:08:25 -   1.70
+++ configure.in18 Nov 2003 16:27:35 -  1.71
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(alsamixer/alsamixer.c)
 AC_PREFIX_DEFAULT(/usr)
-AM_INIT_AUTOMAKE(alsa-utils, 1.0.0)
+AM_INIT_AUTOMAKE(alsa-utils, 1.0.0pre1)
 
 dnl Checks for programs.
 



---
This SF. Net email is sponsored by: GoToMyPC
GoToMyPC is the fast, easy and secure way to access your computer from
any Web browser or wireless device. Click here to Try it Free!
https://www.gotomypc.com/tr/OSDN/AW/Q4_2003/t/g22lp?Target=mm/g22lp.tmpl
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-driver Makefile,1.100,1.101

2003-11-24 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-driver
In directory sc8-pr-cvs1:/tmp/cvs-serv29294

Modified Files:
Makefile 
Log Message:
Uros Bizjak [EMAIL PROTECTED] fixes

Index: Makefile
===
RCS file: /cvsroot/alsa/alsa-driver/Makefile,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- Makefile13 Nov 2003 17:41:15 -  1.100
+++ Makefile24 Nov 2003 08:04:14 -  1.101
@@ -125,7 +125,7 @@
@if [ -L /dev/snd ]; then \
echo The ALSA devices were removed from /proc/asound/dev directory. 
; \
echo Creating static device entries in /dev/snd. ; \
-   $(TOPDIR)/snddevices ; \
+   $(SND_TOPDIR)/snddevices ; \
fi
cat WARNING
 
@@ -173,7 +173,7 @@
 .PHONY: check-snd-prefix
 check-snd-prefix:
@ if [ x$(DESTDIR) = x ]; then \
- if modprobe -c | grep -s -q snd_; then \
+ if /sbin/modprobe -c | grep -s -q snd_; then \
echo;\
echo  = WARNING =;\
echo;\



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-utils cvscompile,1.9,1.10

2003-11-24 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-utils
In directory sc8-pr-cvs1:/tmp/cvs-serv30905

Modified Files:
cvscompile 
Log Message:
Use global alsa.m4 configuration

Index: cvscompile
===
RCS file: /cvsroot/alsa/alsa-utils/cvscompile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cvscompile  1 May 2003 08:28:15 -   1.9
+++ cvscompile  24 Nov 2003 08:13:37 -  1.10
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if test -d ../alsa-lib/utils; then
+if test -d ../alsa-lib/utils  ! test -r `aclocal --print-ac-dir`/alsa.m4; then
   alsa_m4_flags=-I ../alsa-lib/utils
 fi
 aclocal $alsa_m4_flags $ACLOCAL_FLAGS



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-tools/hdspmixer configure.in,1.5,1.6

2003-11-25 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-tools/hdspmixer
In directory sc8-pr-cvs1:/tmp/cvs-serv9503/hdspmixer

Modified Files:
configure.in 
Log Message:
- 1.0.0pre3 version
- added hack for ALSA server to pack also hdsp* tools (fltk issue)


Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-tools/hdspmixer/configure.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- configure.in24 Nov 2003 18:17:05 -  1.5
+++ configure.in25 Nov 2003 12:16:41 -  1.6
@@ -70,7 +70,7 @@
 
 dnl library check
 AC_PATH_PROG(FLTK_CONFIG, fltk-config, no)
-if test $FLTK_CONFIG = no; then
+if test $FLTK_CONFIG = no  ! test `hostname -f` = alsa.alsa-project.org; 
then
 AC_MSG_ERROR(fltk-config is required)
 fi
 FLTK_CXXFLAGS=`$FLTK_CONFIG --cxxflags` -fno-exceptions



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-lib configure.in,1.115,1.116

2003-11-25 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-lib
In directory sc8-pr-cvs1:/tmp/cvs-serv18577

Modified Files:
configure.in 
Log Message:
1.0.0pre3

Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-lib/configure.in,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- configure.in5 Nov 2003 10:38:38 -   1.115
+++ configure.in25 Nov 2003 13:01:44 -  1.116
@@ -8,7 +8,7 @@
 dnl remove API = c+1:0:0
 dnl *
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(alsa-lib, 1.0.0pre1)
+AM_INIT_AUTOMAKE(alsa-lib, 1.0.0pre3)
 eval LIBTOOL_VERSION_INFO=2:0:0
 dnl *
 AM_CONDITIONAL(INSTALL_M4, test -n ${ACLOCAL})



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-driver configure.in,1.204,1.205

2003-11-25 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-driver
In directory sc8-pr-cvs1:/tmp/cvs-serv18296

Modified Files:
configure.in 
Log Message:
1.0.0pre3

Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-driver/configure.in,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- configure.in21 Nov 2003 10:58:02 -  1.204
+++ configure.in25 Nov 2003 13:00:28 -  1.205
@@ -4,7 +4,7 @@
 
 AC_INIT(acore/sound.patch)
 AC_PREFIX_DEFAULT(/usr)
-CONFIG_SND_VERSION=1.0.0pre2
+CONFIG_SND_VERSION=1.0.0pre3
 
 dnl Checks for programs.
 AC_PROG_CC



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-utils configure.in,1.71,1.72

2003-11-25 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-utils
In directory sc8-pr-cvs1:/tmp/cvs-serv18930

Modified Files:
configure.in 
Log Message:
1.0.0pre3

Index: configure.in
===
RCS file: /cvsroot/alsa/alsa-utils/configure.in,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- configure.in18 Nov 2003 16:27:35 -  1.71
+++ configure.in25 Nov 2003 13:03:39 -  1.72
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(alsamixer/alsamixer.c)
 AC_PREFIX_DEFAULT(/usr)
-AM_INIT_AUTOMAKE(alsa-utils, 1.0.0pre1)
+AM_INIT_AUTOMAKE(alsa-utils, 1.0.0pre3)
 
 dnl Checks for programs.
 



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-kernel/include version.h,1.28,1.29

2003-11-25 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1:/tmp/cvs-serv18040

Modified Files:
version.h 
Log Message:
1.0.0pre3

Index: version.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/version.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- version.h   18 Nov 2003 15:54:09 -  1.28
+++ version.h   25 Nov 2003 12:59:34 -  1.29
@@ -1,3 +1,3 @@
 /* include/version.h.  Generated by configure.  */
-#define CONFIG_SND_VERSION 1.0.0pre1
+#define CONFIG_SND_VERSION 1.0.0pre3
 #define CONFIG_SND_DATE 



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-firmware - New directory

2003-11-25 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-firmware
In directory sc8-pr-cvs1:/tmp/cvs-serv24517/alsa-firmware

Log Message:
Directory /cvsroot/alsa/alsa-firmware added to the repository




---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-firmware/hdsploader - New directory

2003-11-25 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-firmware/hdsploader
In directory sc8-pr-cvs1:/tmp/cvs-serv29973/hdsploader

Log Message:
Directory /cvsroot/alsa/alsa-firmware/hdsploader added to the repository




---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-firmware/vxloader - New directory

2003-11-25 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-firmware/vxloader
In directory sc8-pr-cvs1:/tmp/cvs-serv30214/vxloader

Log Message:
Directory /cvsroot/alsa/alsa-firmware/vxloader added to the repository




---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-firmware/mixartloader .cvsignore,NONE,1.1 Makefile.am,NONE,1.1 miXart.conf,NONE,1.1 miXart8.elf,NONE,1.1 miXart8.xlx,NONE,1.1 miXart8AES.xlx,NONE,1.1

2003-11-25 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-firmware/mixartloader
In directory sc8-pr-cvs1:/tmp/cvs-serv30578/mixartloader

Added Files:
.cvsignore Makefile.am miXart.conf miXart8.elf miXart8.xlx 
miXart8AES.xlx 
Log Message:
Initial version - requires more work

--- NEW FILE: .cvsignore ---
Makefile
Makefile.in

--- NEW FILE: Makefile.am ---
cfg_files = miXart.conf \
miXart8AES.xlx \
miXart8.elf \
miXart8.xlx

EXTRA_DIST = $(cfg_files)

firmwaredir = $(datadir)/alsa/firmware/mixartloader
firmware_DATA = $(cfg_files)


--- NEW FILE: miXart.conf ---
# boot firmwares for digigram miXart cards

dsp0miXart8.xlx
dsp1miXart8.elf
dsp2miXart8AES.xlx


--- NEW FILE: miXart8.elf ---
ELF

À8¥œH€

H

H


¥; 


x8fÿø,

09K
°9€
.ì
.ì







:‘d
48`
T
:Ä
4‘d


á8¥ÌÍ|¥PT©ð¾©
€~
€~
€~
€~
€~
€~
€~
€~
€~
€~
€~
€~
Ā
 ì
 ì




€
€
€
€
€
€

:;!
}$KÿúÀU‰:}dJKÿýüVà:}}$KÿÿHºá
|›.W WÄ|».8

 ÐI¤ÐI ¤ÐI
¤9)





 ,
U:‘a








zì
zì
h*Ѓ

@:À+
.8
L.ì
D.ì
.ì
4.ì
,.ì
.ì
48„
B®|à:±ä¨ç
B®|à:±$¨ç
°n¨
°®¨
°n¨
°®¨
°n¨
°®¨
°n¨
°®¨
°n¨
°®¨
°n¨
°®¨

d8䐟 €Ÿä8„
ä8dŸ €Ÿä8„


:ï£èú|L.8






L.9)

D.9
D.ìd*9
D.9
D.ì¦)ºìd*9@






€
€
N€
N€
N€
N€
Á|wxH
|([EMAIL PROTECTED]
   











ÿþ


ÿþ


ÿÿ


ÿÿ


ÿþ


#
€
} Z¨ 
} Z¨ 
€
} Z¨ 
} Z¨ 
®9I0X
@Áð|š#xÃâÐ|Û3xâÜØ; 
ü


ðP|
ð@| [EMAIL PROTECTED]
:8¦
 

 
@PH
X
 P|p|¥”| P|
 @A€





0
.ü
0
0
'
ìTÀø|  ¦A‚
(|ɦˆƒ
˜
˜
˜
˜
€(
d= 
T ø|  ¦A‚






[EMAIL PROTECTED]



:}iAÖ},R‘$
 @|[EMAIL PROTECTED]
[EMAIL PROTECTED]
BzÑ
:}ˆYÖ}R‘9
B‘48Æ


HP|
H@| [EMAIL PROTECTED]
 ì [EMAIL PROTECTED]
p ìp [EMAIL PROTECTED]
:î+zì,ˆzî-xzí÷
‡ºî€zî,‡zíí|zíøzíù~úîZ:Ò^
€|
:8}
ºì :ì'ºÐ
zì;úìœ :È!
zìúí
¼ì:ÂüDü€8ÂÜ
@

ðÀ


:8è
õ€

N€

YH
I€
¿
AìTc:|.|   ¦N€ 8n
Q€ŸŒ8
¥€|(;Ü

p€e
 6€¿¸8


 6€¿¸8


½8
N€
,}h9.€ê,}g1.€Ê,}f).€ª,}e!.€Š,}d.€j,}c.B
Ù~8ž

݀
[EMAIL PROTECTED]

!
€a



9(

™Ÿ
Ÿ
ÃxÁ




H
 @UH:|[EMAIL PROTECTED]


„8


h?@

€m€
LÆ1‚8€
HÆí(
d€
@`
5€
`


ić






[EMAIL PROTECTED]
}ˆ¦N€
A€ÿÜH
Ѐ







vô8!


ƒÁ

A‚
˜Ã
8¤
€
A‚



A‚



8 
8 
H
@‚
ø,
ð(
|,
p,
dH
H
¥
¥
8 
H
A€ÿЀP8€
hH
h8
8 
A€ÿЀß\(
A€ÿÐ8À
hƒhƒhƒ\
hH
h8
8 
A€ÿЀß\(
A€ÿÐ8À
hƒhƒhƒ\
hH
hˆhƒh(
h8
h˜h€
h||êƒß
A€ÿÐ8`
u€
m€
à€
Ԁ
ȃ˜
¼€
°|
h€
À




4;À
8€


|À0P}
ˆz
(
8
8
8
|c8ÿА
|c8ÿА

@€
H

@€
; 
; 
;Ä
|€ P|Àp8„
|§8ÿА

H
H
D;ZÿÐ,[EMAIL PROTECTED]
(
8
|e8ÿА
|e8ÿА

@€
H

@€
; 
; 
;Ä
|€ P|Àp8„


_

E

d



v









 !#$%'()*+,-./0123456789:;=[EMAIL 
PROTECTED]|}~€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ
€






























































































































0æDÏED
n×DœD±DT´DùDž€DEDìóD•çD@
‚¾E1E§ÊE:ŠEÍpE
`}E
ó°E‡   EˆE®-EAøEÕêEj
dEúoKEúÔEû98Eûž=EüMEühgEü͋Eý2¹Eý—òEýý4EþbEþÇ×Eÿ-8Eÿ’£EÿøF
0æF
d¡F
˜aF
ÌF
ÿïF3½FgF›hFÏEFF7
FjøFžèFÒÜF
ÖF
:ÔF
n×F
¢ßF
ÖìF
ýF?Fs.F§NFÛrFœFCÊFwüF¬4FàpF±FH÷F}AF±FåäF=FNšF‚üF·cFëÏF 
?FT´F‰.F½¬Fò/F·F[CFÔFÄjFùF-¤FbGF–ðF˝F
­F@
[EMAIL PROTECTED] FwíFwG¼FwƒFw¿gFwûBFx7 
FxsFx®èFxêÑFy¾Fyb®Fyž¢FyښFz•FzR”FzŽ–FzʜF{¦F{B³F{~ÄF{ºØF{öðF|3
F|o+F|«NF|çtF}#žF}_ËF}›üF}Ø1F~iF~P¥F~ŒäF~É'FmFA·F~FºVFö«F€F€7¯F€UßF€tF€’DF€°yF€Î¯F€ìèFF)^FGœFeÜF„F¢`FÀ¥FÞìFý4F‚~F‚9ÊF‚XF‚vhF‚”¹F‚³

F‚ÑaF‚ï·FƒFƒ,jFƒJÅFƒi#Fƒ‡‚Fƒ¥ãFƒÄFFƒâ«F„F„yF„=ãF„\NF„z¼F„™+F„·œF„ÖF„ôƒF…ùF…1pF…OêF…neF…ŒâF…«aF…ÉáF…èdF†èF†%mF†CõF†b~F†
   
F†Ÿ–F†¾$F†Ü´F†ûFF‡ÚF‡8oF‡WF‡uŸF‡”9F‡²ÕF‡ÑsF‡ðFˆ´Fˆ-XFˆKüFˆj£Fˆ‰KFˆ§õFˆÆ¡FˆåOF‰þF‰¯F‰AaF‰`F‰~ÌF‰ƒF‰¼=F‰ÚøF‰ùµFŠtFŠ74FŠUöFŠtºFŠ“FŠ²FFŠÑFŠïÚF‹¦F‹-tF‹LDF‹kF‹‰èF‹¨½F‹Ç”F‹ælFŒFFŒ$!FŒBÿFŒaÞFŒ€¾FŒŸ¡FŒ¾…FŒÝkFŒüRF;F:FYFxF–ñFµãFÔÖFóËFŽÂFŽ1ºFŽP´FŽo°FŽŽ­FŽ­­FŽÌ­FŽë°F
´F)ºFHÂFgËF†ÖF¥âFÄñFäFF%FA:F`QFiFžƒF½ŸFÜ¼FûÛF‘üF‘:F‘YBF‘xhF‘—F‘¶¹F‘ÕãF‘õF’F’3mF’RŸF’qÒF’‘F’°=F’ÏuF’î®F“
êF“-'F“LeF“k¦F“ŠèF“ª+F“ÉpF“è·F”
F¬•ŒF¬¶F¬Ö”F¬÷F­£F­8,F­X·F­yDF­™ÒF­ºbF­ÚóF­û†F®F®°F®]GF®}àF®žzF®¿F®ß³F¯
FÊdßFʆ´Fʨ‹FÊÊdFÊì=FËFË/õFËQÓFËs³F˕“FË·vFËÙYFËû?FÌ%FÌ?
FÌ`öF̂áF̤ÍFÌÆ»FÌè©FÍ
šFÍ,ŒFÍNFÍpsF͒iFÍ´aFÍÖYFÍøSFÎOFÎLFÎ^JF΀JF΢KFÎÄNFÎæRFÏWFÏ*^FÏLfFÏnpFϐ{Fϲ‡FÏԕFÏö¤FдFÐ:ÆFÐ\ÙFÐ~îFСFÐÃFÐå5FÑOFÑ)kFÑKˆFÑm¦FяÆFѱçFÑÔ
FÑö.FÒSFÒ:zFÒ\¢FÒ~ÌFÒ ÷FÒÃ#FÒåQFÓ€FÓ)°FÓKâFÓnFӐJFÓ²€FÓÔ·FÓöðFÔ*FÔ;fFÔ]£FÔáFÔ¢!FÔÄbFÔæ¤FÕèFÕ+-FÕMtFÕo¼FՒFÕ´PFÕ֜FÕøéFÖ8FÖ=ˆFÖ_ÚFւ-FÖ¤FÖÆ×FÖé.FׇF×-àF×P[EMAIL
 PROTECTED]
G
G   IG '‰G 9ÊG LG ^MG pG ‚ÓG •G §[G ¹ G
 ËåG Þ,G ðrG
ºG
G
'JG
9”G
KÝG
^(G
psG
‚¾G
•G
§WG
¹¥G
ËóG
ÞBG
ð‘GáG1G'‚G9ÔGLG^yGpÌGƒ G•uG§ÊGº GÌwGÞÎGñ%G~G×G(0G:ŠG

[alsa-cvslog] CVS: alsa-firmware/mixartloader Makefile.am,1.2,1.3

2003-11-25 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-firmware/mixartloader
In directory sc8-pr-cvs1:/tmp/cvs-serv17450/mixartloader

Modified Files:
Makefile.am 
Log Message:
Removed alsa-dist rule

Index: Makefile.am
===
RCS file: /cvsroot/alsa/alsa-firmware/mixartloader/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 25 Nov 2003 15:36:01 -  1.2
+++ Makefile.am 25 Nov 2003 15:37:41 -  1.3
@@ -9,9 +9,3 @@
 
 firmwaredir = $(datadir)/alsa/firmware/$(MYNAME)
 firmware_DATA = $(cfg_files)
-
-alsa-dist: distdir
-   @rm -rf ../distdir/$(MYNAME)
-   @mkdir -p ../distdir/$(MYNAME)
-   @cp -RLpv $(distdir)/* ../distdir/$(MYNAME)
-   @rm -rf $(distdir)



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-firmware/vxloader Makefile.am,1.1,1.2

2003-11-25 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-firmware/vxloader
In directory sc8-pr-cvs1:/tmp/cvs-serv16963/vxloader

Modified Files:
Makefile.am 
Log Message:
Ok, things are working now...


Index: Makefile.am
===
RCS file: /cvsroot/alsa/alsa-firmware/vxloader/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 25 Nov 2003 14:07:00 -  1.1
+++ Makefile.am 25 Nov 2003 15:36:01 -  1.2
@@ -1,3 +1,5 @@
+MYNAME = vxloader
+
 cfg_files = vx222.conf vxboard.conf vxpocket.conf vxp440.conf \
bd56002.boot \
bd563s3.boot \
@@ -15,5 +17,11 @@
 
 EXTRA_DIST = $(cfg_files)
 
-firmwaredir = $(datadir)/alsa/firmware/vxloader
+firmwaredir = $(datadir)/alsa/firmware/$(MYNAME)
 firmware_DATA = $(cfg_files)
+
+alsa-dist: distdir
+   @rm -rf ../distdir/$(MYNAME)
+   @mkdir -p ../distdir/$(MYNAME)
+   @cp -RLpv $(distdir)/* ../distdir/$(MYNAME)
+   @rm -rf $(distdir)



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-firmware/vxloader Makefile.am,1.2,1.3

2003-11-25 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-firmware/vxloader
In directory sc8-pr-cvs1:/tmp/cvs-serv17450/vxloader

Modified Files:
Makefile.am 
Log Message:
Removed alsa-dist rule

Index: Makefile.am
===
RCS file: /cvsroot/alsa/alsa-firmware/vxloader/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 25 Nov 2003 15:36:01 -  1.2
+++ Makefile.am 25 Nov 2003 15:37:41 -  1.3
@@ -19,9 +19,3 @@
 
 firmwaredir = $(datadir)/alsa/firmware/$(MYNAME)
 firmware_DATA = $(cfg_files)
-
-alsa-dist: distdir
-   @rm -rf ../distdir/$(MYNAME)
-   @mkdir -p ../distdir/$(MYNAME)
-   @cp -RLpv $(distdir)/* ../distdir/$(MYNAME)
-   @rm -rf $(distdir)



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-firmware/hdsploader .cvsignore,1.1,1.2 Makefile.am,1.1,1.2 tobin.c,1.1,1.2

2003-11-25 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-firmware/hdsploader
In directory sc8-pr-cvs1:/tmp/cvs-serv16963/hdsploader

Modified Files:
.cvsignore Makefile.am tobin.c 
Log Message:
Ok, things are working now...


Index: .cvsignore
===
RCS file: /cvsroot/alsa/alsa-firmware/hdsploader/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore  25 Nov 2003 14:06:58 -  1.1
+++ .cvsignore  25 Nov 2003 15:36:00 -  1.2
@@ -1,2 +1,4 @@
 Makefile
 Makefile.in
+*.bin
+tobin

Index: Makefile.am
===
RCS file: /cvsroot/alsa/alsa-firmware/hdsploader/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 25 Nov 2003 14:06:59 -  1.1
+++ Makefile.am 25 Nov 2003 15:36:01 -  1.2
@@ -1 +1,29 @@
-EXTRA_DIST = $(wildcard *.dat)
+# # Process this file with automake to produce Makefile.in.
+MYNAME = hdsploader
+EXTRA_DIST = digiface_firmware.dat \
+digiface_firmware_rev11.dat \
+multiface_firmware.dat \
+multiface_firmware_rev11.dat \
+tobin.c
+CLEANFILES = tobin *.bin
+
+firmwaredir = $(datadir)/alsa/firmware/$(MYNAME)
+firmware_DATA = digiface_firware.bin \
+   digiface_firmware_rev11.bin \
+   multiface_firmware.bin \
+   multiface_firmware_rev11.bin
+
+tobin: tobin.c $(wildcat *.dat)
+   $(CC) -o tobin tobin.c
+   ./tobin
+
+digiface_firware.bin: tobin
+digiface_firmware_rev11.bin: tobin
+multiface_firmware.bin: tobin
+multiface_firmware_rev11.bin: tobin
+
+alsa-dist: distdir
+   @rm -rf ../distdir/$(MYNAME)
+   @mkdir -p ../distdir/$(MYNAME)
+   @cp -RLpv $(distdir)/* ../distdir/$(MYNAME)
+   @rm -rf $(distdir)

Index: tobin.c
===
RCS file: /cvsroot/alsa/alsa-firmware/hdsploader/tobin.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tobin.c 25 Nov 2003 14:06:59 -  1.1
+++ tobin.c 25 Nov 2003 15:36:01 -  1.2
@@ -1,6 +1,7 @@
 #include stdio.h
 #include stdlib.h
 #include unistd.h
+#include endian.h
 
 #include digiface_firmware.dat
 #include digiface_firmware_rev11.dat
@@ -13,6 +14,16 @@

if ((out = fopen(filename, w+)) == NULL)
return -1;
+#if __BYTE_ORDER == __BIG_ENDIAN
+   {
+   unsigned int idx;
+   for (idx = 0; idx  24413; idx++)
+   array[idx] = ((array[idx]  0x00ff)  16) |
+((array[idx]  0xff00)  8)  |
+((array[idx]  0x00ff)  8)  |
+((array[idx]  0xff00)  16);
+   }
+#endif
if (fwrite(array, 4, 24413, out) != 24413) {
fclose(out);
return -1;



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-firmware .cvsignore,NONE,1.1 Makefile.am,NONE,1.1 configure.in,NONE,1.1 cvscompile,NONE,1.1

2003-11-25 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-firmware
In directory sc8-pr-cvs1:/tmp/cvs-serv16963

Added Files:
.cvsignore Makefile.am configure.in cvscompile 
Log Message:
Ok, things are working now...


--- NEW FILE: .cvsignore ---
configure
config.log
config.cache
config.status
config.guess
config.sub
Makefile.conf
confdefs.h
aclocal.m4
Makefile
Makefile.in
version
autom4te.cache
depcomp
missing
install-sh
mkinstalldirs
ltmain.sh

--- NEW FILE: Makefile.am ---
# # Process this file with automake to produce Makefile.in.
AUTOMAKE_OPTIONS = 1.3 foreign

SUBDIRS = hdsploader mixartloader vxloader

EXTRA_DIST = depcomp

dist-hook:
-chmod -R a+r $(distdir)
@if ! test -z $(AMTAR); then \
$(AMTAR) --create --verbose --file=- $(distdir) | bzip2 -c -9  
$(distdir).tar.bz2 ; \
else \
$(TAR) --create --verbose --file=- $(distdir) | bzip2 -c -9  
$(distdir).tar.bz2 ; \
fi

--- NEW FILE: configure.in ---
AC_INIT(hdsploader/tobin.c)
AM_INIT_AUTOMAKE(alsa-firmware, 1.0.0pre3)
AC_PROG_CC
AC_PROG_INSTALL
AC_HEADER_STDC

AC_OUTPUT(Makefile \
  hdsploader/Makefile \
  mixartloader/Makefile \
  vxloader/Makefile)

--- NEW FILE: cvscompile ---
#!/bin/bash

libtoolize --automake --copy
aclocal $ACLOCAL_FLAGS
automake --foreign --copy --add-missing
autoconf
export CFLAGS='-O2 -Wall -W -pipe -g'
echo CFLAGS=$CFLAGS
echo ./configure $@
./configure $@ || exit 1
unset CFLAGS
if [ -z $CVSCOMPILE_NO_MAKE ]; then
  make
fi



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


[alsa-cvslog] CVS: alsa-firmware/mixartloader Makefile.am,1.1,1.2

2003-11-25 Thread Jaroslav Kysela
Update of /cvsroot/alsa/alsa-firmware/mixartloader
In directory sc8-pr-cvs1:/tmp/cvs-serv16963/mixartloader

Modified Files:
Makefile.am 
Log Message:
Ok, things are working now...


Index: Makefile.am
===
RCS file: /cvsroot/alsa/alsa-firmware/mixartloader/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am 25 Nov 2003 14:06:59 -  1.1
+++ Makefile.am 25 Nov 2003 15:36:01 -  1.2
@@ -1,3 +1,5 @@
+MYNAME = mixartloader
+
 cfg_files = miXart.conf \
miXart8AES.xlx \
miXart8.elf \
@@ -5,6 +7,11 @@
 
 EXTRA_DIST = $(cfg_files)
 
-firmwaredir = $(datadir)/alsa/firmware/mixartloader
+firmwaredir = $(datadir)/alsa/firmware/$(MYNAME)
 firmware_DATA = $(cfg_files)
 
+alsa-dist: distdir
+   @rm -rf ../distdir/$(MYNAME)
+   @mkdir -p ../distdir/$(MYNAME)
+   @cp -RLpv $(distdir)/* ../distdir/$(MYNAME)
+   @rm -rf $(distdir)



---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
___
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog


<    5   6   7   8   9   10   11   12   13   14   >