Changeset 6843a9c in mainline for abi/include/ipc/methods.h


Ignore:
Timestamp:
2012-06-29T13:02:14Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
722912e
Parents:
ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • abi/include/ipc/methods.h

    rba72f2b r6843a9c  
    7272#define IPC_M_CONNECTION_CLONE  1
    7373
    74 /** Protocol for CONNECT - ME
     74/** Protocol for establishing a cloned connection.
    7575 *
    7676 * Through this call, the recipient learns about the new cloned connection.
    … …  
    8181 *
    8282 */
    83 #define IPC_M_CONNECT_ME  2
    84 
    85 /** Protocol for CONNECT - TO - ME
     83#define IPC_M_CLONE_ESTABLISH  2
     84
     85/** Protocol for initializing callback connections.
    8686 *
    8787 * Calling process asks the callee to create a callback connection,
    … …  
    102102#define IPC_M_CONNECT_TO_ME  3
    103103
    104 /** Protocol for CONNECT - ME - TO
     104/** Protocol for initializing new foward connections.
    105105 *
    106106 * Calling process asks the callee to create for him a new connection.
    … …  
    127127 *
    128128 * on answer, the recipient must set:
    129  * - ARG1 - dst as_area base adress
     129 *
     130 * - ARG1 - dst as_area lower bound
     131 * - ARG2 - dst as_area base adress pointer
     132 *          (filled automatically by the kernel)
    130133 *
    131134 */
    … …  
    133136
    134137/** Receive as_area over IPC.
    135  * - ARG1 - destination as_area base address
    136  * - ARG2 - destination as_area size
    137  * - ARG3 - user defined argument
     138 * - ARG1 - destination as_area size
     139 * - ARG2 - user defined argument
    138140 *
    139141 * on answer, the recipient must set:
    … …  
    141143 * - ARG1 - source as_area base address
    142144 * - ARG2 - flags that will be used for sharing
     145 * - ARG3 - dst as_area lower bound
     146 * - ARG4 - dst as_area base address (filled automatically by kernel)
    143147 *
    144148 */
    … …  
    179183 * - ARG1 - recipient's phone to the third party task
    180184 */
    181 #define IPC_M_STATE_CHANGE_AUTHORIZE    9
     185#define IPC_M_STATE_CHANGE_AUTHORIZE  9
    182186
    183187/** Debug the recipient.
    … …  
    186190 *
    187191 */
    188 #define IPC_M_DEBUG 10
     192#define IPC_M_DEBUG  10
    189193
    190194/** Last system IPC method */
Note: See TracChangeset for help on using the changeset viewer.