Changeset d14ca59 in mainline

Timestamp:

2017-10-03T20:50:24Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

f8199ab

Parents:

d07b052

Message:

Removed GetHubStatus request implementation.

File:

• uspace/drv/bus/usb/xhci/rh.c (modified) (5 diffs)

uspace/drv/bus/usb/xhci/rh.c

@@ -62 +62 @@
         header->max_current = 0;
 
-        return virthub_base_init(&rh->base, "xhci rh", &ops, rh, NULL,
+        return virthub_base_init(&rh->base, "xhci-rh", &ops, rh, NULL,
             header, HUB_STATUS_CHANGE_PIPE);
 }
@@ -298 +298 @@
 }
 
-/** Hub status request handler.
- * @param device Virtual hub device
- * @param setup_packet USB setup stage data.
- * @param[out] data destination data buffer, size must be at least
- *             setup_packet->length bytes
- * @param[out] act_size Sized of the valid response part of the buffer.
- * @return Error code.
- */
-static int req_get_status(usbvirt_device_t *device,
-    const usb_device_request_setup_packet_t *setup_packet,
-    uint8_t *data, size_t *act_size)
-{
-        /* TODO: Implement me! */
-        usb_log_debug2("Called req_get_status().");
-        return EOK;
-}
-
 /** Hub set feature request handler.
  * @param device Virtual hub device
@@ -390 +373 @@
  * @param buffer_size Bytes available in buffer
  * @param actual_size Size us the used part of the dest buffer.
- *
- * Produces status mask. Bit 0 indicates hub status change the other bits
- * represent port status change. Endian does not matter as UHCI root hubs
- * only need 1 byte.
  */
 static int req_status_change_handler(usbvirt_device_t *device,
@@ -399 +378 @@
     void *buffer, size_t buffer_size, size_t *actual_size)
 {
-        /* TODO: Implement me! */
         usb_log_debug2("Called req_status_change_handler().");
         return ENAK;
@@ -446 +424 @@
                 CLASS_REQ_IN(USB_REQUEST_RECIPIENT_DEVICE, USB_HUB_REQUEST_GET_STATUS),
                 .name = "GetHubStatus",
-                .callback = req_get_status,
+                /* XHCI root hub has no power source,
+                 * over-current is reported by port */
+                .callback = virthub_base_get_null_status,
         },
         {