[PC-BSD Commits] r423 - pcbsd/trunk/system-overlay/PCBSD/cardDetect

[svn at pcbsd.org]

Author: kris
Date: 2007-07-08 01:38:49 +0100 (Sun, 08 Jul 2007)
New Revision: 423

Modified:
   pcbsd/trunk/system-overlay/PCBSD/cardDetect/sound_defines
   pcbsd/trunk/system-overlay/PCBSD/cardDetect/sound_detect.sh
Log:

Updated sound detection to support intel hda without loading all modules



Modified: pcbsd/trunk/system-overlay/PCBSD/cardDetect/sound_defines
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/cardDetect/sound_defines	2007-07-07 03:27:28 UTC (rev 422)
+++ pcbsd/trunk/system-overlay/PCBSD/cardDetect/sound_defines	2007-07-08 00:38:49 UTC (rev 423)
@@ -56,7 +56,7 @@
 snd_ich   :      ICH3_ID		0x24858086
 snd_ich   :      ICH2_ID		0x24458086
 snd_ich   :      ICH_ID			0x24258086
-snd_ich   :      INTEL_443MX_ID 	0x71958086												
+snd_ich   :      INTEL_443MX_ID 	0x71958086
 snd_ich   :      NVIDIA_NF_ID	        0x01b110de
 snd_ich   :      NVIDIA_NF2_ID		0x006a10de
 snd_ich   :      NVIDIA_NF2_400_ID	0x008a10de
@@ -65,4 +65,5 @@
 snd_ich   :      NVIDIA_NF4_ID		0x005910de
 snd_ich   :      AMD_768_PCI_ID         0x74451022
 snd_ich   :      AMD_8111_PCI_ID	0x746d1022
+snd_hda   :      INTEL_HDA_ID		0x26688086
 snd_solo  :      ESS_SOLO_PCI_ID	0x1969125d

Modified: pcbsd/trunk/system-overlay/PCBSD/cardDetect/sound_detect.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/cardDetect/sound_detect.sh	2007-07-07 03:27:28 UTC (rev 422)
+++ pcbsd/trunk/system-overlay/PCBSD/cardDetect/sound_detect.sh	2007-07-08 00:38:49 UTC (rev 423)
@@ -22,18 +22,24 @@
 PATH_ORIG=/PCBSD/cardDetect
 FILE_1=${PATH_ORIG}/sound_defines
 STR_ID=`pciconf -l | sed -n 's/.*class=0x040100.*chip=\([^ ]*\).*/\1/p'`
+echo "STR_ID: ${STR_ID}"
 
 if [ -n "$STR_ID" ]
 then
     VENDOR_ID=`echo ${PCICONF} | awk '{ print(substr($0,7,4)); }'`
     CARD=`zgrep $STR_ID ${FILE_1} | awk '{print $1}'`
 else
-    echo "Unable to locate the sound card and match an appropriate driver."
-    echo "Maybe you have an ISA sound card, that must be configured manualy."
-    echo "All sound drivers will be given opportiunity to probe for cards."
-    CARD=snd_driver
+    STR_ID=`pciconf -l | sed -n 's/.*class=0x040300.*chip=\([^ ]*\).*/\1/p'`
+    echo "STR_ID: ${STR_ID}"
+
+    if [ -n "${STR_ID}" ]
+    then
+      VENDOR_ID=`echo ${PCICONF} | awk '{ print(substr($0,7,4)); }'`
+      CARD=`zgrep $STR_ID ${FILE_1} | awk '{print $1}'`
+    fi
 fi
 
+
 if [ ! -n "$CARD" ]
 then
     echo "No known driver matched your sound card."