Changeset 3b5d1535 in mainline for uspace/drv/usbmid/main.c

Timestamp:

2011-02-23T10:28:21Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

eb48f61

Parents:

e936e8e (diff), eb1a2f4 (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/drv/usbmid/main.c (modified) (2 diffs)

uspace/drv/usbmid/main.c

@@ -44 +44 @@
 #include "usbmid.h"
 
-static int usbmid_add_device(device_t *gen_dev)
+static int usbmid_add_device(ddf_dev_t *gen_dev)
 {
         usbmid_device_t *dev = usbmid_device_create(gen_dev);
@@ -99 +99 @@
         printf(NAME ": USB multi interface device driver.\n");
 
-        usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
-        return driver_main(&mid_driver);
+        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
+        return ddf_driver_main(&mid_driver);
 }