Changeset 1601f3c in mainline

Timestamp:

2009-05-21T15:32:42Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7d158097

Parents:

a095d20

Message:

console cleanup (no functional changes)

Location:

uspace/srv/console

Files:

• Makefile (modified) (2 diffs)
• console.c (modified) (29 diffs)
• console.h (modified) (2 diffs)
• gcons.c (modified) (21 diffs)
• gcons.h (modified) (2 diffs)
• gfx/anim_1.ppm (moved) (moved from uspace/srv/console/anim_1.ppm )
• gfx/anim_2.ppm (moved) (moved from uspace/srv/console/anim_2.ppm )
• gfx/anim_3.ppm (moved) (moved from uspace/srv/console/anim_3.ppm )
• gfx/anim_4.ppm (moved) (moved from uspace/srv/console/anim_4.ppm )
• gfx/cons_has_data.ppm (moved) (moved from uspace/srv/console/cons_has_data.ppm )
• gfx/cons_idle.ppm (moved) (moved from uspace/srv/console/cons_idle.ppm )
• gfx/cons_kernel.ppm (moved) (moved from uspace/srv/console/cons_kernel.ppm )
• gfx/cons_selected.ppm (moved) (moved from uspace/srv/console/cons_selected.ppm )
• gfx/helenos.ppm (moved) (moved from uspace/srv/console/helenos.ppm )
• gfx/nameic.ppm (moved) (moved from uspace/srv/console/nameic.ppm )
• screenbuffer.c (modified) (11 diffs)
• screenbuffer.h (modified) (6 diffs)

uspace/srv/console/Makefile

@@ -43 +43 @@
 
 OUTPUT = console
+
 GENERIC_SOURCES = \
         console.c \
@@ -49 +50 @@
         gcons.c
 
-IMAGES = helenos.ppm nameic.ppm cons_selected.ppm cons_idle.ppm \
-        cons_has_data.ppm cons_kernel.ppm anim_1.ppm anim_2.ppm anim_3.ppm \
-        anim_4.ppm
-
-ARCH_SOURCES = 
+IMAGES = \
+        gfx/helenos.ppm \
+        gfx/nameic.ppm \
+        gfx/cons_selected.ppm \
+        gfx/cons_idle.ppm \
+        gfx/cons_has_data.ppm \
+        gfx/cons_kernel.ppm \
+        gfx/anim_1.ppm \
+        gfx/anim_2.ppm \
+        gfx/anim_3.ppm \
+        gfx/anim_4.ppm
 
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES))) \
-                        $(addsuffix .o,$(basename $(IMAGES)))   
-ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
+        $(addsuffix .o,$(basename $(IMAGES)))
 
-OBJECTS := $(GENERIC_OBJECTS) $(ARCH_OBJECTS)
+OBJECTS := $(GENERIC_OBJECTS)
 
 .PHONY: all clean depend disasm

uspace/srv/console/console.c

@@ -28 +28 @@
 
 /** @addtogroup console
- * @{ 
+ * @{
  */
 /** @file
@@ -56 +56 @@
 #include "gcons.h"
 
-#define MAX_KEYREQUESTS_BUFFERED 32
-
-#define NAME "console"
+#define NAME  "console"
+
+#define MAX_KEYREQUESTS_BUFFERED  32
+
+/** Size of cwrite_buf. */
+#define CWRITE_BUF_SIZE  256
 
 /** Index of currently used virtual console.
@@ -70 +73 @@
 /** Information about framebuffer */
 struct {
-        int phone;              /**< Framebuffer phone */
-        ipcarg_t rows;          /**< Framebuffer rows */
-        ipcarg_t cols;          /**< Framebuffer columns */
+        int phone;      /**< Framebuffer phone */
+        ipcarg_t rows;  /**< Framebuffer rows */
+        ipcarg_t cols;  /**< Framebuffer columns */
 } fb_info;
 
 typedef struct {
-        keybuffer_t keybuffer;          /**< Buffer for incoming keys. */
+        keybuffer_t keybuffer;        /**< Buffer for incoming 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. */
+            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. */
 } 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 virtual console
-                                                 * switching */
+/** Array of data for virtual consoles */
+static connection_t connections[CONSOLE_COUNT];
+
+/** Pointer to memory shared with framebufer used for
+    faster virtual console switching */
+static keyfield_t *interbuffer = NULL;
 
 /** Information on row-span yet unsent to FB driver. */
 struct {
-        int row;                /**< Row where the span lies. */
-        int col;                /**< Leftmost column of the span. */
-        int n;                  /**< Width of the span. */
+        int row;  /**< Row where the span lies. */
+        int col;  /**< Leftmost column of the span. */
+        int cnt;  /**< Width of the span. */
 } fb_pending;
-
-/** Size of cwrite_buf. */
-#define CWRITE_BUF_SIZE 256
 
 /** Buffer for receiving data via the CONSOLE_WRITE call from the client. */
 static char cwrite_buf[CWRITE_BUF_SIZE];
-
-static void fb_putchar(wchar_t c, int row, int col);
-
 
 /** Find unused virtual console.
@@ -122 +121 @@
                         return i;
         }
+        
         return -1;
 }
@@ -186 +186 @@
                 set_style(attrs->a.s.style);
                 break;
-
         case at_idx:
                 set_color(attrs->a.i.fg_color, attrs->a.i.bg_color,
                     attrs->a.i.flags);
                 break;
-
         case at_rgb:
                 set_rgb_color(attrs->a.r.fg_color, attrs->a.r.bg_color);
@@ -201 +199 @@
 static void fb_update_area(connection_t *conn, int x, int y, int w, int h)
 {
-        int i, j;
-        int rc;
+        int i;
+        int j;
         attrs_t *attrs;
         keyfield_t *field;
-
+        
         if (interbuffer) {
                 for (j = 0; j < h; j++) {
                         for (i = 0; i < w; i++) {
                                 interbuffer[i + j * w] =
-                                    *get_field_at(&conn->screenbuffer,
-                                        x + i, y + j);
+                                    *get_field_at(&conn->screenbuffer, x + i, y + j);
                         }
                 }
-
-                rc = async_req_4_0(fb_info.phone, FB_DRAW_TEXT_DATA,
+                
+                async_req_4_0(fb_info.phone, FB_DRAW_TEXT_DATA,
                     x, y, w, h);
-        } else {
-                rc = ENOTSUP;
-        }
-
-        if (rc != 0) {
-                /*
-                attrs = &conn->screenbuffer.attrs;
-
-                for (j = 0; j < h; j++) {
-                        for (i = 0; i < w; i++) {
-                                field = get_field_at(&conn->screenbuffer,
-                                    x + i, y + j);
-                                if (!attrs_same(*attrs, field->attrs))
-                                        set_attrs(&field->attrs);
-                                attrs = &field->attrs;
-
-                                fb_putchar(field->character, y + j, x + i);
-                        }
-                }*/
         }
 }
@@ -242 +220 @@
 static void fb_pending_flush(void)
 {
-        screenbuffer_t *scr;
-
-        scr = &(connections[active_console].screenbuffer);
-
-        if (fb_pending.n > 0) {
+        screenbuffer_t *scr
+            = &(connections[active_console].screenbuffer);
+        
+        if (fb_pending.cnt > 0) {
                 fb_update_area(&connections[active_console], fb_pending.col,
-                    fb_pending.row, fb_pending.n, 1);
-                fb_pending.n = 0;
+                    fb_pending.row, fb_pending.cnt, 1);
+                fb_pending.cnt = 0;
         }
 }
@@ -257 +234 @@
  * This adds the cell to the pending rowspan if possible. Otherwise
  * the old span is flushed first.
+ *
  */
 static void cell_mark_changed(int row, int col)
 {
-        if (fb_pending.n != 0) {
-                if (row != fb_pending.row ||
-                    col != fb_pending.col + fb_pending.n) {
+        if (fb_pending.cnt != 0) {
+                if ((row != fb_pending.row)
+                    || (col != fb_pending.col + fb_pending.cnt)) {
                         fb_pending_flush();
                 }
         }
-
-        if (fb_pending.n == 0) {
+        
+        if (fb_pending.cnt == 0) {
                 fb_pending.row = row;
                 fb_pending.col = col;
         }
-
-        ++fb_pending.n;
-}
-
+        
+        fb_pending.cnt++;
+}
 
 /** Print a character to the active VC with buffering. */
@@ -287 +264 @@
         bool flush_cursor = false;
         screenbuffer_t *scr = &(connections[console].screenbuffer);
-
+        
         switch (ch) {
         case '\n':
@@ -299 +276 @@
         case '\t':
                 scr->position_x += 8;
-                scr->position_x -= scr->position_x % 8; 
+                scr->position_x -= scr->position_x % 8;
                 break;
         case '\b':
@@ -309 +286 @@
                 screenbuffer_putchar(scr, ' ');
                 break;
-        default:        
+        default:
                 if (console == active_console)
                         cell_mark_changed(scr->position_y, scr->position_x);
-
+                
                 screenbuffer_putchar(scr, ch);
                 scr->position_x++;
         }
-
+        
         if (scr->position_x >= scr->size_x) {
                 flush_cursor = true;
@@ -330 +307 @@
                         async_msg_1(fb_info.phone, FB_SCROLL, 1);
         }
-
+        
         scr->position_x = scr->position_x % scr->size_x;
-
+        
         if (console == active_console && flush_cursor)
                 curs_goto(scr->position_y, scr->position_x);
@@ -341 +318 @@
 {
         connection_t *conn;
-        int i, j, rc;
+        int i;
+        int j;
+        int rc;
         keyfield_t *field;
         attrs_t *attrs;
@@ -347 +326 @@
         if (newcons == active_console)
                 return;
-
+        
         fb_pending_flush();
-
+        
         if (newcons == KERNEL_CONSOLE) {
                 async_serialize_start();
@@ -357 +336 @@
                 kbd_yield();
                 async_serialize_end();
-
+                
                 
                 if (__SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE)) {
@@ -409 +388 @@
                                         attrs = &field->attrs;
                                         if ((field->character == ' ') &&
-                                            (attrs_same(field->attrs,
-                                            conn->screenbuffer.attrs)))
+                                            (attrs_same(field->attrs, conn->screenbuffer.attrs)))
                                                 continue;
-
+                                        
                                         fb_putchar(field->character, j, i);
                                 }
@@ -436 +414 @@
         
         /* Ignore parameters, the connection is alread opened */
-        while (1) {
+        while (true) {
                 callid = async_get_call(&call);
                 switch (IPC_GET_METHOD(call)) {
@@ -461 +439 @@
                         ev.c = IPC_GET_ARG4(call);
                         
-                        /* switch to another virtual console */
-                        
+                        /* Switch to another virtual console */
                         conn = &connections[active_console];
-
+                        
                         if ((ev.key >= KC_F1) && (ev.key < KC_F1 +
                             CONSOLE_COUNT) && ((ev.mods & KM_CTRL) == 0)) {
@@ -474 +451 @@
                         }
                         
-                        /* if client is awaiting key, send it */
-                        if (conn->keyrequest_counter > 0) {             
+                        /* If client is awaiting key, send it */
+                        if (conn->keyrequest_counter > 0) {
                                 conn->keyrequest_counter--;
                                 ipc_answer_4(fifo_pop(conn->keyrequests), EOK,
@@ -481 +458 @@
                                 break;
                         }
-
+                        
                         keybuffer_push(&conn->keybuffer, &ev);
                         retval = 0;
-
+                        
                         break;
                 default:
@@ -500 +477 @@
         wchar_t ch;
         size_t off;
-
+        
         if (!ipc_data_write_receive(&callid, &size)) {
                 ipc_answer_0(callid, EINVAL);
@@ -506 +483 @@
                 return;
         }
-
+        
         if (size > CWRITE_BUF_SIZE)
                 size = CWRITE_BUF_SIZE;
-
+        
         (void) ipc_data_write_finalize(callid, cwrite_buf, size);
-
+        
         async_serialize_start();
-
+        
         off = 0;
         while (off < size) {
@@ -519 +496 @@
                 write_char(consnum, ch);
         }
-
+        
         async_serialize_end();
-
+        
         gcons_notify_char(consnum);
         ipc_answer_1(rid, EOK, size);
@@ -553 +530 @@
         ipc_answer_0(iid, EOK);
         
-        while (1) {
+        while (true) {
                 async_serialize_end();
                 callid = async_get_call(&call);
@@ -562 +539 @@
                 arg3 = 0;
                 arg4 = 0;
-
+                
                 switch (IPC_GET_METHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
@@ -609 +586 @@
                         if (consnum == active_console) {
                                 async_req_0_0(fb_info.phone, FB_FLUSH);
-
+                                
                                 scr = &(connections[consnum].screenbuffer);
                                 curs_goto(scr->position_y, scr->position_x);
@@ -651 +628 @@
                                 /* buffer is empty -> store request */
                                 if (conn->keyrequest_counter <
-                                        MAX_KEYREQUESTS_BUFFERED) {     
+                                        MAX_KEYREQUESTS_BUFFERED) {
                                         fifo_push(conn->keyrequests, callid);
                                         conn->keyrequest_counter++;
@@ -744 +721 @@
         }
         connections[KERNEL_CONSOLE].used = 1;
-
+        
         /* Set up shared memory buffer. */
         ib_size = sizeof(keyfield_t) * fb_info.cols * fb_info.rows;
         interbuffer = as_get_mappable_page(ib_size);
-
-        fb_pending.n = 0;
-
+        
+        fb_pending.cnt = 0;
+        
         if (as_area_create(interbuffer, ib_size, AS_AREA_READ |
             AS_AREA_WRITE | AS_AREA_CACHEABLE) != interbuffer) {
                 interbuffer = NULL;
         }
-
+        
         if (interbuffer) {
                 if (ipc_share_out_start(fb_info.phone, interbuffer,
@@ -775 +752 @@
         if (event_subscribe(EVENT_KCONSOLE, 0) != EOK)
                 printf(NAME ": Error registering kconsole notifications\n");
-                
+        
         async_set_interrupt_received(interrupt_received);
         

uspace/srv/console/console.h

@@ -28 +28 @@
 
 /** @addtogroup console
- * @{ 
+ * @{
  */
 /** @file
@@ -36 +36 @@
 #define __CONSOLE_H__
 
-#define KERNEL_CONSOLE 11
-
-#define CONSOLE_COUNT 12 
+#define CONSOLE_COUNT   12
+#define KERNEL_CONSOLE  11
 
 #endif
- 
+
 /** @}
  */

uspace/srv/console/gcons.c

@@ -28 +28 @@
 
 /** @addtogroup console
- * @{ 
+ * @{
  */
 /** @file
@@ -44 +44 @@
 #include "gcons.h"
 
-#define CONSOLE_TOP      66
-#define CONSOLE_MARGIN   6
-
-#define STATUS_START    110
-#define STATUS_TOP      8
-#define STATUS_SPACE    4
-#define STATUS_WIDTH    48
-#define STATUS_HEIGHT   48
-
-#define MAIN_COLOR      0xffffff
+#define CONSOLE_TOP     66
+#define CONSOLE_MARGIN  6
+
+#define STATUS_START   110
+#define STATUS_TOP     8
+#define STATUS_SPACE   4
+#define STATUS_WIDTH   48
+#define STATUS_HEIGHT  48
+
+#define MAIN_COLOR  0xffffff
 
 static int use_gcons = 0;
@@ -115 +115 @@
         int i;
         enum butstate state = console_state[consnum];
-
+        
         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);
-        }
+        
+        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);
+        }
 }
 
@@ -133 +133 @@
 {
         int i;
-
+        
         if (!use_gcons)
                 return;
-
+        
         if (active_console == KERNEL_CONSOLE) {
                 for (i = 0; i < CONSOLE_COUNT; i++)
@@ -150 +150 @@
         }
         active_console = consnum;
-
+        
         if (console_state[consnum] == CONS_DISCONNECTED) {
                 console_state[consnum] = CONS_DISCONNECTED_SEL;
@@ -157 +157 @@
                 console_state[consnum] = CONS_SELECTED;
         redraw_state(consnum);
-
+        
         vp_switch(console_vp);
 }
@@ -166 +166 @@
         if (!use_gcons)
                 return;
-
-        if (consnum == active_console ||
-                console_state[consnum] == CONS_HAS_DATA)
-                return;
-
+        
+        if ((consnum == active_console) ||
+            (console_state[consnum] == CONS_HAS_DATA))
+                return;
+        
         console_state[consnum] = CONS_HAS_DATA;
-
+        
         if (active_console == KERNEL_CONSOLE)
                 return;
-
+        
         redraw_state(consnum);
         
@@ -186 +186 @@
         if (!use_gcons)
                 return;
+        
         if (active_console == consnum)
                 console_state[consnum] = CONS_DISCONNECTED_SEL;
@@ -203 +204 @@
         if (!use_gcons)
                 return;
+        
         if (active_console == consnum)
                 console_state[consnum] = CONS_SELECTED;
         else
                 console_state[consnum] = CONS_IDLE;
-
+        
         if (active_console == KERNEL_CONSOLE)
                 return;
-
+        
         redraw_state(consnum);
         vp_switch(console_vp);
@@ -226 +228 @@
 
 /** Return x, where left <= x <= right && |a-x|==min(|a-x|) is smallest */
-static inline int limit(int a,int left, int right)
+static inline int limit(int a, int left, int right)
 {
         if (a < left)
@@ -247 +249 @@
         mouse_x = limit(mouse_x + dx, 0, xres);
         mouse_y = limit(mouse_y + dy, 0, yres);
-
+        
         async_msg_2(fbphone, FB_POINTER_MOVE, mouse_x, mouse_y);
 }
@@ -254 +256 @@
 {
         int status_start = STATUS_START + (xres - 800) / 2;
-
-        if (y < STATUS_TOP || y >= STATUS_TOP + STATUS_HEIGHT)
+        
+        if ((y < STATUS_TOP) || (y >= STATUS_TOP + STATUS_HEIGHT))
                 return -1;
         
@@ -276 +278 @@
 {
         int conbut;
-
+        
         if (state) {
                 conbut = gcons_find_conbut(mouse_x, mouse_y);
@@ -285 +287 @@
                 }
                 return -1;
-        } 
-        if (!state && !btn_pressed)
-                return -1;
+        }
+        
+        if ((!state) && (!btn_pressed))
+                return -1;
+        
         btn_pressed = 0;
-
+        
         conbut = gcons_find_conbut(mouse_x, mouse_y);
         if (conbut == gcons_find_conbut(btn_x, btn_y))
                 return conbut;
+        
         return -1;
 }
@@ -308 +313 @@
         char *shm;
         int rc;
-
+        
         /* Create area */
         shm = mmap(NULL, size, PROTO_READ | PROTO_WRITE, MAP_SHARED |
@@ -314 +319 @@
         if (shm == MAP_FAILED)
                 return;
-
+        
         memcpy(shm, logo, size);
+        
         /* Send area */
         rc = async_req_1_0(fbphone, FB_PREPARE_SHM, (ipcarg_t) shm);
         if (rc)
                 goto exit;
+        
         rc = ipc_share_out_start(fbphone, shm, PROTO_READ);
         if (rc)
                 goto drop;
+        
         /* Draw logo */
         async_msg_2(fbphone, FB_DRAW_PPM, x, y);
+        
 drop:
         /* Drop area */
         async_msg_0(fbphone, FB_DROP_SHM);
-exit:       
+        
+exit:
         /* Remove area */
         munmap(shm, size);
 }
 
-extern char _binary_helenos_ppm_start[0];
-extern int _binary_helenos_ppm_size;
-extern char _binary_nameic_ppm_start[0];
-extern int _binary_nameic_ppm_size;
+extern char _binary_gfx_helenos_ppm_start[0];
+extern int _binary_gfx_helenos_ppm_size;
+extern char _binary_gfx_nameic_ppm_start[0];
+extern int _binary_gfx_nameic_ppm_size;
 
 /** Redraws console graphics */
@@ -349 +359 @@
         set_rgb_color(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);
+        draw_pixmap(_binary_gfx_helenos_ppm_start,
+            (size_t) &_binary_gfx_helenos_ppm_size, xres - 66, 2);
+        draw_pixmap(_binary_gfx_nameic_ppm_start,
+            (size_t) &_binary_gfx_nameic_ppm_size, 5, 17);
         
         for (i = 0; i < CONSOLE_COUNT; i++)
                 redraw_state(i);
+        
         vp_switch(console_vp);
 }
@@ -370 +381 @@
         int rc;
         int pxid = -1;
-
+        
         /* Create area */
         shm = mmap(NULL, size, PROTO_READ | PROTO_WRITE, MAP_SHARED |
@@ -376 +387 @@
         if (shm == MAP_FAILED)
                 return -1;
-
+        
         memcpy(shm, data, size);
+        
         /* Send area */
         rc = async_req_1_0(fbphone, FB_PREPARE_SHM, (ipcarg_t) shm);
         if (rc)
                 goto exit;
+        
         rc = ipc_share_out_start(fbphone, shm, PROTO_READ);
         if (rc)
                 goto drop;
-
+        
         /* Obtain pixmap */
         rc = async_req_0_0(fbphone, FB_SHM2PIXMAP);
         if (rc < 0)
                 goto drop;
+        
         pxid = rc;
+        
 drop:
         /* Drop area */
         async_msg_0(fbphone, FB_DROP_SHM);
-exit:       
+        
+exit:
         /* Remove area */
         munmap(shm, size);
-
+        
         return pxid;
 }
 
-extern char _binary_anim_1_ppm_start[0];
-extern int _binary_anim_1_ppm_size;
-extern char _binary_anim_2_ppm_start[0];
-extern int _binary_anim_2_ppm_size;
-extern char _binary_anim_3_ppm_start[0];
-extern int _binary_anim_3_ppm_size;
-extern char _binary_anim_4_ppm_start[0];
-extern int _binary_anim_4_ppm_size;
+extern char _binary_gfx_anim_1_ppm_start[0];
+extern int _binary_gfx_anim_1_ppm_size;
+extern char _binary_gfx_anim_2_ppm_start[0];
+extern int _binary_gfx_anim_2_ppm_size;
+extern char _binary_gfx_anim_3_ppm_start[0];
+extern int _binary_gfx_anim_3_ppm_size;
+extern char _binary_gfx_anim_4_ppm_start[0];
+extern int _binary_gfx_anim_4_ppm_size;
 
 static void make_anim(void)
 {
-        int an;
-        int pm;
-
-        an = async_req_1_0(fbphone, FB_ANIM_CREATE, cstatus_vp[KERNEL_CONSOLE]);
+        int an = async_req_1_0(fbphone, FB_ANIM_CREATE, cstatus_vp[KERNEL_CONSOLE]);
         if (an < 0)
                 return;
-
-        pm = make_pixmap(_binary_anim_1_ppm_start,
-            (int) &_binary_anim_1_ppm_size);
+        
+        int pm = make_pixmap(_binary_gfx_anim_1_ppm_start,
+            (int) &_binary_gfx_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_gfx_anim_2_ppm_start,
+            (int) &_binary_gfx_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_gfx_anim_3_ppm_start,
+            (int) &_binary_gfx_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_gfx_anim_4_ppm_start,
+            (int) &_binary_gfx_anim_4_ppm_size);
         async_msg_2(fbphone, FB_ANIM_ADDPIXMAP, an, pm);
-
+        
         async_msg_1(fbphone, FB_ANIM_START, an);
-
+        
         animation = an;
 }
 
-extern char _binary_cons_selected_ppm_start[0];
-extern int _binary_cons_selected_ppm_size;
-extern char _binary_cons_idle_ppm_start[0];
-extern int _binary_cons_idle_ppm_size;
-extern char _binary_cons_has_data_ppm_start[0];
-extern int _binary_cons_has_data_ppm_size;
-extern char _binary_cons_kernel_ppm_start[0];
-extern int _binary_cons_kernel_ppm_size;
+extern char _binary_gfx_cons_selected_ppm_start[0];
+extern int _binary_gfx_cons_selected_ppm_size;
+extern char _binary_gfx_cons_idle_ppm_start[0];
+extern int _binary_gfx_cons_idle_ppm_size;
+extern char _binary_gfx_cons_has_data_ppm_start[0];
+extern int _binary_gfx_cons_has_data_ppm_size;
+extern char _binary_gfx_cons_kernel_ppm_start[0];
+extern int _binary_gfx_cons_kernel_ppm_size;
 
 /** Initialize nice graphical console environment */
@@ -465 +478 @@
                 return;
         
-        /* create console viewport */
+        /* Create console viewport */
+        
         /* Align width & height to character size */
         console_vp = vp_create(CONSOLE_MARGIN, CONSOLE_TOP,
@@ -487 +501 @@
         /* 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);
+            make_pixmap(_binary_gfx_cons_selected_ppm_start,
+            (int) &_binary_gfx_cons_selected_ppm_size);
+        ic_pixmaps[CONS_IDLE] =
+            make_pixmap(_binary_gfx_cons_idle_ppm_start,
+            (int) &_binary_gfx_cons_idle_ppm_size);
         ic_pixmaps[CONS_HAS_DATA] =
-            make_pixmap(_binary_cons_has_data_ppm_start,
-            (int) &_binary_cons_has_data_ppm_size);
+            make_pixmap(_binary_gfx_cons_has_data_ppm_start,
+            (int) &_binary_gfx_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);
+            make_pixmap(_binary_gfx_cons_idle_ppm_start,
+            (int) &_binary_gfx_cons_idle_ppm_size);
+        ic_pixmaps[CONS_KERNEL] =
+            make_pixmap(_binary_gfx_cons_kernel_ppm_start,
+            (int) &_binary_gfx_cons_kernel_ppm_size);
         ic_pixmaps[CONS_DISCONNECTED_SEL] = ic_pixmaps[CONS_SELECTED];
         

uspace/srv/console/gcons.h

@@ -28 +28 @@
 
 /** @addtogroup console
- * @{ 
+ * @{
  */
 /** @file
@@ -47 +47 @@
 
 #endif
- 
+
 /** @}
  */

uspace/srv/console/screenbuffer.c

@@ -28 +28 @@
 
 /** @addtogroup console
- * @{ 
+ * @{
  */
 /** @file
@@ -38 +38 @@
 #include <unistd.h>
 
-/** Store one character to screenbuffer. Its position is determined by
- * scr->position_x and scr->position_y.
+/** Store one character to screenbuffer.
  *
- * @param scr   screenbuffer
- * @param c     stored character
+ * Its position is determined by scr->position_x
+ * and scr->position_y.
+ *
+ * @param scr Screenbuffer
+ * @param c   Stored character
+ *
  */
 void screenbuffer_putchar(screenbuffer_t *scr, wchar_t ch)
 {
-        keyfield_t *field;
-
-        field = get_field_at(scr, scr->position_x, scr->position_y);
-
+        keyfield_t *field =
+            get_field_at(scr, scr->position_x, scr->position_y);
+        
         field->character = ch;
         field->attrs = scr->attrs;
 }
 
-/** Initilize screenbuffer. Allocate space for screen content in accordance to given size.
- * @param scr           initialized screenbuffer
- * @param size_x        width in characters             
- * @param size_y        height in characters
- * @return pointer to screenbuffer (same as scr parameter) or NULL
+/** Initilize screenbuffer.
+ *
+ * Allocate space for screen content in accordance to given size.
+ *
+ * @param scr    Initialized screenbuffer
+ * @param size_x Width in characters
+ * @param size_y Height in characters
+ *
+ * @return Pointer to screenbuffer (same as scr parameter) or NULL
+ *
  */
 screenbuffer_t *screenbuffer_init(screenbuffer_t *scr, int size_x, int size_y) 
 {
         scr->buffer = (keyfield_t *) malloc(sizeof(keyfield_t) * size_x * size_y);
-        if (!scr->buffer) {
+        if (!scr->buffer)
                 return NULL;
-        }
         
         scr->size_x = size_x;
@@ -78 +84 @@
 }
 
-/** Clear screenbuffer. 
- * @param scr screenbuffer
+/** Clear screenbuffer.
+ *
+ * @param scr Screenbuffer
+ *
  */
 void screenbuffer_clear(screenbuffer_t *scr)
@@ -89 +97 @@
                 scr->buffer[i].attrs = scr->attrs;
         }
-
+        
         scr->top_line = 0;
         scr->position_y = 0;
@@ -96 +104 @@
 
 /** Clear one buffer line.
+ *
  * @param scr
  * @param line One buffer line (not a screen line!)
+ *
  */
 void screenbuffer_clear_line(screenbuffer_t *scr, unsigned int line)
@@ -110 +120 @@
 
 /** Copy content buffer from screenbuffer to given memory.
- * @param scr   source screenbuffer
- * @param dest  destination
+ *
+ * @param scr  Source screenbuffer
+ * @param dest Destination
+ *
  */
 void screenbuffer_copy_buffer(screenbuffer_t *scr, keyfield_t *dest) 
@@ -117 +129 @@
         unsigned int i;
         
-        for (i = 0; i < scr->size_x * scr->size_y; i++) {
+        for (i = 0; i < scr->size_x * scr->size_y; i++)
                 dest[i] = scr->buffer[i];
-        }
 }
 
 /** Set new cursor position in screenbuffer.
+ *
  * @param scr
  * @param x
  * @param y
+ *
  */
 void screenbuffer_goto(screenbuffer_t *scr, unsigned int x, unsigned int y)
@@ -134 +147 @@
 
 /** Set new style.
+ *
  * @param scr
  * @param fg_color
  * @param bg_color
+ *
  */
 void screenbuffer_set_style(screenbuffer_t *scr, int style)
@@ -145 +160 @@
 
 /** Set new color.
+ *
  * @param scr
  * @param fg_color
  * @param bg_color
+ *
  */
 void screenbuffer_set_color(screenbuffer_t *scr, unsigned int fg_color, unsigned int bg_color, unsigned int flags)
@@ -158 +175 @@
 
 /** Set new RGB color.
+ *
  * @param scr
  * @param fg_color
  * @param bg_color
+ *
  */
 void screenbuffer_set_rgb_color(screenbuffer_t *scr, unsigned int fg_color, unsigned int bg_color)
@@ -169 +188 @@
 }
 
- 
 /** @}
  */

uspace/srv/console/screenbuffer.h

@@ -28 +28 @@
 
 /** @addtogroup console
- * @{ 
+ * @{
  */
 /** @file
  */
 
-#ifndef __SCREENBUFFER_H__
-#define __SCREENBUFFER_H__
+#ifndef SCREENBUFFER_H__
+#define SCREENBUFFER_H__
 
 #include <stdint.h>
 #include <sys/types.h>
 
-#define DEFAULT_FOREGROUND 0x0  /**< default console foreground color */
-#define DEFAULT_BACKGROUND 0xf0f0f0     /**< default console background color */
+#define DEFAULT_FOREGROUND 0x0       /**< default console foreground color */
+#define DEFAULT_BACKGROUND 0xf0f0f0  /**< default console background color */
 
 typedef struct {
@@ -53 +53 @@
 
 typedef struct {
-        uint32_t bg_color;      /**< background color */
-        uint32_t fg_color;      /**< foreground color */
+        uint32_t bg_color;  /**< background color */
+        uint32_t fg_color;  /**< foreground color */
 } attr_rgb_t;
 
@@ -67 +67 @@
                 attr_idx_t i;
                 attr_rgb_t r;
-        } a; 
+        } a;
 } attrs_t;
 
 /** One field on screen. It contain one character and its attributes. */
 typedef struct {
-        wchar_t character;              /**< Character itself */
-        attrs_t attrs;                  /**< Character`s attributes */
+        wchar_t character;  /**< Character itself */
+        attrs_t attrs;      /**< Character`s attributes */
 } keyfield_t;
 
@@ -79 +79 @@
  */
 typedef struct {
-        keyfield_t *buffer;                     /**< Screen content - characters and their attributes. Used as a circular buffer. */
-        unsigned int size_x, size_y;            /**< Number of columns and rows */
-        unsigned int position_x, position_y;    /**< Coordinates of last printed character for determining cursor position */
-        attrs_t attrs;                          /**< Current attributes. */
-        unsigned int top_line;                  /**< Points to buffer[][] line that will be printed at screen as the first line */
-        unsigned char is_cursor_visible;        /**< Cursor state - default is visible */
+        keyfield_t *buffer;               /**< Screen content - characters and
+                                               their attributes (used as a circular buffer) */
+        unsigned int size_x;              /**< Number of columns  */
+        unsigned int size_y;              /**< Number of rows */
+        
+        /** Coordinates of last printed character for determining cursor position */
+        unsigned int position_x;
+        unsigned int position_y;
+        
+        attrs_t attrs;                    /**< Current attributes. */
+        unsigned int top_line;            /**< Points to buffer[][] line that will
+                                               be printed at screen as the first line */
+        unsigned char is_cursor_visible;  /**< Cursor state - default is visible */
 } screenbuffer_t;
 
-/** Returns keyfield for position on screen. Screenbuffer->buffer is cyclic buffer so we must couted in index of the topmost line.
- * @param scr   screenbuffer
- * @param x     position on screen
- * @param y     position on screen
- * @return      keyfield structure with character and its attributes on x,y
+/** Returns keyfield for position on screen
+ *
+ * Screenbuffer->buffer is cyclic buffer so we
+ * must couted in index of the topmost line.
+ *
+ * @param scr Screenbuffer
+ * @param x   Position on screen
+ * @param y   Position on screen
+ *
+ * @return Keyfield structure with character and its attributes on x, y
+ *
  */
 static inline keyfield_t *get_field_at(screenbuffer_t *scr, unsigned int x, unsigned int y)
@@ -99 +112 @@
 
 /** Compares two sets of attributes.
- * @param s1 first style
- * @param s2 second style
- * @return nonzero on equality
+ *
+ * @param s1 First style
+ * @param s2 Second style
+ *
+ * @return Nonzero on equality
+ *
  */
 static inline int attrs_same(attrs_t a1, attrs_t a2)
 {
-        if (a1.t != a2.t) return 0;
-
+        if (a1.t != a2.t)
+                return 0;
+        
         switch (a1.t) {
-        case at_style: return a1.a.s.style == a2.a.s.style;
-        case at_idx: return a1.a.i.fg_color == a2.a.i.fg_color &&
-            a1.a.i.bg_color == a2.a.i.bg_color &&
-            a1.a.i.flags == a2.a.i.flags;
-        case at_rgb: return a1.a.r.fg_color == a2.a.r.fg_color &&
-            a1.a.r.bg_color == a2.a.r.bg_color;
+        case at_style:
+                return (a1.a.s.style == a2.a.s.style);
+        case at_idx:
+                return (a1.a.i.fg_color == a2.a.i.fg_color)
+                    && (a1.a.i.bg_color == a2.a.i.bg_color)
+                    && (a1.a.i.flags == a2.a.i.flags);
+        case at_rgb:
+                return (a1.a.r.fg_color == a2.a.r.fg_color)
+                    && (a1.a.r.bg_color == a2.a.r.bg_color);
         }
 }
@@ -133 +153 @@
 #endif
 
- 
 /** @}
  */
-