Changeset d51838f in mainline for uspace/drv/nic/e1k/e1k.c

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.

File:

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

uspace/drv/nic/e1k/e1k.c

@@ -40 +40 @@
 #include <thread.h>
 #include <byteorder.h>
-#include <irc.h>
 #include <as.h>
 #include <ddi.h>
 #include <ddf/log.h>
 #include <ddf/interrupt.h>
+#include <device/hw_res.h>
 #include <device/hw_res_parsed.h>
 #include <pci_dev_iface.h>
@@ -116 +116 @@
 /** E1000 device data */
 typedef struct {
+        /** DDF device */
+        ddf_dev_t *dev;
+        /** Parent session */
+        async_sess_t *parent_sess;
         /** Device configuration */
         e1000_info_t info;
@@ -1757 +1761 @@
         e1000_enable_interrupts(e1000);
         
-        int rc = irc_enable_interrupt(e1000->irq);
+        int rc = hw_res_enable_interrupt(e1000->parent_sess, e1000->irq);
         if (rc != EOK) {
                 e1000_disable_interrupts(e1000);
@@ -1802 +1806 @@
         e1000_disable_rx(e1000);
         
-        irc_disable_interrupt(e1000->irq);
+        hw_res_disable_interrupt(e1000->parent_sess, e1000->irq);
         e1000_disable_interrupts(e1000);
         
@@ -1884 +1888 @@
         
         memset(e1000, 0, sizeof(e1000_t));
+        e1000->dev = dev;
         
         nic_set_specific(nic, e1000);
@@ -1998 +2003 @@
                 ddf_msg(LVL_ERROR, "Unable to allocate device softstate");
                 return ENOMEM;
+        }
+        
+        e1000->parent_sess = ddf_dev_parent_sess_get(dev);
+        if (e1000->parent_sess == NULL) {
+                ddf_msg(LVL_ERROR, "Failed connecting parent device.");
+                return EIO;
         }
         
@@ -2119 +2130 @@
 {
         ddf_fun_t *fun;
-        assert(dev);
         
         /* Initialize device structure for E1000 */