Changeset beb9336 in mainline for uspace/drv/bus/usb/ehci/main.c

Timestamp:

2012-08-24T14:07:52Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

041ab64

Parents:

bd29f9c9 (diff), db81577 (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 with mainline

File:

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

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

@@ -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;