Changeset b077886e in mainline for contrib/arch/uspace/srv/kbd/kbd.bp


Ignore:
Timestamp:
2009-09-13T23:41:37Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
99e5526, c35aabe
Parents:
3052ff4 (diff), 2ac62cf (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 moved

Legend:

Unmodified
Added
Removed
  • contrib/arch/uspace/srv/kbd/kbd.bp

    r3052ff4 rb077886e  
    55!ns.IPC_M_CONNECT_TO_ME ;
    66(
    7         ?IPC_M_CONNECT_ME_TO ;
     7        ?kbd.IPC_M_CONNECT_ME_TO ;
    88        (
    99                (
    10                         ?KBD_YIELD +
    11                         ?KBD_RECLAIM +
     10                        ?kbd.KBD_YIELD +
     11                        ?kbd.KBD_RECLAIM +
    1212                ) |
    1313                !console.KBD_EVENT
    1414        )* ;
    15         ?IPC_M_PHONE_HUNGUP
     15        ?kbd.IPC_M_PHONE_HUNGUP
    1616)* ;
    1717(
Note: See TracChangeset for help on using the changeset viewer.