Attachment 9529 Details for Bug 10577 – net.bluetooth patch

[patch] net.bluetooth patch

bluetooth_pan.patch (text/plain), 3.19 KB, created by Luiz Augusto von Dentz on 2007-04-09 10:38:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Luiz Augusto von Dentz

Created: 2007-04-09 10:38:15 UTC

Size: 3.19 KB

patch

obsolete

>diff --git a/hald/linux/device.c b/hald/linux/device.c
>index da1785a..391e613 100644
>--- a/hald/linux/device.c
>+++ b/hald/linux/device.c
>@@ -435,48 +435,49 @@ net_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de
> 	media_type = hal_device_property_get_int (d, "net.arp_proto_hw_id");
> 	if (media_type == ARPHRD_ETHER) {
> 		const char *addr;
>+		const char *parent_subsys;
> 		char wireless_path[HAL_PATH_MAX];
> 		char wiphy_path[HAL_PATH_MAX];
>-		gboolean is_wireless;
> 		struct stat s;
>+		dbus_uint64_t mac_address = 0;
>+
>+		addr = hal_device_property_get_string (d, "net.address");
>+		if (addr != NULL) {
>+			unsigned int a5, a4, a3, a2, a1, a0;
>+
>+			if (sscanf (addr, "%x:%x:%x:%x:%x:%x",
>+				    &a5, &a4, &a3, &a2, &a1, &a0) == 6) {
>+				mac_address =
>+					((dbus_uint64_t)a5<<40) |
>+					((dbus_uint64_t)a4<<32) |
>+					((dbus_uint64_t)a3<<24) |
>+					((dbus_uint64_t)a2<<16) |
>+					((dbus_uint64_t)a1<< 8) |
>+					((dbus_uint64_t)a0<< 0);
>+			}
>+		}
> 
> 		snprintf (wireless_path, HAL_PATH_MAX, "%s/wireless", sysfs_path);
> 		/* wireless dscape stack e.g. from rt2500pci driver*/
> 		snprintf (wiphy_path, HAL_PATH_MAX, "%s/wiphy", sysfs_path);
>-
>-                if ((stat (wireless_path, &s) == 0 && (s.st_mode & S_IFDIR)) ||
>-		    (stat (wiphy_path, &s) == 0 && (s.st_mode & S_IFDIR))) { 
>+		parent_subsys = hal_device_property_get_string (parent_dev, "linux.subsystem");
>+
>+		if (parent_subsys && strcmp(parent_subsys, "bluetooth") == 0) {
>+			hal_device_property_set_string (d, "info.product", "Bluetooth Interface");
>+			hal_device_property_set_string (d, "info.category", "net.bluetooth");
>+			hal_device_add_capability (d, "net.bluetooth");
>+			hal_device_property_set_uint64 (d, "net.bluetooth.mac_address", mac_address);
>+		} else if ((stat (wireless_path, &s) == 0 && (s.st_mode & S_IFDIR)) ||
>+			(stat (wiphy_path, &s) == 0 && (s.st_mode & S_IFDIR))) {
> 			hal_device_property_set_string (d, "info.product", "WLAN Interface");
> 			hal_device_property_set_string (d, "info.category", "net.80211");
> 			hal_device_add_capability (d, "net.80211");
>-			is_wireless = TRUE;
>+			hal_device_property_set_uint64 (d, "net.80211.mac_address", mac_address);
> 		} else {
> 			hal_device_property_set_string (d, "info.product", "Networking Interface");
> 			hal_device_property_set_string (d, "info.category", "net.80203");
> 			hal_device_add_capability (d, "net.80203");
>-			is_wireless = FALSE;
>-		}
>-
>-		addr = hal_device_property_get_string (d, "net.address");
>-		if (addr != NULL) {
>-			unsigned int a5, a4, a3, a2, a1, a0;
>-			
>-			if (sscanf (addr, "%x:%x:%x:%x:%x:%x",
>-				    &a5, &a4, &a3, &a2, &a1, &a0) == 6) {
>-				dbus_uint64_t mac_address;
>-				
>-				mac_address = 
>-					((dbus_uint64_t)a5<<40) |
>-					((dbus_uint64_t)a4<<32) | 
>-					((dbus_uint64_t)a3<<24) | 
>-					((dbus_uint64_t)a2<<16) | 
>-					((dbus_uint64_t)a1<< 8) | 
>-					((dbus_uint64_t)a0<< 0);
>-				
>-				hal_device_property_set_uint64 (d, is_wireless ? "net.80211.mac_address" : 
>-								"net.80203.mac_address",
>-								mac_address);
>-			}
>+			hal_device_property_set_uint64 (d, "net.80203.mac_address", mac_address);
> 		}
> 	} else if (media_type == ARPHRD_IRDA) {
> 		hal_device_property_set_string (d, "info.product", "Networking Interface");

Actions: View | Splinter Review

Attachments on bug 10577: 9529 | 9566 | 9567 | 9585 | 9586 | 9587 | 9588 | 9589 | 9637 | 9638

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.