Changeset 20a3465 in mainline for uspace/lib/usbdev/include/usb/dev/driver.h

Timestamp:

2011-10-30T19:50:54Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3ce78580, 48902fa

Parents:

4c3ad56 (diff), 45bf63c (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 mainline changes

File:

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

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

@@ -43 +43 @@
         usb_standard_device_descriptor_t device;
         /** Full configuration descriptor of current configuration. */
-        uint8_t *configuration;
+        const uint8_t *configuration;
         size_t configuration_size;
 } usb_device_descriptors_t;
@@ -53 +53 @@
 typedef struct {
         /** Interface descriptor. */
-        usb_standard_interface_descriptor_t *interface;
+        const usb_standard_interface_descriptor_t *interface;
         /** Pointer to start of descriptor tree bound with this interface. */
-        uint8_t *nested_descriptors;
+        const uint8_t *nested_descriptors;
         /** Size of data pointed by nested_descriptors in bytes. */
         size_t nested_descriptors_size;
@@ -156 +156 @@
 \endcode
          */
-        usb_endpoint_description_t **endpoints;
+        const usb_endpoint_description_t **endpoints;
         /** Driver ops. */
-        usb_driver_ops_t *ops;
+        const usb_driver_ops_t *ops;
 } usb_driver_t;
 
-int usb_driver_main(usb_driver_t *);
+int usb_driver_main(const usb_driver_t *);
 
 int usb_device_select_interface(usb_device_t *, uint8_t,
-    usb_endpoint_description_t **);
+    const usb_endpoint_description_t **);
 
 int usb_device_retrieve_descriptors(usb_pipe_t *, usb_device_descriptors_t *);
 int usb_device_create_pipes(const ddf_dev_t *, usb_device_connection_t *,
-    usb_endpoint_description_t **, uint8_t *, size_t, int, int,
+    const usb_endpoint_description_t **, const uint8_t *, size_t, int, int,
     usb_endpoint_mapping_t **, size_t *);
 int usb_device_destroy_pipes(const ddf_dev_t *, usb_endpoint_mapping_t *, size_t);
-int usb_device_create(ddf_dev_t *, usb_endpoint_description_t **, usb_device_t **, const char **);
-void usb_device_destroy(usb_device_t *);
+int usb_device_init(usb_device_t *, ddf_dev_t *,
+    const usb_endpoint_description_t **, const char **);
+void usb_device_deinit(usb_device_t *);
 
-size_t usb_interface_count_alternates(uint8_t *, size_t, uint8_t);
-int usb_alternate_interfaces_create(uint8_t *, size_t, int,
+void * usb_device_data_alloc(usb_device_t *, size_t);
+
+size_t usb_interface_count_alternates(const uint8_t *, size_t, uint8_t);
+int usb_alternate_interfaces_create(const uint8_t *, size_t, int,
     usb_alternate_interfaces_t **);
-
+void usb_alternate_interfaces_destroy(usb_alternate_interfaces_t *);
 #endif
 /**