Changeset 1824609b in mainline for uspace/lib/usb/include

Timestamp:

2011-02-11T18:16:03Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

345ea18

Parents:

8f198c9 (diff), d321cd7 (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 updated to pipe API

Location:

uspace/lib/usb/include/usb

Files:

• pipes.h (modified) (4 diffs)
• recognise.h (added)
• usbdrv.h (modified) (1 diff)

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

@@ -38 +38 @@
 #include <sys/types.h>
 #include <usb/usb.h>
+#include <usb/descriptor.h>
 #include <ipc/devman.h>
 #include <driver.h>
@@ -73 +74 @@
         usb_direction_t direction;
 
+        /** Maximum packet size for the endpoint. */
+        size_t max_packet_size;
+
         /** Phone to the host controller.
          * Negative when no session is active.
@@ -79 +83 @@
 } usb_endpoint_pipe_t;
 
+
+/** Description of endpoint characteristics. */
+typedef struct {
+        /** Transfer type (e.g. control or interrupt). */
+        usb_transfer_type_t transfer_type;
+        /** Transfer direction (to or from a device). */
+        usb_direction_t direction;
+        /** Interface class this endpoint belongs to (-1 for any). */
+        int interface_class;
+        /** Interface subclass this endpoint belongs to (-1 for any). */
+        int interface_subclass;
+        /** Interface protocol this endpoint belongs to (-1 for any). */
+        int interface_protocol;
+        /** Extra endpoint flags. */
+        unsigned int flags;
+} usb_endpoint_description_t;
+
+/** Mapping of endpoint pipes and endpoint descriptions. */
+typedef struct {
+        /** Endpoint pipe. */
+        usb_endpoint_pipe_t *pipe;
+        /** Endpoint description. */
+        const usb_endpoint_description_t *description;
+        /** Found descriptor fitting the description. */
+        usb_standard_endpoint_descriptor_t *descriptor;
+        /** Interface the endpoint belongs to. */
+        usb_standard_interface_descriptor_t *interface;
+        /** Whether the endpoint was actually found. */
+        bool present;
+} usb_endpoint_mapping_t;
 
 int usb_device_connection_initialize_from_device(usb_device_connection_t *,
@@ -87 +121 @@
 int usb_endpoint_pipe_initialize(usb_endpoint_pipe_t *,
     usb_device_connection_t *,
-    usb_endpoint_t, usb_transfer_type_t, usb_direction_t);
+    usb_endpoint_t, usb_transfer_type_t, size_t, usb_direction_t);
 int usb_endpoint_pipe_initialize_default_control(usb_endpoint_pipe_t *,
     usb_device_connection_t *);
+int usb_endpoint_pipe_initialize_from_configuration(usb_endpoint_mapping_t *,
+    size_t, uint8_t *, size_t, usb_device_connection_t *);
 
 

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

@@ -106 +106 @@
     const void *, size_t);
 
-int usb_drv_create_device_match_ids(int, match_id_list_t *, usb_address_t);
-int usb_drv_register_child_in_devman(int, device_t *, usb_address_t,
-    devman_handle_t *);
-
 
 #endif