Changeset 132ab5d1 in mainline for uspace/drv/nic/ne2k/dp8390.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/drv/nic/ne2k/dp8390.c (modified) (2 diffs)

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 */