Changeset 0a9a324 in mainline

Timestamp:

2006-06-08T16:42:20Z (18 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

8bd0316

Parents:

7674793

Message:

Speed update for frame buffer.

Files:

• console/gcons.c (modified) (1 diff)
• fb/fb.c (modified) (3 diffs)

console/gcons.c

@@ -44 +44 @@
 #include "gcons.h"
 
-#define CONSOLE_TOP      65
+#define CONSOLE_TOP      66
 #define CONSOLE_MARGIN   6
 
 #define STATUS_START    110
 #define STATUS_TOP      8
-#define STATUS_SPACE    3
+#define STATUS_SPACE    4
 #define STATUS_WIDTH    48
 #define STATUS_HEIGHT   48

fb/fb.c

@@ -224 +224 @@
 }
 
-/** Fill line with color BGCOLOR */
-static void clear_line(int vp, unsigned int y)
-{
-        unsigned int x;
-        for (x = 0; x < viewports[vp].width; x++)
-                putpixel(vp, x, y, viewports[vp].style.bg_color);
+static inline void putpixel_mem(char *mem, unsigned int x, unsigned int y, 
+                                int color)
+{
+        (*screen.rgb2scr)(&mem[POINTPOS(x,y)],color);
 }
 
@@ -237 +235 @@
 {
         unsigned int x, y;
+        static void *tmpline;
+
+        if (!tmpline)
+                tmpline = malloc(screen.scanline*screen.pixelbytes);
 
         /* Clear first line */
         for (x = 0; x < width; x++)
-                putpixel(vp, sx + x, sy, color);
+                putpixel_mem(tmpline, x, 0, color);
 
         /* Recompute to screen coords */
@@ -246 +248 @@
         sy += viewports[vp].y;
         /* Copy the rest */
-        for (y = sy+1;y < sy+height; y++)
-                memcpy(&screen.fbaddress[POINTPOS(sx,y)],
-                       &screen.fbaddress[POINTPOS(sx,sy)],
+        for (y = sy;y < sy+height; y++)
+                memcpy(&screen.fbaddress[POINTPOS(sx,y)], tmpline, 
                        screen.pixelbytes * width);