Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset a9b6bec in mainline for kernel/generic/include/ipc/ipc.h


Ignore:
Timestamp:
2010-12-14T20:19:41Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
11658b64
Parents:
37f7cfe (diff), 228e490 (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

Extra changes: ipcarg_t is sysarg_t and
IPC_GET_METHOD is IPC_GET_IMETHOD.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/include/ipc/ipc.h

    r37f7cfe ra9b6bec  
    8484/* Macros for manipulating calling data */
    8585#define IPC_SET_RETVAL(data, retval)  ((data).args[0] = (retval))
    86 #define IPC_SET_METHOD(data, val)     ((data).args[0] = (val))
     86#define IPC_SET_IMETHOD(data, val)    ((data).args[0] = (val))
    8787#define IPC_SET_ARG1(data, val)       ((data).args[1] = (val))
    8888#define IPC_SET_ARG2(data, val)       ((data).args[2] = (val))
     
    9191#define IPC_SET_ARG5(data, val)       ((data).args[5] = (val))
    9292
    93 #define IPC_GET_METHOD(data)  ((data).args[0])
    94 #define IPC_GET_RETVAL(data)  ((data).args[0])
     93#define IPC_GET_IMETHOD(data)  ((data).args[0])
     94#define IPC_GET_RETVAL(data)   ((data).args[0])
    9595
    9696#define IPC_GET_ARG1(data)  ((data).args[1])
     
    116116#define IPC_FF_ROUTE_FROM_ME  (1 << 0)
    117117
     118/** Kernel IPC interfaces
     119 *
     120 */
     121#define IPC_IF_KERNEL  0
     122
    118123/** System-specific methods - only through special syscalls
    119  * These methods have special behaviour
     124 *
     125 * These methods have special behaviour. These methods also
     126 * have the implicit kernel interface 0.
    120127 *
    121128 */
     
    311318
    312319typedef struct {
    313         unative_t args[IPC_CALL_LEN];
     320        sysarg_t args[IPC_CALL_LEN];
    314321        phone_t *phone;
    315322} ipc_data_t;
     
    331338       
    332339        /** Private data to internal IPC. */
    333         unative_t priv;
     340        sysarg_t priv;
    334341       
    335342        /** Data passed from/to userspace. */
     
    368375
    369376extern void ipc_cleanup(void);
    370 extern void ipc_backsend_err(phone_t *, call_t *, unative_t);
     377extern void ipc_backsend_err(phone_t *, call_t *, sysarg_t);
    371378extern void ipc_answerbox_slam_phones(answerbox_t *, bool);
    372379extern void ipc_cleanup_call_list(link_t *);
Note: See TracChangeset for help on using the changeset viewer.