hal/hald/linux2 physdev.c,1.14,1.15

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux2
In directory gabe:/tmp/cvs-serv473/hald/linux2

Modified Files:
	physdev.c 
Log Message:
2005-03-22  David Zeuthen  <davidz at redhat.com>

	* hald/linux2/physdev.c: Actuall change driver property to be uniform,
	e.g. put it in info.linux.driver



Index: physdev.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/physdev.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- physdev.c	22 Mar 2005 18:43:18 -0000	1.14
+++ physdev.c	22 Mar 2005 19:03:08 -0000	1.15
@@ -80,7 +80,7 @@
 
 	hal_device_property_set_string (d, "pci.linux.sysfs_path", sysfs_path);
 
-	hal_util_set_driver (d, "pci.linux.driver", sysfs_path);
+	if (hal_util_set_driver (d, "info.linux.driver", sysfs_path))
 
 	hal_util_set_int_from_file (d, "pci.product_id", sysfs_path, "device", 16);
 	hal_util_set_int_from_file (d, "pci.vendor_id", sysfs_path, "vendor", 16);
@@ -247,7 +247,7 @@
 
 		hal_device_property_set_string (d, "info.bus", "usb_device");
 
-		hal_util_set_driver (d, "usb_device.linux.driver", sysfs_path);
+		hal_util_set_driver (d, "info.linux.driver", sysfs_path);
 
 		hal_device_property_set_string (d, "usb_device.linux.sysfs_path", sysfs_path);
 
@@ -328,7 +328,7 @@
 		if (parent != NULL)
 			hal_device_merge_with_rewrite (d, parent, "usb.", "usb_device.");
 
-		hal_util_set_driver (d, "usb.linux.driver", sysfs_path);
+		hal_util_set_driver (d, "info.linux.driver", sysfs_path);
 
 		hal_device_property_set_string (d, "usb.linux.sysfs_path", sysfs_path);
 
@@ -393,7 +393,7 @@
 		hal_device_property_set_string (d, "info.parent", "/org/freedesktop/Hal/devices/computer");
 	}
 
-	hal_util_set_driver (d, "ide.linux.driver", sysfs_path);
+	hal_util_set_driver (d, "info.linux.driver", sysfs_path);
 
 	bus_id = hal_util_get_last_element (sysfs_path);
 
@@ -444,7 +444,7 @@
 		hal_device_property_set_string (d, "info.parent", "/org/freedesktop/Hal/devices/computer");
 	}
 
-	hal_util_set_driver (d, "pnp.linux.driver", sysfs_path);
+	hal_util_set_driver (d, "info.linux.driver", sysfs_path);
 
 	hal_util_set_string_from_file (d, "pnp.id", sysfs_path, "id");
 	if (hal_device_has_property (d, "pnp.id")) {
@@ -499,7 +499,7 @@
 		hal_device_property_set_string (d, "info.parent", "/org/freedesktop/Hal/devices/computer");
 	}
 
-	hal_util_set_driver (d, "serio.linux.driver", sysfs_path);
+	hal_util_set_driver (d, "info.linux.driver", sysfs_path);
 
 	bus_id = hal_util_get_last_element (sysfs_path);
 	hal_device_property_set_string (d, "serio.id", bus_id);
@@ -547,7 +547,7 @@
 
 	bus_id = hal_util_get_last_element (sysfs_path);
 
-	hal_util_set_driver (d, "pcmcia.linux.driver", sysfs_path);
+	hal_util_set_driver (d, "info.linux.driver", sysfs_path);
 
 	/* not sure if %d.%d means socket function - need to revisit */
 	sscanf (bus_id, "%d.%d", &socket, &function);
@@ -654,7 +654,7 @@
 	hal_device_property_set_int (d, "scsi.target", target_num);
 	hal_device_property_set_int (d, "scsi.lun", lun_num);
 
-	hal_util_set_driver (d, "scsi.linux.driver", sysfs_path);
+	hal_util_set_driver (d, "info.linux.driver", sysfs_path);
 
 	/* guestimate product name */
 	hal_device_property_set_string (d, "info.product", "SCSI Device");
@@ -699,7 +699,7 @@
 	hal_device_property_set_string (d, "info.bus", "mmc");
 	hal_device_property_set_string (d, "info.parent", parent->udi);
 
-	hal_util_set_driver (d, "mmc.linux.driver", sysfs_path);
+	hal_util_set_driver (d, "info.linux.driver", sysfs_path);
 
 	bus_id = hal_util_get_last_element (sysfs_path);
 	sscanf (bus_id, "mmc%d:%x", &host_num, &rca);
@@ -790,7 +790,7 @@
 	hal_device_property_set_string (d, "info.bus", "ieee1394");
 	hal_device_property_set_string (d, "info.parent", parent->udi);
 
-	hal_util_set_driver (d, "ieee1394.linux.driver", sysfs_path);
+	hal_util_set_driver (d, "info.linux.driver", sysfs_path);
 
 	hal_device_property_set_uint64 (d, "ieee1394.guid", guid);
 	hal_util_set_int_from_file    (d, "ieee1394.vendor_id", sysfs_path, "../vendor_id", 16);