Changeset e3f7418 in mainline for uspace/lib/usbdev/include

Timestamp:

2011-10-15T13:06:28Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a044f71

Parents:

3958e315 (diff), 065064e6 (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:

USB improvements.

USB unplug part2; Unplug support in all drivers (except for unused usbmouse driver).
Make descriptor paring work on const pointers.
Fixes several crashes and memory leaks.

Location:

uspace/lib/usbdev/include/usb/dev

Files:

• dp.h (modified) (3 diffs)
• driver.h (modified) (4 diffs)
• pipes.h (modified) (1 diff)

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

@@ -59 +59 @@
 typedef struct {
         /** Used descriptor nesting. */
-        usb_dp_descriptor_nesting_t *nesting;
+        const usb_dp_descriptor_nesting_t *nesting;
 } usb_dp_parser_t;
 
@@ -65 +65 @@
 typedef struct {
         /** Data to be parsed. */
-        uint8_t *data;
+        const uint8_t *data;
         /** Size of input data in bytes. */
         size_t size;
@@ -72 +72 @@
 } usb_dp_parser_data_t;
 
-uint8_t *usb_dp_get_nested_descriptor(usb_dp_parser_t *,
-    usb_dp_parser_data_t *, uint8_t *);
-uint8_t *usb_dp_get_sibling_descriptor(usb_dp_parser_t *,
-    usb_dp_parser_data_t *, uint8_t *, uint8_t *);
+typedef void (*walk_callback_t)(const uint8_t *, size_t, void *);
 
-void usb_dp_walk_simple(uint8_t *, size_t, usb_dp_descriptor_nesting_t *,
-    void (*)(uint8_t *, size_t, void *), void *);
+const uint8_t *usb_dp_get_nested_descriptor(const usb_dp_parser_t *,
+    const usb_dp_parser_data_t *, const uint8_t *);
+const uint8_t *usb_dp_get_sibling_descriptor(const usb_dp_parser_t *,
+    const usb_dp_parser_data_t *, const uint8_t *, const uint8_t *);
+
+void usb_dp_walk_simple(uint8_t *, size_t, const usb_dp_descriptor_nesting_t *,
+    walk_callback_t, void *);
 
 #endif

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;
@@ -158 +158 @@
         usb_endpoint_description_t **endpoints;
         /** Driver ops. */
-        usb_driver_ops_t *ops;
+        const usb_driver_ops_t *ops;
 } usb_driver_t;
 
@@ -168 +168 @@
 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,
+    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 *);
+void * usb_device_data_alloc(usb_device_t *, size_t);
 
-size_t usb_interface_count_alternates(uint8_t *, size_t, uint8_t);
-int usb_alternate_interfaces_create(uint8_t *, size_t, int,
+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 **);
 

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

@@ -171 +171 @@
 int usb_pipe_probe_default_control(usb_pipe_t *);
 int usb_pipe_initialize_from_configuration(usb_endpoint_mapping_t *,
-    size_t, uint8_t *, size_t, usb_device_connection_t *);
+    size_t, const uint8_t *, size_t, usb_device_connection_t *);
 int usb_pipe_register_with_speed(usb_pipe_t *, usb_speed_t,
     unsigned int, usb_hc_connection_t *);