Changeset cccd60c3 in mainline for uspace/drv/char/i8042/i8042.c

Timestamp:

2017-10-10T06:51:02Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c46bfbc

Parents:

2bdf92a5

Message:

hw_res_enable_interrupt should allow enabling individual interrupts.

File:

• uspace/drv/char/i8042/i8042.c (modified) (1 diff)

uspace/drv/char/i8042/i8042.c

@@ -291 +291 @@
         assert(parent_sess != NULL);
         
-        const bool enabled = hw_res_enable_interrupt(parent_sess);
-        if (!enabled) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to enable interrupts: %s.",
+        rc = hw_res_enable_interrupt(parent_sess, irq_kbd);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to enable keyboard interrupt: %s.",
+                    ddf_dev_get_name(ddf_dev));
+                rc = EIO;
+                goto error;
+        }
+
+        rc = hw_res_enable_interrupt(parent_sess, irq_mouse);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to enable mouse interrupt: %s.",
                     ddf_dev_get_name(ddf_dev));
                 rc = EIO;