From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 14 Sep 2005 20:07:37 +0000 (+0000)
Subject: Fix hwcfg file name by alsaconf
X-Git-Tag: v1.0.10rc2~5
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=72a72ad7fef2c6504e41ddea2a9b176cb1994c98;p=alsa-utils.git

Fix hwcfg file name by alsaconf

Fixed the hwcfg file name generated by alsaconf.
The domain must be included.
---

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