Changeset eb1a2f4 in mainline for uspace/lib/usb/src/ddfiface.c

Timestamp:

2011-02-22T23:30:56Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3b5d1535, a9c674e0

Parents:

dbe25f1 (diff), 664af708 (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 mainline changes (DDF refactoring)

This merge includes DDF refactoring that brought multifunctional devices
(i.e. ddf_dev_t and ddf_fun_t). Please, see ticket #295 at HelenOS
upstream Trac.

The conflicts themselves were easy to solve (merely several renamings).

Changes to USB subsystem:

• drivers uses ddf_dev_t and ddf_fun_t
• different signatures of many library functions
• several hacks around communication with parent device (now the communication is clearer and somehow what we have now is hack about other hacks)
  • will repair and clean later
• maybe added some extra debugging messages (the diff has about 240K, and I admit I have no energy to double check that)

WARNING:

• the diff is VERY long, recommended is viewing partial diffs of the merge (i.e. merges in mainline branch that lead to the parent one)
• merging with your branches might involve huge renamings, sorry, no other way is possible

BUGS:

• hub driver will not work (no function created)

GOOD NEWS:

• QEMU keyboard seems to work with QEMU 0.13 and 0.14
• we are up-to-date with mainline again

File:

• uspace/lib/usb/src/ddfiface.c (modified) (6 diffs)

uspace/lib/usb/src/ddfiface.c

@@ -34 +34 @@
  */
 #include <ipc/devman.h>
+#include <devman.h>
+#include <async.h>
 #include <usb/ddfiface.h>
+#include <usb/debug.h>
 #include <errno.h>
+#include <assert.h>
 
 /** DDF interface for USB device, implementation for typical hub. */
@@ -56 +60 @@
  * @return Error code.
  */
-int usb_iface_get_hc_handle_hub_impl(device_t *device, devman_handle_t *handle)
+int usb_iface_get_hc_handle_hub_impl(ddf_fun_t *fun, devman_handle_t *handle)
 {
-        assert(device);
-        return usb_hc_find(device->handle, handle);
+        assert(fun);
+        return usb_hc_find(fun->handle, handle);
 }
 
@@ -69 +73 @@
  * @return Error code.
  */
-int usb_iface_get_hc_handle_hub_child_impl(device_t *device,
+int usb_iface_get_hc_handle_hub_child_impl(ddf_fun_t *fun,
     devman_handle_t *handle)
 {
-        assert(device);
-        device_t *parent = device->parent;
+        assert(fun != NULL);
 
-        /* Default error, device does not support this operation. */
-        int rc = ENOTSUP;
-
-        if (parent && parent->ops && parent->ops->interfaces[USB_DEV_IFACE]) {
-                usb_iface_t *usb_iface
-                    = (usb_iface_t *) parent->ops->interfaces[USB_DEV_IFACE];
-                assert(usb_iface != NULL);
-
-                if (usb_iface->get_hc_handle) {
-                        rc = usb_iface->get_hc_handle(parent, handle);
-                }
+        int parent_phone = devman_parent_device_connect(fun->handle,
+            IPC_FLAG_BLOCKING);
+        if (parent_phone < 0) {
+                return parent_phone;
         }
 
-        return rc;
+        sysarg_t hc_handle;
+        int rc = async_req_1_1(parent_phone, DEV_IFACE_ID(USB_DEV_IFACE),
+            IPC_M_USB_GET_HOST_CONTROLLER_HANDLE, &hc_handle);
+
+        if (rc != EOK) {
+                return rc;
+        }
+
+        *handle = hc_handle;
+
+        return EOK;
 }
 
@@ -97 +103 @@
  * @return Always EOK.
  */
-int usb_iface_get_hc_handle_hc_impl(device_t *device, devman_handle_t *handle)
+int usb_iface_get_hc_handle_hc_impl(ddf_fun_t *fun, devman_handle_t *handle)
 {
-        assert(device);
+        assert(fun);
 
         if (handle != NULL) {
-                *handle = device->handle;
+                *handle = fun->handle;
         }
 
@@ -115 +121 @@
  * @return Error code.
  */
-int usb_iface_get_address_hub_impl(device_t *device, devman_handle_t handle,
+int usb_iface_get_address_hub_impl(ddf_fun_t *fun, devman_handle_t handle,
     usb_address_t *address)
 {
-        assert(device);
-        int parent_phone = devman_parent_device_connect(device->handle,
+        assert(fun);
+        int parent_phone = devman_parent_device_connect(fun->handle,
             IPC_FLAG_BLOCKING);
         if (parent_phone < 0) {
@@ -150 +156 @@
  * @return Error code.
  */
-int usb_iface_get_address_hub_child_impl(device_t *device,
+int usb_iface_get_address_hub_child_impl(ddf_fun_t *fun,
     devman_handle_t handle, usb_address_t *address)
 {
-        assert(device);
-        device_t *parent = device->parent;
-
-        /* Default error, device does not support this operation. */
-        int rc = ENOTSUP;
-
-        if (parent && parent->ops && parent->ops->interfaces[USB_DEV_IFACE]) {
-                usb_iface_t *usb_iface
-                    = (usb_iface_t *) parent->ops->interfaces[USB_DEV_IFACE];
-                assert(usb_iface != NULL);
-
-                if (usb_iface->get_address) {
-                        rc = usb_iface->get_address(parent, handle, address);
-                }
+        if (handle == 0) {
+                handle = fun->handle;
         }
-
-        return rc;
+        return usb_iface_get_address_hub_impl(fun, handle, address);
 }