Changeset 58d4880 in mainline

Timestamp:

2015-07-05T04:02:22Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b74ec299

Parents:

51cc6cef

Message:

uhci/rh: Poll the port status locally and in specified intervals

Significantly reduces uhci driver cpu usage

File:

• uspace/drv/bus/usb/uhci/uhci_rh.c (modified) (2 diffs)

uspace/drv/bus/usb/uhci/uhci_rh.c

@@ -107 +107 @@
                 .endpoint = batch->ep->endpoint
         }};
-        batch->error = virthub_base_request(&instance->base, target,
-            usb_transfer_batch_direction(batch), (void*)batch->setup_buffer,
-            batch->buffer, batch->buffer_size, &batch->transfered_size);
+        do {
+                batch->error = virthub_base_request(&instance->base, target,
+                    usb_transfer_batch_direction(batch), (void*)batch->setup_buffer,
+                    batch->buffer, batch->buffer_size, &batch->transfered_size);
+                if (batch->error == ENAK)
+                        async_usleep(instance->base.endpoint_descriptor.poll_interval * 1000);
+                //TODO This is flimsy, but we can't exit early because
+                //ENAK is technically an error condition
+        } while (batch->error == ENAK);
         usb_transfer_batch_finish(batch, NULL);
         usb_transfer_batch_destroy(batch);
@@ -421 +427 @@
         ((uint8_t *)buffer)[0] = status;
         *actual_size = 1;
-        return EOK;
+        return (status != 0 ? EOK : ENAK);
 }