Changeset d51838f in mainline for uspace/drv/nic/rtl8139/driver.c

Timestamp:

2017-10-14T22:49:18Z (7 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/rtl8139/driver.c (modified) (6 diffs)

uspace/drv/nic/rtl8139/driver.c

@@ -36 +36 @@
 #include <ddf/log.h>
 #include <ddf/interrupt.h>
+#include <device/hw_res.h>
 #include <io/log.h>
 #include <nic.h>
 #include <pci_dev_iface.h>
-#include <irc.h>
 #include <stdio.h>
 #include <str.h>
@@ -920 +920 @@
         rtl8139_hw_int_set(rtl8139);
 
-        int rc = irc_enable_interrupt(rtl8139->irq);
+        int rc = hw_res_enable_interrupt(rtl8139->parent_sess, rtl8139->irq);
         if (rc != EOK) {
                 rtl8139_on_stopped(nic_data);
@@ -976 +976 @@
                 return NULL;
 
-        rtl8139_t *rtl8139 = malloc(sizeof(rtl8139_t));
+        rtl8139_t *rtl8139 = calloc(1, sizeof(rtl8139_t));
         if (!rtl8139) {
                 nic_unbind_and_destroy(dev);
@@ -982 +982 @@
         }
 
-        memset(rtl8139, 0, sizeof(rtl8139_t));
+        rtl8139->dev = dev;
 
         rtl8139->nic_data = nic_data;
@@ -1166 +1166 @@
 
         ddf_msg(LVL_DEBUG, "rtl8139: dev_data created");
+        rtl8139->parent_sess = ddf_dev_parent_sess_get(dev);
+        if (rtl8139->parent_sess == NULL) {
+                ddf_msg(LVL_ERROR, "Error connecting parent device.");
+                return EIO;
+        }
 
         /* Obtain and fill hardware resources info and connect to parent */
@@ -1258 +1263 @@
         ddf_fun_t *fun;
 
-        assert(dev);
         ddf_msg(LVL_NOTE, "RTL8139_dev_add %s (handle = %zu)",
             ddf_dev_get_name(dev), ddf_dev_get_handle(dev));