Changeset 5f97ef44 in mainline for uspace/drv/bus/usb/uhci

Timestamp:

2018-07-13T14:10:15Z (8 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

e3787a0

Parents:

9912f49

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-13 14:08:57)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-13 14:10:15)

Message:

Sleep is more natural as part of the fibril API.
(the implementation will move later)

Location:

uspace/drv/bus/usb/uhci

Files:

• hc.c (modified) (4 diffs)
• uhci_rh.c (modified) (2 diffs)

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

@@ -280 +280 @@
         /* Reset everything, who knows what touched it before us */
         pio_write_16(&registers->usbcmd, UHCI_CMD_GLOBAL_RESET);
-        async_usleep(50000); /* 50ms according to USB spec(root hub reset) */
+        fibril_usleep(50000); /* 50ms according to USB spec(root hub reset) */
         pio_write_16(&registers->usbcmd, 0);
 
@@ -286 +286 @@
         pio_write_16(&registers->usbcmd, UHCI_CMD_HCRESET);
         do {
-                async_usleep(10);
+                fibril_usleep(10);
         } while ((pio_read_16(&registers->usbcmd) & UHCI_CMD_HCRESET) != 0);
 
@@ -405 +405 @@
          * the buffers.
          */
-        async_usleep(20000);
+        fibril_usleep(20000);
         batch->base.error = EINTR;
         batch->base.transferred_size = 0;
@@ -660 +660 @@
                             (void *) expected_pa, (void *) real_pa);
                 }
-                async_usleep(UHCI_DEBUGER_TIMEOUT);
+                fibril_usleep(UHCI_DEBUGER_TIMEOUT);
         }
         return EOK;

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

@@ -110 +110 @@
                     batch->dma_buffer.virt, batch->size, &batch->transferred_size);
                 if (batch->error == ENAK)
-                        async_usleep(instance->base.endpoint_descriptor.poll_interval * 1000);
+                        fibril_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
@@ -147 +147 @@
         port_status |= STATUS_IN_RESET;
         pio_write_16(port, port_status);
-        async_usleep(50000);
+        fibril_usleep(50000);
         port_status = pio_read_16(port);
         port_status &= ~STATUS_IN_RESET;