Changeset 071a1ddb in mainline for uspace/drv/char

Timestamp:

2017-12-08T21:17:27Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

0722869, 569a51a

Parents:

9233e9d

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 00:30:18)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 21:17:27)

Message:

Return IRQ handles via a separate out parameter in all uspace code.

Location:

uspace/drv/char

Files:

• i8042/i8042.c (modified) (2 diffs)
• msim-con/msim-con.c (modified) (1 diff)
• ns8250/ns8250.c (modified) (2 diffs)
• pl050/pl050.c (modified) (1 diff)

uspace/drv/char/i8042/i8042.c

@@ -281 +281 @@
         };
         
-        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;
+        int irq_kbd_cap;
+        rc = register_interrupt_handler(ddf_dev, irq_kbd,
+            i8042_irq_handler, &irq_code, &irq_kbd_cap);
+        if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed set handler for kbd: %s.",
                     ddf_dev_get_name(ddf_dev));
@@ -290 +290 @@
         }
         
-        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;
+        int irq_mouse_cap;
+        rc = register_interrupt_handler(ddf_dev, irq_mouse,
+            i8042_irq_handler, &irq_code, &irq_mouse_cap);
+        if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed set handler for mouse: %s.",
                     ddf_dev_get_name(ddf_dev));

uspace/drv/char/msim-con/msim-con.c

@@ -125 +125 @@
         con->irq_code.cmds = msim_cmds;
 
-        async_irq_subscribe(res->irq, msim_irq_handler, con, &con->irq_code);
+        async_irq_subscribe(res->irq, msim_irq_handler, con, &con->irq_code, NULL);
         subscribed = true;
 

uspace/drv/char/ns8250/ns8250.c

@@ -802 +802 @@
  * @param ns            Serial port device
  */
-static inline int ns8250_register_interrupt_handler(ns8250_t *ns)
+static inline int ns8250_register_interrupt_handler(ns8250_t *ns,
+    cap_handle_t *handle)
 {
         return register_interrupt_handler(ns->dev, ns->irq,
-            ns8250_interrupt_handler, NULL);
+            ns8250_interrupt_handler, NULL, handle);
 }
 
@@ -874 +875 @@
         
         /* Register interrupt handler. */
-        ns->irq_cap = ns8250_register_interrupt_handler(ns);
-        if (ns->irq_cap < 0) {
+        rc = ns8250_register_interrupt_handler(ns, &ns->irq_cap);
+        if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed to register interrupt handler.");
                 rc = EADDRNOTAVAIL;

uspace/drv/char/pl050/pl050.c

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