Changeset 41df71f9 in mainline for uspace/lib/usbdev/src

Timestamp:

2017-11-02T14:29:15Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

887c9de

Parents:

479e32d

Message:

ddf: split usb interface to usb and usbhc

File:

• uspace/lib/usbdev/src/pipes.c (modified) (7 diffs)

uspace/lib/usbdev/src/pipes.c

@@ -36 +36 @@
 #include <usb/dev/request.h>
 #include <usb/usb.h>
-#include <usb_iface.h>
+#include <usbhc_iface.h>
 
 #include <assert.h>
@@ -98 +98 @@
         async_exch_t *exch = async_exchange_begin(pipe->bus_session);
         size_t act_size = 0;
-        const int rc = usb_read(exch, pipe->desc.endpoint_no, setup_packet, buffer,
+        const int rc = usbhc_read(exch, pipe->desc.endpoint_no, setup_packet, buffer,
             buffer_size, &act_size);
         async_exchange_end(exch);
@@ -151 +151 @@
 
         async_exch_t *exch = async_exchange_begin(pipe->bus_session);
-        const int rc = usb_write(exch,
+        const int rc = usbhc_write(exch,
             pipe->desc.endpoint_no, setup_packet, buffer, buffer_size);
         async_exchange_end(exch);
@@ -199 +199 @@
         size_t act_size = 0;
         const int rc =
-            usb_read(exch, pipe->desc.endpoint_no, 0, buffer, size, &act_size);
+            usbhc_read(exch, pipe->desc.endpoint_no, 0, buffer, size, &act_size);
         async_exchange_end(exch);
 
@@ -238 +238 @@
 
         async_exch_t *exch = async_exchange_begin(pipe->bus_session);
-        const int rc = usb_write(exch, pipe->desc.endpoint_no, 0, buffer, size);
+        const int rc = usbhc_write(exch, pipe->desc.endpoint_no, 0, buffer, size);
         async_exchange_end(exch);
         return rc;
@@ -307 +307 @@
                 return ENOMEM;
 
-        const int ret = usb_register_endpoint(exch, &pipe->desc);
+        const int ret = usbhc_register_endpoint(exch, &pipe->desc);
 
         async_exchange_end(exch);
@@ -326 +326 @@
                 return ENOMEM;
 
-        const int ret = usb_unregister_endpoint(exch, &pipe->desc);
+        const int ret = usbhc_unregister_endpoint(exch, &pipe->desc);
 
         async_exchange_end(exch);