Changeset 41ef5b9 in mainline for uspace/lib/usb/include/usb/request.h

Timestamp:

2011-03-21T17:16:10Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

4d0c40b

Parents:

fd9f6e4c (diff), 434ef65 (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 from usb/development

File:

• uspace/lib/usb/include/usb/request.h (modified) (1 diff)

uspace/lib/usb/include/usb/request.h

@@ -86 +86 @@
 } __attribute__ ((packed)) usb_device_request_setup_packet_t;
 
-int usb_control_request_set(usb_endpoint_pipe_t *,
+int usb_control_request_set(usb_pipe_t *,
     usb_request_type_t, usb_request_recipient_t, uint8_t,
     uint16_t, uint16_t, void *, size_t);
 
-int usb_control_request_get(usb_endpoint_pipe_t *,
+int usb_control_request_get(usb_pipe_t *,
     usb_request_type_t, usb_request_recipient_t, uint8_t,
     uint16_t, uint16_t, void *, size_t, size_t *);
 
-int usb_request_set_address(usb_endpoint_pipe_t *, usb_address_t);
-int usb_request_get_descriptor(usb_endpoint_pipe_t *, usb_request_type_t,
+int usb_request_get_status(usb_pipe_t *, usb_request_recipient_t,
+    uint16_t, uint16_t *);
+int usb_request_clear_feature(usb_pipe_t *, usb_request_type_t,
+    usb_request_recipient_t, uint16_t, uint16_t);
+int usb_request_set_feature(usb_pipe_t *, usb_request_type_t,
+    usb_request_recipient_t, uint16_t, uint16_t);
+int usb_request_set_address(usb_pipe_t *, usb_address_t);
+int usb_request_get_descriptor(usb_pipe_t *, usb_request_type_t,
     usb_request_recipient_t, uint8_t, uint8_t, uint16_t, void *, size_t, 
     size_t *);
-int usb_request_get_descriptor_alloc(usb_endpoint_pipe_t *, usb_request_type_t,
+int usb_request_get_descriptor_alloc(usb_pipe_t *, usb_request_type_t,
     usb_request_recipient_t, uint8_t, uint8_t, uint16_t, void **, size_t *);
-int usb_request_get_device_descriptor(usb_endpoint_pipe_t *,
+int usb_request_get_device_descriptor(usb_pipe_t *,
     usb_standard_device_descriptor_t *);
-int usb_request_get_bare_configuration_descriptor(usb_endpoint_pipe_t *, int,
+int usb_request_get_bare_configuration_descriptor(usb_pipe_t *, int,
     usb_standard_configuration_descriptor_t *);
-int usb_request_get_full_configuration_descriptor(usb_endpoint_pipe_t *, int,
+int usb_request_get_full_configuration_descriptor(usb_pipe_t *, int,
     void *, size_t, size_t *);
-int usb_request_get_full_configuration_descriptor_alloc(usb_endpoint_pipe_t *,
+int usb_request_get_full_configuration_descriptor_alloc(usb_pipe_t *,
     int, void **, size_t *);
-int usb_request_set_configuration(usb_endpoint_pipe_t *, uint8_t);
+int usb_request_set_descriptor(usb_pipe_t *, usb_request_type_t,
+    usb_request_recipient_t, uint8_t, uint8_t, uint16_t, void *, size_t);
+int usb_request_get_configuration(usb_pipe_t *, uint8_t *);
+int usb_request_set_configuration(usb_pipe_t *, uint8_t);
+int usb_request_get_interface(usb_pipe_t *, uint8_t, uint8_t *);
+int usb_request_set_interface(usb_pipe_t *, uint8_t, uint8_t);
 
-int usb_request_get_supported_languages(usb_endpoint_pipe_t *,
+int usb_request_get_supported_languages(usb_pipe_t *,
     l18_win_locales_t **, size_t *);
-int usb_request_get_string(usb_endpoint_pipe_t *, size_t, l18_win_locales_t,
+int usb_request_get_string(usb_pipe_t *, size_t, l18_win_locales_t,
     char **);