Changes in uspace/drv/nic/e1k/e1k.c [071a1ddb:d51838f] in mainline

File:

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

uspace/drv/nic/e1k/e1k.c

@@ -33 +33 @@
  */
 
-#include <async.h>
 #include <assert.h>
 #include <stdio.h>
@@ -39 +38 @@
 #include <adt/list.h>
 #include <align.h>
+#include <thread.h>
 #include <byteorder.h>
 #include <as.h>
@@ -372 +372 @@
                 fibril_mutex_unlock(&e1000->ctrl_lock);
                 
-                async_usleep(10);
+                thread_usleep(10);
                 
                 fibril_mutex_lock(&e1000->ctrl_lock);
@@ -1237 +1237 @@
 /** Handle device interrupt
  *
+ * @param iid   IPC call id
  * @param icall IPC call structure
  * @param dev   E1000 device
  *
  */
-static void e1000_interrupt_handler(ipc_call_t *icall,
+static void e1000_interrupt_handler(ipc_callid_t iid, ipc_call_t *icall,
     ddf_dev_t *dev)
 {
@@ -1259 +1260 @@
  * @param nic Driver data
  *
- * @param[out] handle  IRQ capability handle if the handler was registered
- *
+ * @return IRQ capability handle if the handler was registered
  * @return Negative error code otherwise
  *
  */
-inline static int e1000_register_int_handler(nic_t *nic, cap_handle_t *handle)
+inline static int e1000_register_int_handler(nic_t *nic)
 {
         e1000_t *e1000 = DRIVER_DATA_NIC(nic);
@@ -1275 +1275 @@
         e1000_irq_code.cmds[2].addr = e1000->reg_base_phys + E1000_IMC;
         
-        int rc = register_interrupt_handler(nic_get_ddf_dev(nic), e1000->irq,
-            e1000_interrupt_handler, &e1000_irq_code, handle);
+        int cap = register_interrupt_handler(nic_get_ddf_dev(nic), e1000->irq,
+            e1000_interrupt_handler, &e1000_irq_code);
         
         fibril_mutex_unlock(&irq_reg_mutex);
-        return rc;
+        return cap;
 }
 
@@ -1725 +1725 @@
         
         /* Wait for the reset */
-        async_usleep(20);
+        thread_usleep(20);
         
         /* check if RST_BIT cleared */
@@ -1813 +1813 @@
          * transfers to descriptors.
          */
-        async_usleep(100);
+        thread_usleep(100);
         
         return EOK;
@@ -2165 +2165 @@
         ddf_fun_set_ops(fun, &e1000_dev_ops);
         
-        int irq_cap;
-        rc = e1000_register_int_handler(nic, &irq_cap);
-        if (rc != EOK) {
+        int irq_cap = e1000_register_int_handler(nic);
+        if (irq_cap < 0) {
+                rc = irq_cap;
                 goto err_fun_create;
         }
@@ -2239 +2239 @@
         uint32_t eerd = E1000_REG_READ(e1000, E1000_EERD);
         while ((eerd & e1000->info.eerd_done) == 0) {
-                async_usleep(1);
+                thread_usleep(1);
                 eerd = E1000_REG_READ(e1000, E1000_EERD);
         }