Changeset 965dc18 in mainline for uspace/srv/fb/msim.c

Timestamp:

2008-12-05T19:59:03Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

49093a4

Parents:

0258e67

Message:

Merge sparc branch to trunk.

File:

• uspace/srv/fb/msim.c (modified) (9 diffs)

uspace/srv/fb/msim.c

@@ -50 +50 @@
 #include <ddi.h>
 
+#include "serial_console.h"
 #include "msim.h"
 
@@ -65 +66 @@
 {
         *virt_addr = c;
-}
-
-static void msim_puts(char *str)
-{
-        while (*str)
-                *virt_addr = *(str++);
-}
-
-static void msim_clrscr(void)
-{
-        msim_puts("\033[2J");
-}
-
-static void msim_goto(const unsigned int row, const unsigned int col)
-{
-        if ((row > HEIGHT) || (col > WIDTH))
-                return;
-        
-        char control[MAX_CONTROL];
-        snprintf(control, MAX_CONTROL, "\033[%u;%uf", row + 1, col + 1);
-        msim_puts(control);
-}
-
-static void msim_set_style(const unsigned int mode)
-{
-        char control[MAX_CONTROL];
-        snprintf(control, MAX_CONTROL, "\033[%um", mode);
-        msim_puts(control);
-}
-
-static void msim_cursor_disable(void)
-{
-        msim_puts("\033[?25l");
-}
-
-static void msim_cursor_enable(void)
-{
-        msim_puts("\033[?25h");
-}
-
-static void msim_scroll(int i)
-{
-        if (i > 0) {
-                msim_goto(HEIGHT - 1, 0);
-                while (i--)
-                        msim_puts("\033D");
-        } else if (i < 0) {
-                msim_goto(0, 0);
-                while (i++)
-                        msim_puts("\033M");
-        }
 }
 
@@ -142 +92 @@
         /* Clear the terminal, set scrolling region
            to 0 - 25 lines */
-        msim_clrscr();
-        msim_goto(0, 0);
-        msim_puts("\033[0;25r");
+        serial_clrscr();
+        serial_goto(0, 0);
+        serial_puts("\033[0;25r");
         
         while (true) {
@@ -158 +108 @@
                         newcol = IPC_GET_ARG3(call);
                         if ((lastcol != newcol) || (lastrow != newrow))
-                                msim_goto(newrow, newcol);
+                                serial_goto(newrow, newcol);
                         lastcol = newcol + 1;
                         lastrow = newrow;
@@ -167 +117 @@
                         newrow = IPC_GET_ARG1(call);
                         newcol = IPC_GET_ARG2(call);
-                        msim_goto(newrow, newcol);
+                        serial_goto(newrow, newcol);
                         lastrow = newrow;
                         lastcol = newcol;
@@ -176 +126 @@
                         continue;
                 case FB_CLEAR:
-                        msim_clrscr();
+                        serial_clrscr();
                         retval = 0;
                         break;
@@ -183 +133 @@
                         bgcolor = IPC_GET_ARG2(call);
                         if (fgcolor < bgcolor)
-                                msim_set_style(0);
+                                serial_set_style(0);
                         else
-                                msim_set_style(7);
+                                serial_set_style(7);
                         retval = 0;
                         break;
@@ -194 +144 @@
                                 break;
                         }
-                        msim_scroll(i);
-                        msim_goto(lastrow, lastcol);
+                        serial_scroll(i);
+                        serial_goto(lastrow, lastcol);
                         retval = 0;
                         break;
                 case FB_CURSOR_VISIBILITY:
                         if(IPC_GET_ARG1(call))
-                                msim_cursor_enable();
+                                serial_cursor_enable();
                         else
-                                msim_cursor_disable();
+                                serial_cursor_disable();
                         retval = 0;
                         break;
@@ -219 +169 @@
         physmem_map(phys_addr, virt_addr, 1, AS_AREA_READ | AS_AREA_WRITE);
         
+        serial_console_init(msim_putc, WIDTH, HEIGHT);
+        
         async_set_client_connection(msim_client_connection);
         return 0;