Attachment 52096 Details for Bug 121869

[patch] Fix that worked on 9.3 Live DVDs

-04-hotplug-sound (text/plain), 7.23 KB, created by Torsten Duwe on 2005-10-10 15:29:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Torsten Duwe

Created: 2005-10-10 15:29:22 UTC

Size: 7.23 KB

patch

obsolete

>--- etc/hotplug/pci.rc-dist	2004-04-07 15:50:31.000000000 +0200
>+++ etc/hotplug/pci.rc	2004-04-14 17:31:11.524838144 +0200
>@@ -28,6 +28,24 @@
> 	< /dev/null > /dev/null 2>&1 & 
> }
> 
>+sound_call_hotplug () {
>+	# There may be /etc/hotplug.d/default/eventrecorder.hotplug
>+	# that logs the environment of every hotplug events. Therefore
>+	# we keep environment clean.
>+#	echo " "\
>+	eval \
>+	$ENV \
>+	${ACTION:+ ACTION=$ACTION} \
>+	${DEVPATH:+ DEVPATH="$DEVPATH"} \
>+	${PCI_SLOT_NAME:+ PCI_SLOT_NAME="$PCI_SLOT_NAME"} \
>+	${PCI_CLASS:+ PCI_CLASS="$PCI_CLASS$PCI_PROGIF"} \
>+	${PCI_ID:+ PCI_ID="$PCI_ID"} \
>+	${PCI_SUBSYS_ID:+ PCI_SUBSYS_ID="$PCI_SUBSYS_ID"} \
>+	${HOTPLUG_TRACE:+ HOTPLUG_TRACE="$HOTPLUG_TRACE"} \
>+	/sbin/hotplug pci-sound \
>+	< /dev/null > /dev/null 2>&1 & 
>+}
>+
> pci_boot_events_nosysfs () {
> 	if [ ! -x /sbin/lspci -o ! -f /proc/bus/pci/devices ]; then
> 	    debug_mesg " ** can't synthesize pci hotplug events"
>@@ -93,6 +111,25 @@
> 			continue;
> 		fi
> 
>+		# check Multimedia (sound)
>+		TAIL=${PCI_CLASS##04}
>+		if [ ${#TAIL} -le 4 ] ; then
>+		    if [ -r /etc/modprobe.d/sound ]; then
>+			debug_mesg ". `lspci -s ${PCI_SLOT_NAME/0000:/}` -> skipped"
>+			echo -n . >&3
>+		     else
>+			PCI_ID="`cat_0x $i/vendor`:`cat_0x $i/device`"
>+			PCI_SUBSYS_ID="`cat_0x $i/subsystem_vendor`"
>+			PCI_SUBSYS_ID="$PCI_SUBSYS_ID:`cat_0x $i/subsystem_device`"
>+			DEVPATH=`cd $i/ ; /bin/pwd`
>+			DEVPATH=${DEVPATH/\/sys/}
>+			echo -n "*" >&3
>+			debug_mesg "* `lspci -s ${PCI_SLOT_NAME/0000:/}` -> generating event"
>+			sound_call_hotplug
>+		    fi
>+		    continue
>+		fi
>+
> 		# Handle only some pci classes
> 		OK=no
> 		for USE in $COLDPLUG_PCI_CLASSES_WHITELIST; do
>--- /dev/null	2004-04-06 15:27:52.000000000 +0200
>+++ etc/hotplug/pci-sound.agent	2004-04-14 17:38:26.146448274 +0200
>@@ -0,0 +1,237 @@
>+#!/bin/bash
>+# $Id: pci.agent,v 1.10 2004/04/03 15:46:50 zoz Exp $
>+#
>+# PCI and CardBus hotplug policy agent.
>+#
>+# Kernel Cardbus/PCI params are:
>+#
>+#        ACTION=%s [add or remove]
>+#        DEVPATH=%s [device path in sysfs]
>+#        PCI_CLASS=%04X
>+#        PCI_ID=%04X:%04X
>+#        PCI_SLOT_NAME=%s
>+#        PCI_SUBSYS_ID=%04X:%04X
>+#
>+# If /proc is mounted, /proc/bus/pci/$PCI_SLOT_NAME is almost the name
>+# of the binary device descriptor file ... just change ':' to '/'.
>+
>+: ${ACTION?Bad invocation: \$ACTION is not set}
>+: ${DEVPATH?Bad invocation: \$DEVPATH is not set}
>+: ${PCI_CLASS?Bad invocation: \$PCI_CLASS is not set}
>+: ${PCI_ID?Bad invocation: \$PCI_ID is not set}
>+: ${PCI_SLOT_NAME?Bad invocation: \$PCI_SLOT_NAME is not set}
>+: ${PCI_SUBSYS_ID?Bad invocation: \$PCI_SUBSYS_ID is not set}
>+
>+cd /etc/hotplug
>+. ./hotplug.functions
>+
>+# ALSA config
>+if [ -r /etc/sysconfig/sound ]; then
>+    . /etc/sysconfig/sound
>+fi
>+
>+# generated by modutils, for kernels 2.4.x and newer
>+MAP_CURRENT=$MODULE_DIR/modules.pcimap
>+
>+#
>+# Each modules.pcimap format line corresponds to one entry in a
>+# MODULE_DEVICE_TABLE(pci,...) declaration in a kernel file.
>+#
>+# Think of it as a database column with up to three "match specs"
>+# to associate kernel modules with particular devices or classes
>+# of device.  The match specs provide a reasonably good filtering
>+# mechanism, but some driver probe() routines need to provide
>+# extra filtering.
>+#
>+
>+# inputs to the match algorithm, from kernel by way of /sbin/hotplug
>+declare -i pci_class
>+declare -i pci_id_vendor pci_id_device
>+declare -i pci_subid_vendor pci_subid_device
>+
>+pci_convert_vars ()
>+{
>+    pci_class=0x$PCI_CLASS
>+
>+    set -- `IFS=:; echo $PCI_ID`
>+    pci_id_vendor=0x$1
>+    pci_id_device=0x$2
>+
>+    set -- `IFS=:; echo $PCI_SUBSYS_ID`
>+    pci_subid_vendor=0x$1
>+    pci_subid_device=0x$2
>+
>+    pci_revision=`lspci -ns ${DEVPATH##*/} 2>/dev/null | sed "s/^.*(rev *$[0-9]*$.*$/\1/"`
>+}
>+
>+declare -i PCI_ANY=0xffffffff
>+
>+# stdin is "modules.pcimap" syntax
>+# on return, ONE matching module was added to $DRIVERS
>+#
>+sound_map_modules ()
>+{
>+    # convert the usb_device_id fields to integers as we read them
>+    local line module ignored
>+    declare -i vendor device
>+    declare -i subvendor subdevice
>+    declare -i class class_mask
>+    declare -i class_temp
>+
>+    # look at each pci_device_id entry
>+    # collect one match in $DRIVERS
>+    while read line
>+    do
>+        # comments are lines that start with "#" ...
>+        # be careful, they still get parsed by bash!
>+        case "$line" in
>+            \#*|"") continue ;;
>+        esac
>+
>+        set -- $line
>+        module=$1
>+        vendor=$(($2))
>+        device=$(($3))
>+        subvendor=$(($4))
>+        subdevice=$(($5))
>+        class=$(($6))
>+        class_mask=$(($7))
>+
>+        : checkmatch $module
>+	case $module in
>+	snd-*|snd_*) ;;
>+	*) continue ;;
>+	esac
>+
>+        : vendor $vendor $pci_id_vendor
>+        if [ $vendor -ne $PCI_ANY -a $vendor -ne $pci_id_vendor ]; then
>+            continue
>+        fi
>+        : device $device $pci_id_device
>+        if [ $device -ne $PCI_ANY -a $device -ne $pci_id_device ]; then
>+            continue
>+        fi
>+        : sub-vendor $subvendor $pci_subid_vendor
>+        if [ $subvendor -ne $PCI_ANY -a $subvendor -ne $pci_subid_vendor ]; then
>+            continue
>+        fi
>+        : sub-device $subdevice $pci_subid_device
>+        if [ $subdevice -ne $PCI_ANY -a $subdevice -ne $pci_subid_device ]; then
>+            continue
>+        fi
>+
>+        class_temp="$pci_class & $class_mask"
>+        if [ $class_temp -eq $class ]; then
>+            DRIVERS="$module $DRIVERS"
>+            : drivers $DRIVERS
>+            break
>+        fi
>+    done
>+}
>+
>+#
>+# check the card indices
>+#
>+check_alsa_cards ()
>+{
>+    NCARD=""
>+    if [ -f /proc/asound/cards ]; then
>+	while read line; do
>+	    case "$line" in
>+	    [0-9]*) ;;
>+	    *) continue ;;
>+	    esac
>+
>+	    set -- $line
>+	    card=$1
>+	    NCARD="$NCARD${card:+ $card}"
>+	done < /proc/asound/cards
>+    fi
>+}
>+
>+#
>+# insert sequencer modules
>+#
>+load_sequencer()
>+{
>+    if [ "$LOAD_SEQUENCER" = "yes" -a -r /proc/asound/seq/drivers ]; then
>+	cut -d , -f 1 /proc/asound/seq/drivers | \
>+	while read t ; do
>+	    /sbin/modprobe $t >/dev/null 2>&1
>+	done
>+    fi
>+}
>+
>+#
>+# run card-dependent scripts
>+#
>+load_carddeps()
>+{
>+    for i in $*; do
>+	i=${i##snd-}
>+	i=${i##snd_}
>+	if [ -x $alsascrdir/$i ]; then
>+	    $alsascrdir/$i
>+	fi
>+    done
>+}
>+
>+
>+#
>+# What to do with this PCI hotplug event?
>+#
>+case $ACTION in
>+
>+    add)
>+
>+        pci_convert_vars
>+        LABEL="PCI slot $PCI_SLOT_NAME"
>+
>+	check_alsa_cards
>+	OLD_NCARD="$NCARD"
>+
>+        # since kernel 2.4 modutils maintains MAP_CURRENT
>+	sound_map_modules < $MAP_CURRENT
>+
>+        [ -e /usr/sbin/hwscanqueue ] && hwscanqueue --pci
>+
>+        if [ "$DRIVERS" = "" ]; then
>+            # mesg "... no modules for $LABEL"
>+            exit 2
>+        fi
>+
>+	$MODPROBE $DRIVERS
>+
>+	if [ "$LOAD_OSS_EMUL_MODULES" = "yes" ]; then
>+	    $MODPROBE snd-pcm-oss
>+	    if [ "$LOAD_SEQUENCER" = "yes" ]; then
>+		$MODPROBE snd-seq-oss
>+	    fi
>+	fi
>+
>+	load_sequencer
>+
>+	# unmute volumes which are not initialized yet
>+	check_alsa_cards
>+	for i in $NCARD; do
>+	    for j in $OLD_NCARD; do
>+		if [ "$i" = "$j" ]; then
>+		    continue 2
>+		fi
>+	    done
>+	    /usr/bin/set_default_volume -f $i
>+	done
>+
>+	load_carddeps $DRIVERS
>+
>+        ;;
>+
>+    remove)
>+
>+        ;;
>+    *)
>+        debug_mesg PCI $ACTION event not supported
>+        exit 1
>+        ;;
>+
>+esac

Actions: View | Diff

Attachments on bug 121869: 52096