Changeset 03362fbd in mainline for uspace/drv/bus/usb/usbflbk/main.c

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• uspace/drv/bus/usb/usbflbk/main.c (modified) (3 diffs)

uspace/drv/bus/usb/usbflbk/main.c

@@ -69 +69 @@
             " (node `%s', handle %" PRIun ").\n",
             dev->interface_no < 0 ? "device" : "interface",
-            dev->ddf_dev->name, fun_name, dev->ddf_dev->handle);
+            ddf_dev_get_name(dev->ddf_dev), fun_name, ddf_dev_get_handle(dev->ddf_dev));
 
         return EOK;
@@ -85 +85 @@
         const int ret = ddf_fun_unbind(ctl_fun);
         if (ret != EOK) {
-                usb_log_error("Failed to unbind %s.\n", ctl_fun->name);
+                usb_log_error("Failed to unbind %s.\n", ddf_fun_get_name(ctl_fun));
                 return ret;
         }
@@ -110 +110 @@
 int main(int argc, char *argv[])
 {
-        usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
+        log_init(NAME);
 
         return usb_driver_main(&usbfallback_driver);