summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Zeuthen <david@fubar.dk>2004-01-05 00:02:40 +0000
committerDavid Zeuthen <david@fubar.dk>2004-01-05 00:02:40 +0000
commit7c3dbf53bc2277c292778c97a2f48ed213bebdd3 (patch)
treeafbd0f13f1c041e0b8062d7480cc6989dd13284e
parent9a70a2ee081fe20a02f7864b9ec5a3c52eebf20b (diff)
add some more debug
add some more debug
-rw-r--r--ChangeLog7
-rw-r--r--hald/linux/linux_class_block.c4
-rw-r--r--hald/linux/linux_osspec.c5
3 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d977f0f..8f9986bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-05 David Zeuthen <david@fubar.dk>
+
+ * hald/linux/linux_osspec.c (handle_hotplug): add some more debug
+
+ * hald/linux/linux_class_block.c
+ (visit_class_device_block_got_parent): add some more debug
+
2004-01-04 David Zeuthen <david@fubar.dk>
* tools/linux/hal_hotplug.c: Don't include dbus-glib
diff --git a/hald/linux/linux_class_block.c b/hald/linux/linux_class_block.c
index b2042d1f..ecfe83bc 100644
--- a/hald/linux/linux_class_block.c
+++ b/hald/linux/linux_class_block.c
@@ -221,7 +221,9 @@ static void visit_class_device_block_got_parent(HalDevice* parent,
HalDevice* new_d = NULL;
HalDevice* d = (HalDevice*) data1;
- /*HAL_INFO(("data2=0x%08x, d=0x%08x, d->udi=%s, parent->udi=%s, parent->in_gdl=%d", data2, d, d->udi, parent!=NULL ? parent->udi : "no parent", parent!=NULL ? parent->in_gdl : 42 ));*/
+ HAL_INFO(("data2=0x%08x, d=0x%08x, d->udi=%s, parent->udi=%s, parent->in_gdl=%d", data2, d, d->udi, parent!=NULL ? parent->udi : "no parent", parent!=NULL ? parent->in_gdl : 42 ));
+ HAL_INFO(("d: linux.sysfs_path=%s", ds_property_get_string(d, "linux.sysfs_path")));
+ HAL_INFO(("d: linux.sysfs_path_device=%s", ds_property_get_string(d, "linux.sysfs_path_device")));
if( parent==NULL )
{
diff --git a/hald/linux/linux_osspec.c b/hald/linux/linux_osspec.c
index 640e851b..aad2402d 100644
--- a/hald/linux/linux_osspec.c
+++ b/hald/linux/linux_osspec.c
@@ -396,8 +396,9 @@ static DBusHandlerResult handle_hotplug(DBusConnection* connection,
input_led = parse_hex(value);
}
- HAL_INFO(("HotplugEvent %s, subsystem=%s",
- (is_add ? "add" : "remove"), subsystem));
+ HAL_INFO(("HotplugEvent %s, subsystem=%s devpath=%s",
+ (is_add ? "add" : "remove"), subsystem,
+ sysfs_devpath[0]!='\0' ? sysfs_devpath : "(none)"));
if( sysfs_devpath[0]!='\0' &&
(strcmp(subsystem, "usb")==0 ||