hal/hald/linux class_device.c, 1.7, 1.8 common.c, 1.3, 1.4 osspec.c,
1.11, 1.12 usb_bus_device.c, 1.6, 1.7 usbif_bus_device.c, 1.4, 1.5
David Zeuthen
david at pdx.freedesktop.org
Wed Apr 21 11:44:43 PDT 2004
Update of /cvs/hal/hal/hald/linux
In directory pdx:/tmp/cvs-serv19759/hald/linux
Modified Files:
class_device.c common.c osspec.c usb_bus_device.c
usbif_bus_device.c
Log Message:
2004-04-21 David Zeuthen <david at fubar.dk>
* hald/callout.c
(hal_callout_property): callouts seem to be a bit broken right
now (segfaults my box etc.), so disable them. Hopefully this is
fixed soon!
(hal_callout_capability): -do-
(hal_callout_device): -do
* hald/linux/usbif_bus_device.c (usbif_device_compute_udi): Don't
print details about the device
* hald/linux/usb_bus_device.c (usb_proc_parse): Comment out noisy
print statements
* hald/linux/osspec.c
(handle_udev_node_created_found_device):
(visit_class_device): clean up logging statements
(visit_device): -do-
(remove_device): comment out noisy logging statements
(remove_class_device): -do-
(handle_hotplug): -do-
* hald/linux/class_device.c
(class_device_got_device_file): comment out noisy logging statement
(class_device_accept): -do-
* hald/linux/common.c
(rename_and_merge): comment out noisy logging statements
(class_device_get_device_file): -do-
* hald/hald.c (gdl_store_changed): don't print device, just print
the UDI
Index: class_device.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/class_device.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/class_device.c 12 Apr 2004 20:11:51 -0000 1.7
+++ b/class_device.c 21 Apr 2004 18:44:41 -0000 1.8
@@ -79,7 +79,8 @@
dbus_bool_t is_probing)
{
- HAL_INFO (("path = %s, classname = %s", path, self->sysfs_class_name));
+ /*HAL_INFO (("path = %s, classname = %s",
+ path, self->sysfs_class_name));*/
/* only care about given sysfs class name */
if (strcmp (class_device->classname, self->sysfs_class_name) == 0) {
@@ -350,7 +351,7 @@
{
ClassDeviceHandler *self = (ClassDeviceHandler *) user_data;
- HAL_INFO (("entering"));
+ /*HAL_INFO (("entering"));*/
if (!prop_exists) {
HAL_WARNING (("Never got device file for class device at %s",
Index: common.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/common.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/common.c 3 Apr 2004 07:46:33 -0000 1.3
+++ b/common.c 21 Apr 2004 18:44:41 -0000 1.4
@@ -485,7 +485,7 @@
/* Device is not in list... */
/* assign the computed device name */
- HAL_INFO ((" ##### computed_udi=%s", computed_udi));
+ /*HAL_INFO ((" ##### computed_udi=%s", computed_udi));*/
hal_device_set_udi (d, computed_udi);
hal_device_property_set_string (d, "info.udi", computed_udi);
@@ -632,7 +632,7 @@
SYSFS_NAME_LEN);
}
- HAL_INFO (("*** sysfs_path_trunc = '%s'", sysfs_path_trunc));
+ /*HAL_INFO (("*** sysfs_path_trunc = '%s'", sysfs_path_trunc));*/
/* Now invoke udevinfo */
if (udev_argv[0] == NULL || g_spawn_sync ("/",
@@ -663,7 +663,7 @@
}
}
- HAL_INFO (("got device file %s for %s", udev_stdout, sysfs_path));
+ /*HAL_INFO (("got device file %s for %s", udev_stdout, sysfs_path));*/
strncpy (dev_file, udev_stdout, dev_file_length);
return TRUE;
Index: osspec.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/osspec.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- a/osspec.c 14 Apr 2004 21:05:08 -0000 1.11
+++ b/osspec.c 21 Apr 2004 18:44:41 -0000 1.12
@@ -134,9 +134,8 @@
return;
}
- HAL_INFO (("*** classname=%s name=%s path=%s\n",
+ HAL_INFO (("*** classname=%s path=%s",
class_device->classname,
- class_device->name,
class_device->path));
for (i=0; class_device_handlers[i] != NULL; i++) {
@@ -219,6 +218,8 @@
return;
}
+ HAL_INFO (("$$$ busname=%s path=%s", device->bus, device->path));
+
/*HAL_INFO ((" path=%s", path));*/
for (i=0; bus_device_handlers[i] != NULL; i++) {
@@ -374,8 +375,8 @@
HAL_WARNING (("Couldn't remove device @ %s on hotplug remove",
path));
} else {
- HAL_INFO (("Removing device @ sysfspath %s, udi %s",
- path, d->udi));
+ /*HAL_INFO (("Removing device @ sysfspath %s, udi %s",
+ path, d->udi));*/
hal_device_store_remove (hald_get_gdl (), d);
}
@@ -407,8 +408,8 @@
"hotplug remove", path));
} else {
- HAL_INFO (("Removing device @ sysfspath %s, udi %s",
- path, d->udi));
+ /*HAL_INFO (("Removing device @ sysfspath %s, udi %s",
+ path, d->udi));*/
bus_name = hal_device_property_get_string (d, "info.bus");
@@ -471,7 +472,7 @@
key = dbus_message_iter_get_dict_key (&dict_iter);
value = dbus_message_iter_get_string (&dict_iter);
- HAL_INFO (("key/value : %s=%s", key, value));
+ /*HAL_INFO (("key/value : %s=%s", key, value));*/
if (strcmp (key, "ACTION") == 0) {
if (strcmp (value, "add") == 0) {
@@ -557,6 +558,10 @@
strncat (sysfs_dev_path, sysfs_path, SYSFS_PATH_MAX);
if (is_add ) {
+
+ HAL_INFO (("DeviceEvent add devpath=%s devfile=%s",
+ sysfs_dev_path, filename));
+
hal_device_store_match_key_value_string_async (
hald_get_tdl (),
".udev.sysfs_path",
@@ -592,12 +597,12 @@
char *dev_file = (char *) data1;
if (d != NULL) {
- HAL_INFO (("Got dev_file=%s for udi=%s", dev_file, d->udi));
+ HAL_INFO (("dev_file=%s is for udi=%s", dev_file, d->udi));
sysfs_class_name =
hal_device_property_get_string (d, ".udev.class_name");
- HAL_INFO ((".udev.class_name = %s", sysfs_class_name));
+ /*HAL_INFO ((".udev.class_name = %s", sysfs_class_name));*/
for (i=0; class_device_handlers[i] != NULL; i++) {
ClassDeviceHandler *ch = class_device_handlers[i];
@@ -606,7 +611,7 @@
}
}
} else {
- HAL_WARNING (("No HAL device corresponding to device %s",
+ HAL_WARNING (("No HAL device corresponding to device file %s",
dev_file));
}
Index: usb_bus_device.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/usb_bus_device.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/usb_bus_device.c 12 Apr 2004 20:11:51 -0000 1.6
+++ b/usb_bus_device.c 21 Apr 2004 18:44:41 -0000 1.7
@@ -489,6 +489,7 @@
}
usb_proc_device_done (usb_proc_cur_info);
+/*
{
usb_proc_info *i;
for (i = usb_proc_head; i != NULL; i = i->next) {
@@ -510,6 +511,7 @@
printf ("\n");
}
}
+*/
}
/** Set capabilities from interface and/or device class. This is a
Index: usbif_bus_device.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/usbif_bus_device.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/usbif_bus_device.c 12 Apr 2004 20:11:51 -0000 1.4
+++ b/usbif_bus_device.c 21 Apr 2004 18:44:41 -0000 1.5
@@ -89,7 +89,7 @@
else
format = "/org/freedesktop/Hal/devices/usbif_%s_%d-%d";
- hal_device_print (d);
+ /*hal_device_print (d);*/
pd = hal_device_property_get_string (d, "info.parent");
len = strlen (pd);
More information about the hal-commit
mailing list