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

Timestamp:

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

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, 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/ne2k/ne2k.c (modified) (6 diffs)

uspace/drv/nic/ne2k/ne2k.c

@@ -40 +40 @@
 #include <stdio.h>
 #include <errno.h>
-#include <irc.h>
+#include <device/hw_res.h>
 #include <stdlib.h>
 #include <str_error.h>
@@ -160 +160 @@
         }
 
-        int rc = register_interrupt_handler(nic_get_ddf_dev(nic_data),
+        int irq_cap = register_interrupt_handler(nic_get_ddf_dev(nic_data),
                 ne2k->irq, ne2k_interrupt_handler, &ne2k->code);
-        return rc;
+        return irq_cap;
 }
 
@@ -228 +228 @@
         ne2k->probed = true;
         
-        rc = ne2k_register_interrupt(nic_data);
-        if (rc != EOK)
+        int irq_cap = ne2k_register_interrupt(nic_data);
+        if (irq_cap < 0)
                 return EINVAL;
         
@@ -256 +256 @@
                         return rc;
 
-                rc = irc_enable_interrupt(ne2k->irq);
+                rc = hw_res_enable_interrupt(ne2k->parent_sess, ne2k->irq);
                 if (rc != EOK) {
                         ne2k_down(ne2k);
@@ -269 +269 @@
         ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
 
-        (void) irc_disable_interrupt(ne2k->irq);
+        (void) hw_res_disable_interrupt(ne2k->parent_sess, ne2k->irq);
         ne2k->receive_configuration = RCR_AB | RCR_AM;
         ne2k_down(ne2k);
@@ -384 +384 @@
         }
         
+        ne2k->dev = dev;
+        ne2k->parent_sess = ddf_dev_parent_sess_get(dev);
+        if (ne2k->parent_sess == NULL) {
+                ne2k_dev_cleanup(dev);
+                return ENOMEM;
+        }
+        
         int rc = ne2k_dev_init(nic_data);
         if (rc != EOK) {