Changeset 76fca31 in mainline for uspace/srv/console/gcons.c

Timestamp:

2008-12-16T19:02:07Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

5ae4443

Parents:

8fe5980

Message:

kconsole is optional
kernel & uspace framebuffer rewrite with speedups (some things are slightly broken yet)

File:

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

uspace/srv/console/gcons.c

@@ -82 +82 @@
 static void vp_switch(int vp)
 {
-        async_msg_1(fbphone,FB_VIEWPORT_SWITCH, vp);
+        async_msg_1(fbphone, FB_VIEWPORT_SWITCH, vp);
 }
 
@@ -106 +106 @@
 static void tran_putch(char c, int row, int col)
 {
-        async_msg_3(fbphone, FB_TRANS_PUTCHAR, c, row, col);
+        async_msg_3(fbphone, FB_PUTCHAR, c, row, col);
 }
 
@@ -190 +190 @@
         else
                 console_state[consnum] = CONS_DISCONNECTED;
-
+        
         if (active_console == KERNEL_CONSOLE)
                 return;
-
+        
         redraw_state(consnum);
         vp_switch(console_vp);
@@ -218 +218 @@
 void gcons_in_kernel(void)
 {
-        if (console_state[active_console] == CONS_DISCONNECTED_SEL)
-                console_state[active_console] = CONS_DISCONNECTED;
-        else
-                console_state[active_console] = CONS_IDLE;
-        redraw_state(active_console);
-
         if (animation != -1)
                 async_msg_1(fbphone, FB_ANIM_STOP, animation);
-
-        active_console = KERNEL_CONSOLE; /* Set to kernel console */
+        
+        active_console = KERNEL_CONSOLE;
         vp_switch(0);
 }
@@ -343 +337 @@
 extern char _binary_nameic_ppm_start[0];
 extern int _binary_nameic_ppm_size;
-/** Redraws console graphics  */
-static void gcons_redraw_console(void)
+
+/** Redraws console graphics */
+void gcons_redraw_console(void)
 {
         int i;
-
+        
         if (!use_gcons)
                 return;
@@ -358 +353 @@
         draw_pixmap(_binary_nameic_ppm_start,
             (size_t) &_binary_nameic_ppm_size, 5, 17);
-
+        
         for (i = 0; i < CONSOLE_COUNT; i++)
                 redraw_state(i);
@@ -460 +455 @@
         int i;
         int status_start = STATUS_START;
-
+        
         fbphone = phone;
-
+        
         rc = async_req_0_2(phone, FB_GET_RESOLUTION, &xres, &yres);
         if (rc)
                 return;
         
-        if (xres < 800 || yres < 600)
-                return;
-
+        if ((xres < 800) || (yres < 600))
+                return;
+        
         /* create console viewport */
         /* Align width & height to character size */
@@ -507 +502 @@
         
         make_anim();
-
+        
         use_gcons = 1;
         console_state[0] = CONS_DISCONNECTED_SEL;
@@ -513 +508 @@
         gcons_redraw_console();
 }
- 
+
 /** @}
  */
-