Changeset 582a0b8 in mainline for uspace/drv/nic/e1k

Timestamp:

2017-05-08T19:20:39Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d2c8533

Parents:

73db198

Message:

Remove unistd.h

• Rename usleep() and sleep() to thread_usleep() and thread_sleep() and move to thread.[hc].
• Include stddef.h in order to provide NULL.
• Move getpagesize() to libposix.
• Sync uspace/dist/src/c/demos with originals.

File:

• uspace/drv/nic/e1k/e1k.c (modified) (5 diffs)

uspace/drv/nic/e1k/e1k.c

@@ -38 +38 @@
 #include <adt/list.h>
 #include <align.h>
+#include <thread.h>
 #include <byteorder.h>
 #include <irc.h>
@@ -365 +366 @@
                 ctrl &= ~(CTRL_SLU);
                 fibril_mutex_unlock(&e1000->ctrl_lock);
-                usleep(10);
+                thread_usleep(10);
                 fibril_mutex_lock(&e1000->ctrl_lock);
                 ctrl |= CTRL_SLU;
@@ -1717 +1718 @@
         
         /* Wait for the reset */
-        usleep(20);
+        thread_usleep(20);
         
         /* check if RST_BIT cleared */
@@ -1805 +1806 @@
          * transfers to descriptors.
          */
-        usleep(100);
+        thread_usleep(100);
         
         return EOK;
@@ -2223 +2224 @@
         uint32_t eerd = E1000_REG_READ(e1000, E1000_EERD);
         while ((eerd & e1000->info.eerd_done) == 0) {
-                usleep(1);
+                thread_usleep(1);
                 eerd = E1000_REG_READ(e1000, E1000_EERD);
         }