Changeset 945d66c in mainline for uspace/lib/usbdev/include/usb/dev/driver.h

Timestamp:

2013-01-25T22:55:22Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9e79a2f

Parents:

c39e9fb

Message:

libusbdev: Don't use the descriptor field directly.

Make descriptor handling functions static.

File:

• uspace/lib/usbdev/include/usb/dev/driver.h (modified) (5 diffs)

uspace/lib/usbdev/include/usb/dev/driver.h

@@ -42 +42 @@
 #include <usb_iface.h>
 
-/** Descriptors for USB device. */
-typedef struct {
-        /** Standard device descriptor. */
-        usb_standard_device_descriptor_t device;
-        /** Full configuration descriptor of current configuration. */
-        const uint8_t *configuration;
-        size_t configuration_size;
-} usb_device_descriptors_t;
 
 /** Wrapper for data related to alternate interface setting.
@@ -84 +76 @@
         /** The default control pipe. */
         usb_pipe_t ctrl_pipe;
+
         /** Other endpoint pipes.
          * This is an array of other endpoint pipes in the same order as
@@ -100 +93 @@
         usb_alternate_interfaces_t alternate_interfaces;
 
-        /** Some useful descriptors. */
-        usb_device_descriptors_t descriptors;
+        /** Some useful descriptors for USB device. */
+        struct {
+                /** Standard device descriptor. */
+                usb_standard_device_descriptor_t device;
+                /** Full configuration descriptor of current configuration. */
+                const uint8_t *configuration;
+                size_t configuration_size;
+        } descriptors;
 
         /** Generic DDF device backing this one. DO NOT TOUCH! */
@@ -179 +178 @@
     const usb_endpoint_description_t **);
 
-int usb_device_retrieve_descriptors(usb_pipe_t *, usb_device_descriptors_t *);
-void usb_device_release_descriptors(usb_device_descriptors_t *);
-
 int usb_device_create_pipes(usb_device_connection_t *,
     const usb_endpoint_description_t **, const uint8_t *, size_t, int, int,
@@ -188 +184 @@
 usb_pipe_t *usb_device_get_default_pipe(usb_device_t *);
 usb_pipe_t *usb_device_get_pipe(usb_device_t *, usb_endpoint_t, usb_direction_t);
+
+const usb_standard_device_descriptor_t *
+usb_device_get_device_descriptor(usb_device_t *);
+const void * usb_device_get_configuration_descriptor(usb_device_t *, size_t *);
+
 
 void * usb_device_data_alloc(usb_device_t *, size_t);