Changeset cc44f7e in mainline for uspace/drv/uhci-rhd/main.c

Timestamp:

2011-02-28T13:04:21Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0b5644c, 494eaf7, 51b46f2

Parents:

81c508c (diff), dced52a (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:

hc and rh work

Support for low speed devices
RH iospace obtained from parent hc driver
proper hc initialization
Debug messages reworked
intelpci adressspace size fix (read the warning)

File:

• uspace/drv/uhci-rhd/main.c (modified) (4 diffs)

uspace/drv/uhci-rhd/main.c

@@ -33 +33 @@
  */
 #include <ddf/driver.h>
+#include <devman.h>
+#include <device/hw_res.h>
 #include <usb_iface.h>
 #include <usb/ddfiface.h>
@@ -43 +45 @@
 
 #define NAME "uhci-rhd"
+static int hc_get_my_registers(ddf_dev_t *dev,
+    uintptr_t *io_reg_address, size_t *io_reg_size);
 
 static int usb_iface_get_hc_handle(ddf_fun_t *fun, devman_handle_t *handle)
@@ -80 +84 @@
         }
 
-        /* TODO: get register values from hc */
-        int ret = uhci_root_hub_init(rh, (void*)0xc030, 4, device);
+        uintptr_t io_regs = 0;
+        size_t io_size = 0;
+
+        int ret = hc_get_my_registers(device, &io_regs, &io_size);
+        assert(ret == EOK);
+
+        /* TODO: verify values from hc */
+        usb_log_info("I/O regs at 0x%X (size %zu).\n", io_regs, io_size);
+        ret = uhci_root_hub_init(rh, (void*)io_regs, io_size, device);
         if (ret != EOK) {
                 usb_log_error("Failed(%d) to initialize driver instance.\n", ret);
@@ -102 +113 @@
         .driver_ops = &uhci_rh_driver_ops
 };
-
+/*----------------------------------------------------------------------------*/
 int main(int argc, char *argv[])
 {
-        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
+        usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
         return ddf_driver_main(&uhci_rh_driver);
+}
+/*----------------------------------------------------------------------------*/
+int hc_get_my_registers(ddf_dev_t *dev,
+    uintptr_t *io_reg_address, size_t *io_reg_size)
+{
+        assert(dev != NULL);
+
+        int parent_phone = devman_parent_device_connect(dev->handle,
+            IPC_FLAG_BLOCKING);
+        if (parent_phone < 0) {
+                return parent_phone;
+        }
+
+        int rc;
+
+        hw_resource_list_t hw_resources;
+        rc = hw_res_get_resource_list(parent_phone, &hw_resources);
+        if (rc != EOK) {
+                goto leave;
+        }
+
+        uintptr_t io_address = 0;
+        size_t io_size = 0;
+        bool io_found = false;
+
+        size_t i;
+        for (i = 0; i < hw_resources.count; i++) {
+                hw_resource_t *res = &hw_resources.resources[i];
+                switch (res->type) {
+                        case IO_RANGE:
+                                io_address = (uintptr_t)
+                                    res->res.io_range.address;
+                                io_size = res->res.io_range.size;
+                                io_found = true;
+                                break;
+                        default:
+                                break;
+                }
+        }
+
+        if (!io_found) {
+                rc = ENOENT;
+                goto leave;
+        }
+
+        if (io_reg_address != NULL) {
+                *io_reg_address = io_address;
+        }
+        if (io_reg_size != NULL) {
+                *io_reg_size = io_size;
+        }
+        rc = EOK;
+leave:
+        async_hangup(parent_phone);
+
+        return rc;
 }
 /**