Changes in uspace/lib/usb/src/pipesio.c [fa0f53b:3954a63b] in mainline

File:

• uspace/lib/usb/src/pipesio.c (modified) (20 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.
@@ -80 +78 @@
         }
 
-        /* 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_3(pipe->hc_phone,
+        aid_t opening_request = async_send_4(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;
         }
@@ -101 +96 @@
         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) {
@@ -157 +146 @@
 
         if (buffer == NULL) {
-                return EINVAL;
+                        return EINVAL;
         }
 
@@ -164 +153 @@
         }
 
+        if (!usb_pipe_is_session_started(pipe)) {
+                return EBADF;
+        }
+
         if (pipe->direction != USB_DIRECTION_IN) {
                 return EBADF;
@@ -172 +165 @@
         }
 
+        size_t act_size = 0;
         int rc;
-        rc = pipe_add_ref(pipe);
-        if (rc != EOK) {
-                return rc;
-        }
-
-
-        size_t act_size = 0;
 
         rc = usb_pipe_read_no_checks(pipe, buffer, size, &act_size);
-
-        pipe_drop_ref(pipe);
-
         if (rc != EOK) {
                 return rc;
@@ -226 +210 @@
         }
 
-        /* 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_3(pipe->hc_phone,
+        aid_t opening_request = async_send_4(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;
         }
@@ -245 +226 @@
          */
         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);
@@ -286 +260 @@
         }
 
+        if (!usb_pipe_is_session_started(pipe)) {
+                return EBADF;
+        }
+
         if (pipe->direction != USB_DIRECTION_OUT) {
                 return EBADF;
@@ -294 +272 @@
         }
 
-        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);
+        int rc = usb_pipe_write_no_check(pipe, buffer, size);
 
         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;
 }
 
@@ -343 +293 @@
     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_3(pipe->hc_phone,
+        aid_t opening_request = async_send_4(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) {
@@ -363 +311 @@
             setup_buffer, setup_buffer_size);
         if (rc != EOK) {
-                pipe_end_transaction(pipe);
                 async_wait_for(opening_request, NULL);
                 return rc;
@@ -375 +322 @@
             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);
@@ -440 +379 @@
         }
 
+        if (!usb_pipe_is_session_started(pipe)) {
+                return EBADF;
+        }
+
         if ((pipe->direction != USB_DIRECTION_BOTH)
             || (pipe->transfer_type != USB_TRANSFER_CONTROL)) {
@@ -445 +388 @@
         }
 
-        int rc;
-
-        rc = pipe_add_ref(pipe);
-        if (rc != EOK) {
-                return rc;
-        }
-
         size_t act_size = 0;
-        rc = usb_pipe_control_read_no_check(pipe,
+        int 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) {
@@ -488 +418 @@
     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_4(pipe->hc_phone,
+        aid_t opening_request = async_send_5(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;
         }
@@ -510 +437 @@
             setup_buffer, setup_buffer_size);
         if (rc != EOK) {
-                pipe_end_transaction(pipe);
                 async_wait_for(opening_request, NULL);
                 return rc;
@@ -521 +447 @@
                 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);
         }
 
@@ -572 +491 @@
         }
 
+        if (!usb_pipe_is_session_started(pipe)) {
+                return EBADF;
+        }
+
         if ((pipe->direction != USB_DIRECTION_BOTH)
             || (pipe->transfer_type != USB_TRANSFER_CONTROL)) {
@@ -577 +500 @@
         }
 
-        int rc;
-
-        rc = pipe_add_ref(pipe);
-        if (rc != EOK) {
-                return rc;
-        }
-
-        rc = usb_pipe_control_write_no_check(pipe,
+        int 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;