Changeset ff582d47 in mainline

Timestamp:

2011-03-21T12:51:02Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

be7950e8

Parents:

8627377

Message:

A really ugly way to register hub

Location:

uspace/drv/ohci

Files:

• hc.c (modified) (3 diffs)
• hc.h (modified) (1 diff)
• main.c (modified) (1 diff)

uspace/drv/ohci/hc.c

@@ -40 +40 @@
 #include <usb/usb.h>
 #include <usb/hub.h>
+#include <usb/ddfiface.h>
 #include <usb/usbdevice.h>
-#include <usb/ddfiface.h>
 
 #include "hc.h"
 
+static int dummy_reset(int foo, void *bar)
+{
+        return EOK;
+}
 /*----------------------------------------------------------------------------*/
 int hc_init(hc_t *instance, ddf_fun_t *fun, ddf_dev_t *dev,
@@ -50 +54 @@
 {
         assert(instance);
-        int ret = pio_enable((void*)regs, reg_size, (void**)&instance->registers);
+        int ret = EOK;
+
+        ret = pio_enable((void*)regs, reg_size, (void**)&instance->registers);
         if (ret != EOK) {
                 usb_log_error("Failed to gain access to device registers.\n");
                 return ret;
         }
+        instance->ddf_instance = fun;
         device_keeper_init(&instance->manager);
 
@@ -60 +67 @@
         rh_init(&instance->rh, dev, instance->registers);
         /* TODO: implement */
-        /* TODO: register root hub */
         return EOK;
 }
 /*----------------------------------------------------------------------------*/
-int hc_register_hub(hc_t *instance, ddf_dev_t *dev)
+int hc_register_hub(hc_t *instance)
 {
+        async_usleep(1000000);
+#define CHECK_RET_RETURN(ret, msg...) \
+        if (ret != EOK) { \
+                usb_log_error(msg); \
+                return ret; \
+        } else (void)0
         assert(instance);
+        assert(instance->ddf_instance);
+        assert(instance->ddf_instance->handle);
+        ddf_dev_t *dev = instance->rh.device;
+        int ret = EOK;
+
+        usb_hc_connection_t conn;
+        ret =
+            usb_hc_connection_initialize(&conn, instance->ddf_instance->handle);
+        CHECK_RET_RETURN(ret, "Failed to initialize hc connection.\n");
+
+        ret = usb_hc_connection_open(&conn);
+        CHECK_RET_RETURN(ret, "Failed to open hc connection.\n");
+
+        usb_address_t address;
+        devman_handle_t handle;
+        ret = usb_hc_new_device_wrapper(dev, &conn, USB_SPEED_FULL, dummy_reset,
+            0, NULL, &address, &handle, NULL, NULL, NULL);
+        CHECK_RET_RETURN(ret, "Failed to add rh device.\n");
+
+        ret = usb_hc_connection_close(&conn);
+        CHECK_RET_RETURN(ret, "Failed to close hc connection.\n");
         return EOK;
 }

uspace/drv/ohci/hc.h

@@ -59 +59 @@
      uintptr_t regs, size_t reg_size, bool interrupts);
 
-int hc_register_hub(hc_t *instance, ddf_dev_t *dev);
+int hc_register_hub(hc_t *instance);
 
 int hc_schedule(hc_t *instance, batch_t *batch);

uspace/drv/ohci/main.c

@@ -179 +179 @@
         hc_fun->driver_data = hcd;
 
-        hc_register_hub(hcd, device);
+        fid_t later = fibril_create((int(*)(void*))hc_register_hub, hcd);
+        fibril_add_ready(later);
 
         usb_log_info("Controlling new OHCI device `%s' (handle %llu).\n",