Changeset e50cd7f in mainline for uspace/lib/usb/src/pipesio.c

Timestamp:

2011-04-17T19:17:55Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

63517c2, cfbbe1d3

Parents:

ef354b6 (diff), 8595577b (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:

new report structure fixes

File:

• uspace/lib/usb/src/pipesio.c (modified) (19 diffs)

uspace/lib/usb/src/pipesio.c

@@ -49 +49 @@
 #include <assert.h>
 #include <usbhc_iface.h>
+#include <usb/request.h>
+#include "pipepriv.h"
 
 /** Request an in transfer, no checking of input parameters.
@@ -78 +80 @@
         }
 
+        /* Ensure serialization over the phone. */
+        pipe_start_transaction(pipe);
+
         /*
          * Make call identifying target USB device and type of transfer.
          */
-        aid_t opening_request = async_send_4(pipe->hc_phone,
+        aid_t opening_request = async_send_3(pipe->hc_phone,
             DEV_IFACE_ID(USBHC_DEV_IFACE), ipc_method,
             pipe->wire->address, pipe->endpoint_no,
-            pipe->max_packet_size,
             NULL);
         if (opening_request == 0) {
+                pipe_end_transaction(pipe);
                 return ENOMEM;
         }
@@ -96 +101 @@
         aid_t data_request = async_data_read(pipe->hc_phone, buffer, size,
             &data_request_call);
+
+        /*
+         * Since now on, someone else might access the backing phone
+         * without breaking the transfer IPC protocol.
+         */
+        pipe_end_transaction(pipe);
 
         if (data_request == 0) {
@@ -146 +157 @@
 
         if (buffer == NULL) {
-                        return EINVAL;
+                return EINVAL;
         }
 
         if (size == 0) {
                 return EINVAL;
-        }
-
-        if (!usb_pipe_is_session_started(pipe)) {
-                return EBADF;
         }
 
@@ -165 +172 @@
         }
 
+        int rc;
+        rc = pipe_add_ref(pipe);
+        if (rc != EOK) {
+                return rc;
+        }
+
+
         size_t act_size = 0;
-        int rc;
 
         rc = usb_pipe_read_no_checks(pipe, buffer, size, &act_size);
+
+        pipe_drop_ref(pipe);
+
         if (rc != EOK) {
                 return rc;
@@ -210 +226 @@
         }
 
+        /* Ensure serialization over the phone. */
+        pipe_start_transaction(pipe);
+
         /*
          * Make call identifying target USB device and type of transfer.
          */
-        aid_t opening_request = async_send_4(pipe->hc_phone,
+        aid_t opening_request = async_send_3(pipe->hc_phone,
             DEV_IFACE_ID(USBHC_DEV_IFACE), ipc_method,
             pipe->wire->address, pipe->endpoint_no,
-            pipe->max_packet_size,
             NULL);
         if (opening_request == 0) {
+                pipe_end_transaction(pipe);
                 return ENOMEM;
         }
@@ -226 +245 @@
          */
         int rc = async_data_write_start(pipe->hc_phone, buffer, size);
+
+        /*
+         * Since now on, someone else might access the backing phone
+         * without breaking the transfer IPC protocol.
+         */
+        pipe_end_transaction(pipe);
+
         if (rc != EOK) {
                 async_wait_for(opening_request, NULL);
@@ -260 +286 @@
         }
 
-        if (!usb_pipe_is_session_started(pipe)) {
-                return EBADF;
-        }
-
         if (pipe->direction != USB_DIRECTION_OUT) {
                 return EBADF;
@@ -272 +294 @@
         }
 
-        int rc = usb_pipe_write_no_check(pipe, buffer, size);
+        int rc;
+
+        rc = pipe_add_ref(pipe);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        rc = usb_pipe_write_no_check(pipe, buffer, size);
+
+        pipe_drop_ref(pipe);
 
         return rc;
+}
+
+/** Try to clear endpoint halt of default control pipe.
+ *
+ * @param pipe Pipe for control endpoint zero.
+ */
+static void clear_self_endpoint_halt(usb_pipe_t *pipe)
+{
+        assert(pipe != NULL);
+
+        if (!pipe->auto_reset_halt || (pipe->endpoint_no != 0)) {
+                return;
+        }
+
+
+        /* Prevent indefinite recursion. */
+        pipe->auto_reset_halt = false;
+        usb_request_clear_endpoint_halt(pipe, 0);
+        pipe->auto_reset_halt = true;
 }
 
@@ -293 +343 @@
     void *data_buffer, size_t data_buffer_size, size_t *data_transfered_size)
 {
+        /* Ensure serialization over the phone. */
+        pipe_start_transaction(pipe);
+
         /*
          * Make call identifying target USB device and control transfer type.
          */
-        aid_t opening_request = async_send_4(pipe->hc_phone,
+        aid_t opening_request = async_send_3(pipe->hc_phone,
             DEV_IFACE_ID(USBHC_DEV_IFACE), IPC_M_USBHC_CONTROL_READ,
             pipe->wire->address, pipe->endpoint_no,
-            pipe->max_packet_size,
             NULL);
         if (opening_request == 0) {
@@ -311 +363 @@
             setup_buffer, setup_buffer_size);
         if (rc != EOK) {
+                pipe_end_transaction(pipe);
                 async_wait_for(opening_request, NULL);
                 return rc;
@@ -322 +375 @@
             data_buffer, data_buffer_size,
             &data_request_call);
+
+        /*
+         * Since now on, someone else might access the backing phone
+         * without breaking the transfer IPC protocol.
+         */
+        pipe_end_transaction(pipe);
+
+
         if (data_request == 0) {
                 async_wait_for(opening_request, NULL);
@@ -379 +440 @@
         }
 
-        if (!usb_pipe_is_session_started(pipe)) {
-                return EBADF;
-        }
-
         if ((pipe->direction != USB_DIRECTION_BOTH)
             || (pipe->transfer_type != USB_TRANSFER_CONTROL)) {
@@ -388 +445 @@
         }
 
+        int rc;
+
+        rc = pipe_add_ref(pipe);
+        if (rc != EOK) {
+                return rc;
+        }
+
         size_t act_size = 0;
-        int rc = usb_pipe_control_read_no_check(pipe,
+        rc = usb_pipe_control_read_no_check(pipe,
             setup_buffer, setup_buffer_size,
             data_buffer, data_buffer_size, &act_size);
+
+        if (rc == ESTALL) {
+                clear_self_endpoint_halt(pipe);
+        }
+
+        pipe_drop_ref(pipe);
 
         if (rc != EOK) {
@@ -418 +488 @@
     void *data_buffer, size_t data_buffer_size)
 {
+        /* Ensure serialization over the phone. */
+        pipe_start_transaction(pipe);
+
         /*
          * Make call identifying target USB device and control transfer type.
          */
-        aid_t opening_request = async_send_5(pipe->hc_phone,
+        aid_t opening_request = async_send_4(pipe->hc_phone,
             DEV_IFACE_ID(USBHC_DEV_IFACE), IPC_M_USBHC_CONTROL_WRITE,
             pipe->wire->address, pipe->endpoint_no,
             data_buffer_size,
-            pipe->max_packet_size,
             NULL);
         if (opening_request == 0) {
+                pipe_end_transaction(pipe);
                 return ENOMEM;
         }
@@ -437 +510 @@
             setup_buffer, setup_buffer_size);
         if (rc != EOK) {
+                pipe_end_transaction(pipe);
                 async_wait_for(opening_request, NULL);
                 return rc;
@@ -447 +521 @@
                 rc = async_data_write_start(pipe->hc_phone,
                     data_buffer, data_buffer_size);
+
+                /* All data sent, pipe can be released. */
+                pipe_end_transaction(pipe);
+
                 if (rc != EOK) {
                         async_wait_for(opening_request, NULL);
                         return rc;
                 }
+        } else {
+                /* No data to send, we can release the pipe for others. */
+                pipe_end_transaction(pipe);
         }
 
@@ -491 +572 @@
         }
 
-        if (!usb_pipe_is_session_started(pipe)) {
-                return EBADF;
-        }
-
         if ((pipe->direction != USB_DIRECTION_BOTH)
             || (pipe->transfer_type != USB_TRANSFER_CONTROL)) {
@@ -500 +577 @@
         }
 
-        int rc = usb_pipe_control_write_no_check(pipe,
+        int rc;
+
+        rc = pipe_add_ref(pipe);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        rc = usb_pipe_control_write_no_check(pipe,
             setup_buffer, setup_buffer_size, data_buffer, data_buffer_size);
+
+        if (rc == ESTALL) {
+                clear_self_endpoint_halt(pipe);
+        }
+
+        pipe_drop_ref(pipe);
 
         return rc;