Changeset d2cc7e1 in mainline for uspace/srv/fb

Timestamp:

2009-03-21T11:26:31Z (17 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

0a5116db

Parents:

5b8c75a

Message:

Buffer console output with line granularity. Makes esp. msim/ski console faster. EGA-fb needs fixing.

Location:

uspace/srv/fb

Files:

• ega.c (modified) (1 diff)
• fb.c (modified) (2 diffs)
• serial_console.c (modified) (3 diffs)

uspace/srv/fb/ega.c

@@ -360 +360 @@
 
                 default:
-                        retval = ENOENT;
+                        retval = EINVAL;
                 }
                 ipc_answer_0(callid, retval);

uspace/srv/fb/fb.c

@@ -1472 +1472 @@
         return rgb_from_idx(&vport->attr, fg_color, bg_color, flags);
 }
+
+#define FB_WRITE_BUF_SIZE 256
+static char fb_write_buf[FB_WRITE_BUF_SIZE];
+
+static void fb_write(viewport_t *vport, ipc_callid_t rid, ipc_call_t *request)
+{
+        int row, col;
+        ipc_callid_t callid;
+        size_t len;
+        size_t i;
+
+        row = IPC_GET_ARG1(*request);
+        col = IPC_GET_ARG2(*request);
+
+        if ((col >= vport->cols) || (row >= vport->rows)) {
+                ipc_answer_0(callid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
+                return;
+        }
+
+        if (!ipc_data_write_receive(&callid, &len)) {
+                ipc_answer_0(callid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
+                return;
+        }
+
+        if (len > FB_WRITE_BUF_SIZE)
+                len = FB_WRITE_BUF_SIZE;
+        if (len >= vport->cols - col)
+                len = vport->cols - col;
+
+        (void) ipc_data_write_finalize(callid, fb_write_buf, len);
+
+        for (i = 0; i < len; i++) {
+                draw_char(vport, fb_write_buf[i], col++, row);
+        }
+
+        ipc_answer_1(rid, EOK, len);
+}
+
 
 /** Function for handling connections to FB
@@ -1547 +1587 @@
                         /* Message already answered */
                         continue;
+                case FB_WRITE:
+                        fb_write(vport, callid, &call);
+                        
+                        /* Message already answered */
+                        continue;
                 case FB_CLEAR:
                         vport_clear(vport);

uspace/srv/fb/serial_console.c

@@ -244 +244 @@
 }
 
+int lastcol = 0;
+int lastrow = 0;
+
+#define FB_WRITE_BUF_SIZE 256
+static char fb_write_buf[FB_WRITE_BUF_SIZE];
+
+static void fb_write(ipc_callid_t rid, ipc_call_t *request)
+{
+        int row, col;
+        ipc_callid_t callid;
+        size_t len;
+        size_t i;
+
+        row = IPC_GET_ARG1(*request);
+        col = IPC_GET_ARG2(*request);
+
+        if ((col >= scr_width) || (row >= scr_height)) {
+                ipc_answer_0(callid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
+                return;
+        }
+
+        if (!ipc_data_write_receive(&callid, &len)) {
+                ipc_answer_0(callid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
+                return;
+        }
+
+        if (len > FB_WRITE_BUF_SIZE)
+                len = FB_WRITE_BUF_SIZE;
+        if (len >= scr_width - col)
+                len = scr_width - col;
+
+        (void) ipc_data_write_finalize(callid, fb_write_buf, len);
+
+        if ((lastcol != col) || (lastrow != row))
+                serial_goto(row, col);
+
+        for (i = 0; i < len; i++) {
+                (*putc_function)(fb_write_buf[i]);
+        }
+
+        lastcol = col + len;
+        lastrow = row;
+
+        ipc_answer_1(rid, EOK, len);
+}
+
 /**
  * Main function of the thread serving client connections.
@@ -256 +304 @@
 
         char c;
-        int lastcol = 0;
-        int lastrow = 0;
         int newcol;
         int newrow;
@@ -318 +364 @@
                         retval = 0;
                         break;
+                case FB_WRITE:
+                        fb_write(callid, &call);
+                        
+                        /* Message already answered */
+                        continue;
                 case FB_CURSOR_GOTO:
                         newrow = IPC_GET_ARG1(call);