Changeset 7aaed09 in mainline for uspace/lib/usbdev/include/usb/dev/pipes.h

Timestamp:

2011-12-18T14:02:30Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (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/pipes.h (modified) (4 diffs)

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

@@ -141 +141 @@
 typedef struct {
         /** Endpoint pipe. */
-        usb_pipe_t *pipe;
+        usb_pipe_t pipe;
         /** Endpoint description. */
         const usb_endpoint_description_t *description;
@@ -149 +149 @@
         int interface_setting;
         /** Found descriptor fitting the description. */
-        usb_standard_endpoint_descriptor_t *descriptor;
+        const usb_standard_endpoint_descriptor_t *descriptor;
         /** Interface descriptor the endpoint belongs to. */
-        usb_standard_interface_descriptor_t *interface;
+        const usb_standard_interface_descriptor_t *interface;
         /** Whether the endpoint was actually found. */
         bool present;
@@ -172 +172 @@
 int usb_pipe_initialize_from_configuration(usb_endpoint_mapping_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 *);
 int usb_pipe_register(usb_pipe_t *, unsigned int, usb_hc_connection_t *);
 int usb_pipe_unregister(usb_pipe_t *, usb_hc_connection_t *);
@@ -181 +179 @@
 
 int usb_pipe_read(usb_pipe_t *, void *, size_t, size_t *);
-int usb_pipe_write(usb_pipe_t *, void *, size_t);
+int usb_pipe_write(usb_pipe_t *, const void *, size_t);
 
 int usb_pipe_control_read(usb_pipe_t *, const void *, size_t,