Changeset d7baee6 in mainline for uspace/console/gcons.c

Timestamp:

2007-01-17T13:03:08Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

df4ed85

Parents:

c738d65

Message:

Rather big indentation and formatting changes.
More inteligent long line wrapping.

File:

• uspace/console/gcons.c (modified) (9 diffs)

uspace/console/gcons.c

@@ -90 +90 @@
 {
         return async_req_2(fbphone, FB_VIEWPORT_CREATE,
-                           (x << 16) | y, (width << 16) | height,
-                           NULL, NULL);
+                           (x << 16) | y, (width << 16) | height, NULL, NULL);
 }
 
@@ -97 +96 @@
 {
         async_msg(fbphone, FB_CLEAR, 0);
-        
 }
 
@@ -123 +121 @@
                         ic_pixmaps[state]);
 
-        if (state != CONS_DISCONNECTED && state != CONS_KERNEL && state !=
-                CONS_DISCONNECTED_SEL) {
+        if (state != CONS_DISCONNECTED && state != CONS_KERNEL &&
+                state != CONS_DISCONNECTED_SEL) {
                 snprintf(data, 5, "%d", consnum + 1);
-                for (i=0; data[i]; i++)
+                for (i = 0; data[i]; i++)
                         tran_putch(data[i], 1, 2 + i);
         }
@@ -169 +167 @@
                 return;
 
-        if (consnum == active_console || console_state[consnum] ==
-                CONS_HAS_DATA)
+        if (consnum == active_console ||
+                console_state[consnum] == CONS_HAS_DATA)
                 return;
 
@@ -358 +356 @@
         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);
@@ -431 +429 @@
                 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);
 
@@ -479 +477 @@
         /* 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;
@@ -488 +486 @@
         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,
+                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)
@@ -499 +497 @@
         /* 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_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);
+                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);
+                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);