Changeset 971fbfde in mainline

Timestamp:

2012-12-22T21:52:10Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

6326155b

Parents:

f8d43aa

Message:

usb: Move request format structure to its own header in libusb.

Location:

uspace/lib

Files:

• usb/include/usb/request.h (added)
• 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). */
@@ -57 +58 @@
 #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 __attribute__ ((packed)) {
-                uint16_t value;
-                /* FIXME: add #ifdefs according to host endianness */
-                struct __attribute__ ((packed)) {
-                        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 assert[(sizeof(usb_device_request_setup_packet_t) == 8) ? 1: -1];
 
 int usb_control_request_set(usb_pipe_t *,