Changeset 7719958 in mainline for uspace/app/trace/ipc_desc.c


Ignore:
Timestamp:
2012-04-23T22:51:36Z (12 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6a3808e
Parents:
3293a94 (diff), 32fef47 (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/app/trace/ipc_desc.c

    r3293a94 r7719958  
    3939ipc_m_desc_t ipc_methods[] = {
    4040        /* System methods */
    41         { IPC_M_PHONE_HUNGUP,  "PHONE_HUNGUP" },
    42         { IPC_M_CONNECT_ME,    "CONNECT_ME" },
    43         { IPC_M_CONNECT_ME_TO, "CONNECT_ME_TO" },
    44         { IPC_M_CONNECT_TO_ME, "CONNECT_TO_ME" },
    45         { IPC_M_SHARE_OUT,     "SHARE_OUT" },
    46         { IPC_M_SHARE_IN,      "SHARE_IN" },
    47         { IPC_M_DATA_WRITE,    "DATA_WRITE" },
    48         { IPC_M_DATA_READ,     "DATA_READ" },
    49         { IPC_M_DEBUG,         "DEBUG" },
     41        { IPC_M_PHONE_HUNGUP,     "PHONE_HUNGUP" },
     42        { IPC_M_CONNECTION_CLONE, "CONNECTION_CLONE" },
     43        { IPC_M_CLONE_ESTABLISH,  "CLONE_ESTABLISH" },
     44        { IPC_M_CONNECT_ME_TO,    "CONNECT_ME_TO" },
     45        { IPC_M_CONNECT_TO_ME,    "CONNECT_TO_ME" },
     46        { IPC_M_SHARE_OUT,        "SHARE_OUT" },
     47        { IPC_M_SHARE_IN,         "SHARE_IN" },
     48        { IPC_M_DATA_WRITE,       "DATA_WRITE" },
     49        { IPC_M_DATA_READ,        "DATA_READ" },
     50        { IPC_M_DEBUG,            "DEBUG" },
    5051       
    5152        /* Terminating entry */
Note: See TracChangeset for help on using the changeset viewer.