Changeset 92574f4 in mainline for uspace/lib/usb/include/usb/request.h

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/lib/usb/include/usb/request.h (modified) (3 diffs)

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

@@ -37 +37 @@
 
 #include <sys/types.h>
+#include <l18n/langs.h>
 #include <usb/usb.h>
 #include <usb/pipes.h>
 #include <usb/descriptor.h>
+
+/** Standard device request. */
+typedef enum {
+        USB_DEVREQ_GET_STATUS = 0,
+        USB_DEVREQ_CLEAR_FEATURE = 1,
+        USB_DEVREQ_SET_FEATURE = 3,
+        USB_DEVREQ_SET_ADDRESS = 5,
+        USB_DEVREQ_GET_DESCRIPTOR = 6,
+        USB_DEVREQ_SET_DESCRIPTOR = 7,
+        USB_DEVREQ_GET_CONFIGURATION = 8,
+        USB_DEVREQ_SET_CONFIGURATION = 9,
+        USB_DEVREQ_GET_INTERFACE = 10,
+        USB_DEVREQ_SET_INTERFACE = 11,
+        USB_DEVREQ_SYNCH_FRAME = 12,
+        USB_DEVREQ_LAST_STD
+} usb_stddevreq_t;
+
+/** Device request setup packet.
+ * The setup packet describes the request.
+ */
+typedef struct {
+        /** Request type.
+         * The type combines transfer direction, request type and
+         * intended recipient.
+         */
+        uint8_t request_type;
+        /** Request identification. */
+        uint8_t request;
+        /** Main parameter to the request. */
+        union {
+                uint16_t value;
+                /* FIXME: add #ifdefs according to host endianess */
+                struct {
+                        uint8_t value_low;
+                        uint8_t value_high;
+                };
+        };
+        /** Auxiliary parameter to the request.
+         * Typically, it is offset to something.
+         */
+        uint16_t index;
+        /** Length of extra data. */
+        uint16_t length;
+} __attribute__ ((packed)) usb_device_request_setup_packet_t;
 
 int usb_control_request_set(usb_endpoint_pipe_t *,
@@ -52 +97 @@
 int usb_request_get_descriptor(usb_endpoint_pipe_t *, usb_request_type_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,
+    uint8_t, uint8_t, uint16_t, void **, size_t *);
 int usb_request_get_device_descriptor(usb_endpoint_pipe_t *,
     usb_standard_device_descriptor_t *);
@@ -60 +107 @@
 int usb_request_set_configuration(usb_endpoint_pipe_t *, uint8_t);
 
+int usb_request_get_supported_languages(usb_endpoint_pipe_t *,
+    l18_win_locales_t **, size_t *);
+int usb_request_get_string(usb_endpoint_pipe_t *, size_t, l18_win_locales_t,
+    char **);
+
 #endif
 /**