Changeset 1110ebd in mainline

Timestamp:

2011-02-03T11:16:43Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

cd50486

Parents:

9d4579e

Message:

Remove default control pipe initialization

It is nonsense as this pipe must be initialized to retrieve
the configuration descriptor used for initialization of other
endpoints.

Location:

uspace/lib/usb

Files:

• include/usb/pipes.h (modified) (2 diffs)
• src/pipesinit.c (modified) (3 diffs)

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

@@ -80 +80 @@
 } usb_endpoint_pipe_t;
 
-/** Flag for default control pipe. */
-#define USB_ENDPOINT_DESCRIPTION_DEFAULT_CONTROL_PIPE 1
 
 /** Description of endpoint characteristics. */
@@ -93 +91 @@
         /** Interface subclass this endpoint belongs to (-1 for any). */
         int interface_subclass;
-        /** Interface protocol this endpoint belogs to (-1 for any). */
+        /** Interface protocol this endpoint belongs to (-1 for any). */
         int interface_protocol;
         /** Extra endpoint flags. */

uspace/lib/usb/src/pipesinit.c

@@ -77 +77 @@
     usb_endpoint_description_t *found)
 {
-        /* Default control pipe is never mentioned in endpoint descriptors. */
-        if (wanted->flags & USB_ENDPOINT_DESCRIPTION_DEFAULT_CONTROL_PIPE) {
-                return false;
-        }
-
 #define _SAME(fieldname) ((wanted->fieldname) == (found->fieldname))
 
@@ -251 +246 @@
  *   configuration
  * - @c descriptor will point inside the configuration descriptor to endpoint
- *   corresponding to given description (or NULL for not found descriptor or
- *   for default control pipe)
+ *   corresponding to given description (or NULL for not found descriptor)
  * - @c interface will point inside the configuration descriptor to interface
  *   descriptor the endpoint @c descriptor belongs to (or NULL for not found
@@ -322 +316 @@
         } while (interface != NULL);
 
-        /*
-         * Find default control pipe and initialize it as well.
-         */
-        for (i = 0; i < mapping_count; i++) {
-                if (mapping[i].description->flags
-                    & USB_ENDPOINT_DESCRIPTION_DEFAULT_CONTROL_PIPE) {
-                        int rc = usb_endpoint_pipe_initialize_default_control(
-                            mapping[i].pipe, connection);
-                        if (rc == EOK) {
-                                mapping[i].present = true;
-                        }
-                }
-        }
-
         return EOK;
 }