Changeset e099f26 in mainline for uspace/drv/uhci-hcd/uhci.c

Timestamp:

2011-03-21T20:22:50Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c56c5b5b

Parents:

4fb6d9ee (diff), 31b568e (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:

Development branch changes (including OHCI)

File:

• uspace/drv/uhci-hcd/uhci.c (modified) (2 diffs)

uspace/drv/uhci-hcd/uhci.c

@@ -70 +70 @@
 {
         assert(fun);
-        device_keeper_t *manager = &((uhci_t*)fun->dev->driver_data)->hc.device_manager;
-
-        usb_address_t addr = device_keeper_find(manager, handle);
+        usb_device_keeper_t *manager = &((uhci_t*)fun->dev->driver_data)->hc.device_manager;
+
+        usb_address_t addr = usb_device_keeper_find(manager, handle);
         if (addr < 0) {
                 return addr;
@@ -167 +167 @@
         CHECK_RET_DEST_FUN_RETURN(ret,
             "Failed(%d) to get I/O addresses:.\n", ret, device->handle);
-        usb_log_info("I/O regs at 0x%X (size %zu), IRQ %d.\n",
+        usb_log_debug("I/O regs at 0x%X (size %zu), IRQ %d.\n",
             io_reg_base, io_reg_size, irq);