Changeset 91b60499 in mainline for uspace/drv/char/ns8250/ns8250.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/char/ns8250/ns8250.c (modified) (3 diffs)

uspace/drv/char/ns8250/ns8250.c

@@ -160 +160 @@
         /** The irq assigned to this device. */
         int irq;
+        /** IRQ capability handle */
+        int irq_cap;
         /** The base i/o address of the devices registers. */
         uintptr_t io_addr;
@@ -797 +799 @@
 static inline int ns8250_unregister_interrupt_handler(ns8250_t *ns)
 {
-        return unregister_interrupt_handler(ns->dev, ns->irq);
+        return unregister_interrupt_handler(ns->dev, ns->irq_cap);
 }
 
@@ -849 +851 @@
         
         /* Register interrupt handler. */
-        if (ns8250_register_interrupt_handler(ns) != EOK) {
+        ns->irq_cap = ns8250_register_interrupt_handler(ns);
+        if (ns->irq_cap < 0) {
                 ddf_msg(LVL_ERROR, "Failed to register interrupt handler.");
                 rc = EADDRNOTAVAIL;