Changeset 03362fbd in mainline for uspace/drv/bus/usb/usbhub/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/usbhub/main.c (modified) (1 diff)

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

@@ -79 +79 @@
 {
         printf(NAME ": HelenOS USB hub driver.\n");
-        usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
+        log_init(NAME);
 
         return usb_driver_main(&usb_hub_driver);