[alsa-cvslog] CVS: alsa-driver/include adriver.h,1.17,1.18
Update of /cvsroot/alsa/alsa-driver/include
In directory usw-pr-cvs1:/tmp/cvs-serv21190
Modified Files:
adriver.h
Log Message:
Added definition of devfs_find_and_unregister() for 2.2 and 2.4 kernels
Index: adriver.h
===
RCS file: /cvsroot/alsa/alsa-driver/include/adriver.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- adriver.h 17 Sep 2002 11:14:42 - 1.17
+++ adriver.h 2 Oct 2002 06:27:33 - 1.18
@@ -165,13 +165,34 @@
#define synchronize_irq(irq) synchronize_irq_wrapper(irq)
#endif /* LINUX_VERSION_CODE 2.5.28 */
-#if LINUX_VERSION_CODE KERNEL_VERSION(2, 5, 29) defined(CONFIG_DEVFS_FS)
+#ifdef CONFIG_DEVFS_FS
+#if LINUX_VERSION_CODE KERNEL_VERSION(2, 5, 29)
#include linux/fs.h
#undef register_chrdev
#define register_chrdev devfs_register_chrdev
#undef unregister_chrdev
#define unregister_chrdev devfs_unregister_chrdev
#endif
+#if LINUX_VERSION_CODE KERNEL_VERSION(2, 3, 0)
+static inline extern void devfs_find_and_unregister (devfs_handle_t dir, const char
+*name,
+unsigned int major, unsigned int
+minor,
+ char type, int
+traverse_symlinks);
+{
+ devfs_handle_t master;
+ master = devfs_find_handle(dir, name, strlen(name), major, minor, type,
+traverse_symlinks);
+ devfs_unregister(master);
+}
+#elif LINUX_VERSION_CODE KERNEL_VERSION(2, 5, 0)
+static inline extern void devfs_find_and_unregister (devfs_handle_t dir, const char
+*name,
+unsigned int major, unsigned int
+minor,
+ char type, int
+traverse_symlinks);
+{
+ devfs_handle_t master;
+ master = devfs_find_handle(dir, name, major, minor, type, traverse_symlinks);
+ devfs_unregister(master);
+}
+#endif
+#endif /* CONFIG_DEVFS_FS */
/* workarounds for USB API */
#if defined(SND_NEED_USB_WRAPPER) (defined(CONFIG_USB) ||
defined(CONFIG_USB_MODULE))
---
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 info.c,1.19,1.20 sound.c,1.23,1.24
Update of /cvsroot/alsa/alsa-kernel/core
In directory usw-pr-cvs1:/tmp/cvs-serv21371
Modified Files:
info.c sound.c
Log Message:
DEVFS cleanup - removal of code for 2.2 and 2.4 kernels
Index: info.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/info.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- info.c 1 Oct 2002 14:49:16 - 1.19
+++ info.c 2 Oct 2002 06:28:20 - 1.20
@@ -960,7 +960,6 @@
{
#ifdef CONFIG_DEVFS_FS
char dname[32];
- devfs_handle_t master;
#endif
snd_runtime_check(entry, return);
@@ -970,12 +969,7 @@
#ifdef CONFIG_DEVFS_FS
if (entry-p strncmp(entry-name, controlC, 8)) {
sprintf(dname, snd/%s, entry-name);
-#if LINUX_VERSION_CODE KERNEL_VERSION(2,3,0)
- master = devfs_find_handle(NULL, dname, strlen(dname), 0, 0,
DEVFS_SPECIAL_CHR, 0);
- devfs_unregister(master);
-#else
devfs_find_and_unregister(NULL, dname, 0, 0, DEVFS_SPECIAL_CHR, 0);
-#endif
}
#endif
snd_info_free_entry(entry);
Index: sound.c
===
RCS file: /cvsroot/alsa/alsa-kernel/core/sound.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sound.c 26 Sep 2002 19:20:54 - 1.23
+++ sound.c 2 Oct 2002 06:28:20 - 1.24
@@ -358,21 +358,12 @@
static void __exit alsa_sound_exit(void)
{
#ifdef CONFIG_DEVFS_FS
- devfs_handle_t master;
char controlname[24];
short controlnum;
for (controlnum = 0; controlnum snd_cards_limit; controlnum++) {
sprintf(controlname, snd/controlC%d, controlnum);
-#if LINUX_VERSION_CODE KERNEL_VERSION(2,3,0)
- master = devfs_find_handle(NULL, controlname, strlen(controlname), 0,
0, DEVFS_SPECIAL_CHR, 0);
- devfs_unregister(master);
-#elif LINUX_VERSION_CODE KERNEL_VERSION(2,5,0)
- master = devfs_find_handle(NULL, controlname, 0, 0, DEVFS_SPECIAL_CHR,
0);
- devfs_unregister(master);
-#else
devfs_find_and_unregister(NULL, controlname, 0, 0, DEVFS_SPECIAL_CHR,
0);
-#endif
}
#endif
---
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-lib acconfig.h,1.6,NONE
Update of /cvsroot/alsa/alsa-lib In directory usw-pr-cvs1:/tmp/cvs-serv1738 Removed Files: acconfig.h Log Message: removed; conflicts with autoheader --- acconfig.h DELETED --- --- 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-utils acconfig.h,1.1,NONE
Update of /cvsroot/alsa/alsa-utils In directory usw-pr-cvs1:/tmp/cvs-serv2235 Removed Files: acconfig.h Log Message: removed; conflicts with autoheader --- acconfig.h DELETED --- --- 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-utils/aplay aplay.c,1.150,1.151
Update of /cvsroot/alsa/alsa-utils/aplay
In directory usw-pr-cvs1:/tmp/cvs-serv1783
Modified Files:
aplay.c
Log Message:
- fixed the multi-line string (deprecated).
- fixed the calculation of max peak for 32bit samples.
- change -v option accumulative. peak bars are shown with double -v
options.
Index: aplay.c
===
RCS file: /cvsroot/alsa/alsa-utils/aplay/aplay.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- aplay.c 19 Sep 2002 16:19:12 - 1.150
+++ aplay.c 2 Oct 2002 14:42:00 - 1.151
@@ -137,32 +137,32 @@
static void usage(char *command)
{
snd_pcm_format_t k;
- fprintf(stderr, \
-Usage: %s [OPTION]... [FILE]...
-
---help help
---version print current version
--l, --list-devices list all soundcards and digital audio devices
--L, --list-pcms list all PCMs defined
--D, --device=NAME select PCM by name
--q, --quiet quiet mode
--t, --file-type TYPEfile type (voc, wav, raw or au)
--c, --channels=#channels
--f, --format=FORMAT sample format (case insensitive)
--r, --rate=#sample rate
--d, --duration=#interrupt after # seconds
--s, --sleep-min=# min ticks to sleep
--M, --mmap mmap stream
--N, --nonblock nonblocking mode
--F, --period-time=# distance between interrupts is # microseconds
--B, --buffer-time=# buffer duration is # microseconds
--A, --avail-min=# min available space for wakeup is # microseconds
--R, --start-delay=# delay for automatic PCM start is # microseconds
-(relative to buffer size if = 0)
--T, --stop-delay=# delay for automatic PCM stop is # microseconds from xrun
--v, --verbose show PCM structure and setup
--I, --separate-channels one file for each channel
-, command);
+ fprintf(stderr,
+Usage: %s [OPTION]... [FILE]...\n
+\n
+--help help\n
+--version print current version\n
+-l, --list-devices list all soundcards and digital audio devices\n
+-L, --list-pcms list all PCMs defined\n
+-D, --device=NAME select PCM by name\n
+-q, --quiet quiet mode\n
+-t, --file-type TYPEfile type (voc, wav, raw or au)\n
+-c, --channels=#channels\n
+-f, --format=FORMAT sample format (case insensitive)\n
+-r, --rate=#sample rate\n
+-d, --duration=#interrupt after # seconds\n
+-s, --sleep-min=# min ticks to sleep\n
+-M, --mmap mmap stream\n
+-N, --nonblock nonblocking mode\n
+-F, --period-time=# distance between interrupts is # microseconds\n
+-B, --buffer-time=# buffer duration is # microseconds\n
+-A, --avail-min=# min available space for wakeup is # microseconds\n
+-R, --start-delay=# delay for automatic PCM start is # microseconds \n
+(relative to buffer size if = 0)\n
+-T, --stop-delay=# delay for automatic PCM stop is # microseconds from xrun\n
+-v, --verbose show PCM structure and setup (accumulative)\n
+-I, --separate-channels one file for each channel\n
+ , command);
fprintf(stderr, Recognized sample formats are:);
for (k = 0; k SND_PCM_FORMAT_LAST; ++(unsigned long) k) {
const char *s = snd_pcm_format_name(k);
@@ -431,7 +431,7 @@
stop_delay = atoi(optarg);
break;
case 'v':
- verbose = 1;
+ verbose++;
break;
case 'M':
mmap_flag = 1;
@@ -956,7 +956,7 @@
max_peak = val;
}
max = 1 (bits_per_sample-1);
- if (max == 0)
+ if (max = 0)
max = 0x7fff;
printf(Max peak (%li samples): %05i (0x%04x) , (long)ocount, max_peak,
max_peak);
perc = max_peak / (max / 100);
@@ -995,7 +995,7 @@
exit(EXIT_FAILURE);
}
if (r 0) {
- if (verbose)
+ if (verbose 1)
compute_max_peak(data, r * hwparams.channels);
result += r;
count -= r;
@@ -1037,7 +1037,7 @@
exit(EXIT_FAILURE);
}
if (r 0) {
- if (verbose) {
+ if (verbose 1) {
for (channel = 0; channel channels; channel++)
compute_max_peak(data[channel], r);
}
@@ -1076,7 +1076,7 @@
exit(EXIT_FAILURE);
}
if (r 0) {
- if (verbose)
+ if (verbose 1)
