Changeset 62f4212 in mainline for uspace/lib/usb/include/usb/devdrv.h

Timestamp:

2011-03-22T10:07:53Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

f8e4cb6

Parents:

18b3cfd (diff), b01995b (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:

Merged changes from development

File:

• uspace/lib/usb/include/usb/devdrv.h (modified) (3 diffs)

uspace/lib/usb/include/usb/devdrv.h

@@ -38 +38 @@
 #include <usb/pipes.h>
 
+/** Descriptors for USB device. */
+typedef struct {
+        /** Standard device descriptor. */
+        usb_standard_device_descriptor_t device;
+        /** Full configuration descriptor of current configuration. */
+        uint8_t *configuration;
+        size_t configuration_size;
+} usb_device_descriptors_t;
+
 /** USB device structure. */
 typedef struct {
         /** The default control pipe. */
-        usb_endpoint_pipe_t ctrl_pipe;
+        usb_pipe_t ctrl_pipe;
         /** Other endpoint pipes.
          * This is an array of other endpoint pipes in the same order as
@@ -47 +56 @@
          */
         usb_endpoint_mapping_t *pipes;
+        /** Current interface.
+         * Usually, drivers operate on single interface only.
+         * This item contains the value of the interface or -1 for any.
+         */
+        int interface_no;
+
+        /** Some useful descriptors. */
+        usb_device_descriptors_t descriptors;
+
         /** Generic DDF device backing this one. */
         ddf_dev_t *ddf_dev;
@@ -74 +92 @@
          */
         const char *name;
-        /** Expected endpoints description. */
+        /** Expected endpoints description, excluding default control endpoint.
+         *
+         * It MUST be of size expected_enpoints_count(excluding default ctrl) + 1
+         * where the last record MUST BE NULL, otherwise catastrophic things may
+         * happen.
+         */
         usb_endpoint_description_t **endpoints;
         /** Driver ops. */