Changes in uspace/lib/usb/src/pipesinit.c [206f71a:b7d8fd9] in mainline

File:

• uspace/lib/usb/src/pipesinit.c (modified) (2 diffs)

uspace/lib/usb/src/pipesinit.c

@@ -41 +41 @@
 #include <errno.h>
 #include <assert.h>
-
-#define CTRL_PIPE_MIN_PACKET_SIZE 8
-#define DEV_DESCR_MAX_PACKET_SIZE_OFFSET 7
 
 
@@ -374 +371 @@
 
         int rc = usb_endpoint_pipe_initialize(pipe, connection,
-            0, USB_TRANSFER_CONTROL, CTRL_PIPE_MIN_PACKET_SIZE,
-            USB_DIRECTION_BOTH);
-
-        return rc;
-}
-
-/** Probe default control pipe for max packet size.
- *
- * The function tries to get the correct value of max packet size several
- * time before giving up.
- *
- * The session on the pipe shall not be started.
- *
- * @param pipe Default control pipe.
- * @return Error code.
- */
-int usb_endpoint_pipe_probe_default_control(usb_endpoint_pipe_t *pipe)
-{
-        assert(pipe);
-        assert(DEV_DESCR_MAX_PACKET_SIZE_OFFSET < CTRL_PIPE_MIN_PACKET_SIZE);
-
-        if ((pipe->direction != USB_DIRECTION_BOTH) ||
-            (pipe->transfer_type != USB_TRANSFER_CONTROL) ||
-            (pipe->endpoint_no != 0)) {
-                return EINVAL;
-        }
-
-#define TRY_LOOP(attempt_var) \
-        for (attempt_var = 0; attempt_var < 3; attempt_var++)
-
-        size_t failed_attempts;
-        int rc;
-
-        TRY_LOOP(failed_attempts) {
-                rc = usb_endpoint_pipe_start_session(pipe);
-                if (rc == EOK) {
-                        break;
-                }
-        }
+            0, USB_TRANSFER_CONTROL, 8, USB_DIRECTION_BOTH);
         if (rc != EOK) {
                 return rc;
         }
-
-
-        uint8_t dev_descr_start[CTRL_PIPE_MIN_PACKET_SIZE];
-        size_t transferred_size;
-        TRY_LOOP(failed_attempts) {
-                rc = usb_request_get_descriptor(pipe, USB_REQUEST_TYPE_STANDARD,
-                    USB_REQUEST_RECIPIENT_DEVICE, USB_DESCTYPE_DEVICE,
-                    0, 0, dev_descr_start, CTRL_PIPE_MIN_PACKET_SIZE,
-                    &transferred_size);
-                if (rc == EOK) {
-                        if (transferred_size != CTRL_PIPE_MIN_PACKET_SIZE) {
-                                rc = ELIMIT;
-                                continue;
-                        }
-                        break;
-                }
-        }
-        usb_endpoint_pipe_end_session(pipe);
+        rc = usb_endpoint_pipe_start_session(pipe);
         if (rc != EOK) {
                 return rc;
         }
 
-        pipe->max_packet_size
-            = dev_descr_start[DEV_DESCR_MAX_PACKET_SIZE_OFFSET];
-
-        return EOK;
+        uint8_t first[8];
+        size_t size = 0;
+        rc = usb_control_request_get(pipe, USB_REQUEST_TYPE_STANDARD,
+            USB_REQUEST_RECIPIENT_DEVICE, USB_DEVREQ_GET_DESCRIPTOR, 1 << 8,
+                        0, first, 8, &size);
+        usb_endpoint_pipe_end_session(pipe);
+        if (rc != EOK || size  != 8) {
+                return rc;
+        }
+
+        pipe->max_packet_size = first[7];
+        return rc;
 }