Changeset 365e29e2 in mainline for uspace/lib/usbdev/src/pipesio.c

Timestamp:

2011-09-14T19:25:06Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

bdd8ad2f

Parents:

56e9fb0

Message:

usb: Use new target packing scheme for IPC.

File:

• uspace/lib/usbdev/src/pipesio.c (modified) (6 diffs)

uspace/lib/usbdev/src/pipesio.c

@@ -65 +65 @@
     void *buffer, size_t size, size_t *size_transfered)
 {
-        /*
-         * Get corresponding IPC method.
-         * In future, replace with static array of mappings
-         * transfer type -> method.
-         */
-        usbhc_iface_funcs_t ipc_method;
-        switch (pipe->transfer_type) {
-                case USB_TRANSFER_INTERRUPT:
-                case USB_TRANSFER_BULK:
-                        ipc_method = IPC_M_USBHC_DATA_READ;
-                        break;
-                default:
-                        return ENOTSUP;
-        }
+        /* Only interrupt and bulk transfers are supported */
+        if (pipe->transfer_type != USB_TRANSFER_INTERRUPT &&
+            pipe->transfer_type != USB_TRANSFER_BULK)
+            return ENOTSUP;
+
+        const usb_target_t target =
+            {{ .address = pipe->wire->address, .endpoint = pipe->endpoint_no }};
         
         /* Ensure serialization over the phone. */
@@ -87 +80 @@
          * Make call identifying target USB device and type of transfer.
          */
-        aid_t opening_request = async_send_3(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
-            ipc_method, pipe->wire->address, pipe->endpoint_no, NULL);
+        aid_t opening_request = async_send_2(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_DATA_READ, target.packed, NULL);
         
         if (opening_request == 0) {
@@ -211 +204 @@
     void *buffer, size_t size)
 {
-        /*
-         * Get corresponding IPC method.
-         * In future, replace with static array of mappings
-         * transfer type -> method.
-         */
-        usbhc_iface_funcs_t ipc_method;
-        switch (pipe->transfer_type) {
-                case USB_TRANSFER_INTERRUPT:
-                case USB_TRANSFER_BULK:
-                        ipc_method = IPC_M_USBHC_DATA_WRITE;
-                        break;
-                default:
-                        return ENOTSUP;
-        }
+        /* Only interrupt and bulk transfers are supported */
+        if (pipe->transfer_type != USB_TRANSFER_INTERRUPT &&
+            pipe->transfer_type != USB_TRANSFER_BULK)
+            return ENOTSUP;
+
+        const usb_target_t target =
+            {{ .address = pipe->wire->address, .endpoint = pipe->endpoint_no }};
 
         /* Ensure serialization over the phone. */
@@ -233 +219 @@
          * Make call identifying target USB device and type of transfer.
          */
-        aid_t opening_request = async_send_3(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
-            ipc_method, pipe->wire->address, pipe->endpoint_no, NULL);
+        aid_t opening_request = async_send_2(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_DATA_WRITE, target.packed, NULL);
         
         if (opening_request == 0) {
@@ -348 +334 @@
         pipe_start_transaction(pipe);
 
+        const usb_target_t target =
+            {{ .address = pipe->wire->address, .endpoint = pipe->endpoint_no }};
+
         /*
          * Make call identifying target USB device and control transfer type.
          */
         async_exch_t *exch = async_exchange_begin(pipe->hc_sess);
-        aid_t opening_request = async_send_3(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
-            IPC_M_USBHC_CONTROL_READ, pipe->wire->address, pipe->endpoint_no,
-            NULL);
+        aid_t opening_request = async_send_2(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_CONTROL_READ, target.packed, NULL);
         
         if (opening_request == 0) {
@@ -494 +482 @@
         pipe_start_transaction(pipe);
 
+        const usb_target_t target =
+            {{ .address = pipe->wire->address, .endpoint = pipe->endpoint_no }};
+
         /*
          * Make call identifying target USB device and control transfer type.
          */
         async_exch_t *exch = async_exchange_begin(pipe->hc_sess);
-        aid_t opening_request = async_send_4(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
-            IPC_M_USBHC_CONTROL_WRITE, pipe->wire->address, pipe->endpoint_no,
+        aid_t opening_request = async_send_3(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_CONTROL_WRITE, target.packed,
             data_buffer_size, NULL);