Changeset 51b46f2 in mainline for uspace/drv/uhci-hcd/root_hub.c

Timestamp:

2011-03-01T15:39:52Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

e135751

Parents:

0e3505a (diff), cc44f7e (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 development/ changes

File:

• uspace/drv/uhci-hcd/root_hub.c (modified) (6 diffs)

uspace/drv/uhci-hcd/root_hub.c

@@ -34 +34 @@
 #include <assert.h>
 #include <errno.h>
+#include <str_error.h>
 #include <stdio.h>
+#include <ops/hw_res.h>
+
 #include <usb_iface.h>
 #include <usb/debug.h>
@@ -41 +44 @@
 #include "uhci.h"
 
+/*----------------------------------------------------------------------------*/
 static int usb_iface_get_hc_handle_rh_impl(ddf_fun_t *root_hub_fun,
     devman_handle_t *handle)
@@ -51 +55 @@
         return EOK;
 }
-
+/*----------------------------------------------------------------------------*/
 static int usb_iface_get_address_rh_impl(ddf_fun_t *fun, devman_handle_t handle,
     usb_address_t *address)
@@ -61 +65 @@
         assert(hc);
 
-        usb_address_t addr = usb_address_keeping_find(&hc->address_manager,
+        usb_address_t addr = device_keeper_find(&hc->device_manager,
             handle);
         if (addr < 0) {
@@ -73 +77 @@
         return EOK;
 }
-
+/*----------------------------------------------------------------------------*/
 usb_iface_t usb_iface_root_hub_fun_impl = {
         .get_hc_handle = usb_iface_get_hc_handle_rh_impl,
         .get_address = usb_iface_get_address_rh_impl
 };
+/*----------------------------------------------------------------------------*/
+static hw_resource_list_t *get_resource_list(ddf_fun_t *dev)
+{
+        assert(dev);
+        ddf_fun_t *hc_ddf_instance = dev->driver_data;
+        assert(hc_ddf_instance);
+        uhci_t *hc = hc_ddf_instance->driver_data;
+        assert(hc);
 
+        //TODO: fix memory leak
+        hw_resource_list_t *resource_list = malloc(sizeof(hw_resource_list_t));
+        assert(resource_list);
+        resource_list->count = 1;
+        resource_list->resources = malloc(sizeof(hw_resource_t));
+        assert(resource_list->resources);
+        resource_list->resources[0].type = IO_RANGE;
+        resource_list->resources[0].res.io_range.address =
+            ((uintptr_t)hc->registers) + 0x10; // see UHCI design guide
+        resource_list->resources[0].res.io_range.size = 4;
+        resource_list->resources[0].res.io_range.endianness = LITTLE_ENDIAN;
+
+        return resource_list;
+}
+/*----------------------------------------------------------------------------*/
+static hw_res_ops_t hw_res_iface = {
+        .get_resource_list = get_resource_list,
+        .enable_interrupt = NULL
+};
+/*----------------------------------------------------------------------------*/
 static ddf_dev_ops_t root_hub_ops = {
-        .interfaces[USB_DEV_IFACE] = &usb_iface_root_hub_fun_impl
+        .interfaces[USB_DEV_IFACE] = &usb_iface_root_hub_fun_impl,
+        .interfaces[HW_RES_DEV_IFACE] = &hw_res_iface
 };
-
 /*----------------------------------------------------------------------------*/
 int setup_root_hub(ddf_fun_t **fun, ddf_dev_t *hc)
 {
         assert(fun);
+        assert(hc);
         int ret;
 
@@ -105 +138 @@
         ret = ddf_fun_add_match_id(hub, match_str, 100);
         if (ret != EOK) {
-                usb_log_error("Failed to add root hub match id.\n");
+                usb_log_error("Failed(%d) to add root hub match id: %s\n",
+                    ret, str_error(ret));
                 ddf_fun_destroy(hub);
-                return ENOMEM;
+                return ret;
         }