Changeset 8627377 in mainline

Timestamp:

2011-03-21T12:23:31Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ff582d47

Parents:

a6d1bc1

Message:

Add usb iface implementation

Location:

uspace/drv/ohci

Files:

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

uspace/drv/ohci/hc.c

@@ -67 +67 @@
 {
         assert(instance);
-        return rh_register(&instance->rh, dev);
+        return EOK;
 }
 /*----------------------------------------------------------------------------*/

uspace/drv/ohci/main.c

@@ -48 +48 @@
 
 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);
+        device_keeper_t *manager = &fun_to_hc(fun)->manager;
+  usb_address_t addr = device_keeper_find(manager, handle);
+  if (addr < 0) {
+    return addr;
+  }
+
+  if (address != NULL) {
+    *address = addr;
+  }
+
+  return EOK;
+}
 /*----------------------------------------------------------------------------*/
 /** IRQ handling callback, identifies device
@@ -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[USB_DEV_IFACE] = &hc_usb_iface,
         .interfaces[USBHC_DEV_IFACE] = &hc_iface,
 };
-
 /*----------------------------------------------------------------------------*/
 /** Initializes a new ddf driver instance of OHCI hcd.

uspace/drv/ohci/root_hub.c

@@ -67 +67 @@
         /* TODO: implement */
 }
-/*----------------------------------------------------------------------------*/
-int rh_register(rh_t *instance, ddf_dev_t *dev)
-{
-        return EOK;
-}
 /**
  * @}

uspace/drv/ohci/root_hub.h

@@ -52 +52 @@
 
 void rh_interrupt(rh_t *instance);
-
-int rh_register(rh_t *instance, ddf_dev_t *dev);
 #endif
 /**