Changeset 4e5dabf in mainline

Timestamp:

2012-06-01T18:55:03Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

77ad86c

Parents:

db675dd

Message:

cstyle (no change in functionality)

Location:

kernel/generic

Files:

• include/ipc/ipc.h (modified) (1 diff)
• include/ipc/ipcrsc.h (modified) (1 diff)
• src/ipc/sysipc.c (modified) (3 diffs)
• src/synch/spinlock.c (modified) (1 diff)

kernel/generic/include/ipc/ipc.h

@@ -148 +148 @@
 extern int ipc_call(phone_t *, call_t *);
 extern int ipc_call_sync(phone_t *, call_t *);
-extern call_t * ipc_wait_for_call(answerbox_t *, uint32_t, unsigned int);
+extern call_t *ipc_wait_for_call(answerbox_t *, uint32_t, unsigned int);
 extern int ipc_forward(call_t *, phone_t *, answerbox_t *, unsigned int);
 extern void ipc_answer(answerbox_t *, call_t *);

kernel/generic/include/ipc/ipcrsc.h

@@ -39 +39 @@
 #include <ipc/ipc.h>
 
-extern call_t * get_call(sysarg_t callid);
-extern int phone_alloc(task_t *t);
-extern void phone_connect(int phoneid, answerbox_t *box);
-extern void phone_dealloc(int phoneid);
+extern call_t *get_call(sysarg_t);
+extern int phone_alloc(task_t *);
+extern void phone_connect(int, answerbox_t *);
+extern void phone_dealloc(int);
 
 #endif

kernel/generic/src/ipc/sysipc.c

@@ -597 +597 @@
         if (IPC_GET_IMETHOD(call->data) == IPC_M_CONNECT_TO_ME) {
                 int phoneid = phone_alloc(TASK);
-                if (phoneid < 0) { /* Failed to allocate phone */
+                if (phoneid < 0) {  /* Failed to allocate phone */
                         IPC_SET_RETVAL(call->data, ELIMIT);
                         ipc_answer(box, call);
@@ -883 +883 @@
         
         /*
-         * Userspace is not allowed to change interface and method of system
+         * User space is not allowed to change interface and method of system
          * methods on forward, allow changing ARG1, ARG2, ARG3 and ARG4 by
-         * means of method, arg1, arg2 and arg3.
+         * means of imethod, arg1, arg2 and arg3.
          * If the interface and method is immutable, don't change anything.
          */
@@ -897 +897 @@
                         IPC_SET_ARG3(call->data, arg2);
                         
-                        if (slow) {
+                        if (slow)
                                 IPC_SET_ARG4(call->data, arg3);
-                                /*
-                                 * For system methods we deliberately don't
-                                 * overwrite ARG5.
-                                 */
-                        }
+                        
+                        /*
+                         * For system methods we deliberately don't
+                         * overwrite ARG5.
+                         */
                 } else {
                         IPC_SET_IMETHOD(call->data, imethod);

kernel/generic/src/synch/spinlock.c

@@ -262 +262 @@
         int rc = spinlock_trylock(&(lock->lock));
         
-        ASSERT_IRQ_SPINLOCK(!rc || !lock->guard, lock);
+        ASSERT_IRQ_SPINLOCK((!rc) || (!lock->guard), lock);
         return rc;
 }