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

Changeset 4e5dabf in mainline


Ignore:
Timestamp:
2012-06-01T18:55:03Z (8 years ago)
Author:
Martin Decky <martin@…>
Branches:
master
Children:
77ad86c
Parents:
db675dd
Message:

cstyle (no change in functionality)

Location:
kernel/generic
Files:
4 edited

Legend:

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

    rdb675dd r4e5dabf  
    148148extern int ipc_call(phone_t *, call_t *);
    149149extern int ipc_call_sync(phone_t *, call_t *);
    150 extern call_t * ipc_wait_for_call(answerbox_t *, uint32_t, unsigned int);
     150extern call_t *ipc_wait_for_call(answerbox_t *, uint32_t, unsigned int);
    151151extern int ipc_forward(call_t *, phone_t *, answerbox_t *, unsigned int);
    152152extern void ipc_answer(answerbox_t *, call_t *);
  • kernel/generic/include/ipc/ipcrsc.h

    rdb675dd r4e5dabf  
    3939#include <ipc/ipc.h>
    4040
    41 extern call_t * get_call(sysarg_t callid);
    42 extern int phone_alloc(task_t *t);
    43 extern void phone_connect(int phoneid, answerbox_t *box);
    44 extern void phone_dealloc(int phoneid);
     41extern call_t *get_call(sysarg_t);
     42extern int phone_alloc(task_t *);
     43extern void phone_connect(int, answerbox_t *);
     44extern void phone_dealloc(int);
    4545
    4646#endif
  • kernel/generic/src/ipc/sysipc.c

    rdb675dd r4e5dabf  
    597597        if (IPC_GET_IMETHOD(call->data) == IPC_M_CONNECT_TO_ME) {
    598598                int phoneid = phone_alloc(TASK);
    599                 if (phoneid < 0) { /* Failed to allocate phone */
     599                if (phoneid < 0) {  /* Failed to allocate phone */
    600600                        IPC_SET_RETVAL(call->data, ELIMIT);
    601601                        ipc_answer(box, call);
     
    883883       
    884884        /*
    885          * Userspace is not allowed to change interface and method of system
     885         * User space is not allowed to change interface and method of system
    886886         * methods on forward, allow changing ARG1, ARG2, ARG3 and ARG4 by
    887          * means of method, arg1, arg2 and arg3.
     887         * means of imethod, arg1, arg2 and arg3.
    888888         * If the interface and method is immutable, don't change anything.
    889889         */
     
    897897                        IPC_SET_ARG3(call->data, arg2);
    898898                       
    899                         if (slow) {
     899                        if (slow)
    900900                                IPC_SET_ARG4(call->data, arg3);
    901                                 /*
    902                                  * For system methods we deliberately don't
    903                                  * overwrite ARG5.
    904                                  */
    905                         }
     901                       
     902                        /*
     903                         * For system methods we deliberately don't
     904                         * overwrite ARG5.
     905                         */
    906906                } else {
    907907                        IPC_SET_IMETHOD(call->data, imethod);
  • kernel/generic/src/synch/spinlock.c

    rdb675dd r4e5dabf  
    262262        int rc = spinlock_trylock(&(lock->lock));
    263263       
    264         ASSERT_IRQ_SPINLOCK(!rc || !lock->guard, lock);
     264        ASSERT_IRQ_SPINLOCK((!rc) || (!lock->guard), lock);
    265265        return rc;
    266266}
Note: See TracChangeset for help on using the changeset viewer.