Changeset 9d3536e in mainline

Timestamp:

2018-01-20T22:17:40Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

defaab2

Parents:

d648e83

Message:

usbhub: clear ignored changes and report them only once

Location:

uspace/drv/bus/usb/usbhub

Files:

• port.c (modified) (3 diffs)
• usbhub.c (modified) (2 diffs)

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

@@ -255 +255 @@
         }
 
-        for (uint32_t feature = 0; feature < sizeof(usb_port_status_t) * 8; ++feature) {
+        for (uint32_t feature = 16; feature < sizeof(usb_port_status_t) * 8; ++feature) {
                 uint32_t mask = 1 << feature;
 
@@ -261 +261 @@
                         continue;
 
+                /* Clear the change so it won't come again */
+                usb_hub_clear_port_feature(port->hub, port->port_number, feature);
+
                 if (!port_change_handlers[feature])
                         continue;
@@ -266 +269 @@
                 /* ACK this change */
                 status &= ~mask;
-                usb_hub_clear_port_feature(port->hub, port->port_number, feature);
 
                 port_change_handlers[feature](port, status);
         }
 
-        port_log(debug2, port, "Port status after handling: %#08" PRIx32, status);
+        /* Check for changes we ignored */
+        if (status & 0xffff0000) {
+                port_log(debug, port, "Port status change igored. Status: %#08" PRIx32, status);
+        }
 }
 

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

@@ -560 +560 @@
         size_t recv_size;
 
+        uint32_t buffer;
         const int rc = usb_pipe_control_read(hub->control_pipe,
             &request, sizeof(usb_device_request_setup_packet_t),
-            status, sizeof(*status), &recv_size);
+            &buffer, sizeof(buffer), &recv_size);
         if (rc != EOK)
                 return rc;
@@ -569 +570 @@
                 return ELIMIT;
 
+        *status = uint32_usb2host(buffer);
         return EOK;
 }