Changeset e2a6b72 in mainline for uspace/drv/char

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.

Location:

uspace/drv/char

Files:

• i8042/i8042.c (modified) (2 diffs)
• i8042/main.c (modified) (1 diff)
• ns8250/ns8250.c (modified) (2 diffs)
• ps2mouse/main.c (modified) (1 diff)
• xtkbd/main.c (modified) (1 diff)

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;

uspace/drv/char/i8042/main.c

@@ -151 +151 @@
 {
         printf("%s: HelenOS PS/2 driver.\n", NAME);
-        ddf_log_init(NAME, LVL_NOTE);
+        ddf_log_init(NAME);
         return ddf_driver_main(&i8042_driver);
 }

uspace/drv/char/ns8250/ns8250.c

@@ -51 +51 @@
 #include <sys/stat.h>
 #include <ddi.h>
-#include <libarch/ddi.h>
 
 #include <ddf/driver.h>
@@ -1084 +1083 @@
 static void ns8250_init(void)
 {
-        ddf_log_init(NAME, LVL_WARN);
+        ddf_log_init(NAME);
         
         ns8250_dev_ops.open = &ns8250_open;

uspace/drv/char/ps2mouse/main.c

@@ -69 +69 @@
 {
         printf(NAME ": HelenOS ps/2 mouse driver.\n");
-        ddf_log_init(NAME, LVL_NOTE);
+        ddf_log_init(NAME);
         return ddf_driver_main(&mouse_driver);
 }

uspace/drv/char/xtkbd/main.c

@@ -69 +69 @@
 {
         printf(NAME ": HelenOS XT keyboard driver.\n");
-        ddf_log_init(NAME, LVL_NOTE);
+        ddf_log_init(NAME);
         return ddf_driver_main(&kbd_driver);
 }