Changeset 1561e8b in mainline

Timestamp:

2011-12-12T13:09:38Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c804484

Parents:

6a21877

Message:

libusbdev: Use provided usb_device_connection_t wrappers.

Location:

uspace/lib/usbdev

Files:

• include/usb/dev/usb_device_connection.h (modified) (2 diffs)
• src/pipes.c (modified) (2 diffs)
• src/pipesinit.c (modified) (6 diffs)

uspace/lib/usbdev/include/usb/dev/usb_device_connection.h

@@ -105 +105 @@
 {
         assert(conn);
-        return usb_hc_control_read(conn->hc_connection,
+        return usb_hc_read(conn->hc_connection,
             conn->address, ep, setup, data, size, rsize);
 }
@@ -113 +113 @@
 {
         assert(conn);
-        return usb_hc_control_write(conn->hc_connection,
+        return usb_hc_write(conn->hc_connection,
             conn->address, ep, setup, data, size);
 }

uspace/lib/usbdev/src/pipes.c

@@ -87 +87 @@
             return ENOTSUP;
 
-        return usb_hc_control_read(pipe->wire->hc_connection,
-            pipe->wire->address, pipe->endpoint_no, setup, buffer, size,
-            size_transfered);
+        return usb_device_control_read(pipe->wire,
+            pipe->endpoint_no, setup, buffer, size, size_transfered);
 }
 /*----------------------------------------------------------------------------*/
@@ -108 +107 @@
             return ENOTSUP;
 
-        return usb_hc_control_write(pipe->wire->hc_connection,
-            pipe->wire->address, pipe->endpoint_no, setup, buffer, size);
+        return usb_device_control_write(pipe->wire,
+            pipe->endpoint_no, setup, buffer, size);
 }
 /*----------------------------------------------------------------------------*/

uspace/lib/usbdev/src/pipesinit.c

@@ -38 +38 @@
 #include <usb/dev/dp.h>
 #include <usb/dev/request.h>
-#include <usbhc_iface.h>
 #include <errno.h>
 #include <assert.h>
@@ -357 +356 @@
         return EOK;
 }
-
 
 /** Initialize USB endpoint pipe as the default zero control pipe.
@@ -434 +432 @@
  * @param pipe Pipe to be registered.
  * @param interval Polling interval.
- * @param hc_connection Connection to the host controller (must be opened).
  * @return Error code.
  */
@@ -441 +438 @@
         assert(pipe);
         assert(pipe->wire);
-        assert(pipe->wire->hc_connection);
-
-        return usb_hc_register_endpoint(pipe->wire->hc_connection,
-           pipe->wire->address, pipe->endpoint_no, pipe->transfer_type,
+
+        return usb_device_register_endpoint(pipe->wire,
+           pipe->endpoint_no, pipe->transfer_type,
            pipe->direction, pipe->max_packet_size, interval);
 }
@@ -451 +447 @@
  *
  * @param pipe Pipe to be unregistered.
- * @param hc_connection Connection to the host controller (must be opened).
  * @return Error code.
  */
@@ -458 +453 @@
         assert(pipe);
         assert(pipe->wire);
-        assert(pipe->wire->hc_connection);
-
-        return usb_hc_unregister_endpoint(pipe->wire->hc_connection,
-            pipe->wire->address, pipe->endpoint_no, pipe->direction);
+
+        return usb_device_unregister_endpoint(pipe->wire,
+            pipe->endpoint_no, pipe->direction);
 }