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

Timestamp:

2017-12-08T21:17:27Z (8 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/e1k/e1k.c (modified) (3 diffs)

uspace/drv/nic/e1k/e1k.c

@@ -1259 +1259 @@
  * @param nic Driver data
  *
- * @return IRQ capability handle if the handler was registered
+ * @param[out] handle  IRQ capability handle if the handler was registered
+ *
  * @return Negative error code otherwise
  *
  */
-inline static int e1000_register_int_handler(nic_t *nic)
+inline static int e1000_register_int_handler(nic_t *nic, cap_handle_t *handle)
 {
         e1000_t *e1000 = DRIVER_DATA_NIC(nic);
@@ -1274 +1275 @@
         e1000_irq_code.cmds[2].addr = e1000->reg_base_phys + E1000_IMC;
         
-        int cap = register_interrupt_handler(nic_get_ddf_dev(nic), e1000->irq,
-            e1000_interrupt_handler, &e1000_irq_code);
+        int rc = register_interrupt_handler(nic_get_ddf_dev(nic), e1000->irq,
+            e1000_interrupt_handler, &e1000_irq_code, handle);
         
         fibril_mutex_unlock(&irq_reg_mutex);
-        return cap;
+        return rc;
 }
 
@@ -2164 +2165 @@
         ddf_fun_set_ops(fun, &e1000_dev_ops);
         
-        int irq_cap = e1000_register_int_handler(nic);
-        if (irq_cap < 0) {
-                rc = irq_cap;
+        int irq_cap;
+        rc = e1000_register_int_handler(nic, &irq_cap);
+        if (rc != EOK) {
                 goto err_fun_create;
         }