Changeset f6b2a76 in mainline

Timestamp:

2013-01-25T22:20:20Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c39e9fb

Parents:

ffa254f1

Message:

libusbdev: Add name getting wrapper.

Location:

uspace/lib/usbdev

Files:

• include/usb/dev/driver.h (modified) (1 diff)
• src/devdrv.c (modified) (1 diff)
• src/devpoll.c (modified) (2 diffs)

uspace/lib/usbdev/include/usb/dev/driver.h

@@ -171 +171 @@
 void usb_device_deinit(usb_device_t *);
 
+const char* usb_device_get_name(usb_device_t *);
+
 async_exch_t * usb_device_bus_exchange_begin(usb_device_t *);
 void usb_device_bus_exchange_end(async_exch_t *);

uspace/lib/usbdev/src/devdrv.c

@@ -521 +521 @@
 }
 
+const char *usb_device_get_name(usb_device_t *usb_dev)
+{
+        assert(usb_dev);
+        assert(usb_dev->ddf_dev);
+        //TODO Handle case without ddf_dev
+        return ddf_dev_get_name(usb_dev->ddf_dev);
+}
+
 async_exch_t * usb_device_bus_exchange_begin(usb_device_t *usb_dev)
 {

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, ddf_dev_get_name(data->dev->ddf_dev),
+                    data, usb_device_get_name(data->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", ddf_dev_get_name(
-                            data->dev->ddf_dev));
+                            "recurring failures.\n",
+                            usb_device_get_name(data->dev));
                 } else {
                         usb_log_debug("Polling of device `%s' terminated: "
-                            "driver request.\n", ddf_dev_get_name(
-                            data->dev->ddf_dev));
+                            "driver request.\n",
+                            usb_device_get_name(data->dev));
                 }
         }