Changeset ace12560 in mainline for uspace/lib/usb/include

Timestamp:

2011-02-20T21:52:43Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

b317b0b, d37b235

Parents:

62066b4 (diff), 41e645c (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:

yet another merge with usb/development

Location:

uspace/lib/usb/include/usb

Files:

• ddfiface.h (added)
• dp.h (modified) (1 diff)
• pipes.h (modified) (2 diffs)
• recognise.h (modified) (1 diff)
• usbdrv.h (modified) (1 diff)

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

@@ -45 +45 @@
 } usb_dp_descriptor_nesting_t;
 
+extern usb_dp_descriptor_nesting_t usb_dp_standard_descriptor_nesting[];
+
 typedef struct {
         usb_dp_descriptor_nesting_t *nesting;

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

@@ -107 +107 @@
         /** Endpoint description. */
         const usb_endpoint_description_t *description;
+        /** Interface number the endpoint must belong to (-1 for any). */
+        const int interface_no;
         /** Found descriptor fitting the description. */
         usb_standard_endpoint_descriptor_t *descriptor;
@@ -121 +123 @@
 int usb_device_connection_initialize(usb_device_connection_t *,
     devman_handle_t, usb_address_t);
+
+int usb_device_get_assigned_interface(device_t *);
 
 int usb_endpoint_pipe_initialize(usb_endpoint_pipe_t *,

uspace/lib/usb/include/usb/recognise.h

@@ -41 +41 @@
 #include <ipc/devman.h>
 
+int usb_device_create_match_ids_from_interface(
+    const usb_standard_device_descriptor_t *,
+    const usb_standard_interface_descriptor_t *, match_id_list_t *);
+
 int usb_device_create_match_ids(usb_endpoint_pipe_t *, match_id_list_t *);
 

uspace/lib/usb/include/usb/usbdrv.h

@@ -103 +103 @@
 int usb_drv_create_match_ids_from_device_descriptor(match_id_list_t *,
     const usb_standard_device_descriptor_t *);
-int usb_drv_create_match_ids_from_configuration_descriptor(match_id_list_t *,
-    const void *, size_t);
-
 
 #endif