Changeset 91b60499 in mainline for uspace/drv/nic/e1k/e1k.c

Timestamp:

2017-09-30T06:29:42Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

300f4c4

Parents:

d076f16 (diff), 6636fb19 (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 support for capabilities from lp:~jakub/helenos/caps

This commit introduces capabilities as task-local names for references to kernel
objects. Kernel objects are reference-counted wrappers for a select group of
objects allocated in and by the kernel that can be made accessible to userspace
in a controlled way via integer handles.

So far, a kernel object encapsulates either an irq_t or a phone_t.

Support for the former lead to the removal of kernel-assigned devnos and
unsecure deregistration of IRQs in which a random task was able to unregister
some other task's IRQ.

File:

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

uspace/drv/nic/e1k/e1k.c

@@ -1253 +1253 @@
  * @param nic Driver data
  *
- * @return EOK if the handler was registered
+ * @return IRQ capability handle if the handler was registered
  * @return Negative error code otherwise
  *
@@ -1268 +1268 @@
         e1000_irq_code.cmds[2].addr = e1000->reg_base_phys + E1000_IMC;
         
-        int rc = register_interrupt_handler(nic_get_ddf_dev(nic),
-            e1000->irq, e1000_interrupt_handler, &e1000_irq_code);
+        int cap = register_interrupt_handler(nic_get_ddf_dev(nic), e1000->irq,
+            e1000_interrupt_handler, &e1000_irq_code);
         
         fibril_mutex_unlock(&irq_reg_mutex);
-        return rc;
+        return cap;
 }
 
@@ -2152 +2152 @@
         ddf_fun_set_ops(fun, &e1000_dev_ops);
         
-        rc = e1000_register_int_handler(nic);
-        if (rc != EOK)
+        int irq_cap = e1000_register_int_handler(nic);
+        if (irq_cap < 0) {
+                rc = irq_cap;
                 goto err_fun_create;
+        }
         
         rc = e1000_initialize_rx_structure(nic);
@@ -2189 +2191 @@
         e1000_uninitialize_rx_structure(nic);
 err_irq:
-        unregister_interrupt_handler(dev, DRIVER_DATA_DEV(dev)->irq);
+        unregister_interrupt_handler(dev, irq_cap);
 err_fun_create:
         ddf_fun_destroy(fun);