Ignore:
Timestamp:
2010-01-07T19:06:59Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8190e63
Parents:
743e17b (diff), eca2435 (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
  • contrib/arch/uspace/srv/loader/loader.bp

    r743e17b r985e26d2  
    1 !ns.NS_ID_INTRO ;
    2 !ns.IPC_M_CONNECT_TO_ME ;
    31(
    4         ?loader.LOADER_GET_TASKID {
    5                 ?loader.IPC_M_DATA_READ /* task id */
     2        ?get_taskid {
     3                ?ipc_m_data_read /* task ID */
    64        } +
    75       
    8         ?loader.LOADER_SET_PATHNAME {
    9                 ?loader.IPC_M_DATA_WRITE /* path */
     6        ?set_pathname {
     7                ?ipc_m_data_write /* pathname */
    108        } +
    119       
    12         ?loader.LOADER_SET_ARGS {
    13                 ?loader.IPC_M_DATA_WRITE /* arguments */
     10        ?set_args {
     11                ?ipc_m_data_write /* arguments */
    1412        } +
    1513       
    16         ?loader.LOADER_SET_FILES {
    17                 ?loader.IPC_M_DATA_WRITE /* files */
     14        ?set_files {
     15                ?ipc_m_data_write /* files */
    1816        } +
    1917       
    20         ?loader.LOADER_LOAD
     18        ?load
    2119)* ;
    2220(
    23         ?loader.LOADER_RUN +
    24         ?loader.IPC_M_PHONE_HUNGUP
     21        ?run +
     22        ?ipc_m_phone_hungup
    2523)
Note: See TracChangeset for help on using the changeset viewer.