Changeset bba0f1fc in mainline

Timestamp:

2011-09-23T11:50:29Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d6e2938

Parents:

b3433a2

Message:

usbhub: Use generic device requests for hub device features.

According to the specs. ClearHubFeature is equivalent to class specific device request ClearFeature.
Remove unused code.

Location:

uspace/drv/bus/usb/usbhub

Files:

• usbhub.c (modified) (2 diffs)
• utils.h (modified) (2 diffs)

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -59 +59 @@
 /** Standard get hub global status request */
 static const usb_device_request_setup_packet_t get_hub_status_request = {
-        .index = 0,
         .request_type = USB_HUB_REQ_TYPE_GET_HUB_STATUS,
         .request = USB_HUB_REQUEST_GET_STATUS,
+        .index = 0,
         .value = 0,
         .length = sizeof(usb_hub_status_t),
@@ -441 +441 @@
                  * Just ACK the change.
                  */
-                const int opResult = usb_hub_clear_feature(
-                    control_pipe, USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
+                const int opResult = usb_request_clear_feature(
+                    control_pipe, USB_REQUEST_TYPE_CLASS,
+                    USB_REQUEST_RECIPIENT_DEVICE,
+                    USB_HUB_FEATURE_C_HUB_LOCAL_POWER, 0);
                 if (opResult != EOK) {
-                        usb_log_error("Cannot clear hub power change flag: "
-                            "%s\n",
+                        usb_log_error(
+                            "Failed to clear hub power change flag: %s.\n",
                             str_error(opResult));
                 }

uspace/drv/bus/usb/usbhub/utils.h

@@ -50 +50 @@
 #include "usbhub.h"
 
-//************
-//
-// convenience define for malloc
-//
-//************
-
-/**
- * Set the device request to be a get hub descriptor request.
- * @warning the size is allways set to USB_HUB_MAX_DESCRIPTOR_SIZE
- * @param request
- * @param addr
- */
-static inline void usb_hub_set_descriptor_request(
-    usb_device_request_setup_packet_t *request )
-{
-        request->index = 0;
-        request->request_type = USB_HUB_REQ_TYPE_GET_DESCRIPTOR;
-        request->request = USB_HUB_REQUEST_GET_DESCRIPTOR;
-        request->value_high = USB_DESCTYPE_HUB;
-        request->value_low = 0;
-        request->length = USB_HUB_MAX_DESCRIPTOR_SIZE;
-}
-
 /**
  * Clear feature on hub port.
@@ -121 +98 @@
 }
 
-/**
- * Clear feature on hub port.
- *
- * @param pipe pipe to hub control endpoint
- * @param feature Feature selector
- * @return Operation result
- */
-static inline int usb_hub_clear_feature(usb_pipe_t *pipe,
-    usb_hub_class_feature_t feature) {
-
-        usb_device_request_setup_packet_t clear_request = {
-                .request_type = USB_HUB_REQ_TYPE_CLEAR_HUB_FEATURE,
-                .request = USB_DEVREQ_CLEAR_FEATURE,
-                .length = 0,
-                .index = 0
-        };
-        clear_request.value = feature;
-        return usb_pipe_control_write(pipe, &clear_request,
-            sizeof (clear_request), NULL, 0);
-}
-
-/**
- * Clear feature on hub port.
- *
- * @param pipe pipe to hub control endpoint
- * @param feature Feature selector
- * @return Operation result
- */
-static inline int usb_hub_set_feature(usb_pipe_t *pipe,
-    usb_hub_class_feature_t feature)
-{
-
-        usb_device_request_setup_packet_t clear_request = {
-                .request_type = USB_HUB_REQ_TYPE_CLEAR_HUB_FEATURE,
-                .request = USB_DEVREQ_SET_FEATURE,
-                .length = 0,
-                .index = 0
-        };
-        clear_request.value = feature;
-        return usb_pipe_control_write(pipe, &clear_request,
-            sizeof (clear_request), NULL, 0);
-}
-
 void * usb_create_serialized_hub_descriptor(usb_hub_descriptor_t *descriptor);