hal/tools/linux hal_hotplug_map.c,1.1,1.2

[David Zeuthen]

Update of /cvs/hal/hal/tools/linux
In directory gabe:/tmp/cvs-serv28348/tools/linux

Modified Files:
	hal_hotplug_map.c 
Log Message:
2004-08-25  David Zeuthen  <david at fubar.dk>

	* tools/linux/hal_hotplug_map.c (main): Match usb_device rather
	than usb since we don't want to merge onto interfaces.



Index: hal_hotplug_map.c
===================================================================
RCS file: /cvs/hal/hal/tools/linux/hal_hotplug_map.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hal_hotplug_map.c	25 Aug 2004 20:55:13 -0000	1.1
+++ hal_hotplug_map.c	25 Aug 2004 21:06:45 -0000	1.2
@@ -110,15 +110,15 @@
 		verbose = TRUE;
 
 	bus = getenv ("HAL_PROP_INFO_BUS");
-	if (bus == NULL || strcmp (bus, "usb") != 0)
+	if (bus == NULL || strcmp (bus, "usb_device") != 0)
 		return 0;
 
-	vendor_id_str = getenv ("HAL_PROP_USB_VENDOR_ID");
+	vendor_id_str = getenv ("HAL_PROP_USB_DEVICE_VENDOR_ID");
 	if (vendor_id_str == NULL)
 		return 1;
 	vendor_id = atoi (vendor_id_str);
 
-	product_id_str = getenv ("HAL_PROP_USB_PRODUCT_ID");
+	product_id_str = getenv ("HAL_PROP_USB_DEVICE_PRODUCT_ID");
 	if (product_id_str == NULL)
 		return 1;
 	product_id = atoi (product_id_str);