summaryrefslogtreecommitdiff
path: root/alsaconf
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-09-14 20:07:37 +0000
committerTakashi Iwai <tiwai@suse.de>2005-09-14 20:07:37 +0000
commit72a72ad7fef2c6504e41ddea2a9b176cb1994c98 (patch)
treeda45f4b416c5e971214b273f1304b25cd8e28d7a /alsaconf
parentbd7a1e98479330b74ca7ed8d919c45fc9374e83b (diff)
downloadalsa-utils-72a72ad7fef2c6504e41ddea2a9b176cb1994c98.tar.gz
Fix hwcfg file name by alsaconf
Fixed the hwcfg file name generated by alsaconf. The domain must be included.
Diffstat (limited to 'alsaconf')
-rw-r--r--alsaconf/alsaconf.in9
1 files changed, 8 insertions, 1 deletions
diff --git a/alsaconf/alsaconf.in b/alsaconf/alsaconf.in
index f09405f..a5d8895 100644
--- a/alsaconf/alsaconf.in
+++ b/alsaconf/alsaconf.in
@@ -426,6 +426,7 @@ set_mixers() {
mixer DAC,1 90%
# some notebooks use headphone instead of master
mixer Headphone 75%
+ mixer 'Internal Speaker' 75%
mixer Playback 100%
# turn off digital switches
amixer set "SB Live Analog/Digital Output Jack" off >/dev/null 2>&1
@@ -718,7 +719,13 @@ get_hwcfg_type () {
if [ "$driver" = "$1" ]; then
case "$dev" in
*:*)
- echo bus-pci-`$lspci -d "$dev" | head -n 1 | sed -e 's/ .*$//'`
+ # FIXME: need to look around /sys/bus/pci/* (or use vpid-* ?)
+ devid=`$lspci -d "$dev" | head -n 1 | sed -e 's/ .*$//'`
+ case "$devid" in
+ *:*:*.*) ;;
+ *) devid="0000:$devid" ;;
+ esac
+ echo bus-pci-$devid
;;
*)
echo $driver