Changeset 2a6e2358 in mainline

Timestamp:

2013-01-05T18:23:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b997e7b

Parents:

c9399c0

Message:

libusbvirt: Make request creation macros available in header.

Location:

uspace

Files:

• app/vuhid/main.c (modified) (1 diff)
• drv/bus/usb/vhc/hub/virthubops.c (modified) (1 diff)
• lib/usbvirt/include/usbvirt/device.h (modified) (2 diffs)
• lib/usbvirt/src/stdreq.c (modified) (1 diff)

uspace/app/vuhid/main.c

@@ -57 +57 @@
 static usbvirt_control_request_handler_t endpoint_zero_handlers[] = {
         {
-                .request_type = SETUP_REQUEST_TO_HOST(USB_REQUEST_TYPE_STANDARD,  USB_REQUEST_RECIPIENT_INTERFACE),
-                .request = USB_DEVREQ_GET_DESCRIPTOR,
+                STD_REQ_IN(USB_REQUEST_RECIPIENT_INTERFACE, USB_DEVREQ_GET_DESCRIPTOR),
                 .name = "Get_Descriptor",
                 .callback = req_get_descriptor
         },
         {
-                .request_type = SETUP_REQUEST_TO_DEVICE(USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE),
-                .request = USB_HIDREQ_SET_PROTOCOL,
+                CLASS_REQ_OUT(USB_REQUEST_RECIPIENT_INTERFACE, USB_HIDREQ_SET_PROTOCOL),
                 .name = "Set_Protocol",
                 .callback = req_set_protocol
         },
         {
-                .request_type = SETUP_REQUEST_TO_DEVICE(USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE),
-                .request = USB_HIDREQ_SET_REPORT,
+                CLASS_REQ_OUT(USB_REQUEST_RECIPIENT_INTERFACE, USB_HIDREQ_SET_REPORT),
                 .name = "Set_Report",
                 .callback = req_set_report

uspace/drv/bus/usb/vhc/hub/virthubops.c

@@ -347 +347 @@
 
 
-/** Create a class request to get data from device
- *
- * @param rec Request recipient.
- * @param req Request code.
- */
-#define CLASS_REQ_IN(rec, req) \
-        .request_type = SETUP_REQUEST_TO_HOST(USB_REQUEST_TYPE_CLASS, rec), \
-        .request = req
-
-/** Create a class request to send data to device
- *
- * @param rec Request recipient.
- * @param req Request code.
- */
-#define CLASS_REQ_OUT(rec, req) \
-        .request_type = SETUP_REQUEST_TO_DEVICE(USB_REQUEST_TYPE_CLASS, rec), \
-        .request = req
-
 /** Hub operations on control endpoint zero. */
 static usbvirt_control_request_handler_t endpoint_zero_handlers[] = {
         {
-                .request_type = SETUP_REQUEST_TO_HOST(USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE),
-                .request = USB_DEVREQ_GET_DESCRIPTOR,
+                STD_REQ_IN(USB_REQUEST_RECIPIENT_DEVICE, USB_DEVREQ_GET_DESCRIPTOR),
                 .name = "GetDescriptor",
                 .callback = req_get_descriptor

uspace/lib/usbvirt/include/usbvirt/device.h

@@ -41 +41 @@
 #include <async.h>
 
+
 /** Maximum number of endpoints supported by virtual USB. */
 #define USBVIRT_ENDPOINT_MAX 16
@@ -87 +88 @@
     const usb_device_request_setup_packet_t *setup_packet,
     uint8_t *data, size_t *act_data_size);
+
+/** Create a class request to get data from device
+ *
+ * @param rec Request recipient.
+ * @param req Request code.
+ */
+#define CLASS_REQ_IN(rec, req) \
+        .request_type = SETUP_REQUEST_TO_HOST(USB_REQUEST_TYPE_CLASS, rec), \
+        .request = req
+
+/** Create a class request to send data to device
+ *
+ * @param rec Request recipient.
+ * @param req Request code.
+ */
+#define CLASS_REQ_OUT(rec, req) \
+        .request_type = SETUP_REQUEST_TO_DEVICE(USB_REQUEST_TYPE_CLASS, rec), \
+        .request = req
+
+/** Create a standard request to get data from device
+ *
+ * @param rec Request recipient.
+ * @param req Request code.
+ */
+#define STD_REQ_IN(rec, req) \
+        .request_type = SETUP_REQUEST_TO_HOST(USB_REQUEST_TYPE_STANDARD, rec), \
+        .request = req
+
+/** Create a standard request to send data to device
+ *
+ * @param rec Request recipient.
+ * @param req Request code.
+ */
+#define STD_REQ_OUT(rec, req) \
+        .request_type = SETUP_REQUEST_TO_DEVICE(USB_REQUEST_TYPE_STANDARD, rec), \
+        .request = req
 
 /** Callback for control request on a virtual USB device.

uspace/lib/usbvirt/src/stdreq.c

@@ -192 +192 @@
 usbvirt_control_request_handler_t library_handlers[] = {
         {
-                .request_type = SETUP_REQUEST_TO_DEVICE(USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE),
-                .request = USB_DEVREQ_SET_ADDRESS,
+                STD_REQ_OUT(USB_REQUEST_RECIPIENT_DEVICE, USB_DEVREQ_SET_ADDRESS),
                 .name = "SetAddress",
                 .callback = req_set_address
         },
         {
-                .request_type = SETUP_REQUEST_TO_HOST(USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE),
-                .request = USB_DEVREQ_GET_DESCRIPTOR,
+                STD_REQ_IN(USB_REQUEST_RECIPIENT_DEVICE, USB_DEVREQ_GET_DESCRIPTOR),
                 .name = "GetDescriptor",
                 .callback = req_get_descriptor
         },
         {
-                .request_type = SETUP_REQUEST_TO_DEVICE(USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE),
-                .request = USB_DEVREQ_SET_CONFIGURATION,
+                STD_REQ_OUT(USB_REQUEST_RECIPIENT_DEVICE, USB_DEVREQ_SET_CONFIGURATION),
                 .name = "SetConfiguration",
                 .callback = req_set_configuration