Changeset 54d4b9e in mainline for uspace/srv/hid/console/gcons.c


Ignore:
Timestamp:
2011-06-17T17:53:05Z (14 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
dec55ce
Parents:
8d12065 (diff), 98caf49 (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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/hid/console/gcons.c

    r8d12065 r54d4b9e  
    168168void gcons_change_console(size_t index)
    169169{
    170         if (!use_gcons)
    171                 return;
     170        if (!use_gcons) {
     171                active_console = index;
     172                return;
     173        }
    172174       
    173175        if (active_console == KERNEL_CONSOLE) {
Note: See TracChangeset for help on using the changeset viewer.