Changeset e2ec667e in mainline

Timestamp:

2012-02-28T19:18:59Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

c0964cd7

Parents:

412f813 (diff), 68c60b0 (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 with mainline

Files:

• kernel/generic/src/ddi/ddi.c (modified) (1 diff)
• kernel/generic/src/lib/func.c (modified) (1 diff)
• uspace/drv/char/ps2mouse/ps2mouse.c (modified) (1 diff)

kernel/generic/src/ddi/ddi.c

@@ -166 +166 @@
         }
         
-        if (zones.info[znum].flags & ZONE_FIRMWARE) {
-                /*
-                 * Frames are part of firmware
+        if (zones.info[znum].flags & (ZONE_FIRMWARE | ZONE_RESERVED)) {
+                /*
+                 * Frames are part of firmware or reserved zone
                  * -> allow mapping for privileged tasks.
                  */

kernel/generic/src/lib/func.c

@@ -53 +53 @@
 void halt()
 {
-#ifdef CONFIG_DEBUG
+#if (defined(CONFIG_DEBUG)) && (defined(CONFIG_KCONSOLE))
         bool rundebugger = false;
         

uspace/drv/char/ps2mouse/ps2mouse.c

@@ -80 +80 @@
         } \
         if (data != (value)) { \
-                ddf_msg(LVL_ERROR, "Failed testing byte: got %hhx vs. %hhx)", \
+                ddf_msg(LVL_DEBUG, "Failed testing byte: got %hhx vs. %hhx)", \
                     data, (value)); \
                 return EIO; \