Changeset d51838f in mainline for uspace/drv/nic/rtl8169

Timestamp:

2017-10-14T22:49:18Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

75911d24

Parents:

ce732e74

Message:

Let leaf drivers enable/disable/clear interrupts via hw_res instead of directly using irc.

Location:

uspace/drv/nic/rtl8169

Files:

• driver.c (modified) (4 diffs)
• driver.h (modified) (1 diff)

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>
@@ -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;
@@ -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;

uspace/drv/nic/rtl8169/driver.h

@@ -49 +49 @@
 /** RTL8139 device data */
 typedef struct rtl8169_data {
+        /** DDF device */
+        ddf_dev_t *dev;
+        /** Parent session */
+        async_sess_t *parent_sess;
         /** I/O address of the device */
         void *regs_phys;