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

Timestamp:

2011-02-22T23:30:56Z (13 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/pipes.c (modified) (6 diffs)

uspace/lib/usb/src/pipes.c

@@ -35 +35 @@
 #include <usb/usb.h>
 #include <usb/pipes.h>
+#include <usb/debug.h>
 #include <usbhc_iface.h>
 #include <usb_iface.h>
+#include <devman.h>
 #include <errno.h>
 #include <assert.h>
@@ -46 +48 @@
  * @return USB address or error code.
  */
-static usb_address_t get_my_address(int phone, device_t *dev)
+static usb_address_t get_my_address(int phone, ddf_dev_t *dev)
 {
         sysarg_t address;
+
+
+        /*
+         * We are sending special value as a handle - zero - to get
+         * handle of the parent function (that handle was used
+         * when registering our device @p dev.
+         */
         int rc = async_req_2_1(phone, DEV_IFACE_ID(USB_DEV_IFACE),
             IPC_M_USB_GET_ADDRESS,
-            dev->handle, &address);
+            0, &address);
 
         if (rc != EOK) {
@@ -65 +74 @@
  * @return Interface number (negative code means any).
  */
-int usb_device_get_assigned_interface(device_t *device)
+int usb_device_get_assigned_interface(ddf_dev_t *device)
 {
         int parent_phone = devman_parent_device_connect(device->handle,
@@ -94 +103 @@
  */
 int usb_device_connection_initialize_from_device(
-    usb_device_connection_t *connection, device_t *device)
+    usb_device_connection_t *connection, ddf_dev_t *dev)
 {
         assert(connection);
-        assert(device);
+        assert(dev);
 
         int rc;
@@ -103 +112 @@
         usb_address_t my_address;
 
-        rc = usb_hc_find(device->handle, &hc_handle);
+        rc = usb_hc_find(dev->handle, &hc_handle);
         if (rc != EOK) {
                 return rc;
         }
 
-        int parent_phone = devman_parent_device_connect(device->handle,
+        int parent_phone = devman_parent_device_connect(dev->handle,
             IPC_FLAG_BLOCKING);
         if (parent_phone < 0) {
@@ -114 +123 @@
         }
 
-        my_address = get_my_address(parent_phone, device);
+        my_address = get_my_address(parent_phone, dev);
         if (my_address < 0) {
                 rc = my_address;