Changeset 91b60499 in mainline for uspace/drv/char/i8042/i8042.c

Timestamp:

2017-09-30T06:29:42Z (8 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/i8042/i8042.c (modified) (2 diffs)

uspace/drv/char/i8042/i8042.c

@@ -269 +269 @@
         };
         
-        rc = register_interrupt_handler(ddf_dev, irq_kbd, i8042_irq_handler,
-            &irq_code);
-        if (rc != EOK) {
+        const int irq_kbd_cap = register_interrupt_handler(ddf_dev, irq_kbd,
+            i8042_irq_handler, &irq_code);
+        if (irq_kbd_cap < 0) {
+                rc = irq_kbd_cap;
                 ddf_msg(LVL_ERROR, "Failed set handler for kbd: %s.",
                     ddf_dev_get_name(ddf_dev));
@@ -277 +278 @@
         }
         
-        rc = register_interrupt_handler(ddf_dev, irq_mouse, i8042_irq_handler,
-            &irq_code);
-        if (rc != EOK) {
+        const int irq_mouse_cap = register_interrupt_handler(ddf_dev, irq_mouse,
+            i8042_irq_handler, &irq_code);
+        if (irq_mouse_cap < 0) {
+                rc = irq_mouse_cap;
                 ddf_msg(LVL_ERROR, "Failed set handler for mouse: %s.",
                     ddf_dev_get_name(ddf_dev));