Changeset 41ef5b9 in mainline for uspace/drv/ohci/main.c

Timestamp:

2011-03-21T17:16:10Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

4d0c40b

Parents:

fd9f6e4c (diff), 434ef65 (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 from usb/development

File:

• uspace/drv/ohci/main.c (modified) (6 diffs)

uspace/drv/ohci/main.c

@@ -45 +45 @@
 #include "pci.h"
 #include "iface.h"
-#include "ohci_hc.h"
+#include "hc.h"
 
 static int ohci_add_device(ddf_dev_t *device);
+static int get_hc_handle(ddf_fun_t *fun, devman_handle_t *handle)
+{
+        assert(handle);
+  assert(fun != NULL);
+
+  *handle = fun->handle;
+  return EOK;
+}
+/*----------------------------------------------------------------------------*/
+static int get_address(
+    ddf_fun_t *fun, devman_handle_t handle, usb_address_t *address)
+{
+        assert(fun);
+        usb_device_keeper_t *manager = &fun_to_hc(fun)->manager;
+  usb_address_t addr = usb_device_keeper_find(manager, handle);
+  if (addr < 0) {
+    return addr;
+  }
+
+  if (address != NULL) {
+    *address = addr;
+  }
+
+  return EOK;
+}
 /*----------------------------------------------------------------------------*/
 /** IRQ handling callback, identifies device
@@ -58 +83 @@
 {
         assert(dev);
-        ohci_hc_t *hc = (ohci_hc_t*)dev->driver_data;
+        hc_t *hc = (hc_t*)dev->driver_data;
         assert(hc);
-        ohci_hc_interrupt(hc, 0);
+        hc_interrupt(hc, 0);
 }
 /*----------------------------------------------------------------------------*/
@@ -71 +96 @@
         .driver_ops = &ohci_driver_ops
 };
+/*----------------------------------------------------------------------------*/
+static usb_iface_t hc_usb_iface = {
+        .get_address = get_address,
+        .get_hc_handle = get_hc_handle,
+};
+/*----------------------------------------------------------------------------*/
 static ddf_dev_ops_t hc_ops = {
-        .interfaces[USBHC_DEV_IFACE] = &ohci_hc_iface,
-};
-
+        .interfaces[USB_DEV_IFACE] = &hc_usb_iface,
+        .interfaces[USBHC_DEV_IFACE] = &hc_iface,
+};
 /*----------------------------------------------------------------------------*/
 /** Initializes a new ddf driver instance of OHCI hcd.
@@ -105 +136 @@
             "Failed(%d) disable legacy USB: %s.\n", ret, str_error(ret));
 
-        ohci_hc_t *hcd = malloc(sizeof(ohci_hc_t));
+        hc_t *hcd = malloc(sizeof(hc_t));
         if (hcd == NULL) {
                 usb_log_error("Failed to allocate OHCI driver.\n");
@@ -129 +160 @@
         }
 
-        ret = ohci_hc_init(hcd, hc_fun, mem_reg_base, mem_reg_size, interrupts);
+        ret = hc_init(hcd, hc_fun, device, mem_reg_base, mem_reg_size, interrupts);
         if (ret != EOK) {
                 usb_log_error("Failed to initialize OHCI driver.\n");
@@ -148 +179 @@
         hc_fun->driver_data = hcd;
 
-        /* TODO: register interrupt handler */
+        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",