Attachment 9642 Details for Bug 10631 – Patch 1 of 1

[patch] Patch 1 of 1

0001-Fix-bug-10631.patch (text/plain), 3.20 KB, created by Luiz Augusto von Dentz on 2007-04-17 13:40:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Luiz Augusto von Dentz

Created: 2007-04-17 13:40:45 UTC

Size: 3.20 KB

patch

obsolete

>diff --git a/hald/linux/device.c b/hald/linux/device.c
>index da1785a..a0d0021 100644
>--- a/hald/linux/device.c
>+++ b/hald/linux/device.c
>@@ -354,6 +354,7 @@ bluetooth_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *par
> 	       const gchar *parent_path)
> {
> 	HalDevice *d;
>+	const char *type_entry;
> 
> 	d = NULL;
> 
>@@ -365,14 +366,25 @@ bluetooth_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *par
> 	hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path);
> 	hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev));
> 
>-	hal_device_property_set_string (d, "info.category", "bluetooth_hci");
>-	hal_device_add_capability (d, "bluetooth_hci");
>-
>-	hal_device_property_set_string (d, "bluetooth_hci.originating_device", hal_device_get_udi (parent_dev));
>-	hal_device_property_set_string (d, "bluetooth_hci.physical_device", hal_device_get_udi (parent_dev));
>-	hal_util_set_string_from_file (d, "bluetooth_hci.interface_name", sysfs_path, "name");
>-
>-	hal_device_property_set_string (d, "info.product", "Bluetooth Host Controller Interface");
>+	type_entry = hal_util_get_string_from_file (sysfs_path, "type");
>+
>+	if (type_entry && strcmp (type_entry, "ACL") == 0) {
>+		hal_device_property_set_string (d, "info.category", "bluetooth_acl");
>+		hal_device_add_capability (d, "bluetooth_acl");
>+		hal_device_property_set_string (d, "info.product", "Bluetooth Asynchronous Connection-oriented Link");
>+		hal_device_property_set_string (d, "bluetooth_acl.originating_device", hal_device_get_udi (parent_dev));
>+	} else if (type_entry && strcmp (type_entry, "SCO") == 0) {
>+		hal_device_property_set_string (d, "info.category", "bluetooth_sco");
>+		hal_device_add_capability (d, "bluetooth_sco");
>+		hal_device_property_set_string (d, "info.product", "Bluetooth Synchronous Connection-oriented Link");
>+		hal_device_property_set_string (d, "bluetooth_sco.originating_device", hal_device_get_udi (parent_dev));
>+	} else {
>+		hal_device_property_set_string (d, "info.category", "bluetooth_hci");
>+		hal_device_add_capability (d, "bluetooth_hci");
>+		hal_device_property_set_string (d, "info.product", "Bluetooth Host Controller Interface");
>+		hal_device_property_set_string (d, "bluetooth_hci.originating_device", hal_device_get_udi (parent_dev));
>+		hal_device_property_set_string (d, "bluetooth_hci.physical_device", hal_device_get_udi (parent_dev));
>+	}
> 
> out:
> 	return d;
>@@ -383,9 +395,19 @@ bluetooth_compute_udi (HalDevice *d)
> {
> 	gchar udi[256];
> 
>-	hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi),
>+	if (hal_device_has_capability (d, "bluetooth_acl")) {
>+		hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi),
>+			      "%s_bluetooth_acl",
>+			      hal_device_property_get_string (d, "info.parent"));
>+	} else if (hal_device_has_capability (d, "bluetooth_sco")) {
>+		hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi),
>+			      "%s_bluetooth_sco",
>+			      hal_device_property_get_string (d, "info.parent"));
>+	} else {
>+		hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi),
> 			      "%s_bluetooth_hci",
> 			      hal_device_property_get_string (d, "info.parent"));
>+	}
> 	hal_device_set_udi (d, udi);
> 	hal_device_property_set_string (d, "info.udi", udi);
> 	return TRUE;

Actions: View | Splinter Review

Attachments on bug 10631: 9597 | 9642

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.