Index: uspace/console/console.c
===================================================================
--- uspace/console/console.c	(revision f8ddd176406660da88b0e9d63695413731cd58ff)
+++ uspace/console/console.c	(revision f88fcbec8f4c20dfefb67f4a7237bfc980de7a2d)
@@ -71,15 +71,24 @@
 typedef struct {
 	keybuffer_t keybuffer;		/**< Buffer for incoming keys. */
-	FIFO_CREATE_STATIC(keyrequests, ipc_callid_t , MAX_KEYREQUESTS_BUFFERED);	/**< Buffer for unsatisfied request for keys. */
+	/** Buffer for unsatisfied request for keys. */
+	FIFO_CREATE_STATIC(keyrequests, ipc_callid_t,
+		MAX_KEYREQUESTS_BUFFERED);	
 	int keyrequest_counter;		/**< Number of requests in buffer. */
 	int client_phone;		/**< Phone to connected client. */
-	int used;			/**< 1 if this virtual console is connected to some client.*/
-	screenbuffer_t screenbuffer;	/**< Screenbuffer for saving screen contents and related settings. */
+	int used;			/**< 1 if this virtual console is
+					 * connected to some client.*/
+	screenbuffer_t screenbuffer;	/**< Screenbuffer for saving screen
+					 * contents and related settings. */
 } connection_t;
 
-static connection_t connections[CONSOLE_COUNT];	/**< Array of data for virtual consoles */
-static keyfield_t *interbuffer = NULL;			/**< Pointer to memory shared with framebufer used for faster virt. console switching */
-
-static int kernel_pixmap = -1;      /**< Number of fb pixmap, where kernel console is stored */
+static connection_t connections[CONSOLE_COUNT];	/**< Array of data for virtual
+						 * consoles */
+static keyfield_t *interbuffer = NULL;		/**< Pointer to memory shared
+						 * with framebufer used for
+						 * faster virtual console
+						 *switching */
+
+static int kernel_pixmap = -1;	/**< Number of fb pixmap, where kernel
+				 * console is stored */
 
 
@@ -116,5 +125,6 @@
 static void set_style(style_t *style)
 {
-	async_msg_2(fb_info.phone, FB_SET_STYLE, style->fg_color, style->bg_color); 
+	async_msg_2(fb_info.phone, FB_SET_STYLE, style->fg_color,
+		style->bg_color); 
 }
 
@@ -138,32 +148,28 @@
 	
 	switch (key) {
-		case '\n':
-			scr->position_y += 1;
-			scr->position_x =  0;
-			break;
-		case '\r':
-			break;
-		case '\t':
-			scr->position_x += 8;
-			scr->position_x -= scr->position_x % 8; 
-			break;
-		case '\b':
-			if (scr->position_x == 0) 
-				break;
-
-			scr->position_x--;
-
-			if (console == active_console)
-				prtchr(' ', scr->position_y, scr->position_x);
-	
-			screenbuffer_putchar(scr, ' ');
-			
-			break;
-		default:	
-			if (console == active_console)
-				prtchr(key, scr->position_y, scr->position_x);
-	
-			screenbuffer_putchar(scr, key);
-			scr->position_x++;
+	case '\n':
+		scr->position_y += 1;
+		scr->position_x =  0;
+		break;
+	case '\r':
+		break;
+	case '\t':
+		scr->position_x += 8;
+		scr->position_x -= scr->position_x % 8; 
+		break;
+	case '\b':
+		if (scr->position_x == 0) 
+			break;
+		scr->position_x--;
+		if (console == active_console)
+			prtchr(' ', scr->position_y, scr->position_x);
+		screenbuffer_putchar(scr, ' ');
+		break;
+	default:	
+		if (console == active_console)
+			prtchr(key, scr->position_y, scr->position_x);
+
+		screenbuffer_putchar(scr, key);
+		scr->position_x++;
 	}
 	
@@ -258,7 +264,10 @@
 		for (i = 0; i < conn->screenbuffer.size_x; i++)
 			for (j = 0; j < conn->screenbuffer.size_y; j++) 
-				interbuffer[i + j*conn->screenbuffer.size_x] = *get_field_at(&(conn->screenbuffer),i, j);
+				interbuffer[i + j * conn->screenbuffer.size_x]
+					= *get_field_at(&(conn->screenbuffer),
+					i, j);
 		/* This call can preempt, but we are already at the end */
-		rc = async_req_2(fb_info.phone, FB_DRAW_TEXT_DATA, 0, 0, NULL, NULL);		
+		rc = async_req_2(fb_info.phone, FB_DRAW_TEXT_DATA, 0, 0, NULL,
+			NULL);		
 	};
 	
@@ -270,9 +279,12 @@
 		for (j = 0; j < conn->screenbuffer.size_y; j++) 
 			for (i = 0; i < conn->screenbuffer.size_x; i++) {
-				field = get_field_at(&(conn->screenbuffer),i, j);
+				field = get_field_at(&(conn->screenbuffer), i,
+					j);
 				if (!style_same(*style, field->style))
 					set_style(&field->style);
 				style = &field->style;
-				if ((field->character == ' ') && (style_same(field->style, conn->screenbuffer.style)))
+				if ((field->character == ' ') &&
+					(style_same(field->style,
+					conn->screenbuffer.style)))
 					continue;
 
@@ -281,5 +293,6 @@
 	}
 	
-	curs_goto(conn->screenbuffer.position_y, conn->screenbuffer.position_x);
+	curs_goto(conn->screenbuffer.position_y,
+		conn->screenbuffer.position_x);
 	curs_visibility(conn->screenbuffer.is_cursor_visible);
 
@@ -311,5 +324,6 @@
 			break;
 		case KBD_MS_MOVE:
-			gcons_mouse_move(IPC_GET_ARG1(call), IPC_GET_ARG2(call));
+			gcons_mouse_move(IPC_GET_ARG1(call),
+				IPC_GET_ARG2(call));
 			retval = 0;
 			break;
@@ -322,5 +336,8 @@
 			
 			conn = &connections[active_console];
-//			if ((c >= KBD_KEY_F1) && (c < KBD_KEY_F1 + CONSOLE_COUNT)) {
+/*
+ *			if ((c >= KBD_KEY_F1) && (c < KBD_KEY_F1 +
+ *				CONSOLE_COUNT)) {
+ */
 			if ((c >= 0x101) && (c < 0x101 + CONSOLE_COUNT)) {
 				if (c == 0x112)
@@ -334,5 +351,6 @@
 			if (conn->keyrequest_counter > 0) {		
 				conn->keyrequest_counter--;
-				ipc_answer_fast(fifo_pop(conn->keyrequests), 0, c, 0);
+				ipc_answer_fast(fifo_pop(conn->keyrequests), 0,
+					c, 0);
 				break;
 			}
@@ -386,5 +404,6 @@
 			while (conn->keyrequest_counter > 0) {		
 				conn->keyrequest_counter--;
-				ipc_answer_fast(fifo_pop(conn->keyrequests), ENOENT, 0, 0);
+				ipc_answer_fast(fifo_pop(conn->keyrequests),
+					ENOENT, 0, 0);
 				break;
 			}
@@ -405,11 +424,10 @@
 			break;
 		case CONSOLE_GOTO:
-			
-			screenbuffer_goto(&conn->screenbuffer, IPC_GET_ARG2(call), IPC_GET_ARG1(call));
+			screenbuffer_goto(&conn->screenbuffer,
+				IPC_GET_ARG2(call), IPC_GET_ARG1(call));
 			if (consnum == active_console)
-				curs_goto(IPC_GET_ARG1(call),IPC_GET_ARG2(call));
-			
-			break;
-
+				curs_goto(IPC_GET_ARG1(call),
+					IPC_GET_ARG2(call));
+			break;
 		case CONSOLE_GETSIZE:
 			arg1 = fb_info.rows;
@@ -418,8 +436,8 @@
 		case CONSOLE_FLUSH:
 			if (consnum == active_console)
-				async_req_2(fb_info.phone, FB_FLUSH, 0, 0, NULL, NULL);		
+				async_req_2(fb_info.phone, FB_FLUSH, 0, 0,
+					NULL, NULL);		
 			break;
 		case CONSOLE_SET_STYLE:
-			
 			arg1 = IPC_GET_ARG1(call);
 			arg2 = IPC_GET_ARG2(call);
@@ -427,5 +445,4 @@
 			if (consnum == active_console)
 				set_style_col(arg1, arg2);
-				
 			break;
 		case CONSOLE_CURSOR_VISIBILITY:
@@ -438,15 +455,18 @@
 			if (keybuffer_empty(&conn->keybuffer)) {
 				/* buffer is empty -> store request */
-				if (conn->keyrequest_counter < MAX_KEYREQUESTS_BUFFERED) {		
+				if (conn->keyrequest_counter <
+					MAX_KEYREQUESTS_BUFFERED) {	
 					fifo_push(conn->keyrequests, callid);
 					conn->keyrequest_counter++;
 				} else {
-					/* no key available and too many requests => fail */
+					/*
+					 * No key available and too many
+					 * requests => fail.
+					*/
 					ipc_answer_fast(callid, ELIMIT, 0, 0);
 				}
 				continue;
-			};
-			keybuffer_pop(&conn->keybuffer, (int *)&arg1);
-			
+			}
+			keybuffer_pop(&conn->keybuffer, (int *) &arg1);
 			break;
 		}
@@ -465,16 +485,19 @@
 	/* Connect to keyboard driver */
 
-	while ((kbd_phone = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0)) < 0) {
+	while ((kbd_phone = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0))
+		< 0) {
 		usleep(10000);
-	};
-	
-	if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, &phonehash) != 0) {
+	}
+	
+	if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, &phonehash) != 0)
+		{
 		return -1;
-	};
+	}
 	async_new_connection(phonehash, 0, NULL, keyboard_events);
 	
 	/* Connect to framebuffer driver */
 	
-	while ((fb_info.phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0)) < 0) {
+	while ((fb_info.phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0))
+		< 0) {
 		usleep(10000);
 	}
@@ -490,5 +513,6 @@
 	async_msg_2(fb_info.phone, FB_VIEWPORT_DB, (sysarg_t)-1, 1);
 	
-	async_req_2(fb_info.phone, FB_GET_CSIZE, 0, 0, &(fb_info.rows), &(fb_info.cols)); 
+	async_req_2(fb_info.phone, FB_GET_CSIZE, 0, 0, &(fb_info.rows),
+		&(fb_info.cols)); 
 	set_style_col(DEFAULT_FOREGROUND, DEFAULT_BACKGROUND);
 	clrscr();
@@ -499,9 +523,11 @@
 		keybuffer_init(&(connections[i].keybuffer));
 		
-		connections[i].keyrequests.head = connections[i].keyrequests.tail = 0;
+		connections[i].keyrequests.head =
+			connections[i].keyrequests.tail = 0;
 		connections[i].keyrequests.items = MAX_KEYREQUESTS_BUFFERED;
 		connections[i].keyrequest_counter = 0;
 		
-		if (screenbuffer_init(&(connections[i].screenbuffer), fb_info.cols, fb_info.rows ) == NULL) {
+		if (screenbuffer_init(&(connections[i].screenbuffer),
+			fb_info.cols, fb_info.rows) == NULL) {
 			/*FIXME: handle error */
 			return -1;
@@ -510,7 +536,11 @@
 	connections[KERNEL_CONSOLE].used = 1;
 	
-	if ((interbuffer = mmap(NULL, sizeof(keyfield_t) * fb_info.cols * fb_info.rows , PROTO_READ|PROTO_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, 0 ,0 )) != NULL) {
-		if (async_req_3(fb_info.phone, IPC_M_AS_AREA_SEND, (ipcarg_t)interbuffer, 0, AS_AREA_READ, NULL, NULL, NULL) != 0) {
-			munmap(interbuffer, sizeof(keyfield_t) * fb_info.cols * fb_info.rows);
+	if ((interbuffer = mmap(NULL, sizeof(keyfield_t) * fb_info.cols *
+		fb_info.rows, PROTO_READ | PROTO_WRITE, MAP_ANONYMOUS |
+		MAP_PRIVATE, 0, 0)) != NULL) {
+		if (async_req_3(fb_info.phone, IPC_M_AS_AREA_SEND, (ipcarg_t)
+			interbuffer, 0, AS_AREA_READ, NULL, NULL, NULL) != 0) {
+			munmap(interbuffer, sizeof(keyfield_t) * fb_info.cols
+				* fb_info.rows);
 			interbuffer = NULL;
 		}
@@ -523,5 +553,5 @@
 	if (ipc_connect_to_me(PHONE_NS, SERVICE_CONSOLE, 0, &phonehash) != 0) {
 		return -1;
-	};
+	}
 	
 	async_manager();
Index: uspace/console/gcons.c
===================================================================
--- uspace/console/gcons.c	(revision f8ddd176406660da88b0e9d63695413731cd58ff)
+++ uspace/console/gcons.c	(revision f88fcbec8f4c20dfefb67f4a7237bfc980de7a2d)
@@ -75,5 +75,5 @@
 
 /** List of pixmaps identifying these icons */
-static int ic_pixmaps[CONS_LAST] = {-1,-1,-1,-1,-1,-1};
+static int ic_pixmaps[CONS_LAST] = {-1, -1, -1, -1, -1, -1};
 static int animation = -1;
 
@@ -120,10 +120,12 @@
 	vp_switch(cstatus_vp[consnum]);
 	if (ic_pixmaps[state] != -1)
-		async_msg_2(fbphone, FB_VP_DRAW_PIXMAP, cstatus_vp[consnum], ic_pixmaps[state]);
-
- 	if (state != CONS_DISCONNECTED && state != CONS_KERNEL && state != CONS_DISCONNECTED_SEL) {
- 		snprintf(data, 5, "%d", consnum+1);
- 		for (i=0;data[i];i++)
- 			tran_putch(data[i], 1, 2+i);
+		async_msg_2(fbphone, FB_VP_DRAW_PIXMAP, cstatus_vp[consnum],
+			ic_pixmaps[state]);
+
+ 	if (state != CONS_DISCONNECTED && state != CONS_KERNEL && state !=
+		CONS_DISCONNECTED_SEL) {
+ 		snprintf(data, 5, "%d", consnum + 1);
+ 		for (i=0; data[i]; i++)
+ 			tran_putch(data[i], 1, 2 + i);
  	}
 }
@@ -138,5 +140,5 @@
 
 	if (active_console == KERNEL_CONSOLE) {
-		for (i=0; i < CONSOLE_COUNT; i++)
+		for (i = 0; i < CONSOLE_COUNT; i++)
 			redraw_state(i);
 		if (animation != -1)
@@ -167,5 +169,6 @@
 		return;
 
-	if (consnum == active_console || console_state[consnum] == CONS_HAS_DATA)
+	if (consnum == active_console || console_state[consnum] ==
+		CONS_HAS_DATA)
 		return;
 
@@ -258,7 +261,7 @@
 static int gcons_find_conbut(int x, int y)
 {
-	int status_start = STATUS_START + (xres-800) / 2;;
-
-	if (y < STATUS_TOP || y >= STATUS_TOP+STATUS_HEIGHT)
+	int status_start = STATUS_START + (xres - 800) / 2;;
+
+	if (y < STATUS_TOP || y >= STATUS_TOP + STATUS_HEIGHT)
 		return -1;
 	
@@ -266,10 +269,10 @@
 		return -1;
 	
-	if (x >= status_start + (STATUS_WIDTH+STATUS_SPACE)*CONSOLE_COUNT)
+	if (x >= status_start + (STATUS_WIDTH + STATUS_SPACE) * CONSOLE_COUNT)
 		return -1;
 	if (((x - status_start) % (STATUS_WIDTH+STATUS_SPACE)) < STATUS_SPACE)
 		return -1;
 	
-	return (x-status_start) / (STATUS_WIDTH+STATUS_SPACE);
+	return (x - status_start) / (STATUS_WIDTH+STATUS_SPACE);
 }
 
@@ -315,5 +318,6 @@
 
 	/* Create area */
-	shm = mmap(NULL, size, PROTO_READ | PROTO_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	shm = mmap(NULL, size, PROTO_READ | PROTO_WRITE, MAP_SHARED |
+		MAP_ANONYMOUS, 0, 0);
 	if (shm == MAP_FAILED)
 		return;
@@ -321,8 +325,10 @@
 	memcpy(shm, logo, size);
 	/* Send area */
-	rc = async_req_2(fbphone, FB_PREPARE_SHM, (ipcarg_t)shm, 0, NULL, NULL);
+	rc = async_req_2(fbphone, FB_PREPARE_SHM, (ipcarg_t) shm, 0, NULL,
+		NULL);
 	if (rc)
 		goto exit;
-	rc = async_req_3(fbphone, IPC_M_AS_AREA_SEND, (ipcarg_t)shm, 0, PROTO_READ, NULL, NULL, NULL);
+	rc = async_req_3(fbphone, IPC_M_AS_AREA_SEND, (ipcarg_t) shm, 0,
+		PROTO_READ, NULL, NULL, NULL);
 	if (rc)
 		goto drop;
@@ -352,8 +358,10 @@
 	set_style(MAIN_COLOR, MAIN_COLOR);
 	clear();
-	draw_pixmap(_binary_helenos_ppm_start, (size_t)&_binary_helenos_ppm_size, xres-66, 2);
-	draw_pixmap(_binary_nameic_ppm_start, (size_t)&_binary_nameic_ppm_size, 5, 17);
-
-	for (i=0;i < CONSOLE_COUNT; i++) 
+	draw_pixmap(_binary_helenos_ppm_start, (size_t)
+		&_binary_helenos_ppm_size, xres - 66, 2);
+	draw_pixmap(_binary_nameic_ppm_start, (size_t)
+		&_binary_nameic_ppm_size, 5, 17);
+
+	for (i=0;i < CONSOLE_COUNT; i++)
 		redraw_state(i);
 	vp_switch(console_vp);
@@ -373,5 +381,6 @@
 
 	/* Create area */
-	shm = mmap(NULL, size, PROTO_READ | PROTO_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
+	shm = mmap(NULL, size, PROTO_READ | PROTO_WRITE, MAP_SHARED |
+		MAP_ANONYMOUS, 0, 0);
 	if (shm == MAP_FAILED)
 		return -1;
@@ -379,8 +388,10 @@
 	memcpy(shm, data, size);
 	/* Send area */
-	rc = async_req_2(fbphone, FB_PREPARE_SHM, (ipcarg_t)shm, 0, NULL, NULL);
+	rc = async_req_2(fbphone, FB_PREPARE_SHM, (ipcarg_t) shm, 0, NULL,
+		NULL);
 	if (rc)
 		goto exit;
-	rc = async_req_3(fbphone, IPC_M_AS_AREA_SEND, (ipcarg_t)shm, 0, PROTO_READ, NULL, NULL, NULL);
+	rc = async_req_3(fbphone, IPC_M_AS_AREA_SEND, (ipcarg_t) shm, 0,
+		PROTO_READ, NULL, NULL, NULL);
 	if (rc)
 		goto drop;
@@ -409,4 +420,5 @@
 extern char _binary_anim_4_ppm_start[0];
 extern int _binary_anim_4_ppm_size;
+
 static void make_anim(void)
 {
@@ -414,18 +426,23 @@
 	int pm;
 
-	an = async_req(fbphone, FB_ANIM_CREATE, cstatus_vp[KERNEL_CONSOLE], NULL);
+	an = async_req(fbphone, FB_ANIM_CREATE, cstatus_vp[KERNEL_CONSOLE],
+		NULL);
 	if (an < 0)
 		return;
 
-	pm = make_pixmap(_binary_anim_1_ppm_start, (int)&_binary_anim_1_ppm_size);
+	pm = make_pixmap(_binary_anim_1_ppm_start, (int)
+		&_binary_anim_1_ppm_size);
 	async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
 
-	pm = make_pixmap(_binary_anim_2_ppm_start, (int)&_binary_anim_2_ppm_size);
+	pm = make_pixmap(_binary_anim_2_ppm_start, (int)
+		&_binary_anim_2_ppm_size);
 	async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
 
-	pm = make_pixmap(_binary_anim_3_ppm_start, (int)&_binary_anim_3_ppm_size);
+	pm = make_pixmap(_binary_anim_3_ppm_start, (int)
+		&_binary_anim_3_ppm_size);
 	async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
 
-	pm = make_pixmap(_binary_anim_4_ppm_start, (int)&_binary_anim_4_ppm_size);
+	pm = make_pixmap(_binary_anim_4_ppm_start, (int)
+		&_binary_anim_4_ppm_size);
 	async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
 
@@ -443,4 +460,5 @@
 extern char _binary_cons_kernel_ppm_start[0];
 extern int _binary_cons_kernel_ppm_size;
+
 /** Initialize nice graphical console environment */
 void gcons_init(int phone)
@@ -461,15 +479,16 @@
 	/* create console viewport */
 	/* Align width & height to character size */
-	console_vp = vp_create(CONSOLE_MARGIN, CONSOLE_TOP, 
-			       ALIGN_DOWN(xres-2*CONSOLE_MARGIN, 8),
-			       ALIGN_DOWN(yres-(CONSOLE_TOP+CONSOLE_MARGIN),16));
+	console_vp = vp_create(CONSOLE_MARGIN, CONSOLE_TOP, ALIGN_DOWN(xres -
+		2 * CONSOLE_MARGIN, 8), ALIGN_DOWN(yres - (CONSOLE_TOP +
+		CONSOLE_MARGIN), 16));
 	if (console_vp < 0)
 		return;
 	
 	/* Create status buttons */
-	status_start += (xres-800) / 2;
-	for (i=0; i < CONSOLE_COUNT; i++) {
-		cstatus_vp[i] = vp_create(status_start+CONSOLE_MARGIN+i*(STATUS_WIDTH+STATUS_SPACE),
-					  STATUS_TOP, STATUS_WIDTH, STATUS_HEIGHT);
+	status_start += (xres - 800) / 2;
+	for (i = 0; i < CONSOLE_COUNT; i++) {
+		cstatus_vp[i] = vp_create(status_start + CONSOLE_MARGIN + i *
+			(STATUS_WIDTH + STATUS_SPACE), STATUS_TOP,
+			STATUS_WIDTH, STATUS_HEIGHT);
 		if (cstatus_vp[i] < 0)
 			return;
@@ -479,14 +498,17 @@
 	
 	/* Initialize icons */
-	ic_pixmaps[CONS_SELECTED] = make_pixmap(_binary_cons_selected_ppm_start,
-					      (int)&_binary_cons_selected_ppm_size);
-	ic_pixmaps[CONS_IDLE] = make_pixmap(_binary_cons_idle_ppm_start,
-					      (int)&_binary_cons_idle_ppm_size);
-	ic_pixmaps[CONS_HAS_DATA] = make_pixmap(_binary_cons_has_data_ppm_start,
-						(int)&_binary_cons_has_data_ppm_size);
-	ic_pixmaps[CONS_DISCONNECTED] = make_pixmap(_binary_cons_idle_ppm_start,
-					      (int)&_binary_cons_idle_ppm_size);
+	ic_pixmaps[CONS_SELECTED] =
+		make_pixmap(_binary_cons_selected_ppm_start, (int)
+		&_binary_cons_selected_ppm_size);
+	ic_pixmaps[CONS_IDLE] = make_pixmap(_binary_cons_idle_ppm_start, (int)
+		&_binary_cons_idle_ppm_size);
+	ic_pixmaps[CONS_HAS_DATA] =
+		make_pixmap(_binary_cons_has_data_ppm_start, (int)
+		&_binary_cons_has_data_ppm_size);
+	ic_pixmaps[CONS_DISCONNECTED] =
+		make_pixmap(_binary_cons_idle_ppm_start, (int)
+		&_binary_cons_idle_ppm_size);
 	ic_pixmaps[CONS_KERNEL] = make_pixmap(_binary_cons_kernel_ppm_start,
-					      (int)&_binary_cons_kernel_ppm_size);
+		(int) &_binary_cons_kernel_ppm_size);
 	ic_pixmaps[CONS_DISCONNECTED_SEL] = ic_pixmaps[CONS_SELECTED];
 	
Index: uspace/fb/ega.c
===================================================================
--- uspace/fb/ega.c	(revision f8ddd176406660da88b0e9d63695413731cd58ff)
+++ uspace/fb/ega.c	(revision f88fcbec8f4c20dfefb67f4a7237bfc980de7a2d)
@@ -83,7 +83,7 @@
 	int i;
 	
-	for (i=0; i < scr_width*scr_height; i++) {
-		scr_addr[i*2] = ' ';
-		scr_addr[i*2+1] = style;
+	for (i = 0; i < scr_width*scr_height; i++) {
+		scr_addr[i * 2] = ' ';
+		scr_addr[i * 2 + 1] = style;
 	}
 }
@@ -93,9 +93,9 @@
 	int ega_cursor;
 
-	ega_cursor=col+scr_width*row;
+	ega_cursor = col + scr_width * row;
 	
-	outb(EGA_IO_ADDRESS    , 0xe);
-	outb(EGA_IO_ADDRESS + 1, (ega_cursor >>8) & 0xff);
-	outb(EGA_IO_ADDRESS    , 0xf);
+	outb(EGA_IO_ADDRESS, 0xe);
+	outb(EGA_IO_ADDRESS + 1, (ega_cursor >> 8) & 0xff);
+	outb(EGA_IO_ADDRESS, 0xf);
 	outb(EGA_IO_ADDRESS + 1, ega_cursor & 0xff);
 }
@@ -105,8 +105,8 @@
 	uint8_t stat;
 
-	outb(EGA_IO_ADDRESS , 0xa);
+	outb(EGA_IO_ADDRESS, 0xa);
 	stat=inb(EGA_IO_ADDRESS + 1);
-	outb(EGA_IO_ADDRESS , 0xa);
-	outb(EGA_IO_ADDRESS +1 ,stat | (1<<5) );
+	outb(EGA_IO_ADDRESS, 0xa);
+	outb(EGA_IO_ADDRESS + 1, stat | (1 << 5));
 }
 
@@ -115,8 +115,8 @@
 	uint8_t stat;
 
-	outb(EGA_IO_ADDRESS , 0xa);
+	outb(EGA_IO_ADDRESS, 0xa);
 	stat=inb(EGA_IO_ADDRESS + 1);
-	outb(EGA_IO_ADDRESS , 0xa);
-	outb(EGA_IO_ADDRESS +1 ,stat & (~(1<<5)) );
+	outb(EGA_IO_ADDRESS, 0xa);
+	outb(EGA_IO_ADDRESS + 1, stat & (~(1 << 5)));
 }
 
@@ -125,14 +125,14 @@
 	int i;
 	if (rows > 0) {
-		memcpy (scr_addr,((char *)scr_addr) + rows * scr_width * 2,
+		memcpy(scr_addr, ((char *) scr_addr) + rows * scr_width * 2,
 			scr_width * scr_height * 2 - rows * scr_width * 2);
-		for (i = 0; i < rows * scr_width ; i ++)
-			(((short *)scr_addr) + scr_width * scr_height - rows *
-				scr_width) [i] = ((style << 8) + ' ');
+		for (i = 0; i < rows * scr_width; i++)
+			(((short *) scr_addr) + scr_width * scr_height - rows *
+				scr_width)[i] = ((style << 8) + ' ');
 	} else if (rows < 0) {
-		memcpy (((char *)scr_addr) - rows * scr_width * 2, scr_addr,
+		memcpy(((char *)scr_addr) - rows * scr_width * 2, scr_addr,
 			scr_width * scr_height * 2 + rows * scr_width * 2);
-		for (i = 0; i < - rows * scr_width ; i++)
-			((short *)scr_addr) [i] = ((style << 8 ) + ' ');
+		for (i = 0; i < -rows * scr_width; i++)
+			((short *)scr_addr)[i] = ((style << 8 ) + ' ');
 	}
 }
@@ -140,8 +140,8 @@
 static void printchar(char c, unsigned int row, unsigned int col)
 {
-	scr_addr[(row*scr_width + col)*2] = c;
-	scr_addr[(row*scr_width + col)*2+1] = style;
+	scr_addr[(row * scr_width + col) * 2] = c;
+	scr_addr[(row * scr_width + col) * 2 + 1] = style;
 	
-	cursor_goto(row,col+1);
+	cursor_goto(row, col + 1);
 }
 
@@ -150,7 +150,8 @@
 	int i;
 
-	for (i=0; i < scr_width*scr_height; i++) {
-		scr_addr[i*2] = data[i].character;
-		scr_addr[i*2+1] = EGA_STYLE(data[i].style.fg_color, data[i].style.bg_color);
+	for (i = 0; i < scr_width * scr_height; i++) {
+		scr_addr[i * 2] = data[i].character;
+		scr_addr[i * 2 + 1] = EGA_STYLE(data[i].style.fg_color,
+			data[i].style.bg_color);
 	}
 }
@@ -160,9 +161,9 @@
 	int i;
 
-	for (i=0; ( i < MAX_SAVED_SCREENS ) && (saved_screens[i].data); i++)
+	for (i=0; (i < MAX_SAVED_SCREENS) && (saved_screens[i].data); i++)
 		;
 	if (i == MAX_SAVED_SCREENS) 
 		return EINVAL;
-	if (!(saved_screens[i].data=malloc( 2 * scr_width*scr_height ))) 
+	if (!(saved_screens[i].data = malloc(2 * scr_width * scr_height))) 
 		return ENOMEM;
 	memcpy(saved_screens[i].data, scr_addr, 2 * scr_width * scr_height);
@@ -174,6 +175,8 @@
 {
 	if (saved_screens[i].data)
-		memcpy(scr_addr, saved_screens[i].data, 2 * scr_width * scr_height);
-	else return EINVAL;
+		memcpy(scr_addr, saved_screens[i].data, 2 * scr_width *
+			scr_height);
+	else
+		return EINVAL;
 	return i;
 }
@@ -204,11 +207,13 @@
 		case IPC_M_PHONE_HUNGUP:
 			client_connected = 0;
-			ipc_answer_fast(callid,0,0,0);
+			ipc_answer_fast(callid, 0, 0, 0);
 			return; /* Exit thread */
 		case IPC_M_AS_AREA_SEND:
 			/* We accept one area for data interchange */
 			intersize = IPC_GET_ARG2(call);
-			if (intersize >= scr_width*scr_height*sizeof(*interbuf)) {
-				receive_comm_area(callid,&call,(void *)&interbuf);
+			if (intersize >= scr_width * scr_height *
+				sizeof(*interbuf)) {
+				receive_comm_area(callid, &call, (void *)
+					&interbuf);
 				continue;
 			}
@@ -238,5 +243,5 @@
 				break;
 			}
-			printchar(c,row,col);
+			printchar(c, row, col);
 			retval = 0;
 			break;
@@ -248,10 +253,10 @@
 				break;
 			}
-			cursor_goto(row,col);
+			cursor_goto(row, col);
  			retval = 0;
  			break;
 		case FB_SCROLL:
 			i = IPC_GET_ARG1(call);
-			if (i > scr_height || i < (- (int)scr_height)) {
+			if (i > scr_height || i < -((int) scr_height)) {
 				retval = EINVAL;
 				break;
@@ -296,5 +301,5 @@
 			retval = ENOENT;
 		}
-		ipc_answer_fast(callid,retval,0,0);
+		ipc_answer_fast(callid, retval, 0, 0);
 	}
 }
@@ -305,8 +310,7 @@
 	size_t sz;
 
-
-	ega_ph_addr=(void *)sysinfo_value("fb.address.physical");
-	scr_width=sysinfo_value("fb.width");
-	scr_height=sysinfo_value("fb.height");
+	ega_ph_addr = (void *) sysinfo_value("fb.address.physical");
+	scr_width = sysinfo_value("fb.width");
+	scr_height = sysinfo_value("fb.height");
 	iospace_enable(task_get_id(), (void *) EGA_IO_ADDRESS, 2);
 
Index: uspace/fb/fb.c
===================================================================
--- uspace/fb/fb.c	(revision f8ddd176406660da88b0e9d63695413731cd58ff)
+++ uspace/fb/fb.c	(revision f88fcbec8f4c20dfefb67f4a7237bfc980de7a2d)
@@ -162,5 +162,6 @@
 static void bgr_byte0888(void *dst, int rgb)
 {
-	*((uint32_t *) dst) = BLUE(rgb, 8) << 16 | GREEN(rgb, 8) << 8 | RED(rgb, 8);
+	*((uint32_t *) dst) = BLUE(rgb, 8) << 16 | GREEN(rgb, 8) << 8 |
+		RED(rgb, 8);
 }
 
@@ -168,5 +169,6 @@
 {
 	int color = *(uint32_t *)(src);
-	return ((color & 0xff) << 16) | (((color >> 8) & 0xff) << 8) | ((color >> 16) & 0xff);
+	return ((color & 0xff) << 16) | (((color >> 8) & 0xff) << 8) | ((color
+		>> 16) & 0xff);
 }
 
@@ -199,5 +201,6 @@
 {
 	/* 5-bit, 5-bits, 5-bits */ 
-	*((uint16_t *)(dst)) = RED(rgb, 5) << 10 | GREEN(rgb, 5) << 5 | BLUE(rgb, 5);
+	*((uint16_t *)(dst)) = RED(rgb, 5) << 10 | GREEN(rgb, 5) << 5 |
+		BLUE(rgb, 5);
 }
 
@@ -206,5 +209,6 @@
 {
 	int color = *(uint16_t *)(src);
-	return (((color >> 10) & 0x1f) << (16 + 3)) | (((color >> 5) & 0x1f) << (8 + 3)) | ((color & 0x1f) << 3);
+	return (((color >> 10) & 0x1f) << (16 + 3)) | (((color >> 5) & 0x1f) <<
+		(8 + 3)) | ((color & 0x1f) << 3);
 }
 
@@ -213,5 +217,6 @@
 {
 	/* 5-bit, 6-bits, 5-bits */ 
-	*((uint16_t *)(dst)) = RED(rgb, 5) << 11 | GREEN(rgb, 6) << 5 | BLUE(rgb, 5);
+	*((uint16_t *)(dst)) = RED(rgb, 5) << 11 | GREEN(rgb, 6) << 5 |
+		BLUE(rgb, 5);
 }
 
@@ -220,5 +225,6 @@
 {
 	int color = *(uint16_t *)(src);
-	return (((color >> 11) & 0x1f) << (16 + 3)) | (((color >> 5) & 0x3f) << (8 + 2)) | ((color & 0x1f) << 3);
+	return (((color >> 11) & 0x1f) << (16 + 3)) | (((color >> 5) & 0x3f) <<
+		(8 + 2)) | ((color & 0x1f) << 3);
 }
 
@@ -233,5 +239,6 @@
 {
 	int color = *(uint8_t *)src;
-	return (((color >> 5) & 0x7) << (16 + 5)) | (((color >> 3) & 0x3) << (8 + 6)) | ((color & 0x7) << 5);
+	return (((color >> 5) & 0x7) << (16 + 5)) | (((color >> 3) & 0x3) <<
+		(8 + 6)) | ((color & 0x7) << 5);
 }
 
@@ -243,5 +250,6 @@
  * @param color RGB color 
  */
-static void putpixel(viewport_t *vport, unsigned int x, unsigned int y, int color)
+static void putpixel(viewport_t *vport, unsigned int x, unsigned int y, int
+	color)
 {
 	int dx = vport->x + x;
@@ -267,6 +275,6 @@
 }
 
-static inline void putpixel_mem(char *mem, unsigned int x, unsigned int y, 
-				int color)
+static inline void putpixel_mem(char *mem, unsigned int x, unsigned int y, int
+	color)
 {
 	(*screen.rgb2scr)(&mem[POINTPOS(x,y)], COLOR(color));
@@ -274,6 +282,5 @@
 
 static void draw_rectangle(viewport_t *vport, unsigned int sx, unsigned int sy,
-			   unsigned int width, unsigned int height,
-			   int color)
+	unsigned int width, unsigned int height, int color)
 {
 	unsigned int x, y;
@@ -297,8 +304,10 @@
 	}
 	if (vport->dbdata) {
-		for (y=sy;y < sy+height; y++) {
+		for (y = sy; y < sy + height; y++) {
 			int rline = (y + vport->dboffset) % vport->height;
-			int rpos = (rline * vport->width + sx) * screen.pixelbytes;
-			memcpy(&vport->dbdata[rpos], tmpline, screen.pixelbytes * width);
+			int rpos = (rline * vport->width + sx) *
+				screen.pixelbytes;
+			memcpy(&vport->dbdata[rpos], tmpline,
+				screen.pixelbytes * width);
 		}
 	}
@@ -309,5 +318,6 @@
 static void clear_port(viewport_t *vport)
 {
-	draw_rectangle(vport, 0, 0, vport->width, vport->height, vport->style.bg_color);
+	draw_rectangle(vport, 0, 0, vport->width, vport->height,
+		vport->style.bg_color);
 }
 
@@ -322,17 +332,19 @@
 
 	if (lines > 0) {
-		for (y=vport->y; y < vport->y+vport->height - lines; y++)
+		for (y = vport->y; y < vport->y+vport->height - lines; y++)
 			memcpy(&screen.fbaddress[POINTPOS(vport->x,y)],
 			       &screen.fbaddress[POINTPOS(vport->x,y + lines)],
 			       screen.pixelbytes * vport->width);
-		draw_rectangle(vport, 0, vport->height - lines,
-			       vport->width, lines, vport->style.bg_color);
+		draw_rectangle(vport, 0, vport->height - lines, vport->width,
+			lines, vport->style.bg_color);
 	} else if (lines < 0) {
 		lines = -lines;
-		for (y=vport->y + vport->height-1; y >= vport->y + lines; y--)
+		for (y = vport->y + vport->height-1; y >= vport->y + lines;
+			 y--)
 			memcpy(&screen.fbaddress[POINTPOS(vport->x,y)],
 			       &screen.fbaddress[POINTPOS(vport->x,y - lines)],
 			       screen.pixelbytes * vport->width);
-		draw_rectangle(vport, 0, 0, vport->width, lines, vport->style.bg_color);
+		draw_rectangle(vport, 0, 0, vport->width, lines,
+			vport->style.bg_color);
 	}
 }
@@ -408,6 +420,6 @@
  * @param transparent If false, print background color
  */
-static void draw_glyph(viewport_t *vport,uint8_t glyph, unsigned int sx, unsigned int sy, 
-		       style_t style, int transparent)
+static void draw_glyph(viewport_t *vport,uint8_t glyph, unsigned int sx,
+	 unsigned int sy, style_t style, int transparent)
 {
 	int i;
@@ -419,7 +431,9 @@
 		for (i = 0; i < 8; i++) {
 			if (glline & (1 << (7 - i)))
-				putpixel(vport, sx + i, sy + y, style.fg_color);
+				putpixel(vport, sx + i, sy + y,
+					style.fg_color);
 			else if (!transparent)
-				putpixel(vport, sx + i, sy + y, style.bg_color);
+				putpixel(vport, sx + i, sy + y,
+					style.bg_color);
 		}
 	}
@@ -434,5 +448,6 @@
 	for (x = 0; x < COL_WIDTH; x++)
 		for (y = 0; y < FONT_SCANLINES; y++)
-			invert_pixel(vport, col * COL_WIDTH + x, row * FONT_SCANLINES + y);
+			invert_pixel(vport, col * COL_WIDTH + x, row *
+				FONT_SCANLINES + y);
 }
 
@@ -446,5 +461,5 @@
  */
 static int viewport_create(unsigned int x, unsigned int y,unsigned int width, 
-			   unsigned int height)
+	unsigned int height)
 {
 	int i;
@@ -488,5 +503,6 @@
  *
  */
-static bool screen_init(void *addr, unsigned int xres, unsigned int yres, unsigned int scan, unsigned int visual, bool invert_colors)
+static bool screen_init(void *addr, unsigned int xres, unsigned int yres,
+	unsigned int scan, unsigned int visual, bool invert_colors)
 {
 	switch (visual) {
@@ -578,6 +594,6 @@
  * @param transparent If false, print background color with character
  */
-static void draw_char(viewport_t *vport, char c, unsigned int row, unsigned int col, 
-		      style_t style, int transparent)
+static void draw_char(viewport_t *vport, char c, unsigned int row, unsigned int
+	col, style_t style, int transparent)
 {
 	/* Optimize - do not hide cursor if we are going to overwrite it */
@@ -586,5 +602,6 @@
 		invert_char(vport, vport->cur_row, vport->cur_col);
 	
-	draw_glyph(vport, c, col * COL_WIDTH, row * FONT_SCANLINES, style, transparent);
+	draw_glyph(vport, c, col * COL_WIDTH, row * FONT_SCANLINES, style,
+		transparent);
 
 	vport->cur_col = col;
@@ -592,5 +609,5 @@
 
 	vport->cur_col++;
-	if (vport->cur_col>= vport->cols) {
+	if (vport->cur_col >= vport->cols) {
 		vport->cur_col = 0;
 		vport->cur_row++;
@@ -612,11 +629,13 @@
 
 	clear_port(vport);
-	for (i=0; i < vport->cols * vport->rows; i++) {
-		if (data[i].character == ' ' && style_same(data[i].style,vport->style))
+	for (i = 0; i < vport->cols * vport->rows; i++) {
+		if (data[i].character == ' ' && style_same(data[i].style,
+			vport->style))
 			continue;
 		col = i % vport->cols;
 		row = i / vport->cols;
-		draw_glyph(vport, data[i].character, col * COL_WIDTH, row * FONT_SCANLINES, 
-			   data[i].style, style_same(data[i].style,vport->style));
+		draw_glyph(vport, data[i].character, col * COL_WIDTH, row *
+			FONT_SCANLINES, data[i].style,
+			style_same(data[i].style,vport->style));
 	}
 	cursor_print(vport);
@@ -671,10 +690,10 @@
  * Protocol for drawing pixmaps:
  * - FB_PREPARE_SHM(client shm identification)
- * - IPC_M_SEND_AS_AREA
+ * - IPC_M_AS_AREA_SEND
  * - FB_DRAW_PPM(startx,starty)
  * - FB_DROP_SHM
  *
  * Protocol for text drawing
- * - IPC_M_SEND_AS_AREA
+ * - IPC_M_AS_AREA_SEND
  * - FB_DRAW_TEXT_DATA
  *
@@ -755,6 +774,7 @@
 		}
 		
-		ppm_draw(shm, shm_size, IPC_GET_ARG1(*call), IPC_GET_ARG2(*call),
-			 vport->width - x, vport->height - y, (putpixel_cb_t)putpixel, vport);
+		ppm_draw(shm, shm_size, IPC_GET_ARG1(*call),
+			IPC_GET_ARG2(*call), vport->width - x, vport->height -
+			y, (putpixel_cb_t)putpixel, vport);
 		break;
 	case FB_DRAW_TEXT_DATA:
@@ -763,5 +783,6 @@
 			break;
 		}
-		if (intersize < vport->cols*vport->rows*sizeof(*interbuffer)) {
+		if (intersize < vport->cols * vport->rows *
+			sizeof(*interbuffer)) {
 			retval = EINVAL;
 			break;
@@ -793,7 +814,9 @@
 	rowsize = width * screen.pixelbytes;
 
-	for (y=0;y < height; y++) {
-		tmp = (vport->y + y) * screen.scanline + vport->x * screen.pixelbytes;
-		memcpy(pmap->data + rowsize*y, screen.fbaddress + tmp, rowsize); 
+	for (y = 0; y < height; y++) {
+		tmp = (vport->y + y) * screen.scanline + vport->x *
+			screen.pixelbytes;
+		memcpy(pmap->data + rowsize * y, screen.fbaddress + tmp,
+			rowsize); 
 	}
 }
@@ -852,6 +875,8 @@
 
 	for (y=0; y < realheight; y++) {
-		tmp = (vport->y + y) * screen.scanline + vport->x * screen.pixelbytes;
-		memcpy(screen.fbaddress + tmp, pmap->data + y * srcrowsize, realrowsize);
+		tmp = (vport->y + y) * screen.scanline + vport->x *
+			screen.pixelbytes;
+		memcpy(screen.fbaddress + tmp, pmap->data + y * srcrowsize,
+			realrowsize);
 	}
 	return 0;
@@ -865,13 +890,16 @@
 	
 	/* Limit redrawing */
-	counts = (counts+1) % 8;
+	counts = (counts + 1) % 8;
 	if (counts)
 		return;
 
 	for (i=0; i < MAX_ANIMATIONS; i++) {
-		if (!animations[i].animlen || !animations[i].initialized || !animations[i].enabled)
+		if (!animations[i].animlen || !animations[i].initialized ||
+			!animations[i].enabled)
 			continue;
-		draw_pixmap(animations[i].vp, animations[i].pixmaps[animations[i].pos]);
-		animations[i].pos = (animations[i].pos+1) % animations[i].animlen;
+		draw_pixmap(animations[i].vp,
+			animations[i].pixmaps[animations[i].pos]);
+		animations[i].pos = (animations[i].pos + 1) %
+			animations[i].animlen;
 	}
 }
@@ -895,5 +923,6 @@
 	/* Save image under the cursor */
 	if (pointer_vport == -1) {
-		pointer_vport = viewport_create(pointer_x, pointer_y, pointer_width, pointer_height);
+		pointer_vport = viewport_create(pointer_x, pointer_y,
+			pointer_width, pointer_height);
 		if (pointer_vport < 0)
 			return;
@@ -906,15 +935,20 @@
 		pointer_pixmap = save_vp_to_pixmap(&viewports[pointer_vport]);
 	else
-		copy_vp_to_pixmap(&viewports[pointer_vport], &pixmaps[pointer_pixmap]);
+		copy_vp_to_pixmap(&viewports[pointer_vport],
+			&pixmaps[pointer_pixmap]);
 
 	/* Draw cursor */
-	for (i=0; i < pointer_height; i++)
-		for (j=0;j < pointer_width; j++) {
-			bytepos = i*((pointer_width-1)/8+1) + j/8;
-			visibility = pointer_mask_bits[bytepos] & (1 << (j % 8));
+	for (i = 0; i < pointer_height; i++)
+		for (j = 0; j < pointer_width; j++) {
+			bytepos = i * ((pointer_width - 1) / 8 + 1) + j / 8;
+			visibility = pointer_mask_bits[bytepos] & (1 << (j %
+				8));
 			if (visibility) {
-				color = pointer_bits[bytepos] & (1 << (j % 8)) ? 0 : 0xffffff;
-				if (pointer_x+j < screen.xres && pointer_y+i < screen.yres)
-					putpixel(&viewports[0], pointer_x+j, pointer_y+i, color);
+				color = pointer_bits[bytepos] & (1 << (j % 8))
+					? 0 : 0xffffff;
+				if (pointer_x + j < screen.xres && pointer_y +
+					i < screen.yres)
+					putpixel(&viewports[0], pointer_x + j,
+						 pointer_y+i, color);
 			}
 		}
@@ -951,10 +985,11 @@
 		if (nvp == -1)
 			nvp = vp;
-		if (nvp >= MAX_VIEWPORTS || nvp < 0 || !viewports[nvp].initialized) {
-			retval = EINVAL;
-			break;
-		}
-		for (i=0; i < MAX_ANIMATIONS; i++) {
-			if (! animations[i].initialized)
+		if (nvp >= MAX_VIEWPORTS || nvp < 0 ||
+			!viewports[nvp].initialized) {
+			retval = EINVAL;
+			break;
+		}
+		for (i = 0; i < MAX_ANIMATIONS; i++) {
+			if (!animations[i].initialized)
 				break;
 		}
@@ -980,5 +1015,6 @@
 	case FB_ANIM_ADDPIXMAP:
 		i = IPC_GET_ARG1(*call);
-		if (i >= MAX_ANIMATIONS || i < 0 || !animations[i].initialized) {
+		if (i >= MAX_ANIMATIONS || i < 0 ||
+			!animations[i].initialized) {
 			retval = EINVAL;
 			break;
@@ -989,5 +1025,6 @@
 		}
 		newval = IPC_GET_ARG2(*call);
-		if (newval < 0 || newval > MAX_PIXMAPS || !pixmaps[newval].data) {
+		if (newval < 0 || newval > MAX_PIXMAPS ||
+			!pixmaps[newval].data) {
 			retval = EINVAL;
 			break;
@@ -1004,5 +1041,6 @@
 		if (nvp == -1)
 			nvp = vp;
-		if (nvp >= MAX_VIEWPORTS || nvp < 0 || !viewports[nvp].initialized) {
+		if (nvp >= MAX_VIEWPORTS || nvp < 0 ||
+			!viewports[nvp].initialized) {
 			retval = EINVAL;
 			break;
@@ -1043,5 +1081,6 @@
 		if (nvp == -1)
 			nvp = vp;
-		if (nvp < 0 || nvp >= MAX_VIEWPORTS || !viewports[nvp].initialized) {
+		if (nvp < 0 || nvp >= MAX_VIEWPORTS ||
+			!viewports[nvp].initialized) {
 			retval = EINVAL;
 			break;
@@ -1054,5 +1093,6 @@
 		if (nvp == -1)
 			nvp = vp;
-		if (nvp < 0 || nvp >= MAX_VIEWPORTS || !viewports[nvp].initialized)
+		if (nvp < 0 || nvp >= MAX_VIEWPORTS ||
+			!viewports[nvp].initialized)
 			retval = EINVAL;
 		else
@@ -1126,5 +1166,5 @@
 			client_connected = 0;
 			/* cleanup other viewports */
-			for (i=1; i < MAX_VIEWPORTS; i++)
+			for (i = 1; i < MAX_VIEWPORTS; i++)
 				vport->initialized = 0;
 			return; /* Exit thread */
@@ -1141,5 +1181,6 @@
 			ipc_answer_fast(callid,0,0,0);
 
-			draw_char(vport, c, row, col, vport->style, IPC_GET_METHOD(call) == FB_TRANS_PUTCHAR);
+			draw_char(vport, c, row, col, vport->style,
+				IPC_GET_METHOD(call) == FB_TRANS_PUTCHAR);
 			continue; /* msg already answered */
 		case FB_CLEAR:
@@ -1196,6 +1237,9 @@
 			viewports[i].dboffset = 0;
 			if (IPC_GET_ARG2(call) == 1 && !viewports[i].dbdata)
-				viewports[i].dbdata = malloc(screen.pixelbytes*viewports[i].width * viewports[i].height);
-			else if (IPC_GET_ARG2(call) == 0 && viewports[i].dbdata) {
+				viewports[i].dbdata = malloc(screen.pixelbytes
+					* viewports[i].width *
+					viewports[i].height);
+			else if (IPC_GET_ARG2(call) == 0 &&
+				viewports[i].dbdata) {
 				free(viewports[i].dbdata);
 				viewports[i].dbdata = NULL;
@@ -1221,7 +1265,6 @@
 		case FB_VIEWPORT_CREATE:
 			retval = viewport_create(IPC_GET_ARG1(call) >> 16,
-						 IPC_GET_ARG1(call) & 0xffff,
-						 IPC_GET_ARG2(call) >> 16,
-						 IPC_GET_ARG2(call) & 0xffff);
+				IPC_GET_ARG1(call) & 0xffff, IPC_GET_ARG2(call)
+				 >> 16, IPC_GET_ARG2(call) & 0xffff);
 			break;
 		case FB_VIEWPORT_DELETE:
@@ -1284,8 +1327,9 @@
 
 	asz = fb_scanline * fb_height;
-	fb_addr = as_get_mappable_page(asz, (int) sysinfo_value("fb.address.color"));
-	
-	physmem_map(fb_ph_addr, fb_addr, ALIGN_UP(asz, PAGE_SIZE) >> PAGE_WIDTH,
-		    AS_AREA_READ | AS_AREA_WRITE);
+	fb_addr = as_get_mappable_page(asz, (int)
+		sysinfo_value("fb.address.color"));
+	
+	physmem_map(fb_ph_addr, fb_addr, ALIGN_UP(asz, PAGE_SIZE) >>
+		PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
 
 	if (screen_init(fb_addr, fb_width, fb_height, fb_scanline, fb_visual,
Index: uspace/fb/main.c
===================================================================
--- uspace/fb/main.c	(revision f8ddd176406660da88b0e9d63695413731cd58ff)
+++ uspace/fb/main.c	(revision f88fcbec8f4c20dfefb67f4a7237bfc980de7a2d)
@@ -46,5 +46,5 @@
 	dest = as_get_mappable_page(IPC_GET_ARG2(*call),
 		PAGE_COLOR(IPC_GET_ARG1(*call)));
-	if (ipc_answer_fast(callid, 0, (sysarg_t)dest, 0) == 0) {
+	if (ipc_answer_fast(callid, 0, (sysarg_t) dest, 0) == 0) {
 		if (*area)
 			as_area_destroy(*area);
@@ -65,5 +65,5 @@
 #endif
 #ifdef EGA_ENABLED
-	if (! initialized && sysinfo_value("fb.kind") == 2) {
+	if (!initialized && sysinfo_value("fb.kind") == 2) {
 		if (ega_init() == 0)
 			initialized = 1;
Index: uspace/libc/arch/sparc64/include/psthread.h
===================================================================
--- uspace/libc/arch/sparc64/include/psthread.h	(revision f8ddd176406660da88b0e9d63695413731cd58ff)
+++ uspace/libc/arch/sparc64/include/psthread.h	(revision f88fcbec8f4c20dfefb67f4a7237bfc980de7a2d)
@@ -46,12 +46,13 @@
 #endif
 
-#define context_set(c, _pc, stack, size, ptls)								\
-	(c)->pc = ((uintptr_t) _pc) - 8;								\
-	(c)->sp = ((uintptr_t) stack) + ALIGN_UP((size), STACK_ALIGNMENT) - (STACK_BIAS + SP_DELTA);	\
-	(c)->fp = -STACK_BIAS;										\
+#define context_set(c, _pc, stack, size, ptls)			\
+	(c)->pc = ((uintptr_t) _pc) - 8;			\
+	(c)->sp = ((uintptr_t) stack) + ALIGN_UP((size),	\
+		STACK_ALIGNMENT) - (STACK_BIAS + SP_DELTA);	\
+	(c)->fp = -STACK_BIAS;					\
 	(c)->tp = ptls
 	
 /*
- * Only save registers that must be preserved across
+ * Save only registers that must be preserved across
  * function calls.
  */