Changeset efdfebc in mainline for uspace/drv/char/xtkbd/main.c

Timestamp:

2012-11-06T21:03:44Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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 changes.

File:

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

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);
 }
@@ -98 +98 @@
 
         ddf_msg(LVL_NOTE, "Controlling '%s' (%" PRIun ").",
-            device->name, device->handle);
+            ddf_dev_get_name(device), ddf_dev_get_handle(device));
         return EOK;
 }