Changeset efdfebc in mainline for uspace/drv/bus/usb/ehci/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/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",
-            device->handle, str_error(ret));
+            ddf_dev_get_handle(device), 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);
-        hc_fun->ops = &hc_ops;
+        ddf_fun_set_ops(hc_fun,  &hc_ops);
 
         ret = ddf_fun_bind(hc_fun);
@@ -116 +116 @@
 
         usb_log_info("Controlling new EHCI device `%s' (handle %" PRIun ").\n",
-            device->name, device->handle);
+            ddf_dev_get_name(device), ddf_dev_get_handle(device));
 
         return EOK;
 #undef CHECK_RET_RETURN
 }
-/*----------------------------------------------------------------------------*/
+
 /** Initializes global driver structures (NONE).
  *
@@ -132 +132 @@
 int main(int argc, char *argv[])
 {
-        usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
+        log_init(NAME);
         return ddf_driver_main(&ehci_driver);
 }