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

Timestamp:

2011-02-04T12:37:31Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial

Children:

1669a73

Parents:

5944244

Message:

Separate phones for every root hub port

Add tons of debug output

File:

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

uspace/drv/uhci-rhd/root_hub.c

@@ -53 +53 @@
         }
 
-        /* connect to the parent device (HC) */
-        rh->parent_phone = devman_device_connect(8, 0);
-        //usb_drv_hc_connect(rh, instance->hc_handle, 0);
-        if (rh->parent_phone < 0) {
-                usb_log_error("Failed to connect to the HC device.\n");
-                return rh->parent_phone;
-        }
-
         /* allow access to root hub registers */
         assert(sizeof(port_status_t) * UHCI_ROOT_HUB_PORT_COUNT == size);
@@ -75 +67 @@
         unsigned i = 0;
         for (; i < UHCI_ROOT_HUB_PORT_COUNT; ++i) {
+                /* connect to the parent device (HC) */
+                int parent_phone = devman_device_connect(instance->hc_handle, 0);
+                //usb_drv_hc_connect(rh, instance->hc_handle, 0);
+                if (parent_phone < 0) {
+                        usb_log_error("Failed to connect to the HC device port %d.\n", i);
+                        return parent_phone;
+                }
                 /* mind pointer arithmetics */
                 int ret = uhci_port_init(
-                  &instance->ports[i], regs + i, i, ROOT_HUB_WAIT_USEC, rh);
+                  &instance->ports[i], regs + i, i, ROOT_HUB_WAIT_USEC, rh, parent_phone);
                 if (ret != EOK) {
                         unsigned j = 0;