Changeset c69209d in mainline

Timestamp:

2011-03-14T10:49:57Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

15d3b54, 9370884

Parents:

189cd4e (diff), 206f71a (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:

Add reading max packet size for pipe zero

Location:

uspace

Files:

• app/usbinfo/info.c (modified) (1 diff)
• app/usbinfo/main.c (modified) (1 diff)
• drv/usbhid/hiddev.c (modified) (1 diff)
• drv/usbhub/usbhub.c (modified) (2 diffs)
• drv/usbmid/usbmid.c (modified) (1 diff)
• lib/usb/include/usb/pipes.h (modified) (1 diff)
• lib/usb/src/devdrv.c (modified) (1 diff)
• lib/usb/src/hub.c (modified) (1 diff)
• lib/usb/src/pipesinit.c (modified) (2 diffs)
• lib/usb/src/recognise.c (modified) (1 diff)

uspace/app/usbinfo/info.c

@@ -65 +65 @@
                 goto leave;
         }
+        rc = usb_endpoint_pipe_probe_default_control(&ctrl_pipe);
+        if (rc != EOK) {
+                fprintf(stderr,
+                    NAME ": probing default control pipe failed: %s.\n",
+                    str_error(rc));
+                goto leave;
+        }
         rc = usb_endpoint_pipe_start_session(&ctrl_pipe);
         if (rc != EOK) {

uspace/app/usbinfo/main.c

@@ -82 +82 @@
 
         if (str_cmp(path, "uhci") == 0) {
-                path = "/hw/pci0/00:01.2/uhci";
+                path = "/hw/pci0/00:01.2/uhci-hc";
         }
 

uspace/drv/usbhid/hiddev.c

@@ -391 +391 @@
                 return rc;
         }
+        rc = usb_endpoint_pipe_probe_default_control(&hid_dev->ctrl_pipe);
+        if (rc != EOK) {
+                usb_log_error("Probing default control pipe failed: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
 
         /*

uspace/drv/usbhub/usbhub.c

@@ -118 +118 @@
                 dprintf(USB_LOG_LEVEL_ERROR,
                                 "could not initialize connection to device endpoint, errno %d",opResult);
-        }
-        return opResult;
+                return opResult;
+        }
+
+        opResult = usb_endpoint_pipe_probe_default_control(&hub->endpoints.control);
+        if (opResult != EOK) {
+                dprintf(USB_LOG_LEVEL_ERROR, "failed probing endpoint 0, %d", opResult);
+                return opResult;
+        }
+
+        return EOK;
 }
 
@@ -430 +438 @@
                         &new_device_pipe,
                         &new_device_connection);
+        usb_endpoint_pipe_probe_default_control(&new_device_pipe);
         /// \TODO get highspeed info
         usb_speed_t speed = isLowSpeed?USB_SPEED_LOW:USB_SPEED_FULL;

uspace/drv/usbmid/usbmid.c

@@ -116 +116 @@
                 return NULL;
         }
+        rc = usb_endpoint_pipe_probe_default_control(&mid->ctrl_pipe);
+        if (rc != EOK) {
+                usb_log_error("Probing default control pipe failed: %s.\n",
+                    str_error(rc));
+                free(mid);
+                return NULL;
+        }
 
         mid->dev = dev;

uspace/lib/usb/include/usb/pipes.h

@@ -129 +129 @@
 int usb_endpoint_pipe_initialize_default_control(usb_endpoint_pipe_t *,
     usb_device_connection_t *);
+int usb_endpoint_pipe_probe_default_control(usb_endpoint_pipe_t *);
 int usb_endpoint_pipe_initialize_from_configuration(usb_endpoint_mapping_t *,
     size_t, uint8_t *, size_t, usb_device_connection_t *);

uspace/lib/usb/src/devdrv.c

@@ -228 +228 @@
         }
 
+        rc = usb_endpoint_pipe_probe_default_control(&dev->ctrl_pipe);
+        if (rc != EOK) {
+                usb_log_error(
+                    "Probing default control pipe on device `%s' failed: %s.\n",
+                    dev->ddf_dev->name, str_error(rc));
+                return rc;
+        }
+
         /*
          * Initialization of other pipes requires open session on

uspace/lib/usb/src/hub.c

@@ -235 +235 @@
                 goto leave_release_default_address;
         }
+        rc = usb_endpoint_pipe_probe_default_control(&ctrl_pipe);
+        if (rc != EOK) {
+                rc = ENOTCONN;
+                goto leave_release_default_address;
+        }
 
         rc = usb_endpoint_pipe_start_session(&ctrl_pipe);

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
 
 
@@ -371 +374 @@
 
         int rc = usb_endpoint_pipe_initialize(pipe, connection,
-            0, USB_TRANSFER_CONTROL, 8, USB_DIRECTION_BOTH);
+            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;
+                }
+        }
         if (rc != EOK) {
                 return rc;
         }
-        rc = usb_endpoint_pipe_start_session(pipe);
+
+
+        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);
         if (rc != EOK) {
                 return rc;
         }
 
-        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;
+        pipe->max_packet_size
+            = dev_descr_start[DEV_DESCR_MAX_PACKET_SIZE_OFFSET];
+
+        return EOK;
 }
 

uspace/lib/usb/src/recognise.c

@@ -369 +369 @@
                 goto failure;
         }
+        rc = usb_endpoint_pipe_probe_default_control(&ctrl_pipe);
+        if (rc != EOK) {
+                goto failure;
+        }
 
         /*