Changeset 1b0b86e6 in mainline for uspace/lib

Timestamp:

2011-03-13T22:02:44Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b7d8fd9

Parents:

67f54965 (diff), deb4ba7 (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:

Merge development/ changes

Location:

uspace/lib/usb

Files:

• Makefile (modified) (1 diff)
• include/usb/devdrv.h (added)
• include/usb/pipes.h (modified) (1 diff)
• src/devdrv.c (added)
• src/devpoll.c (added)
• src/pipesinit.c (modified) (2 diffs)

uspace/lib/usb/Makefile

@@ -37 +37 @@
         src/ddfiface.c \
         src/debug.c \
+        src/devdrv.c \
+        src/devpoll.c \
         src/dp.c \
         src/dump.c \

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

@@ -106 +106 @@
         const usb_endpoint_description_t *description;
         /** Interface number the endpoint must belong to (-1 for any). */
-        const int interface_no;
+        int interface_no;
         /** Found descriptor fitting the description. */
         usb_standard_endpoint_descriptor_t *descriptor;

uspace/lib/usb/src/pipesinit.c

@@ -37 +37 @@
 #include <usb/pipes.h>
 #include <usb/dp.h>
+#include <usb/request.h>
 #include <errno.h>
 #include <assert.h>
@@ -370 +371 @@
         int rc = usb_endpoint_pipe_initialize(pipe, connection,
             0, USB_TRANSFER_CONTROL, 8, USB_DIRECTION_BOTH);
-
+        if (rc != EOK) {
+                return rc;
+        }
+        rc = usb_endpoint_pipe_start_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;
 }