Changeset 92574f4 in mainline for uspace/drv/usbhub/main.c

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/drv/usbhub/main.c (modified) (3 diffs)

uspace/drv/usbhub/main.c

@@ -31 +31 @@
  */
 
-#include <driver.h>
+#include <ddf/driver.h>
 #include <errno.h>
 #include <async.h>
-
-#include <usb/usbdrv.h>
 
 #include "usbhub.h"
@@ -64 +62 @@
 int main(int argc, char *argv[])
 {
-        usb_dprintf_enable(NAME, 0);
+        usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
         
         fibril_mutex_initialize(&usb_hub_list_lock);
@@ -79 +77 @@
         fibril_add_ready(fid);
 
-        return driver_main(&hub_driver);
+        return ddf_driver_main(&hub_driver);
 }