Changeset 95c675b in mainline for uspace/drv/nic/rtl8169/driver.c

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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 mainline

File:

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

uspace/drv/nic/rtl8169/driver.c

@@ -31 +31 @@
 #include <align.h>
 #include <byteorder.h>
-#include <irc.h>
 #include <libarch/barrier.h>
 
@@ -38 +37 @@
 #include <ddf/log.h>
 #include <ddf/interrupt.h>
+#include <device/hw_res.h>
+#include <device/hw_res_parsed.h>
 #include <io/log.h>
 #include <nic.h>
 #include <pci_dev_iface.h>
 
-#include <ipc/irc.h>
 #include <sysinfo.h>
 #include <ipc/ns.h>
@@ -371 +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),
+        int irq_cap = register_interrupt_handler(nic_get_ddf_dev(nic_data),
             rtl8169->irq, rtl8169_irq_handler, &rtl8169_irq_code);
 
-        return rc;
+        return irq_cap;
 }
 
@@ -396 +396 @@
         rtl8169_t *rtl8169 = nic_get_specific(nic_data);
 
+        rtl8169->dev = dev;
+        rtl8169->parent_sess = ddf_dev_parent_sess_get(dev);
+        if (rtl8169->parent_sess == NULL)
+                return EIO;
+
         /* Get PCI VID & PID */
-        rc = pci_config_space_read_16(ddf_dev_parent_sess_get(dev),
-            PCI_VENDOR_ID, &rtl8169->pci_vid);
+        rc = pci_config_space_read_16(rtl8169->parent_sess, PCI_VENDOR_ID,
+            &rtl8169->pci_vid);
         if (rc != EOK)
                 return rc;
 
-        rc = pci_config_space_read_16(ddf_dev_parent_sess_get(dev),
-            PCI_DEVICE_ID, &rtl8169->pci_pid);
+        rc = pci_config_space_read_16(rtl8169->parent_sess, PCI_DEVICE_ID,
+            &rtl8169->pci_pid);
         if (rc != EOK)
                 return rc;
@@ -426 +431 @@
                 goto err_pio;
 
-        rc = rtl8169_register_int_handler(nic_data);
-        if (rc != EOK) {
+        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;
-
         }
 
@@ -469 +474 @@
 err_srv:
         /* XXX Disconnect from services */
+        unregister_interrupt_handler(dev, irq_cap);
 err_irq:
-        //unregister_interrupt_handler(dev, rtl8169->irq);
 err_pio:
 err_destroy:
@@ -745 +750 @@
 
         pio_write_16(rtl8169->regs + IMR, 0xffff);
-        irc_enable_interrupt(rtl8169->irq);
+        /* XXX Check return value */
+        hw_res_enable_interrupt(rtl8169->parent_sess, rtl8169->irq);
 
         return EOK;