Changeset 0a46c41e in mainline

Timestamp:

2011-02-18T21:09:27Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

745d2ad

Parents:

fbf0589

Message:

Add bulk transfers to libusb

Location:

uspace/lib

Files:

• drv/generic/remote_usbhc.c (modified) (3 diffs)
• drv/include/usbhc_iface.h (modified) (2 diffs)
• usb/src/pipesio.c (modified) (2 diffs)

uspace/lib/drv/generic/remote_usbhc.c

@@ -46 +46 @@
 static void remote_usbhc_interrupt_out(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_interrupt_in(device_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usbhc_bulk_out(device_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usbhc_bulk_in(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_control_write(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_control_read(device_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -69 +71 @@
         remote_usbhc_interrupt_in,
 
+        remote_usbhc_bulk_out,
+        remote_usbhc_bulk_in,
+
         remote_usbhc_control_write,
         remote_usbhc_control_read
@@ -389 +394 @@
         return remote_usbhc_in_transfer(device, callid, call,
             usb_iface->interrupt_in);
+}
+
+void remote_usbhc_bulk_out(device_t *device, void *iface,
+    ipc_callid_t callid, ipc_call_t *call)
+{
+        usbhc_iface_t *usb_iface = (usbhc_iface_t *) iface;
+        assert(usb_iface != NULL);
+
+        return remote_usbhc_out_transfer(device, callid, call,
+            usb_iface->bulk_out);
+}
+
+void remote_usbhc_bulk_in(device_t *device, void *iface,
+    ipc_callid_t callid, ipc_call_t *call)
+{
+        usbhc_iface_t *usb_iface = (usbhc_iface_t *) iface;
+        assert(usb_iface != NULL);
+
+        return remote_usbhc_in_transfer(device, callid, call,
+            usb_iface->bulk_in);
 }
 

uspace/lib/drv/include/usbhc_iface.h

@@ -153 +153 @@
         IPC_M_USBHC_INTERRUPT_IN,
 
+        /** Send bulk data to device.
+         * See explanation at usb_iface_funcs_t (OUT transaction).
+         */
+        IPC_M_USBHC_BULK_OUT,
+
+        /** Get bulk data from device.
+         * See explanation at usb_iface_funcs_t (IN transaction).
+         */
+        IPC_M_USBHC_BULK_IN,
+
         /** Issue control WRITE transfer.
          * See explanation at usb_iface_funcs_t (OUT transaction) for
@@ -207 +217 @@
         usbhc_iface_transfer_in_t interrupt_in;
 
+        usbhc_iface_transfer_out_t bulk_out;
+        usbhc_iface_transfer_in_t bulk_in;
+
         int (*control_write)(device_t *, usb_target_t,
             size_t,

uspace/lib/usb/src/pipesio.c

@@ -71 +71 @@
                         ipc_method = IPC_M_USBHC_INTERRUPT_IN;
                         break;
+                case USB_TRANSFER_BULK:
+                        ipc_method = IPC_M_USBHC_BULK_IN;
+                        break;
                 default:
                         return ENOTSUP;
@@ -194 +197 @@
                 case USB_TRANSFER_INTERRUPT:
                         ipc_method = IPC_M_USBHC_INTERRUPT_OUT;
+                        break;
+                case USB_TRANSFER_BULK:
+                        ipc_method = IPC_M_USBHC_BULK_OUT;
                         break;
                 default: