Index: kernel/generic/src/ipc/sysipc.c
===================================================================
--- kernel/generic/src/ipc/sysipc.c	(revision 0c1a5d8afc92defd6f72d5e63c28c60152e3d46b)
+++ kernel/generic/src/ipc/sysipc.c	(revision f6d2c81e91d648da1853eee9644638ddc3431847)
@@ -50,10 +50,10 @@
 #include <print.h>
 
-#define GET_CHECK_PHONE(phone,phoneid,err) { \
+#define GET_CHECK_PHONE(phone, phoneid, err) { \
       if (phoneid > IPC_MAX_PHONES) { err; } \
       phone = &TASK->phones[phoneid]; \
 }
 
-#define STRUCT_TO_USPACE(dst,src) copy_to_uspace(dst,src,sizeof(*(src)))
+#define STRUCT_TO_USPACE(dst, src) copy_to_uspace(dst, src, sizeof(*(src)))
 
 /** Return true if the method is a system method */
@@ -72,6 +72,6 @@
 static inline int is_forwardable(unative_t method)
 {
-	if (method == IPC_M_PHONE_HUNGUP || method == IPC_M_AS_AREA_SEND \
-	    || method == IPC_M_AS_AREA_RECV)
+	if (method == IPC_M_PHONE_HUNGUP || method == IPC_M_AS_AREA_SEND ||
+	    method == IPC_M_AS_AREA_RECV)
 		return 0; /* This message is meant only for the receiver */
 	return 1;
@@ -131,16 +131,18 @@
 		} else {
 			/* The connection was accepted */
-			phone_connect(phoneid,&answer->sender->answerbox);
+			phone_connect(phoneid, &answer->sender->answerbox);
 			/* Set 'phone identification' as arg3 of response */
-			IPC_SET_ARG3(answer->data, (unative_t)&TASK->phones[phoneid]);
+			IPC_SET_ARG3(answer->data,
+			    (unative_t) &TASK->phones[phoneid]);
 		}
 	} else if (IPC_GET_METHOD(*olddata) == IPC_M_CONNECT_ME_TO) {
 		/* If the users accepted call, connect */
 		if (!IPC_GET_RETVAL(answer->data)) {
-			ipc_phone_connect((phone_t *)IPC_GET_ARG3(*olddata),
-					  &TASK->answerbox);
+			ipc_phone_connect((phone_t *) IPC_GET_ARG3(*olddata),
+			    &TASK->answerbox);
 		}
 	} else if (IPC_GET_METHOD(*olddata) == IPC_M_AS_AREA_SEND) {
-		if (!IPC_GET_RETVAL(answer->data)) { /* Accepted, handle as_area receipt */
+		if (!IPC_GET_RETVAL(answer->data)) {
+			/* Accepted, handle as_area receipt */
 			ipl_t ipl;
 			int rc;
@@ -153,6 +155,7 @@
 			interrupts_restore(ipl);
 			
-			rc = as_area_share(as, IPC_GET_ARG1(*olddata), IPC_GET_ARG2(*olddata),
-					   AS, IPC_GET_ARG1(answer->data), IPC_GET_ARG3(*olddata));
+			rc = as_area_share(as, IPC_GET_ARG1(*olddata),
+			    IPC_GET_ARG2(*olddata), AS,
+			    IPC_GET_ARG1(answer->data), IPC_GET_ARG3(*olddata));
 			IPC_SET_RETVAL(answer->data, rc);
 			return rc;
@@ -170,6 +173,7 @@
 			interrupts_restore(ipl);
 			
-			rc = as_area_share(AS, IPC_GET_ARG1(answer->data), IPC_GET_ARG2(*olddata),
-					   as, IPC_GET_ARG1(*olddata), IPC_GET_ARG2(answer->data));
+			rc = as_area_share(AS, IPC_GET_ARG1(answer->data),
+			    IPC_GET_ARG2(*olddata), as, IPC_GET_ARG1(*olddata),
+			    IPC_GET_ARG2(answer->data));
 			IPC_SET_RETVAL(answer->data, rc);
 		}
@@ -193,5 +197,5 @@
 			return ELIMIT;
 		/* Set arg3 for server */
-		IPC_SET_ARG3(call->data, (unative_t)&TASK->phones[newphid]);
+		IPC_SET_ARG3(call->data, (unative_t) &TASK->phones[newphid]);
 		call->flags |= IPC_CALL_CONN_ME_TO;
 		call->priv = newphid;
@@ -218,6 +222,6 @@
 static void process_answer(call_t *call)
 {
-	if (IPC_GET_RETVAL(call->data) == EHANGUP && \
-	    call->flags & IPC_CALL_FORWARDED)
+	if (IPC_GET_RETVAL(call->data) == EHANGUP &&
+	    (call->flags & IPC_CALL_FORWARDED))
 		IPC_SET_RETVAL(call->data, EFORWARD);
 
@@ -234,5 +238,5 @@
  * @return 0 - the call should be passed to userspace, 1 - ignore call
  */
-static int process_request(answerbox_t *box,call_t *call)
+static int process_request(answerbox_t *box, call_t *call)
 {
 	int phoneid;
@@ -255,6 +259,6 @@
            -2 on 'Too many async request, handle answers first
  */
-unative_t sys_ipc_call_sync_fast(unative_t phoneid, unative_t method, 
-				unative_t arg1, ipc_data_t *data)
+unative_t sys_ipc_call_sync_fast(unative_t phoneid, unative_t method,
+    unative_t arg1, ipc_data_t *data)
 {
 	call_t call;
@@ -279,6 +283,6 @@
 
 /** Synchronous IPC call allowing to send whole message */
-unative_t sys_ipc_call_sync(unative_t phoneid, ipc_data_t *question, 
-			   ipc_data_t *reply)
+unative_t sys_ipc_call_sync(unative_t phoneid, ipc_data_t *question,
+    ipc_data_t *reply)
 {
 	call_t call;
@@ -288,5 +292,6 @@
 
 	ipc_call_static_init(&call);
-	rc = copy_from_uspace(&call.data.args, &question->args, sizeof(call.data.args));
+	rc = copy_from_uspace(&call.data.args, &question->args,
+	    sizeof(call.data.args));
 	if (rc != 0)
 		return (unative_t) rc;
@@ -325,6 +330,6 @@
            -2 on 'Too many async request, handle answers first
  */
-unative_t sys_ipc_call_async_fast(unative_t phoneid, unative_t method, 
-				 unative_t arg1, unative_t arg2)
+unative_t sys_ipc_call_async_fast(unative_t phoneid, unative_t method,
+    unative_t arg1, unative_t arg2)
 {
 	call_t *call;
@@ -343,5 +348,5 @@
 	IPC_SET_ARG3(call->data, 0);
 
-	if (!(res=request_preprocess(call)))
+	if (!(res = request_preprocess(call)))
 		ipc_call(phone, call);
 	else
@@ -368,10 +373,11 @@
 
 	call = ipc_call_alloc(0);
-	rc = copy_from_uspace(&call->data.args, &data->args, sizeof(call->data.args));
+	rc = copy_from_uspace(&call->data.args, &data->args,
+	    sizeof(call->data.args));
 	if (rc != 0) {
 		ipc_call_free(call);
 		return (unative_t) rc;
 	}
-	if (!(res=request_preprocess(call)))
+	if (!(res = request_preprocess(call)))
 		ipc_call(phone, call);
 	else
@@ -389,5 +395,5 @@
  */
 unative_t sys_ipc_forward_fast(unative_t callid, unative_t phoneid,
-			      unative_t method, unative_t arg1)
+    unative_t method, unative_t arg1)
 {
 	call_t *call;
@@ -430,6 +436,6 @@
 
 /** Send IPC answer */
-unative_t sys_ipc_answer_fast(unative_t callid, unative_t retval, 
-			     unative_t arg1, unative_t arg2)
+unative_t sys_ipc_answer_fast(unative_t callid, unative_t retval,
+    unative_t arg1, unative_t arg2)
 {
 	call_t *call;
@@ -481,5 +487,5 @@
 	}
 	rc = copy_from_uspace(&call->data.args, &data->args, 
-			 sizeof(call->data.args));
+	    sizeof(call->data.args));
 	if (rc != 0)
 		return rc;
@@ -509,7 +515,8 @@
 /** Wait for incoming ipc call or answer
  *
- * @param calldata Pointer to buffer where the call/answer data is stored 
- * @param usec Timeout. See waitq_sleep_timeout() for explanation.
- * @param flags Select mode of sleep operation. See waitq_sleep_timeout() for explanation.
+ * @param calldata	Pointer to buffer where the call/answer data is stored.
+ * @param usec 		Timeout. See waitq_sleep_timeout() for explanation.
+ * @param flags		Select mode of sleep operation. See waitq_sleep_timeout()
+ *			for explanation.
  *
  * @return Callid, if callid & 1, then the call is answer
@@ -520,5 +527,6 @@
 
 restart:	
-	call = ipc_wait_for_call(&TASK->answerbox, usec, flags | SYNCH_FLAGS_INTERRUPTIBLE);
+	call = ipc_wait_for_call(&TASK->answerbox, usec,
+	    flags | SYNCH_FLAGS_INTERRUPTIBLE);
 	if (!call)
 		return 0;
@@ -575,5 +583,6 @@
  * @return EPERM or a return code returned by ipc_irq_register().
  */
-unative_t sys_ipc_register_irq(inr_t inr, devno_t devno, unative_t method, irq_code_t *ucode)
+unative_t sys_ipc_register_irq(inr_t inr, devno_t devno, unative_t method,
+    irq_code_t *ucode)
 {
 	if (!(cap_get(TASK) & CAP_IRQ_REG))