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

Timestamp:

2011-09-18T21:22:59Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

dcc44ca1

Parents:

85ff862 (diff), 45a9cf4 (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 mainline changes

File:

• uspace/lib/usbdev/src/pipesio.c (modified) (7 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:
-                        ipc_method = IPC_M_USBHC_INTERRUPT_IN;
-                        break;
-                case USB_TRANSFER_BULK:
-                        ipc_method = IPC_M_USBHC_BULK_IN;
-                        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. */
@@ -89 +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_READ, target.packed, NULL);
         
         if (opening_request == 0) {
@@ -213 +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:
-                        ipc_method = IPC_M_USBHC_INTERRUPT_OUT;
-                        break;
-                case USB_TRANSFER_BULK:
-                        ipc_method = IPC_M_USBHC_BULK_OUT;
-                        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. */
@@ -238 +220 @@
          */
         aid_t opening_request = async_send_3(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
-            ipc_method, pipe->wire->address, pipe->endpoint_no, NULL);
+            IPC_M_USBHC_WRITE, target.packed, size, NULL);
         
         if (opening_request == 0) {
@@ -352 +334 @@
         pipe_start_transaction(pipe);
 
+        const usb_target_t target =
+            {{ .address = pipe->wire->address, .endpoint = pipe->endpoint_no }};
+
+        assert(setup_buffer_size == 8);
+        uint64_t setup_packet;
+        memcpy(&setup_packet, setup_buffer, 8);
         /*
          * 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_4(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_READ, target.packed,
+            (setup_packet & UINT32_MAX), (setup_packet >> 32), NULL);
+
         if (opening_request == 0) {
                 async_exchange_end(exch);
                 return ENOMEM;
         }
-        
-        /*
-         * Send the setup packet.
-         */
-        int rc = async_data_write_start(exch, setup_buffer, setup_buffer_size);
-        if (rc != EOK) {
-                async_exchange_end(exch);
-                pipe_end_transaction(pipe);
-                async_wait_for(opening_request, NULL);
-                return rc;
-        }
-        
+
         /*
          * Retrieve the data.
@@ -498 +475 @@
         pipe_start_transaction(pipe);
 
+        const usb_target_t target =
+            {{ .address = pipe->wire->address, .endpoint = pipe->endpoint_no }};
+        assert(setup_buffer_size == 8);
+        uint64_t setup_packet;
+        memcpy(&setup_packet, setup_buffer, 8);
+
         /*
          * 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,
-            data_buffer_size, NULL);
+        aid_t opening_request = async_send_5(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
+            IPC_M_USBHC_WRITE, target.packed, data_buffer_size,
+            (setup_packet & UINT32_MAX), (setup_packet >> 32), NULL);
         
         if (opening_request == 0) {
@@ -511 +494 @@
                 return ENOMEM;
         }
-        
-        /*
-         * Send the setup packet.
-         */
-        int rc = async_data_write_start(exch, setup_buffer, setup_buffer_size);
-        if (rc != EOK) {
-                async_exchange_end(exch);
-                pipe_end_transaction(pipe);
-                async_wait_for(opening_request, NULL);
-                return rc;
-        }
-        
+
         /*
          * Send the data (if any).
          */
         if (data_buffer_size > 0) {
-                rc = async_data_write_start(exch, data_buffer, data_buffer_size);
+                int rc = async_data_write_start(exch, data_buffer, data_buffer_size);
                 
                 /* All data sent, pipe can be released. */