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

Timestamp:

2012-10-15T16:28:58Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b3ab8f7

Parents:

7eb49f4 (diff), c4c2406 (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 mainline and io improvements.

File:

• uspace/drv/char/i8042/i8042.c (modified) (2 diffs)

uspace/drv/char/i8042/i8042.c

@@ -41 +41 @@
 #include <device/hw_res.h>
 #include <ddi.h>
-#include <libarch/ddi.h>
 #include <errno.h>
 #include <str_error.h>
@@ -302 +301 @@
         const bool enabled = hw_res_enable_interrupt(parent_sess);
         if (!enabled) {
-                log_msg(LVL_ERROR, "Failed to enable interrupts: %s.",
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to enable interrupts: %s.",
                     ddf_dev_get_name(ddf_dev));
                 rc = EIO;