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

Timestamp:

2011-03-04T13:05:35Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

d49728c

Parents:

dff940f8 (diff), 9a422574 (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 \usb\development

File:

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

uspace/drv/uhci-rhd/root_hub.c

@@ -40 +40 @@
 #include "root_hub.h"
 
-
 int uhci_root_hub_init(
   uhci_root_hub_t *instance, void *addr, size_t size, ddf_dev_t *rh)
@@ -47 +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 +60 @@
         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, parent_phone);
+                ret = uhci_port_init(
+                  &instance->ports[i], regs + i, i, ROOT_HUB_WAIT_USEC, rh);
                 if (ret != EOK) {
                         unsigned j = 0;