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

uspace/drv/audio/sb16/main.c

@@ -94 +94 @@
         irq_cmd_t irq_cmds[irq_cmd_count];
         irq_pio_range_t irq_ranges[1];
+        int irq_cap;
 
         sb16_t *soft_state = ddf_dev_data_alloc(device, sizeof(sb16_t));
@@ -123 +124 @@
         };
 
-        rc = register_interrupt_handler(device, irq, irq_handler, &irq_code);
-        if (rc != EOK) {
+        irq_cap = register_interrupt_handler(device, irq, irq_handler,
+            &irq_code);
+        if (irq_cap < 0) {
+                rc = irq_cap;
                 ddf_log_error("Failed to register irq handler: %s.",
                     str_error(rc));
@@ -168 +171 @@
 error:
         if (handler_regd)
-                unregister_interrupt_handler(device, irq);
+                unregister_interrupt_handler(device, irq_cap);
         return rc;
 }