Changeset 132ab5d1 in mainline for uspace/drv/nic/rtl8169/driver.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/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>
@@ -34 +36 @@
 
 #include <as.h>
-#include <thread.h>
 #include <ddf/log.h>
 #include <ddf/interrupt.h>
@@ -42 +43 @@
 #include <nic.h>
 #include <pci_dev_iface.h>
-
-#include <sysinfo.h>
-#include <ipc/ns.h>
 
 #include <str.h>
@@ -75 +73 @@
 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_callid_t iid, ipc_call_t *icall,
-    ddf_dev_t *dev);
-static inline int rtl8169_register_int_handler(nic_t *nic_data);
+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 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);
@@ -363 +360 @@
 }
 
-inline static int rtl8169_register_int_handler(nic_t *nic_data)
+inline static int rtl8169_register_int_handler(nic_t *nic_data, cap_handle_t *handle)
 {
         rtl8169_t *rtl8169 = nic_get_specific(nic_data);
@@ -371 +368 @@
         rtl8169_irq_code.cmds[2].addr = rtl8169->regs + ISR;
         rtl8169_irq_code.cmds[3].addr = rtl8169->regs + IMR;
-        int irq_cap = register_interrupt_handler(nic_get_ddf_dev(nic_data),
-            rtl8169->irq, rtl8169_irq_handler, &rtl8169_irq_code);
-
-        return irq_cap;
+        int rc = register_interrupt_handler(nic_get_ddf_dev(nic_data),
+            rtl8169->irq, rtl8169_irq_handler, &rtl8169_irq_code, handle);
+
+        return rc;
 }
 
@@ -431 +428 @@
                 goto err_pio;
 
-        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);
+        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));
                 goto err_irq;
         }
@@ -710 +707 @@
         rc = rtl8169_allocate_buffers(rtl8169);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Error allocating buffers: %d", rc);
+                ddf_msg(LVL_ERROR, "Error allocating buffers: %s", str_error_name(rc));
                 return 0;
         }
@@ -767 +764 @@
         memory_barrier();
         while (pio_read_8(rtl8169->regs + CR) & CR_RST) {
-                thread_usleep(1);
+                async_usleep(1);
                 read_barrier();
         }
@@ -1035 +1032 @@
 }
 
-static void rtl8169_irq_handler(ipc_callid_t iid, ipc_call_t *icall,
-    ddf_dev_t *dev)
+static void rtl8169_irq_handler(ipc_call_t *icall, ddf_dev_t *dev)
 {
         assert(dev);
@@ -1181 +1177 @@
         do {
                 phyar = pio_read_32(rtl8169->regs + PHYAR);
-                thread_usleep(20);
+                async_usleep(20);
         } while ((phyar & PHYAR_RW_WRITE) == 0);
 
@@ -1199 +1195 @@
         do {
                 phyar = pio_read_32(rtl8169->regs + PHYAR);
-                thread_usleep(20);
+                async_usleep(20);
         } while ((phyar & PHYAR_RW_WRITE) != 0);
 
-        thread_usleep(20);
+        async_usleep(20);
 }