Changes in uspace/drv/uhci-rhd/main.c [357a302:1a93bb0] in mainline

File:

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

uspace/drv/uhci-rhd/main.c

@@ -32 +32 @@
  * @brief UHCI driver
  */
-#include <driver.h>
+#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(device_t *dev, devman_handle_t *handle)
+static int usb_iface_get_hc_handle(ddf_fun_t *fun, devman_handle_t *handle)
 {
-        assert(dev);
-        assert(dev->driver_data);
+        assert(fun);
+        assert(fun->driver_data);
         assert(handle);
 
-        *handle = ((uhci_root_hub_t*)dev->driver_data)->hc_handle;
-        usb_log_debug("Answering HC handle: %d.\n", *handle);
+        *handle = ((uhci_root_hub_t*)fun->driver_data)->hc_handle;
 
         return EOK;
@@ -61 +64 @@
 };
 
-static device_ops_t uhci_rh_ops = {
+static ddf_dev_ops_t uhci_rh_ops = {
         .interfaces[USB_DEV_IFACE] = &uhci_rh_usb_iface,
 };
 
-static int uhci_rh_add_device(device_t *device)
+static int uhci_rh_add_device(ddf_dev_t *device)
 {
         if (!device)
@@ -71 +74 @@
 
         usb_log_debug2("%s called device %d\n", __FUNCTION__, device->handle);
-        device->ops = &uhci_rh_ops;
+
+        //device->ops = &uhci_rh_ops;
+        (void) uhci_rh_ops;
 
         uhci_root_hub_t *rh = malloc(sizeof(uhci_root_hub_t));
@@ -79 +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);
@@ -101 +113 @@
         .driver_ops = &uhci_rh_driver_ops
 };
-
+/*----------------------------------------------------------------------------*/
 int main(int argc, char *argv[])
 {
-        usb_log_enable(USB_LOG_LEVEL_ERROR, NAME);
-        return driver_main(&uhci_rh_driver);
+        usb_log_enable(USB_LOG_LEVEL_INFO, 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;
 }
 /**