Changeset 253f35a1 in mainline for kernel/genarch/src/fb/fb.c

Timestamp:

2006-09-07T19:56:44Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ab1ae2d9

Parents:

801579fe

Message:

sparc64 work.

• Changes to enable userspace keyboard drivers.
• Fix z8530 initialization (i.e. clear any pending Tx interrupts).
• Experimental support for framebuffers with inverted colors.

File:

• kernel/genarch/src/fb/fb.c (modified) (8 diffs)

kernel/genarch/src/fb/fb.c

@@ -61 +61 @@
 static unsigned int bitspp = 0;
 static unsigned int pixelbytes = 0;
+#ifdef FB_INVERT_COLORS
+static bool invert_colors = true;
+#else
+static bool invert_colors = false;
+#endif
 
 static unsigned int position = 0;
@@ -66 +71 @@
 static unsigned int rows = 0;
 
-
 #define COL_WIDTH       8
 #define ROW_BYTES       (scanline * FONT_SCANLINES)
@@ -85 +89 @@
 static void (*rgb2scr)(void *, int);
 static int (*scr2rgb)(void *);
+
+static inline int COLOR(int color)
+{
+        return invert_colors ? ~color : color;
+}
 
 /* Conversion routines between different color representations */
@@ -160 +169 @@
 static void putpixel(unsigned int x, unsigned int y, int color)
 {
-        (*rgb2scr)(&fbaddress[POINTPOS(x,y)],color);
+        (*rgb2scr)(&fbaddress[POINTPOS(x,y)], COLOR(color));
 
         if (dbbuffer) {
                 int dline = (y + dboffset) % yres;
-                (*rgb2scr)(&dbbuffer[POINTPOS(x,dline)],color);
+                (*rgb2scr)(&dbbuffer[POINTPOS(x,dline)], COLOR(color));
         }
 }
@@ -173 +182 @@
         if (dbbuffer) {
                 int dline = (y + dboffset) % yres;
-                return (*scr2rgb)(&dbbuffer[POINTPOS(x,dline)]);
-        }
-        return (*scr2rgb)(&fbaddress[POINTPOS(x,y)]);
+                return COLOR((*scr2rgb)(&dbbuffer[POINTPOS(x,dline)]));
+        }
+        return COLOR((*scr2rgb)(&fbaddress[POINTPOS(x,y)]));
 }
 
@@ -275 +284 @@
                         byte >>= x % 8;
                         if (byte & 1)
-                                putpixel(startx + x, starty + y, LOGOCOLOR);
+                                putpixel(startx + x, starty + y, COLOR(LOGOCOLOR));
                 }
 }
@@ -398 +407 @@
         sysinfo_set_item_val("fb.scanline", NULL, scan);
         sysinfo_set_item_val("fb.address.physical", NULL, addr);
+        sysinfo_set_item_val("fb.invert-colors", NULL, invert_colors);
 
         /* Allocate double buffer */
@@ -417 +427 @@
         if (!blankline)
                 panic("Failed to allocate blank line for framebuffer.");
-        for (y=0; y < FONT_SCANLINES; y++)
-                for (x=0; x < xres; x++)
-                        (*rgb2scr)(&blankline[POINTPOS(x,y)],BGCOLOR);
+        for (y=0; y < FONT_SCANLINES; y++) {
+                for (x=0; x < xres; x++) {
+                        (*rgb2scr)(&blankline[POINTPOS(x,y)], COLOR(BGCOLOR));
+                }
+        }
 
         clear_screen();