Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset e2ec667e in mainline


Ignore:
Timestamp:
2012-02-28T19:18:59Z (10 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master
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:
3 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/ddi/ddi.c

    r412f813 re2ec667e  
    166166        }
    167167       
    168         if (zones.info[znum].flags & ZONE_FIRMWARE) {
    169                 /*
    170                  * Frames are part of firmware
     168        if (zones.info[znum].flags & (ZONE_FIRMWARE | ZONE_RESERVED)) {
     169                /*
     170                 * Frames are part of firmware or reserved zone
    171171                 * -> allow mapping for privileged tasks.
    172172                 */
  • kernel/generic/src/lib/func.c

    r412f813 re2ec667e  
    5353void halt()
    5454{
    55 #ifdef CONFIG_DEBUG
     55#if (defined(CONFIG_DEBUG)) && (defined(CONFIG_KCONSOLE))
    5656        bool rundebugger = false;
    5757       
  • uspace/drv/char/ps2mouse/ps2mouse.c

    r412f813 re2ec667e  
    8080        } \
    8181        if (data != (value)) { \
    82                 ddf_msg(LVL_ERROR, "Failed testing byte: got %hhx vs. %hhx)", \
     82                ddf_msg(LVL_DEBUG, "Failed testing byte: got %hhx vs. %hhx)", \
    8383                    data, (value)); \
    8484                return EIO; \
Note: See TracChangeset for help on using the changeset viewer.