Changeset efdfebc in mainline for uspace/drv/bus/usb/ohci/main.c

Timestamp:

2012-11-06T21:03:44Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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/bus/usb/ohci/main.c (modified) (2 diffs)

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

@@ -59 +59 @@
                 return ret;
         }
-        usb_log_info("Controlling new OHCI device '%s'.\n", device->name);
+        usb_log_info("Controlling new OHCI device '%s'.\n", ddf_dev_get_name(device));
 
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
 static driver_ops_t ohci_driver_ops = {
         .dev_add = ohci_dev_add,
 };
-/*----------------------------------------------------------------------------*/
+
 static driver_t ohci_driver = {
         .name = NAME,
         .driver_ops = &ohci_driver_ops
 };
-/*----------------------------------------------------------------------------*/
+
 /** Initializes global driver structures (NONE).
  *
@@ -83 +83 @@
 int main(int argc, char *argv[])
 {
-        usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
+        log_init(NAME);
         return ddf_driver_main(&ohci_driver);
 }