Changeset b4b534ac in mainline for uspace/drv/bus/usb/vhc/hub/virthubops.c

Timestamp:

2016-07-22T08:24:47Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jan.vesely/helenos/usb

File:

• uspace/drv/bus/usb/vhc/hub/virthubops.c (modified) (2 diffs)

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

@@ -340 +340 @@
 
 
-/** IN class request. */
-#define CLASS_REQ_IN(recipient) \
-        USBVIRT_MAKE_CONTROL_REQUEST_TYPE(USB_DIRECTION_IN, \
-        USBVIRT_REQUEST_TYPE_CLASS, recipient)
-/** OUT class request. */
-#define CLASS_REQ_OUT(recipient) \
-        USBVIRT_MAKE_CONTROL_REQUEST_TYPE(USB_DIRECTION_OUT, \
-        USBVIRT_REQUEST_TYPE_CLASS, recipient)
 
 /** Recipient: other. */
@@ -353 +345 @@
 /** Recipient: device. */
 #define REC_DEVICE USB_REQUEST_RECIPIENT_DEVICE
-/** Direction: in. */
-#define DIR_IN USB_DIRECTION_IN
-/** Direction: out. */
-#define DIR_OUT USB_DIRECTION_OUT
-
-
-/** Create a class request.
- *
- * @param direction Request direction.
- * @param recipient Request recipient.
- * @param req Request code.
- */
-#define CLASS_REQ(direction, recipient, req) \
-        .req_direction = direction, \
-        .req_recipient = recipient, \
-        .req_type = USB_REQUEST_TYPE_CLASS, \
-        .request = req
-
-/** Create a standard request.
- *
- * @param direction Request direction.
- * @param recipient Request recipient.
- * @param req Request code.
- */
-#define STD_REQ(direction, recipient, req) \
-        .req_direction = direction, \
-        .req_recipient = recipient, \
-        .req_type = USB_REQUEST_TYPE_STANDARD, \
-        .request = req
+
 
 /** Hub operations on control endpoint zero. */
 static usbvirt_control_request_handler_t endpoint_zero_handlers[] = {
         {
-                STD_REQ(DIR_IN, REC_DEVICE, USB_DEVREQ_GET_DESCRIPTOR),
-                .name = "GetDescriptor",
+                STD_REQ_IN(USB_REQUEST_RECIPIENT_DEVICE, USB_DEVREQ_GET_DESCRIPTOR),
+                .name = "GetStdDescriptor",
                 .callback = req_get_descriptor
         },
         {
-                CLASS_REQ(DIR_IN, REC_DEVICE, USB_DEVREQ_GET_DESCRIPTOR),
-                .name = "GetDescriptor",
+                CLASS_REQ_IN(REC_DEVICE, USB_DEVREQ_GET_DESCRIPTOR),
+                .name = "GetClassDescriptor",
                 .callback = req_get_descriptor
         },
         {
-                CLASS_REQ(DIR_IN, REC_OTHER, USB_HUB_REQUEST_GET_STATUS),
+                CLASS_REQ_IN(REC_OTHER, USB_HUB_REQUEST_GET_STATUS),
                 .name = "GetPortStatus",
                 .callback = req_get_port_status
         },
         {
-                CLASS_REQ(DIR_OUT, REC_DEVICE, USB_HUB_REQUEST_CLEAR_FEATURE),
+                CLASS_REQ_OUT(REC_DEVICE, USB_HUB_REQUEST_CLEAR_FEATURE),
                 .name = "ClearHubFeature",
                 .callback = req_clear_hub_feature
         },
         {
-                CLASS_REQ(DIR_OUT, REC_OTHER, USB_HUB_REQUEST_CLEAR_FEATURE),
+                CLASS_REQ_OUT(REC_OTHER, USB_HUB_REQUEST_CLEAR_FEATURE),
                 .name = "ClearPortFeature",
                 .callback = req_clear_port_feature
         },
         {
-                CLASS_REQ(DIR_IN, REC_OTHER, USB_HUB_REQUEST_GET_STATE),
+                CLASS_REQ_IN(REC_OTHER, USB_HUB_REQUEST_GET_STATE),
                 .name = "GetBusState",
                 .callback = req_get_bus_state
         },
         {
-                CLASS_REQ(DIR_IN, REC_DEVICE, USB_HUB_REQUEST_GET_DESCRIPTOR),
+                CLASS_REQ_IN(REC_DEVICE, USB_HUB_REQUEST_GET_DESCRIPTOR),
                 .name = "GetHubDescriptor",
                 .callback = req_get_descriptor
         },
         {
-                CLASS_REQ(DIR_IN, REC_DEVICE, USB_HUB_REQUEST_GET_STATUS),
+                CLASS_REQ_IN(REC_DEVICE, USB_HUB_REQUEST_GET_STATUS),
                 .name = "GetHubStatus",
                 .callback = req_get_hub_status
         },
         {
-                CLASS_REQ(DIR_IN, REC_OTHER, USB_HUB_REQUEST_GET_STATUS),
+                CLASS_REQ_IN(REC_OTHER, USB_HUB_REQUEST_GET_STATUS),
                 .name = "GetPortStatus",
                 .callback = req_get_port_status
         },
         {
-                CLASS_REQ(DIR_OUT, REC_DEVICE, USB_HUB_REQUEST_SET_FEATURE),
+                CLASS_REQ_OUT(REC_DEVICE, USB_HUB_REQUEST_SET_FEATURE),
                 .name = "SetHubFeature",
                 .callback = req_set_hub_feature
         },
         {
-                CLASS_REQ(DIR_OUT, REC_OTHER, USB_HUB_REQUEST_SET_FEATURE),
+                CLASS_REQ_OUT(REC_OTHER, USB_HUB_REQUEST_SET_FEATURE),
                 .name = "SetPortFeature",
                 .callback = req_set_port_feature