Index: uspace/lib/usbdev/include/usb/dev/request.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/request.h	(revision 2f80b866a195d42afdd303ad12934281dcc1a897)
+++ uspace/lib/usbdev/include/usb/dev/request.h	(revision aeeddebec17dfc9de8a699b88923c6c447cb94b9)
@@ -84,12 +84,9 @@
 #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. */