Attachment 6490 Details for Bug 7803 – Ignore /dev/audio

[patch] Ignore /dev/audio

hal-ignore-dev-audio.patch (text/plain), 4.94 KB, created by Lennart Poettering on 2006-08-07 14:59:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lennart Poettering

Created: 2006-08-07 14:59:18 UTC

Size: 4.94 KB

patch

obsolete

>Only in hal-0.5.7/hald/linux2: acpi.lo
>Only in hal-0.5.7/hald/linux2: acpi.o
>Only in hal-0.5.7/hald/linux2/addons: addon-acpi.o
>Only in hal-0.5.7/hald/linux2/addons: addon-hid-ups.o
>Only in hal-0.5.7/hald/linux2/addons: addon-keyboard.o
>Only in hal-0.5.7/hald/linux2/addons: addon-pmu.o
>Only in hal-0.5.7/hald/linux2/addons: addon-storage.o
>Only in hal-0.5.7/hald/linux2/addons: .deps
>Only in hal-0.5.7/hald/linux2/addons: hald-addon-acpi
>Only in hal-0.5.7/hald/linux2/addons: hald-addon-hid-ups
>Only in hal-0.5.7/hald/linux2/addons: hald-addon-keyboard
>Only in hal-0.5.7/hald/linux2/addons: hald-addon-pmu
>Only in hal-0.5.7/hald/linux2/addons: hald-addon-storage
>Only in hal-0.5.7/hald/linux2/addons: .libs
>Only in hal-0.5.7/hald/linux2/addons: Makefile
>Only in hal-0.5.7/hald/linux2: apm.lo
>Only in hal-0.5.7/hald/linux2: apm.o
>Only in hal-0.5.7/hald/linux2: blockdev.lo
>Only in hal-0.5.7/hald/linux2: blockdev.o
>diff -ur hal-0.5.7.orig/hald/linux2/classdev.c hal-0.5.7/hald/linux2/classdev.c
>--- hal-0.5.7.orig/hald/linux2/classdev.c	2006-01-28 23:51:18.000000000 +0100
>+++ hal-0.5.7/hald/linux2/classdev.c	2006-08-07 23:31:00.000000000 +0200
>@@ -614,9 +614,14 @@
> 	if (device_file == NULL) 
> 		goto out;	
> 
>+        device = hal_util_get_last_element(sysfs_path);
>+
>+        /* ignore legacy /dev/audio devices */
>+        if (strncmp(device, "audio", 5) == 0)
>+                goto out;
>+        
> 	d = hal_device_new ();
> 	hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
>-	device = hal_util_get_last_element(sysfs_path);
> 
> 	if (physdev == NULL || sysfs_path_in_devices == NULL) {
>  		/* handle global ALSA and OSS devices, these devices are for all ALSA/OSS Sound devices
>@@ -710,7 +715,7 @@
> 			}
> 		} else if (!strncmp (device, "dsp", 3) || !strncmp (device, "adsp", 4) || 
> 			   !strncmp (device, "midi", 4) || !strncmp (device, "amidi", 5) ||
>-			   !strncmp (device, "audio", 5) || !strncmp (device, "mixer", 5)) {
>+			   !strncmp (device, "mixer", 5)) {
> 			
> 			/* handle OSS-Devices */
> 			ClassDevOSSDeviceTypes type;
>@@ -727,9 +732,6 @@
> 			} else if (!strncmp (device, "amidi", 5)) {
> 				if(sscanf (device, "amidi%d", &cardnum) != 1) cardnum = 0;
> 				type = OSS_DEVICE_TYPE_AMIDI;
>-			} else if (!strncmp (device, "audio", 5)) {
>-				if(sscanf (device, "audio%d", &cardnum) != 1) cardnum = 0;
>-				type = OSS_DEVICE_TYPE_AUDIO;
> 			} else if (!strncmp (device, "mixer", 5)) {
> 				if(sscanf (device, "mixer%d", &cardnum) != 1) cardnum = 0;
> 				type = OSS_DEVICE_TYPE_MIXER;
>@@ -765,7 +767,6 @@
> 						          hal_device_property_get_string (d, "oss.card_id"));
> 					break;
> 				case OSS_DEVICE_TYPE_DSP:
>-				case OSS_DEVICE_TYPE_AUDIO:
> 				case OSS_DEVICE_TYPE_ADSP:
> 					if (type == OSS_DEVICE_TYPE_ADSP)
> 						hal_device_property_set_int (d, "oss.device", 1);
>diff -ur hal-0.5.7.orig/hald/linux2/classdev.h hal-0.5.7/hald/linux2/classdev.h
>--- hal-0.5.7.orig/hald/linux2/classdev.h	2005-11-02 16:38:13.000000000 +0100
>+++ hal-0.5.7/hald/linux2/classdev.h	2006-08-07 23:31:02.000000000 +0200
>@@ -34,7 +34,6 @@
> 	OSS_DEVICE_TYPE_ADSP,
> 	OSS_DEVICE_TYPE_MIDI,
> 	OSS_DEVICE_TYPE_AMIDI,
>-	OSS_DEVICE_TYPE_AUDIO,
> 	OSS_DEVICE_TYPE_MIXER,
> 	OSS_DEVICE_TYPE_UNKNOWN
> } ClassDevOSSDeviceTypes;
>Only in hal-0.5.7/hald/linux2: classdev.lo
>Only in hal-0.5.7/hald/linux2: classdev.o
>Only in hal-0.5.7/hald/linux2: coldplug.lo
>Only in hal-0.5.7/hald/linux2: coldplug.o
>Only in hal-0.5.7/hald/linux2: .deps
>Only in hal-0.5.7/hald/linux2: hotplug.lo
>Only in hal-0.5.7/hald/linux2: hotplug.o
>Only in hal-0.5.7/hald/linux2: ids.lo
>Only in hal-0.5.7/hald/linux2: ids.o
>Only in hal-0.5.7/hald/linux2: libhald_linux2.la
>Only in hal-0.5.7/hald/linux2: .libs
>Only in hal-0.5.7/hald/linux2: Makefile
>Only in hal-0.5.7/hald/linux2: osspec.lo
>Only in hal-0.5.7/hald/linux2: osspec.o
>Only in hal-0.5.7/hald/linux2: physdev.lo
>Only in hal-0.5.7/hald/linux2: physdev.o
>Only in hal-0.5.7/hald/linux2: pmu.lo
>Only in hal-0.5.7/hald/linux2: pmu.o
>Only in hal-0.5.7/hald/linux2/probing: .deps
>Only in hal-0.5.7/hald/linux2/probing: hald-probe-hiddev
>Only in hal-0.5.7/hald/linux2/probing: hald-probe-input
>Only in hal-0.5.7/hald/linux2/probing: hald-probe-pc-floppy
>Only in hal-0.5.7/hald/linux2/probing: hald-probe-printer
>Only in hal-0.5.7/hald/linux2/probing: hald-probe-serial
>Only in hal-0.5.7/hald/linux2/probing: hald-probe-smbios
>Only in hal-0.5.7/hald/linux2/probing: hald-probe-storage
>Only in hal-0.5.7/hald/linux2/probing: hald-probe-volume
>Only in hal-0.5.7/hald/linux2/probing: .libs
>Only in hal-0.5.7/hald/linux2/probing: linux_dvd_rw_utils.o
>Only in hal-0.5.7/hald/linux2/probing: Makefile
>Only in hal-0.5.7/hald/linux2/probing: probe-hiddev.o
>Only in hal-0.5.7/hald/linux2/probing: probe-input.o
>Only in hal-0.5.7/hald/linux2/probing: probe-pc-floppy.o
>Only in hal-0.5.7/hald/linux2/probing: probe-printer.o
>Only in hal-0.5.7/hald/linux2/probing: probe-serial.o
>Only in hal-0.5.7/hald/linux2/probing: probe-smbios.o
>Only in hal-0.5.7/hald/linux2/probing: probe-storage.o
>Only in hal-0.5.7/hald/linux2/probing: probe-volume.o

Actions: View | Splinter Review

Attachments on bug 7803: 6490

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.