Index: uspace/fb/ega.c
===================================================================
--- uspace/fb/ega.c	(revision f8ddd176406660da88b0e9d63695413731cd58ff)
+++ uspace/fb/ega.c	(revision 0313ff0ebb436deb6a48b67d17b944f3fc79f731)
@@ -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 0313ff0ebb436deb6a48b67d17b944f3fc79f731)
@@ -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 0313ff0ebb436deb6a48b67d17b944f3fc79f731)
@@ -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;