Changeset f300523 in mainline for uspace/drv/nic

Timestamp:

2017-11-29T18:43:10Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

39026d7c

Parents:

48b77ed

Message:

Eliminate uses of thread_usleep() in favor of async_usleep(). Obvious cases are in components that don't explicitly create threads.

Location:

uspace/drv/nic

Files:

• e1k/e1k.c (modified) (6 diffs)
• ne2k/dp8390.c (modified) (2 diffs)
• rtl8139/driver.c (modified) (2 diffs)
• rtl8169/driver.c (modified) (5 diffs)

uspace/drv/nic/e1k/e1k.c

@@ -33 +33 @@
  */
 
+#include <async.h>
 #include <assert.h>
 #include <stdio.h>
@@ -38 +39 @@
 #include <adt/list.h>
 #include <align.h>
-#include <thread.h>
 #include <byteorder.h>
 #include <as.h>
@@ -372 +372 @@
                 fibril_mutex_unlock(&e1000->ctrl_lock);
                 
-                thread_usleep(10);
+                async_usleep(10);
                 
                 fibril_mutex_lock(&e1000->ctrl_lock);
@@ -1724 +1724 @@
         
         /* Wait for the reset */
-        thread_usleep(20);
+        async_usleep(20);
         
         /* check if RST_BIT cleared */
@@ -1812 +1812 @@
          * transfers to descriptors.
          */
-        thread_usleep(100);
+        async_usleep(100);
         
         return EOK;
@@ -2238 +2238 @@
         uint32_t eerd = E1000_REG_READ(e1000, E1000_EERD);
         while ((eerd & e1000->info.eerd_done) == 0) {
-                thread_usleep(1);
+                async_usleep(1);
                 eerd = E1000_REG_READ(e1000, E1000_EERD);
         }

uspace/drv/nic/ne2k/dp8390.c

@@ -55 +55 @@
 
 #include <assert.h>
+#include <async.h>
 #include <byteorder.h>
 #include <errno.h>
 #include <stdio.h>
 #include <ddi.h>
-#include <thread.h>
 #include "dp8390.h"
 
@@ -172 +172 @@
         /* Reset the ethernet card */
         uint8_t val = pio_read_8(ne2k->port + NE2K_RESET);
-        thread_usleep(2000);
+        async_usleep(2000);
         pio_write_8(ne2k->port + NE2K_RESET, val);
-        thread_usleep(2000);
+        async_usleep(2000);
         
         /* Reset the DP8390 */

uspace/drv/nic/rtl8139/driver.c

@@ -28 +28 @@
 
 #include <assert.h>
+#include <async.h>
 #include <errno.h>
 #include <align.h>
-#include <thread.h>
 #include <byteorder.h>
 #include <libarch/barrier.h>
@@ -435 +435 @@
         memory_barrier();
         while(pio_read_8(io_base + CR) & CR_RST) {
-                thread_usleep(1);
+                async_usleep(1);
                 read_barrier();
         }

uspace/drv/nic/rtl8169/driver.c

@@ -28 +28 @@
 
 #include <assert.h>
+#include <async.h>
 #include <errno.h>
 #include <align.h>
@@ -34 +35 @@
 
 #include <as.h>
-#include <thread.h>
 #include <ddf/log.h>
 #include <ddf/interrupt.h>
@@ -763 +763 @@
         memory_barrier();
         while (pio_read_8(rtl8169->regs + CR) & CR_RST) {
-                thread_usleep(1);
+                async_usleep(1);
                 read_barrier();
         }
@@ -1176 +1176 @@
         do {
                 phyar = pio_read_32(rtl8169->regs + PHYAR);
-                thread_usleep(20);
+                async_usleep(20);
         } while ((phyar & PHYAR_RW_WRITE) == 0);
 
@@ -1194 +1194 @@
         do {
                 phyar = pio_read_32(rtl8169->regs + PHYAR);
-                thread_usleep(20);
+                async_usleep(20);
         } while ((phyar & PHYAR_RW_WRITE) != 0);
 
-        thread_usleep(20);
+        async_usleep(20);
 }