Changes in uspace/drv/nic/rtl8169/driver.c [dd8ab1c:d51838f] in mainline

File:

• uspace/drv/nic/rtl8169/driver.c (modified) (12 diffs)

uspace/drv/nic/rtl8169/driver.c

@@ -28 +28 @@
 
 #include <assert.h>
-#include <async.h>
 #include <errno.h>
-#include <str_error.h>
 #include <align.h>
 #include <byteorder.h>
@@ -36 +34 @@
 
 #include <as.h>
+#include <thread.h>
 #include <ddf/log.h>
 #include <ddf/interrupt.h>
@@ -43 +42 @@
 #include <nic.h>
 #include <pci_dev_iface.h>
+
+#include <sysinfo.h>
+#include <ipc/ns.h>
 
 #include <str.h>
@@ -73 +75 @@
 static int rtl8169_on_stopped(nic_t *nic_data);
 static void rtl8169_send_frame(nic_t *nic_data, void *data, size_t size);
-static void rtl8169_irq_handler(ipc_call_t *icall, ddf_dev_t *dev);
-static inline int rtl8169_register_int_handler(nic_t *nic_data, cap_handle_t *handle);
+static void rtl8169_irq_handler(ipc_callid_t iid, ipc_call_t *icall,
+    ddf_dev_t *dev);
+static inline int rtl8169_register_int_handler(nic_t *nic_data);
 static inline void rtl8169_get_hwaddr(rtl8169_t *rtl8169, nic_address_t *addr);
 static inline void rtl8169_set_hwaddr(rtl8169_t *rtl8169, const nic_address_t *addr);
@@ -360 +363 @@
 }
 
-inline static int rtl8169_register_int_handler(nic_t *nic_data, cap_handle_t *handle)
+inline static int rtl8169_register_int_handler(nic_t *nic_data)
 {
         rtl8169_t *rtl8169 = nic_get_specific(nic_data);
@@ -368 +371 @@
         rtl8169_irq_code.cmds[2].addr = rtl8169->regs + ISR;
         rtl8169_irq_code.cmds[3].addr = rtl8169->regs + IMR;
-        int rc = register_interrupt_handler(nic_get_ddf_dev(nic_data),
-            rtl8169->irq, rtl8169_irq_handler, &rtl8169_irq_code, handle);
-
-        return rc;
+        int irq_cap = register_interrupt_handler(nic_get_ddf_dev(nic_data),
+            rtl8169->irq, rtl8169_irq_handler, &rtl8169_irq_code);
+
+        return irq_cap;
 }
 
@@ -428 +431 @@
                 goto err_pio;
 
-        int irq_cap;
-        rc = rtl8169_register_int_handler(nic_data, &irq_cap);
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed to register IRQ handler (%s)", str_error_name(rc));
+        int irq_cap = rtl8169_register_int_handler(nic_data);
+        if (irq_cap < 0) {
+                rc = irq_cap;
+                ddf_msg(LVL_ERROR, "Failed to register IRQ handler (%d)", rc);
                 goto err_irq;
         }
@@ -707 +710 @@
         rc = rtl8169_allocate_buffers(rtl8169);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Error allocating buffers: %s", str_error_name(rc));
+                ddf_msg(LVL_ERROR, "Error allocating buffers: %d", rc);
                 return 0;
         }
@@ -764 +767 @@
         memory_barrier();
         while (pio_read_8(rtl8169->regs + CR) & CR_RST) {
-                async_usleep(1);
+                thread_usleep(1);
                 read_barrier();
         }
@@ -1032 +1035 @@
 }
 
-static void rtl8169_irq_handler(ipc_call_t *icall, ddf_dev_t *dev)
+static void rtl8169_irq_handler(ipc_callid_t iid, ipc_call_t *icall,
+    ddf_dev_t *dev)
 {
         assert(dev);
@@ -1177 +1181 @@
         do {
                 phyar = pio_read_32(rtl8169->regs + PHYAR);
-                async_usleep(20);
+                thread_usleep(20);
         } while ((phyar & PHYAR_RW_WRITE) == 0);
 
@@ -1195 +1199 @@
         do {
                 phyar = pio_read_32(rtl8169->regs + PHYAR);
-                async_usleep(20);
+                thread_usleep(20);
         } while ((phyar & PHYAR_RW_WRITE) != 0);
 
-        async_usleep(20);
+        thread_usleep(20);
 }