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

File:

• uspace/drv/nic/rtl8139/driver.c (modified) (6 diffs)

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) {
-                async_usleep(1);
+                thread_usleep(1);
                 read_barrier();
         }
@@ -816 +816 @@
 /** Handle device interrupt
  *
+ * @param iid    The IPC call id
  * @param icall  The IPC call structure
  * @param dev    The rtl8139 device
  *
  */
-static void rtl8139_interrupt_handler(ipc_call_t *icall, ddf_dev_t *dev)
+static void rtl8139_interrupt_handler(ipc_callid_t iid, ipc_call_t *icall,
+    ddf_dev_t *dev)
 {
         assert(dev);
@@ -842 +844 @@
  *  @param nic_data  The 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 rtl8139_register_int_handler(nic_t *nic_data, cap_handle_t *handle)
+inline static int rtl8139_register_int_handler(nic_t *nic_data)
 {
         rtl8139_t *rtl8139 = nic_get_specific(nic_data);
@@ -857 +858 @@
         rtl8139_irq_code.cmds[2].addr = rtl8139->io_addr + ISR;
         rtl8139_irq_code.cmds[3].addr = rtl8139->io_addr + IMR;
-        int rc = register_interrupt_handler(nic_get_ddf_dev(nic_data),
-            rtl8139->irq, rtl8139_interrupt_handler, &rtl8139_irq_code, handle);
+        int cap = register_interrupt_handler(nic_get_ddf_dev(nic_data),
+            rtl8139->irq, rtl8139_interrupt_handler, &rtl8139_irq_code);
 
         RTL8139_IRQ_STRUCT_UNLOCK();
 
-        return rc;
+        return cap;
 }
 
@@ -1288 +1289 @@
 
         /* Register interrupt handler */
-        int irq_cap;
-        rc = rtl8139_register_int_handler(nic_data, &irq_cap);
-        if (rc != EOK) {
+        int irq_cap = rtl8139_register_int_handler(nic_data);
+        if (irq_cap < 0) {
+                rc = irq_cap;
                 goto err_pio;
         }