Changeset fd07e526 in mainline for uspace/lib/usbdev/src/pipesinit.c

Timestamp:

2011-09-16T14:50:20Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

432a269, d1e18573

Parents:

47fecbb (diff), 82a31261 (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 USB changes from bzr://krabicka.net/orome/helenos/usb/

• Move common HC code from uhci/ohci drivers to libusbhost
• Rewrite USB HC interface to have common read/write functions for all transfer types.
• Restructure hc drivers to avoid some hooks and void* casts
• Cleanup the code and remove unnecessary mallocs.

File:

• uspace/lib/usbdev/src/pipesinit.c (modified) (2 diffs)

uspace/lib/usbdev/src/pipesinit.c

@@ -486 +486 @@
                 return EBADF;
         
+        const usb_target_t target =
+            {{ .address = pipe->wire->address, .endpoint = pipe->endpoint_no }};
 #define _PACK2(high, low) (((high) << 16) + (low))
 #define _PACK3(high, middle, low) (((((high) << 8) + (middle)) << 8) + (low))
@@ -491 +493 @@
         async_exch_t *exch = async_exchange_begin(hc_connection->hc_sess);
         int rc = async_req_4_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
-            IPC_M_USBHC_REGISTER_ENDPOINT,
-            _PACK2(pipe->wire->address, pipe->endpoint_no),
+            IPC_M_USBHC_REGISTER_ENDPOINT, target.packed,
             _PACK3(speed, pipe->transfer_type, pipe->direction),
             _PACK2(pipe->max_packet_size, interval));