Changeset 52c4264 in mainline for uspace/lib/usbdev/src/devpoll.c

Timestamp:

2012-08-17T12:23:52Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

267f235

Parents:

ae2c925 (diff), ad78054 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/lib/usbdev/src/devpoll.c (modified) (2 diffs)

uspace/lib/usbdev/src/devpoll.c

@@ -80 +80 @@
                 usb_log_debug("Poll%p: started polling of `%s' - " \
                     "interface %d (%s,%d,%d), %zuB/%zu.\n",
-                    data, data->dev->ddf_dev->name,
+                    data, ddf_dev_get_name(data->dev->ddf_dev),
                     (int) mapping->interface->interface_number,
                     usb_str_class(mapping->interface->interface_class),
@@ -159 +159 @@
                 if (failed) {
                         usb_log_error("Polling of device `%s' terminated: "
-                            "recurring failures.\n", data->dev->ddf_dev->name);
+                            "recurring failures.\n", ddf_dev_get_name(
+                            data->dev->ddf_dev));
                 } else {
                         usb_log_debug("Polling of device `%s' terminated: "
-                            "driver request.\n", data->dev->ddf_dev->name);
+                            "driver request.\n", ddf_dev_get_name(
+                            data->dev->ddf_dev));
                 }
         }