Changeset e9d15d9 in mainline for uspace/drv/char

Timestamp:

2017-08-18T21:15:26Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

24abb85d

Parents:

1c85bae

Message:

Turn IRQ structures into kernel objects

ipc_irq_subscribe() now returns a capability for the underlying IRQ kernel
object. ipc_irq_unsubscribe() can now be done only with a valid IRQ capability.

Location:

uspace/drv/char

Files:

• i8042/i8042.c (modified) (2 diffs)
• ns8250/ns8250.c (modified) (3 diffs)
• pl050/pl050.c (modified) (1 diff)

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));

uspace/drv/char/ns8250/ns8250.c

@@ -160 +160 @@
         /** The irq assigned to this device. */
         int irq;
+        /** IRQ capability */
+        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;

uspace/drv/char/pl050/pl050.c

@@ -212 +212 @@
         pl050->regs = regs;
 
-        rc = register_interrupt_handler(pl050->dev, res.irqs.irqs[0],
-            pl050_interrupt, &pl050_irq_code);
-        if (rc != EOK) {
+        const int irq_cap = register_interrupt_handler(pl050->dev,
+            res.irqs.irqs[0], pl050_interrupt, &pl050_irq_code);
+        if (irq_cap < 0) {
+                rc = irq_cap;
                 ddf_msg(LVL_ERROR, "Failed registering interrupt handler. (%d)",
                     rc);