Changeset 132ab5d1 in mainline for uspace/drv/nic/ne2k/ne2k.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

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

uspace/drv/nic/ne2k/ne2k.c

@@ -122 +122 @@
 };
 
-static void ne2k_interrupt_handler(ipc_callid_t, ipc_call_t *, ddf_dev_t *);
-
-static int ne2k_register_interrupt(nic_t *nic_data)
+static void ne2k_interrupt_handler(ipc_call_t *, ddf_dev_t *);
+
+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;
         
@@ -239 +237 @@
 }
 
-void ne2k_interrupt_handler(ipc_callid_t iid, ipc_call_t *call, ddf_dev_t *dev)
+void ne2k_interrupt_handler(ipc_call_t *call, ddf_dev_t *dev)
 {
         nic_t *nic_data = DRIVER_DATA(dev);
         ne2k_interrupt(nic_data, IRQ_GET_ISR(*call), IRQ_GET_TSR(*call));
-        
-        async_answer_0(iid, EOK);
 }