Changeset c68c713c in mainline

Timestamp:

2017-10-04T14:10:11Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

a0a0d9f4

Parents:

816335c

Message:

Cleanup in constants and other small adjustments.

Location:

uspace/drv/bus/usb

Files:

• usbhub/usbhub.c (modified) (2 diffs)
• xhci/rh.c (modified) (4 diffs)

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

@@ -236 +236 @@
         /* It is an error condition if we didn't receive enough data */
         if (change_bitmap_size == 0) {
+                usb_log_warning("(%p) USB hub stopped polling", hub);
                 return false;
         }
@@ -253 +254 @@
                 }
         }
+        usb_log_warning("(%p) USB hub continued polling", hub);
         return true;
 }

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

@@ -61 +61 @@
         header->length = sizeof(usb_hub_descriptor_header_t);
         header->descriptor_type = USB_DESCTYPE_HUB;
-        /* FIXME: Use hcs_params1 and cap to 0x7F */
-        header->port_count = 0x7F;
+        header->port_count = XHCI_MAX_PORTS;
         header->characteristics =
                     HUB_CHAR_NO_POWER_SWITCH_FLAG | HUB_CHAR_NO_OC_FLAG;
@@ -68 +67 @@
         header->max_current = 0;
 
-        return virthub_base_init(&rh->base, "xhci-rh", &ops, rh, NULL,
+        return virthub_base_init(&rh->base, "xhci", &ops, rh, NULL,
             header, HUB_STATUS_CHANGE_PIPE);
 }
@@ -347 +346 @@
         assert(hub);
 
-        const uint16_t ports = 255; /* FIXME: Fetch this from somewhere. */
-        if (!setup_packet->index || setup_packet->index > ports) {
+        if (!setup_packet->index || setup_packet->index > XHCI_MAX_PORTS) {
                 return ESTALL;
         }
@@ -431 +429 @@
                 return ESTALL;
 
-        /* TODO: Set this based on the received event TRBs. */
         memset(buffer, 0, 16);
         *actual_size = 16;
-
-        /* TODO: Set to EOK if something happened. */
         return ENAK;
 }