Update of /cvsroot/alsa/alsa-utils/alsaconf
In directory sc8-pr-cvs1:/tmp/cvs-serv25242
Modified Files:
alsaconf.in
Log Message:
fixes by Philippe De Muyter <[EMAIL PROTECTED]>:
- Removed erroneous space between `snd[-_]' and $1 in grep
search expression.
- Test also `0xf00' for `cport'.
Index: alsaconf.in
===================================================================
RCS file: /cvsroot/alsa/alsa-utils/alsaconf/alsaconf.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- alsaconf.in 25 Nov 2003 12:15:48 -0000 1.6
+++ alsaconf.in 26 Nov 2003 18:07:27 -0000 1.7
@@ -679,7 +679,7 @@
ac_try_load () {
test $do_logging = 1 && echo "$1 ${*:2}" >> $LOGFILE
/sbin/modprobe snd-$1 ${*:2} >/dev/null 2>&1
- $lsmod | grep -E '(snd-|snd_)' $1 >/dev/null 2>&1 || return 1
+ $lsmod | grep -E '(snd-|snd_)'$1 >/dev/null 2>&1 || return 1
# mute mixers
amixer set Master 0% mute >/dev/null 2>&1
@@ -713,7 +713,7 @@
ac_try_capture () {
test $do_logging = 1 && echo "$1 ${*:2}" >> $LOGFILE
/sbin/modprobe snd-$1 ${*:3} >/dev/null 2>&1
- $lsmod | grep -E '(snd-|snd_)' $1 >/dev/null 2>&1 || return 1
+ $lsmod | grep -E '(snd-|snd_)'$1 >/dev/null 2>&1 || return 1
# mute mixers
amixer set Master 0% mute >/dev/null 2>&1
@@ -915,7 +915,7 @@
card=cs4236
irq_list=`check_irq_avail 5 7 9 11 12 15`
isapnp=`ac_check_option $card ${mpfx}isapnp 0`
- for cport in 0x538 0x210; do
+ for cport in 0x538 0x210 0xf00; do
for port in 0x530 0x534; do
opts="${mpfx}port=$port ${mpfx}cport=$cport $isapnp"
ac_try_dmas $card "$opts" $irq_list && return 0
@@ -928,7 +928,7 @@
card=cs4232
irq_list=`check_irq_avail 5 7 9 11 12 15`
isapnp=`ac_check_option $card ${mpfx}isapnp 0`
- for cport in 0x538 0x210; do
+ for cport in 0x538 0x210 0xf00; do
for port in 0x530 0x534; do
opts="${mpfx}port=$port ${mpfx}cport=$cport $isapnp"
ac_try_dmas $card "$opts" $irq_list && return 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
