Changeset dced52a in mainline for uspace/drv/uhci-rhd/root_hub.c

Timestamp:

2011-02-28T12:24:57Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

86341e2, cc44f7e

Parents:

4abc304

Message:

Debug code refactoring, redundant code removed

File:

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

uspace/drv/uhci-rhd/root_hub.c

@@ -46 +46 @@
         assert(rh);
         int ret;
-        ret = usb_hc_find(rh->handle, &instance->hc_handle);
-        usb_log_info("rh found(%d) hc handle: %d.\n", ret, instance->hc_handle);
-        if (ret != EOK) {
-                return ret;
-        }
 
         /* allow access to root hub registers */
         assert(sizeof(port_status_t) * UHCI_ROOT_HUB_PORT_COUNT == size);
         port_status_t *regs;
-        ret = pio_enable(
-          addr, sizeof(port_status_t) * UHCI_ROOT_HUB_PORT_COUNT, (void**)&regs);
+        ret = pio_enable(addr, size, (void**)&regs);
 
         if (ret < 0) {
@@ -67 +61 @@
         for (; i < UHCI_ROOT_HUB_PORT_COUNT; ++i) {
                 /* mind pointer arithmetics */
-                int ret = uhci_port_init(
+                ret = uhci_port_init(
                   &instance->ports[i], regs + i, i, ROOT_HUB_WAIT_USEC, rh);
                 if (ret != EOK) {