[alsa-cvslog] CVS: alsa-kernel/isa/ad1848 ad1848_lib.c,1.29,1.30
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
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-utils/alsaconf - New directory
Update of /cvsroot/alsa/alsa-utils/alsaconf In directory sc8-pr-cvs1:/tmp/cvs-serv31973/alsaconf Log Message: Directory /cvsroot/alsa/alsa-utils/alsaconf added to the repository --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-driver/utils alsaconf,1.10,NONE alsaconf.8,1.1,NONE
Update of /cvsroot/alsa/alsa-driver/utils In directory sc8-pr-cvs1:/tmp/cvs-serv32208/utils Removed Files: alsaconf alsaconf.8 Log Message: moved alsaconf to alsa-utils. --- alsaconf DELETED --- --- alsaconf.8 DELETED --- --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-utils Makefile.am,1.27,1.28 README,1.6,1.7 configure.in,1.68,1.69
Update of /cvsroot/alsa/alsa-utils In directory sc8-pr-cvs1:/tmp/cvs-serv32418 Modified Files: Makefile.am README configure.in Log Message: - added alsaconf script. - fixed alsaconf script for the new module tools of 2.6 kernel. Index: Makefile.am === RCS file: /cvsroot/alsa/alsa-utils/Makefile.am,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- Makefile.am 28 Oct 2003 10:53:43 - 1.27 +++ Makefile.am 29 Oct 2003 13:38:23 - 1.28 @@ -4,7 +4,7 @@ else ALSAMIXER_DIR= endif -SUBDIRS=include alsactl $(ALSAMIXER_DIR) amidi amixer aplay iecset seq utils +SUBDIRS=include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq utils EXTRA_DIST=ChangeLog INSTALL TODO README configure cvscompile depcomp rpm: dist Index: README === RCS file: /cvsroot/alsa/alsa-utils/README,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- README 28 Oct 2003 10:53:43 - 1.6 +++ README 29 Oct 2003 13:38:23 - 1.7 @@ -6,6 +6,7 @@ The package can be compiled only with the installed ALSA driver and the ALSA C library. +alsaconf - the ALSA driver configurator script alsactl- an utility for soundcard settings management aplay/arecord - an utility for the playback / capture of .wav,.voc,.au files amixer - a command line mixer Index: configure.in === RCS file: /cvsroot/alsa/alsa-utils/configure.in,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- configure.in28 Oct 2003 10:53:43 - 1.68 +++ configure.in29 Oct 2003 13:38:23 - 1.69 @@ -48,9 +48,11 @@ AC_SUBST(CURSESINC) AC_SUBST(CURSESLIB) -dnl Check for Gtk+ -dnl AM_PATH_GTK(1.0.1) -dnl CFLAGS=$CFLAGS $GTK_CFLAGS +AC_ARG_WITH(testsound, + [ --with-testsound=filegive the path of test sound file for alsaconf], + TESTSOUND=$withval, + TESTSOUND=/usr/share/sounds/alsa/test.wav) +AC_SUBST(TESTSOUND) AM_CONFIG_HEADER(include/aconfig.h) @@ -65,5 +67,6 @@ SAVE_UTIL_VERSION AC_OUTPUT(Makefile alsactl/Makefile alsamixer/Makefile amidi/Makefile amixer/Makefile \ + alsaconf/alsaconf alsaconf/Makefile \ aplay/Makefile include/Makefile iecset/Makefile utils/Makefile \ utils/alsa-utils.spec seq/Makefile seq/aconnect/Makefile seq/aseqnet/Makefile) --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
[alsa-cvslog] CVS: alsa-utils/alsaconf .cvsignore,NONE,1.1 Makefile.am,NONE,1.1 alsaconf.8,NONE,1.1 alsaconf.in,NONE,1.1
Update of /cvsroot/alsa/alsa-utils/alsaconf
In directory sc8-pr-cvs1:/tmp/cvs-serv32418/alsaconf
Added Files:
.cvsignore Makefile.am alsaconf.8 alsaconf.in
Log Message:
- added alsaconf script.
- fixed alsaconf script for the new module tools of 2.6 kernel.
--- NEW FILE: .cvsignore ---
.deps
alsaconf
Makefile
Makefile.in
--- NEW FILE: Makefile.am ---
bin_SCRIPTS = alsaconf
man_MANS = alsaconf.8
EXTRA_DIST = alsaconf.8
--- NEW FILE: alsaconf.8 ---
.\ Hey, EMACS: -*- nroff -*-
.\ alsaconf.8 is copyright 2003 by Jordi Mallach [EMAIL PROTECTED]
.\
.\ This is free documentation, see the latest version of the GNU
.\ General Public License for copying conditions. There is NO warranty.
.TH ALSACONF 8 February 23, 2003
.SH NAME
alsaconf \- configuration tool for the Advanced Linux Sound Architecture
.SH SYNOPSIS
.B alsaconf
.RI [ options ]
.SH DESCRIPTION
This manual page documents briefly the
.B alsaconf
command.
This manual page was written for the Debian distribution because the
original program does not have a manual page.
.PP
\fBAlsaconf\fP is a simple shell script which tries to detect the sound cards
on your system and writes a suitable configuration file for ALSA. It will try
to guess what GNU/Linux distribution you're running, and will act accordingly
to the standards of that distribution, if specific support is available.
.PP
Alsaconf will write a modutils snippet which can be then used by modutils
to load the correct parameters for your sound card.
.SH OPTIONS
Alsaconf accepts the following options:
.TP
.B \-l, \-\-legacy
Check only for legacy non-isapnp cards
.TP
.B \-m, \-\-modinfo
Read module descriptions instead of reading a card database.
.TP
.B \-s, \-\-sound\-wav\-file
Use the specified wav file as a test sound
.TP
.B \-u, \-\-uid uid
Set the uid for the ALSA devices (default = 0)
.TP
.B \-g, \-\-gid gid
Set the gid for the ALSA devices (default = 0)
.TP
.B \-d, \-\-devmode mode
Set the device mode for the ALSA devices (default = 0666)
.TP
.B \-r, \-\-strict
Set strict device mode (equiv. with -g 17 -d 0660)
.TP
.B \-L, \-\-log
Logging on /tmp/alsaconf.log
.TP
.B \-p, \-\-probe card-name
Probe a legacy non-isapnp card and print module options
.TP
.B \-h, \-\-help
Displays this help text
.SH DEBIAN SPECIFIC
In Debian, the default gid of the device files is 29 (corresponding to the
audio group) and the default device mode is 0660.
For the ALSA base package, see also
.I /usr/share/doc/alsa-base/
.SH SEE ALSO
\fB
alsamixer(1),
amixer(1),
aplay(1),
arecord(1)
\fP
.SH HOMEPAGE
http://www.alsa-project.org/
.SH AUTHOR
The alsaconf script was written by
Takashi Iwai [EMAIL PROTECTED],
Bernd Kaindl [EMAIL PROTECTED] and
Jan Ondrej (SAL) [EMAIL PROTECTED]
This manual page was written by Jordi Mallach [EMAIL PROTECTED],
for the Debian system (but may be used by others).
--- NEW FILE: alsaconf.in ---
#!/bin/bash
#
# ALSA Configurator
#
# Copyright (c) 1999-2002 SuSE GmbH
# Jan ONDREJ
#
# written by Takashi Iwai [EMAIL PROTECTED]
# Bernd Kaindl [EMAIL PROTECTED]
# Jan ONDREJ (SAL) [EMAIL PROTECTED]
#
# based on the original version of Jan ONDREJ's alsaconf for ALSA 0.4.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
[EMAIL PROTECTED]@
# Check for root privileges
if [ `id -u` -ne 0 ]; then
echo You must be root to use this script.
exit 1
fi
# Check for GNU/Linux distributions
if [ -f /etc/SuSE-release -o -f /etc/UnitedLinux-release ]; then
distribution=suse
elif [ -f /etc/debian_version ]; then
distribution=debian
elif [ -f /etc/redhat-release ]; then
distribution=redhat
else
distribution=unknown
fi
for prog in lspci lsmod; do
for path in /sbin /usr/sbin /bin /usr/bin;do
[[ -x $path/$prog ]] eval $prog=$path/$prog
done
done
unset prog path
usage() {
echo ALSA configurator version $version
echo usage: alsaconf [options]
echo -l|--legacycheck only legacy non-isapnp cards
echo -m|--modinfo read module descriptions instead of reading card db
echo -s|--sound wav-file
echo use the specified wav file as a test sound
echo -u|--uid uid set the uid for the ALSA devices (default = 0) [obsoleted]
echo -g|--gid gid set the gid for the ALSA devices (default = 0) [obsoleted]
echo -d|--devmode mode
echo set the device mode for the ALSA devices (default = 0666)
[obs.]
echo -r|--strictset strict device mode (equiv. with -g 17 -d 0660)
[obsoleted]
echo -L|--log logging on $LOGFILE
echo -p|--probe card-name
echo probe a legacy non-isapnp card and print module options
echo -P|--listprobe list the supported
[alsa-cvslog] CVS: alsa-kernel/core sound.c,1.51,1.52
Update of /cvsroot/alsa/alsa-kernel/core In directory sc8-pr-cvs1:/tmp/cvs-serv3283/core Modified Files: sound.c Log Message: - cards_limit=1 as default instead of 8. - cards_limit means the number of auto-loaded cards. not limits the actual card numbers for manual loading (e.g. hotplug). Index: sound.c === RCS file: /cvsroot/alsa/alsa-kernel/core/sound.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- sound.c 23 Oct 2003 14:34:52 - 1.51 +++ sound.c 29 Oct 2003 16:33:06 - 1.52 @@ -36,7 +36,7 @@ static int major = CONFIG_SND_MAJOR; int snd_major; -static int cards_limit = SNDRV_CARDS; +static int cards_limit = 1; #ifdef CONFIG_DEVFS_FS static int device_mode = S_IFCHR | S_IRUGO | S_IWUGO; #endif @@ -50,7 +50,7 @@ MODULE_PARM_DESC(major, Major # for sound driver.); MODULE_PARM_SYNTAX(major, default:116,skill:devel); MODULE_PARM(cards_limit, i); -MODULE_PARM_DESC(cards_limit, Count of soundcards installed in the system.); +MODULE_PARM_DESC(cards_limit, Count of auto-loadable soundcards.); MODULE_PARM_SYNTAX(cards_limit, default:8,skill:advanced); #ifdef CONFIG_DEVFS_FS MODULE_PARM(device_mode, i); @@ -58,6 +58,10 @@ MODULE_PARM_SYNTAX(device_mode, default:0666,base:8); #endif +/* this one holds the actual max. card number currently available. + * as default, it's identical with cards_limit option. when more + * modules are loaded manually, this limit number increases, too. + */ int snd_ecards_limit; static struct list_head snd_minors_hash[SNDRV_CARDS]; @@ -224,7 +228,7 @@ } list_add_tail(preg-list, snd_minors_hash[SNDRV_MINOR_CARD(minor)]); #ifdef CONFIG_DEVFS_FS - if (strncmp(name, controlC, 8)) /* created in sound.c */ + if (strncmp(name, controlC, 8) || card-number = cards_limit) devfs_mk_cdev(MKDEV(major, minor), S_IFCHR | device_mode, snd/%s, name); #endif up(sound_mutex); @@ -257,6 +261,8 @@ #ifdef CONFIG_DEVFS_FS if (strncmp(mptr-name, controlC, 8)) /* created in sound.c */ devfs_remove(snd/%s, mptr-name); + else if (card-number = cards_limit) + devfs_remove(snd/%s, mptr-name); /* manualy created */ #endif list_del(mptr-list); up(sound_mutex); --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
