Changes in uspace/drv/bus/usb/ehci/main.c [920d0fc:dcffe95] in mainline

File:

• uspace/drv/bus/usb/ehci/main.c (modified) (6 diffs)

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

@@ -49 +49 @@
 
 static int ehci_dev_add(ddf_dev_t *device);
-
+/*----------------------------------------------------------------------------*/
 static driver_ops_t ehci_driver_ops = {
         .dev_add = ehci_dev_add,
 };
-
+/*----------------------------------------------------------------------------*/
 static driver_t ehci_driver = {
         .name = NAME,
@@ -62 +62 @@
 };
 
-
+/*----------------------------------------------------------------------------*/
 /** Initializes a new ddf driver instance of EHCI hcd.
  *
@@ -84 +84 @@
         CHECK_RET_RETURN(ret,
             "Failed to get memory addresses for %" PRIun ": %s.\n",
-            ddf_dev_get_handle(device), str_error(ret));
+            device->handle, str_error(ret));
         usb_log_info("Memory mapped regs at 0x%" PRIxn " (size %zu), IRQ %d.\n",
             reg_base, reg_size, irq);
@@ -104 +104 @@
         /* High Speed, no bandwidth */
         hcd_init(ehci_hc, USB_SPEED_HIGH, 0, NULL);
-        ddf_fun_set_ops(hc_fun,  &hc_ops);
+        hc_fun->ops = &hc_ops;
 
         ret = ddf_fun_bind(hc_fun);
@@ -116 +116 @@
 
         usb_log_info("Controlling new EHCI device `%s' (handle %" PRIun ").\n",
-            ddf_dev_get_name(device), ddf_dev_get_handle(device));
+            device->name, device->handle);
 
         return EOK;
 #undef CHECK_RET_RETURN
 }
-
+/*----------------------------------------------------------------------------*/
 /** Initializes global driver structures (NONE).
  *
@@ -132 +132 @@
 int main(int argc, char *argv[])
 {
-        log_init(NAME);
+        usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
         return ddf_driver_main(&ehci_driver);
 }