Changeset b6bade0 in mainline

Timestamp:

2011-12-06T21:03:34Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2963a0d

Parents:

e8d82cb

Message:

libusbdev: Add macros constructing the bitfield instead of duplicated values.

Those values are in libusb usb.h

File:

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

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

@@ -84 +84 @@
 #define SETUP_REQUEST_TYPE_DEVICE_TO_HOST (1 << 7)
 #define SETUP_REQUEST_TYPE_GET_TYPE(rt) ((rt >> 5) & 0x3)
-#define SETUP_REQUEST_TYPE_STANDART 0
-#define SETUP_REQUEST_TYPE_CLASS    1
-#define SETUP_REQUEST_TYPE_VENDOR   2
-#define SETUP_REQUEST_TYPE_GET_RECIPIENT(rt) (rt & 0x1f)
-#define SETUP_REQUEST_TYPE_REC_DEVICE    0
-#define SETUP_REQUEST_TYPE_REC_INTERFACE 1
-#define SETUP_REQUEST_TYPE_REC_ENDPOINT  2
-#define SETUP_REQUEST_TYPE_REC_OTHER     3
+#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. */