Changeset 10270a8 in mainline

Timestamp:

2009-04-24T20:24:41Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

ebfabf6

Parents:

c07544d3

Message:

Better switch to kcon on serial console — relinquish/reclaim screen before/after switching to kcon.

Location:

uspace

Files:

• lib/libc/include/ipc/fb.h (modified) (1 diff)
• srv/console/console.c (modified) (3 diffs)
• srv/fb/ega.c (modified) (1 diff)
• srv/fb/fb.c (modified) (1 diff)
• srv/fb/serial_console.c (modified) (5 diffs)

uspace/lib/libc/include/ipc/fb.h

@@ -67 +67 @@
         FB_ANIM_START,
         FB_ANIM_STOP,
-        FB_POINTER_MOVE
+        FB_POINTER_MOVE,
+        FB_SCREEN_GRAB,
+        FB_SCREEN_RELINQUISH
 } fb_request_t;
 

uspace/srv/console/console.c

@@ -142 +142 @@
 }
 
+static void screen_grab(void)
+{
+        ipc_call_sync_0_0(fb_info.phone, FB_SCREEN_GRAB);
+}
+
+static void screen_relinquish(void)
+{
+        ipc_call_sync_0_0(fb_info.phone, FB_SCREEN_RELINQUISH);
+}
+
 static void set_style(int style)
 {
@@ -331 +341 @@
                 curs_hide_sync();
                 gcons_in_kernel();
+                screen_relinquish();
                 async_serialize_end();
+
                 
                 if (__SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE)) {
@@ -343 +355 @@
                 async_serialize_start();
                 
-                if (active_console == KERNEL_CONSOLE)
+                if (active_console == KERNEL_CONSOLE) {
+                        screen_grab();
                         gcons_redraw_console();
+                }
                 
                 active_console = newcons;

uspace/srv/fb/ega.c

@@ -392 +392 @@
                         retval = 0;
                         break;
-
+                case FB_SCREEN_GRAB:
+                case FB_SCREEN_RELINQUISH:
+                        retval = EOK;
+                        break;
                 default:
                         retval = EINVAL;

uspace/srv/fb/fb.c

@@ -1714 +1714 @@
                         retval = EOK;
                         break;
+                case FB_SCREEN_GRAB:
+                case FB_SCREEN_RELINQUISH:
+                        retval = EOK;
+                        break;
                 default:
                         retval = ENOENT;

uspace/srv/fb/serial_console.c

@@ -275 +275 @@
 
                 for (i = 0; i < w; i++) {
-                        unsigned int col = x + i;
-                        unsigned int row = y + j;
-
                         field = &data[j * w + i];
 
@@ -305 +302 @@
         wchar_t c;
         int col, row, w, h;
-        int fgcolor;
-        int bgcolor;
-        int flags;
-        int style;
         int i;
 
+        attrs_t cur_attr;
         
         if (client_connected) {
@@ -319 +313 @@
         client_connected = 1;
         ipc_answer_0(iid, EOK);
+
+        cur_attr.t = at_style;
+        cur_attr.a.s.style = STYLE_NORMAL;
         
         /* Clear the terminal, set scrolling region
@@ -389 +386 @@
                         break;
                 case FB_SET_STYLE:
-                        style = IPC_GET_ARG1(call);
-                        serial_set_style(style);
+                        cur_attr.t = at_style;
+                        cur_attr.a.s.style = IPC_GET_ARG1(call);
+                        cur_attr.a.i.bg_color = IPC_GET_ARG2(call);
+                        serial_set_attrs(&cur_attr);
+
                         retval = 0;
                         break;
                 case FB_SET_COLOR:
-                        fgcolor = IPC_GET_ARG1(call);
-                        bgcolor = IPC_GET_ARG2(call);
-                        flags = IPC_GET_ARG3(call);
-
-                        serial_set_idx(fgcolor, bgcolor, flags);
+                        cur_attr.t = at_idx;
+                        cur_attr.a.i.fg_color = IPC_GET_ARG1(call);
+                        cur_attr.a.i.bg_color = IPC_GET_ARG2(call);
+                        cur_attr.a.i.flags = IPC_GET_ARG3(call);
+                        serial_set_attrs(&cur_attr);
+
                         retval = 0;
                         break;
                 case FB_SET_RGB_COLOR:
-                        fgcolor = IPC_GET_ARG1(call);
-                        bgcolor = IPC_GET_ARG2(call);
-
-                        serial_set_rgb(fgcolor, bgcolor);
+                        cur_attr.t = at_rgb;
+                        cur_attr.a.i.fg_color = IPC_GET_ARG1(call);
+                        cur_attr.a.i.bg_color = IPC_GET_ARG2(call);
+                        serial_set_attrs(&cur_attr);
+
                         retval = 0;
                         break;
@@ -425 +427 @@
                         retval = 0;
                         break;
+                case FB_SCREEN_GRAB:
+                        serial_clrscr();
+                        serial_set_attrs(&cur_attr);
+                        retval = 0;
+                        break;
+                case FB_SCREEN_RELINQUISH:
+                        serial_sgr(SGR_RESET);
+                        serial_puts("\033[2J");
+                        serial_goto(0, 0);
+                        serial_cursor_enable();
+                        retval = 0;
+                        break;
                 default:
                         retval = ENOENT;