Changes in uspace/lib/usbdev/include/usb/dev/request.h [0eb2a0f:9d58539] in mainline

File:

• uspace/lib/usbdev/include/usb/dev/request.h (modified) (2 diffs)

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

@@ -41 +41 @@
 #include <usb/dev/pipes.h>
 #include <usb/descriptor.h>
-#include <usb/request.h>
+
+/** USB device status - device is self powered (opposed to bus powered). */
+#define USB_DEVICE_STATUS_SELF_POWERED ((uint16_t)(1 << 0))
+
+/** USB device status - remote wake-up signaling is enabled. */
+#define USB_DEVICE_STATUS_REMOTE_WAKEUP ((uint16_t)(1 << 1))
+
+/** USB endpoint status - endpoint is halted (stalled). */
+#define USB_ENDPOINT_STATUS_HALTED ((uint16_t)(1 << 0))
+
+/** USB feature selector - endpoint halt (stall). */
+#define USB_FEATURE_SELECTOR_ENDPOINT_HALT (0)
+
+/** USB feature selector - device remote wake-up. */
+#define USB_FEATURE_SELECTOR_REMOTE_WAKEUP (1)
+
+/** 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;
+#define SETUP_REQUEST_TYPE_DEVICE_TO_HOST (1 << 7)
+#define SETUP_REQUEST_TYPE_GET_TYPE(rt) ((rt >> 5) & 0x3)
+#define SETUP_REQUEST_TYPE_GET_RECIPIENT(rec) (rec & 0x1f)
+#define SETUP_REQUEST_TO_HOST(type, recipient) \
+    (uint8_t)((1 << 7) | ((type & 0x3) << 5) | (recipient & 0x1f))
+#define SETUP_REQUEST_TO_DEVICE(type, recipient) \
+    (uint8_t)(((type & 0x3) << 5) | (recipient & 0x1f))
+
+        /** Request identification. */
+        uint8_t request;
+        /** Main parameter to the request. */
+        union {
+                uint16_t value;
+                /* FIXME: add #ifdefs according to host endianness */
+                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_pipe_t *,
     usb_request_type_t, usb_request_recipient_t, uint8_t,
-    uint16_t, uint16_t, const void *, size_t);
+    uint16_t, uint16_t, void *, size_t);
 
 int usb_control_request_get(usb_pipe_t *,
@@ -69 +135 @@
     void *, size_t, size_t *);
 int usb_request_get_full_configuration_descriptor_alloc(usb_pipe_t *,
-    int, const void **, size_t *);
+    int, void **, size_t *);
 int usb_request_set_descriptor(usb_pipe_t *, usb_request_type_t,
-    usb_request_recipient_t, uint8_t, uint8_t, uint16_t, const void *, size_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);