Changeset 071a1ddb in mainline for uspace/drv/nic/ne2k/ne2k.c

Timestamp:

2017-12-08T21:17:27Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

0722869, 569a51a

Parents:

9233e9d

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 00:30:18)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 21:17:27)

Message:

Return IRQ handles via a separate out parameter in all uspace code.

File:

• uspace/drv/nic/ne2k/ne2k.c (modified) (3 diffs)

uspace/drv/nic/ne2k/ne2k.c

@@ -124 +124 @@
 static void ne2k_interrupt_handler(ipc_call_t *, ddf_dev_t *);
 
-static int ne2k_register_interrupt(nic_t *nic_data)
+static int ne2k_register_interrupt(nic_t *nic_data, cap_handle_t *handle)
 {
         ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data);
@@ -160 +160 @@
         }
 
-        int irq_cap = register_interrupt_handler(nic_get_ddf_dev(nic_data),
-                ne2k->irq, ne2k_interrupt_handler, &ne2k->code);
-        return irq_cap;
+        return register_interrupt_handler(nic_get_ddf_dev(nic_data),
+                ne2k->irq, ne2k_interrupt_handler, &ne2k->code, handle);
 }
 
@@ -228 +227 @@
         ne2k->probed = true;
         
-        int irq_cap = ne2k_register_interrupt(nic_data);
-        if (irq_cap < 0)
+        if (ne2k_register_interrupt(nic_data, NULL) != EOK)
                 return EINVAL;